Merge branch 'main' into thomas/fix-missing-arg-in-init

matter-labs · May 16, 2024 · 250355e · 250355e
2 parents d5b822c + 25540d9
commit 250355e
Show file tree

Hide file tree

Showing 102 changed files with 1,787 additions and 751 deletions.
diff --git a/.github/workflows/build-contract-verifier-template.yml b/.github/workflows/build-contract-verifier-template.yml
@@ -33,6 +33,7 @@ jobs:
       matrix:
           components:
             - contract-verifier
+            - verified-sources-fetcher
           platforms:
             - linux/amd64
 
@@ -154,6 +155,8 @@ jobs:
         component:
           - name: contract-verifier
             platform: linux/amd64
+          - name: verified-sources-fetcher
+            platform: linux/amd64
     env:
       IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }}
     steps:

diff --git a/.github/workflows/build-core-template.yml b/.github/workflows/build-core-template.yml
@@ -168,6 +168,7 @@ jobs:
             platform: linux/amd64,linux/arm64
           - name: snapshots-creator
             platform: linux/amd64
+
     env:
       IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }}${{ (inputs.en_alpha_release && matrix.component.name == 'external-node') && '-alpha' || '' }}
     steps:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -146,7 +146,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-prover-images]
+    needs: [ci-for-core-lint, ci-for-core, ci-for-prover, ci-for-docs, build-core-images, build-contract-verifier, build-prover-images]
     steps:
       - name: Status
         run: |

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/bin/block_reverter/src/main.rs b/core/bin/block_reverter/src/main.rs
@@ -11,7 +11,7 @@ use zksync_block_reverter::{
     BlockReverter, BlockReverterEthConfig, NodeRole,
 };
 use zksync_config::{
-    configs::{chain::NetworkConfig, ObservabilityConfig},
+    configs::{chain::NetworkConfig, DatabaseSecrets, L1Secrets, ObservabilityConfig},
     ContractsConfig, DBConfig, EthConfig, PostgresConfig,
 };
 use zksync_dal::{ConnectionPool, Core};
@@ -106,7 +106,9 @@ async fn main() -> anyhow::Result<()> {
         .default_priority_fee_per_gas;
     let contracts = ContractsConfig::from_env().context("ContractsConfig::from_env()")?;
     let network = NetworkConfig::from_env().context("NetworkConfig::from_env()")?;
-    let postgres_config = PostgresConfig::from_env().context("PostgresConfig::from_env()")?;
+    let database_secrets = DatabaseSecrets::from_env().context("DatabaseSecrets::from_env()")?;
+    let l1_secrets = L1Secrets::from_env().context("L1Secrets::from_env()")?;
+    let postgress_config = PostgresConfig::from_env().context("PostgresConfig::from_env()")?;
     let era_chain_id = env::var("CONTRACTS_ERA_CHAIN_ID")
         .context("`CONTRACTS_ERA_CHAIN_ID` env variable is not set")?
         .parse()
@@ -116,8 +118,8 @@ async fn main() -> anyhow::Result<()> {
     let config = BlockReverterEthConfig::new(&eth_sender, &contracts, &network, era_chain_id)?;
 
     let connection_pool = ConnectionPool::<Core>::builder(
-        postgres_config.master_url()?,
-        postgres_config.max_connections()?,
+        database_secrets.master_url()?,
+        postgress_config.max_connections()?,
     )
     .build()
     .await
@@ -129,7 +131,7 @@ async fn main() -> anyhow::Result<()> {
             json,
             operator_address,
         } => {
-            let eth_client = Client::http(eth_sender.web3_url.clone())
+            let eth_client = Client::http(l1_secrets.l1_rpc_url.clone())
                 .context("Ethereum client")?
                 .build();
 
@@ -147,7 +149,7 @@ async fn main() -> anyhow::Result<()> {
             priority_fee_per_gas,
             nonce,
         } => {
-            let eth_client = Client::http(eth_sender.web3_url.clone())
+            let eth_client = Client::http(l1_secrets.l1_rpc_url.clone())
                 .context("Ethereum client")?
                 .build();
             #[allow(deprecated)]

diff --git a/core/bin/contract-verifier/src/main.rs b/core/bin/contract-verifier/src/main.rs
@@ -6,7 +6,7 @@ use prometheus_exporter::PrometheusExporterConfig;
 use tokio::sync::watch;
 use zksync_config::{
     configs::{ObservabilityConfig, PrometheusConfig},
-    ApiConfig, ContractVerifierConfig, PostgresConfig,
+    ApiConfig, ContractVerifierConfig,
 };
 use zksync_dal::{ConnectionPool, Core, CoreDal};
 use zksync_env_config::FromEnv;
@@ -116,6 +116,7 @@ async fn update_compiler_versions(connection_pool: &ConnectionPool<Core>) {
 }
 
 use structopt::StructOpt;
+use zksync_config::configs::DatabaseSecrets;
 
 #[derive(StructOpt)]
 #[structopt(name = "zkSync contract code verifier", author = "Matter Labs")]
@@ -134,9 +135,9 @@ async fn main() -> anyhow::Result<()> {
         listener_port: verifier_config.prometheus_port,
         ..ApiConfig::from_env().context("ApiConfig")?.prometheus
     };
-    let postgres_config = PostgresConfig::from_env().context("PostgresConfig")?;
+    let database_secrets = DatabaseSecrets::from_env().context("DatabaseSecrets")?;
     let pool = ConnectionPool::<Core>::singleton(
-        postgres_config
+        database_secrets
             .master_url()
             .context("Master DB URL is absent")?,
     )