adding missing fields

matter-labs · Dec 4, 2024 · 6dc4ecb · 6dc4ecb
1 parent 9c8b13d
commit 6dc4ecb
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -325,4 +325,4 @@ zksync_node_consensus = { version = "0.1.0", path = "core/node/consensus" }
 zksync_contract_verification_server = { version = "0.1.0", path = "core/node/contract_verification_server" }
 zksync_node_api_server = { version = "0.1.0", path = "core/node/api_server" }
 zksync_base_token_adjuster = { version = "0.1.0", path = "core/node/base_token_adjuster" }
-zksync_logs_bloom_backfill = { version = "0.1.0", path = "core/node/logs_bloom_backfill" }
+zksync_logs_bloom_backfill = { version = "0.1.0", path = "core/node/logs_bloom_backfill" }
diff --git a/core/bin/envs_to_files/Cargo.toml b/core/bin/envs_to_files/Cargo.toml
@@ -14,8 +14,6 @@ zksync_config.workspace = true
 zksync_env_config.workspace = true
 zksync_protobuf_config.workspace = true
 zksync_core_leftovers.workspace = true
-
-
 anyhow.workspace = true
 clap = { workspace = true, features = ["derive"] }
 serde_json.workspace = true

diff --git a/core/bin/envs_to_files/src/main.rs b/core/bin/envs_to_files/src/main.rs
@@ -6,7 +6,7 @@ use zksync_config::{
         api::{HealthCheckConfig, MerkleTreeApiConfig, Web3JsonRpcConfig},
         chain::{
             CircuitBreakerConfig, MempoolConfig, NetworkConfig, OperationsManagerConfig,
-            StateKeeperConfig,
+            StateKeeperConfig, TimestampAsserterConfig,
         },
         fri_prover_group::FriProverGroupConfig,
         house_keeper::HouseKeeperConfig,
@@ -16,7 +16,7 @@ use zksync_config::{
         L1Secrets, ObjectStoreConfig, ObservabilityConfig, PrometheusConfig,
         ProofDataHandlerConfig, ProtectiveReadsWriterConfig, ProverJobMonitorConfig,
     },
-    ApiConfig, BaseTokenAdjusterConfig, ContractVerifierConfig, ContractsConfig,
+    ApiConfig, BaseTokenAdjusterConfig, ContractVerifierConfig, ContractsConfig, DAClientConfig,
     DADispatcherConfig, DBConfig, EthConfig, EthWatchConfig, ExternalProofIntegrationApiConfig,
     GasAdjusterConfig, GenesisConfig, PostgresConfig, SnapshotsCreatorConfig,
 };
@@ -60,6 +60,7 @@ fn load_env_config() -> TempConfigStore {
         gas_adjuster_config: GasAdjusterConfig::from_env().ok(),
         observability: ObservabilityConfig::from_env().ok(),
         snapshot_creator: SnapshotsCreatorConfig::from_env().ok(),
+        da_client_config: DAClientConfig::from_env().ok(),
         da_dispatcher_config: DADispatcherConfig::from_env().ok(),
         protective_reads_writer_config: ProtectiveReadsWriterConfig::from_env().ok(),
         basic_witness_input_producer_config: BasicWitnessInputProducerConfig::from_env().ok(),
@@ -72,6 +73,7 @@ fn load_env_config() -> TempConfigStore {
         external_proof_integration_api_config: ExternalProofIntegrationApiConfig::from_env().ok(),
         experimental_vm_config: ExperimentalVmConfig::from_env().ok(),
         prover_job_monitor_config: ProverJobMonitorConfig::from_env().ok(),
+        timestamp_asserter_config: TimestampAsserterConfig::from_env().ok(),
     }
 }
 
@@ -86,6 +88,7 @@ fn main() {
         consensus: None,
         database: DatabaseSecrets::from_env().ok(),
         l1: L1Secrets::from_env().ok(),
+        data_availability: None,
     };
 
     let data = encode_yaml(&ProtoGeneral::build(&general)).unwrap();

diff --git a/etc/env/file_based/general.yaml b/etc/env/file_based/general.yaml
@@ -382,4 +382,4 @@ consensus:
   server_addr: "127.0.0.1:3054"
   public_addr: "127.0.0.1:3054"
   max_payload_size: 2500000
-  gossip_dynamic_inbound_limit: 100
+  gossip_dynamic_inbound_limit: 100
diff --git a/etc/env/file_based/genesis.yaml b/etc/env/file_based/genesis.yaml
@@ -13,4 +13,4 @@ prover:
 genesis_protocol_semantic_version: 0.25.0
 l1_batch_commit_data_generator_mode: Rollup
 # TODO: uncomment once EVM emulator is present in the `contracts` submodule
-# evm_emulator_hash: 0x01000e53aa35d9d19fa99341c2e2901cf93b3668f01569dd5c6ca409c7696b91
+# evm_emulator_hash: 0x01000e53aa35d9d19fa99341c2e2901cf93b3668f01569dd5c6ca409c7696b91
diff --git a/etc/env/file_based/secrets.yaml b/etc/env/file_based/secrets.yaml
@@ -3,4 +3,4 @@ database:
   server_replica_url: postgres://postgres:notsecurepassword@localhost/zksync_local
   prover_url: postgres://postgres:notsecurepassword@localhost/prover_local
 l1:
-  l1_rpc_url: http://127.0.0.1:8545/
+  l1_rpc_url: http://127.0.0.1:8545