Merge branch 'dev' into vb-add-missing-ts-tests

Cargo.toml

@@ -8,6 +8,13 @@ members = [
     "core/bin/gen_token_add_contract",
     "core/bin/parse_pub_data",
 
+    # Server micro-services
+    "core/bin/zksync_api",
+    "core/bin/zksync_core",
+    "core/bin/zksync_eth_sender",
+    "core/bin/zksync_witness_generator",
+    "core/bin/zksync_prometheus_exporter",
+
     # Libraries
     "core/lib/circuit",
     "core/lib/eth_client",

bin/ci-integration-tests.sh

@@ -21,7 +21,7 @@ function cat_logs() {
     exitcode=$?
     echo "Termination started"
     # Wait for server to finish any ongoing jobs
-    sleep 30
+    sleep 5
 
     set +e
     pkill -P $SERVER_PID
@@ -34,7 +34,7 @@ function cat_logs() {
     cat integration-prover.log
 
     # Wait for server to be surely killed
-    sleep 10
+    sleep 5
 
     exit $exitcode
 }

bin/ci-zcli.sh

@@ -16,15 +16,15 @@ function cat_logs() {
     echo Termination started
 
     # Wait for server to finish any ongoing jobs
-    sleep 30
+    sleep 5
 
     set +e
     pkill -P $TIMEOUT_PID,$SERVER_PID
     echo Server logs:
     cat zcli-test-server.log
 
     # Wait for server to be surely killed
-    sleep 10
+    sleep 5
 
     exit $exitcode
 }

bin/rust-sdk-tests.sh

@@ -21,7 +21,7 @@ function cat_logs() {
     echo Termination started
 
     # Wait for server to finish any ongoing jobs
-    sleep 30
+    sleep 5
 
     set +e
     pkill -P $SERVER_PID
@@ -34,15 +34,22 @@ function cat_logs() {
     cat rust-sdk-prover.log
 
     # Wait for server to be surely killed
-    sleep 10
+    sleep 5
 
     exit $exitcode
 }
 
 zksync dummy-prover status | grep -q 'disabled' && zksync dummy-prover enable
 
+# We have to compile binaries, because otherwise the time to compile it may exceed 15 seconds,
+# and the test will start without an actually running server.
+f cargo build --bin zksync_server --release
+f cargo build --bin dummy_prover --release
+
 zksync server &> rust-sdk-server.log &
 SERVER_PID=$!
+# Wait a bit, so server and prover won't have conflicts about the workspace lockfile.
+sleep 1 
 zksync dummy-prover &> rust-sdk-prover.log &
 PROVER_PID=$!
 

contracts/scripts/contract-info.ts

@@ -1,14 +1,14 @@
-import {Contract, ethers} from "ethers";
-import {Deployer} from "../src.ts/deploy";
+import { Contract, ethers } from "ethers";
+import { Deployer } from "../src.ts/deploy";
 
 const provider = new ethers.providers.JsonRpcProvider(process.env.WEB3_URL);
 const wallet = ethers.Wallet.fromMnemonic(process.env.MNEMONIC, "m/44'/60'/0'/0/1").connect(provider);
 
 async function main() {
-    const deployer = new Deployer({deployWallet: wallet});
+    const deployer = new Deployer({ deployWallet: wallet });
     const upgradeGatekeeper = deployer.upgradeGatekeeperContract(wallet);
     const tx = await upgradeGatekeeper.finishUpgrade(["0x", "0x", "0x"]);
-    console.log(tx)
+    console.log(tx);
 }
 
 main();