merge new changes from upstream

Author: Jrigada

.dockerignore

@@ -1,6 +1,5 @@
 *
 !docker/prover/prover-entry.sh
-!docker/local-node/entrypoint.sh
 !docker/external-node/entrypoint.sh
 !docker/contract-verifier/install-all-solc.sh
 !etc/test_config

.github/workflows/build-local-node-docker.yml

@@ -215,8 +215,8 @@ proc-macro2 = "1.0"
 trybuild = "1.0"
 
 # "Internal" dependencies
-vise = "0.3.1"
-vise-exporter = "0.3.1"
+vise = "0.3.2"
+vise-exporter = "0.3.2"
 smart-config = "=0.2.0-pre"
 smart-config-commands = "=0.2.0-pre"
 foundry-compilers = { version = "0.11.6", git = "https://github.com/Moonsong-Labs/compilers.git", rev = "7c69695e5c75451f158dd2456bf8c94a7492ea0b" }

core/Cargo.lock

@@ -15,8 +15,8 @@ use zksync_block_reverter::{
 };
 use zksync_config::{
     configs::{
-        wallets::Wallets, BasicWitnessInputProducerConfig, DatabaseSecrets, GenesisConfigWrapper,
-        L1Secrets, ProtectiveReadsWriterConfig,
+        wallets::Wallets, BasicWitnessInputProducerConfig, GenesisConfigWrapper, L1Secrets,
+        PostgresSecrets, ProtectiveReadsWriterConfig,
     },
     full_config_schema,
     sources::ConfigFilePaths,
@@ -132,7 +132,7 @@ async fn main() -> anyhow::Result<()> {
         .observability()?
         .install_with_logs(zksync_vlog::Logs::disable_default_logs)?;
 
-    let schema = full_config_schema(false);
+    let schema = full_config_schema();
     let mut repo = config_sources.build_repository(&schema);
     let wallets_config: Option<Wallets> = repo.parse_opt()?;
     let genesis_config = repo.parse::<GenesisConfigWrapper>()?.genesis;
@@ -142,7 +142,7 @@ async fn main() -> anyhow::Result<()> {
     let basic_witness_input_producer_config: BasicWitnessInputProducerConfig = repo.parse()?;
     let contracts: ContractsConfig = repo.parse()?;
     let postgres_config: PostgresConfig = repo.parse()?;
-    let database_secrets: DatabaseSecrets = repo.parse()?;
+    let database_secrets: PostgresSecrets = repo.parse()?;
     let l1_secrets: L1Secrets = repo.parse()?;
 
     let default_priority_fee_per_gas = eth_sender.gas_adjuster.default_priority_fee_per_gas;

core/Cargo.toml

@@ -4,7 +4,7 @@ use anyhow::Context as _;
 use clap::Parser;
 use tokio::sync::watch;
 use zksync_config::{
-    configs::{ContractVerifierSecrets, DatabaseSecrets},
+    configs::{ContractVerifierSecrets, PostgresSecrets},
     full_config_schema,
     sources::ConfigFilePaths,
     ContractVerifierConfig,
@@ -72,9 +72,9 @@ async fn main() -> anyhow::Result<()> {
 
     let _observability_guard = config_sources.observability()?.install()?;
 
-    let schema = full_config_schema(false);
+    let schema = full_config_schema();
     let mut repo = config_sources.build_repository(&schema);
-    let database_secrets: DatabaseSecrets = repo.parse()?;
+    let database_secrets: PostgresSecrets = repo.parse()?;
     let contract_verifier_secrets: ContractVerifierSecrets = repo.parse()?;
     let verifier_config: ContractVerifierConfig = repo.parse()?;
 

core/bin/block_reverter/src/main.rs

@@ -16,10 +16,8 @@ zksync_commitment_generator.workspace = true
 zksync_dal = { workspace = true, features = ["node_framework"] }
 zksync_config = { workspace = true, features = ["observability_ext", "cli"] }
 zksync_eth_client = { workspace = true, features = ["node_framework"] }
-zksync_storage.workspace = true
 zksync_state.workspace = true
 zksync_contracts.workspace = true
-zksync_l1_contract_interface.workspace = true
 zksync_snapshots_applier.workspace = true
 zksync_object_store = { workspace = true, features = ["node_framework"] }
 zksync_health_check = { workspace = true, features = ["node_framework"] }
@@ -29,11 +27,9 @@ zksync_block_reverter.workspace = true
 zksync_da_clients.workspace = true
 zksync_gateway_migrator.workspace = true
 zksync_logs_bloom_backfill.workspace = true
-zksync_node_genesis.workspace = true
 zksync_node_fee_model.workspace = true
 zksync_node_storage_init.workspace = true
 zksync_node_db_pruner.workspace = true
-zksync_eth_sender.workspace = true
 zksync_state_keeper.workspace = true
 zksync_reorg_detector.workspace = true
 zksync_consistency_checker.workspace = true
@@ -44,7 +40,6 @@ zksync_node_consensus.workspace = true
 zksync_node_framework.workspace = true
 zksync_vlog = { workspace = true, features = ["node_framework"] }
 
-zksync_concurrency.workspace = true
 zksync_consensus_roles.workspace = true
 zksync_consensus_crypto.workspace = true
 vise.workspace = true
@@ -55,12 +50,9 @@ anyhow.workspace = true
 tokio = { workspace = true, features = ["full"] }
 futures.workspace = true
 serde = { workspace = true, features = ["derive"] }
-envy.workspace = true
 smart-config.workspace = true
 url.workspace = true
 clap = { workspace = true, features = ["derive"] }
-serde_json.workspace = true
-serde_yaml.workspace = true
 tracing.workspace = true
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
@@ -71,5 +63,7 @@ zksync_instrument = { workspace = true, features = ["jemalloc"] }
 
 [dev-dependencies]
 assert_matches.workspace = true
+serde_yaml.workspace = true
 tempfile.workspace = true
 test-casing.workspace = true
+zksync_node_genesis.workspace = true