Updated mirror.

Cargo.toml

@@ -6,14 +6,17 @@ members = [
     # "core/bin/prover",
     # Server
     "core/bin/zksync_core",
+    "core/bin/external_node",
     "core/bin/admin-tools",
     "core/bin/system-constants-generator",
+    "core/tests/cross_external_nodes_checker",
     # Contract verifier
     "core/bin/contract-verifier",
     # Setup key generator and server: its commented as it cannot be built with stable rust.
     # "core/bin/setup_key_generator_and_server",
     # Verification key generator and server
     "core/bin/verification_key_generator_and_server",
+    "core/bin/witness_generator",
     # circuit synthesizer: its commented as it cannot be built with stable rust.
     # "core/bin/circuit_synthesizer",
     # Libraries
@@ -28,6 +31,7 @@ members = [
     "core/lib/eth_signer",
     "core/lib/mempool",
     "core/lib/merkle_tree",
+    "core/lib/merkle_tree2",
     "core/lib/object_store",
     "core/lib/mini_merkle_tree",
     "core/lib/prometheus_exporter",
@@ -40,10 +44,13 @@ members = [
     "core/lib/vlog",
     "core/lib/vm",
     "core/lib/web3_decl",
+    "core/lib/db_storage_provider",
 
     # Test infrastructure
     "core/tests/loadnext",
     "core/tests/testkit",
+    "core/tests/vm-benchmark",
+    "core/tests/vm-benchmark/harness",
 
     # SDK section
     "sdk/zksync-rs",
@@ -55,3 +62,7 @@ exclude = [ "core/bin/prover", "core/bin/circuit_synthesizer", "core/bin/setup_k
 [profile.test.package.zksync_merkle_tree]
 opt-level = 3
 
+# for `perf` profiling
+[profile.perf]
+inherits = "release"
+debug = true

bors.toml

@@ -4,14 +4,12 @@ timeout-sec = 14400
 
 # If expected statuses are not specified explicitly, bors tries to "guess" and apperently does it wrong sometimes
 status = [
-  "codecov/patch",
-  "codecov/project",
-  "generate",
   "integration",
   "loadtest",
   "lint",
   "testkit",
-  "Build images / Build and Push Docker Images"
+  "unit-tests",
+  "Build images / Build and Push Docker Images",
 ]
 
 use_squash_merge = true

core/bin/admin-tools/src/application.rs

@@ -24,8 +24,7 @@ pub fn create_app<'a>(profile: &Option<String>) -> Result<App<'a>, AppError> {
 
     let tokio = tokio::runtime::Runtime::new().map_err(|x| AppError::Init(InitError::IO(x)))?;
 
-    let db =
-        tokio.block_on(async { zksync_dal::StorageProcessor::establish_connection(true).await });
+    let db = zksync_dal::StorageProcessor::establish_connection_blocking(true);
 
     let invocation = std::process::Command::new("stty")
         .arg("-f")