Merge branch 'main' into anastasiia-add-new-block-tag

.github/workflows/ci-common-reusable.yml

@@ -29,6 +29,7 @@ jobs:
       - name: Init
         run: |
           ci_run zk
+          ci_run run_retried rustup show
           ci_run zk db setup
 
       # This does both linting and "building". We're using `zk lint prover` as it's common practice within our repo

.github/workflows/ci-core-lint-reusable.yml

@@ -28,6 +28,7 @@ jobs:
       - name: Setup db
         run: |
           ci_run zk
+          ci_run run_retried rustup show
           ci_run zk db migrate
 
       - name: Lints

.github/workflows/ci-core-reusable.yml

@@ -53,6 +53,7 @@ jobs:
       - name: Init
         run: |
           ci_run zk
+          ci_run run_retried rustup show
           ci_run zk run yarn
           ci_run zk db setup
           ci_run zk compiler all
@@ -192,6 +193,7 @@ jobs:
           ci_run git config --global --add safe.directory /usr/src/zksync/contracts/system-contracts
           ci_run git config --global --add safe.directory /usr/src/zksync/contracts
           ci_run zk
+          ci_run run_retried rustup show
           if [[ "${{ matrix.deployment_mode }}" == "Validium" ]]; then
             ci_run zk env dev_validium_docker
             ci_run zk config compile dev_validium_docker
@@ -333,6 +335,7 @@ jobs:
           ci_run git config --global --add safe.directory /usr/src/zksync/contracts/system-contracts
           ci_run git config --global --add safe.directory /usr/src/zksync/contracts
           ci_run zk
+          ci_run run_retried rustup show
           if [[ "${{ matrix.deployment_mode }}" == "Rollup" ]]; then
             ci_run zk config compile
           elif [[ "${{ matrix.deployment_mode }}" == "Validium" ]]; then

.github/workflows/ci-prover-reusable.yml

@@ -60,6 +60,7 @@ jobs:
       - name: Init
         run: |
           ci_run zk
+          ci_run run_retried rustup show
           ci_run zk db setup
 
       - name: Prover unit tests

.github/workflows/ci-zk-toolbox-reusable.yml

@@ -28,6 +28,7 @@ jobs:
       - name: Start services
         run: |
           ci_localnet_up
+          ci_run sccache --start-server
 
       - name: Build
         run: |
@@ -75,6 +76,7 @@ jobs:
       - name: Start services
         run: |
           ci_localnet_up
+          ci_run sccache --start-server
 
       - name: Initialize ecosystem
         run: |
@@ -88,7 +90,7 @@ jobs:
 
       - name: Run server
         run: |
-          ci_run zk_inception server --ignore-prerequisites &>server.log &
+          ci_run zk_inception server --ignore-prerequisites -a --use-node-framework --verbose &>server.log &
           ci_run sleep 5
 
       - name: Run integration tests

.github/workflows/ci.yml

@@ -157,7 +157,7 @@ jobs:
     name: Github Status Check
     runs-on: ubuntu-latest
     if: always() && !cancelled()
-    needs: [ci-for-core-lint, ci-for-core, ci-for-prover, ci-for-docs, build-core-images, build-contract-verifier, build-prover-images]
+    needs: [ci-for-core-lint, ci-for-common, ci-for-core, ci-for-prover, ci-for-docs, build-core-images, build-contract-verifier, build-prover-images]
     steps:
       - name: Status
         run: |

CONTRIBUTING.md

@@ -40,7 +40,7 @@ We aim to make it as easy as possible to contribute to the mission. This is stil
 and suggestions here too. Some resources to help:
 
 1. [In-repo docs aimed at developers](docs)
-2. [zkSync Era docs!](https://docs.zksync.io)
+2. [ZKsync Era docs!](https://docs.zksync.io)
 3. Company links can be found in the [repositories' readme](README.md)
 
 ## Code of Conduct

Cargo.toml

@@ -38,6 +38,7 @@ members = [
     "core/lib/basic_types",
     "core/lib/config",
     "core/lib/constants",
+    "core/lib/contract_verifier",
     "core/lib/contracts",
     "core/lib/crypto",
     "core/lib/circuit_breaker",
@@ -212,6 +213,7 @@ zksync = { path = "sdk/zksync-rs" }
 zksync_basic_types = { path = "core/lib/basic_types" }
 zksync_circuit_breaker = { path = "core/lib/circuit_breaker" }
 zksync_config = { path = "core/lib/config" }
+zksync_contract_verifier_lib = { path = "core/lib/contract_verifier" }
 zksync_contracts = { path = "core/lib/contracts" }
 zksync_core_leftovers = { path = "core/lib/zksync_core_leftovers" }
 zksync_crypto = { path = "core/lib/crypto" }

README.md

@@ -1,10 +1,10 @@
-# zkSync Era: A ZK Rollup For Scaling Ethereum
+# ZKsync Era: A ZK Rollup For Scaling Ethereum
 
 [![Logo](eraLogo.png)](https://zksync.io/)
 
-zkSync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or
+ZKsync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or
 decentralization. Since it's EVM compatible (Solidity/Vyper), 99% of Ethereum projects can redeploy without refactoring
-or re-auditing a single line of code. zkSync Era also uses an LLVM-based compiler that will eventually let developers
+or re-auditing a single line of code. ZKsync Era also uses an LLVM-based compiler that will eventually let developers
 write smart contracts in C++, Rust and other popular languages.
 
 ## Knowledge Index
@@ -27,7 +27,7 @@ The following questions will be answered by the following resources:
 
 ## License
 
-zkSync Era is distributed under the terms of either
+ZKsync Era is distributed under the terms of either
 
 - Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
 - MIT license ([LICENSE-MIT](LICENSE-MIT) or <https://opensource.org/blog/license/mit/>)
@@ -47,7 +47,7 @@ at your option.
 
 ## Disclaimer
 
-zkSync Era has been through lots of testing and audits. Although it is live, it is still in alpha state and will go
+ZKsync Era has been through lots of testing and audits. Although it is live, it is still in alpha state and will go
 through more audits and bug bounty programs. We would love to hear our community's thoughts and suggestions about it! It
 is important to state that forking it now can potentially lead to missing important security updates, critical features,
 and performance improvements.

checks-config/era.dic

@@ -135,7 +135,7 @@ boolean
 prover
 timestamp
 H160
-zkSync
+ZKsync
 AccessList
 miniblock
 member₁
@@ -212,7 +212,7 @@ EOAs
 zeroized
 cardinality
 
-// zkSync-related words
+// ZKsync-related words
 matterlabs
 zkweb
 zksync
@@ -610,7 +610,7 @@ DBs
 unexecutable
 RLP
 DAL
-zkSync's
+ZKsync's
 l2_to_l1
 PoW
 coinbase
@@ -962,6 +962,7 @@ zksync_merkle_tree
 TreeMetadata
 delegator
 decrement
+whitelisted
 Bbellman
 Sbellman
 DCMAKE

core/bin/contract-verifier/Cargo.toml

@@ -11,11 +11,10 @@ categories.workspace = true
 publish = false
 
 [dependencies]
-zksync_types.workspace = true
 zksync_dal.workspace = true
 zksync_env_config.workspace = true
 zksync_config.workspace = true
-zksync_contracts.workspace = true
+zksync_contract_verifier_lib.workspace = true
 zksync_queued_job_processor.workspace = true
 zksync_utils.workspace = true
 prometheus_exporter.workspace = true
@@ -25,15 +24,5 @@ anyhow.workspace = true
 tokio = { workspace = true, features = ["full"] }
 futures.workspace = true
 ctrlc.workspace = true
-thiserror.workspace = true
-chrono.workspace = true
-serde_json.workspace = true
-ethabi.workspace = true
-vise.workspace = true
-hex.workspace = true
-serde = { workspace = true, features = ["derive"] }
 structopt.workspace = true
-lazy_static.workspace = true
-tempfile.workspace = true
-regex.workspace = true
 tracing.workspace = true

core/bin/contract-verifier/src/main.rs

@@ -9,19 +9,12 @@ use zksync_config::{
     configs::{ObservabilityConfig, PrometheusConfig},
     ApiConfig, ContractVerifierConfig,
 };
+use zksync_contract_verifier_lib::ContractVerifier;
 use zksync_dal::{ConnectionPool, Core, CoreDal};
 use zksync_env_config::FromEnv;
 use zksync_queued_job_processor::JobProcessor;
 use zksync_utils::{wait_for_tasks::ManagedTasks, workspace_dir_or_current_dir};
 
-use crate::verifier::ContractVerifier;
-
-pub mod error;
-mod metrics;
-pub mod verifier;
-pub mod zksolc_utils;
-pub mod zkvyper_utils;
-
 async fn update_compiler_versions(connection_pool: &ConnectionPool<Core>) {
     let mut storage = connection_pool.connection().await.unwrap();
     let mut transaction = storage.start_transaction().await.unwrap();
@@ -119,7 +112,7 @@ async fn update_compiler_versions(connection_pool: &ConnectionPool<Core>) {
 use zksync_config::configs::DatabaseSecrets;
 
 #[derive(StructOpt)]
-#[structopt(name = "zkSync contract code verifier", author = "Matter Labs")]
+#[structopt(name = "ZKsync contract code verifier", author = "Matter Labs")]
 struct Opt {
     /// Number of jobs to process. If None, runs indefinitely.
     #[structopt(long)]

core/bin/external_node/Cargo.toml

@@ -42,6 +42,7 @@ zksync_metadata_calculator.workspace = true
 zksync_node_sync.workspace = true
 zksync_node_api_server.workspace = true
 zksync_node_consensus.workspace = true
+zksync_node_framework.workspace = true
 vlog.workspace = true
 
 zksync_concurrency.workspace = true

core/bin/external_node/README.md

@@ -1,4 +1,4 @@
-# zkSync External Node
+# ZKsync External Node
 
 This application is a read replica that can sync from the main node and serve the state locally.
 

core/bin/external_node/src/config/mod.rs

@@ -647,7 +647,7 @@ pub(crate) struct RequiredENConfig {
     /// L1 chain ID (e.g., 9 for Ethereum mainnet). This ID will be checked against the `eth_client_url` RPC provider on initialization
     /// to ensure that there's no mismatch between the expected and actual L1 network.
     pub l1_chain_id: L1ChainId,
-    /// L2 chain ID (e.g., 270 for zkSync Era mainnet). This ID will be checked against the `main_node_url` RPC provider on initialization
+    /// L2 chain ID (e.g., 270 for ZKsync Era mainnet). This ID will be checked against the `main_node_url` RPC provider on initialization
     /// to ensure that there's no mismatch between the expected and actual L2 network.
     pub l2_chain_id: L2ChainId,