fixes

Author: tomg10

core/bin/external_node/src/node_builder.rs

@@ -575,7 +575,7 @@ impl ExternalNodeBuilder {
                 .optional
                 .snapshots_recovery_postgres_max_concurrency,
             snapshot_recovery_config,
-            diamond_proxy_addr: self.config.diamond_proxy_address(),
+            diamond_proxy_addr: self.config.l1_diamond_proxy_address(),
         });
         let mut layer = NodeStorageInitializerLayer::new();
         if matches!(kind, LayerKind::Precondition) {

core/lib/dal/.sqlx/query-1701ec926e3fc1a170cc9432cc39544065610769d865092197ec0b8e52384939.json

@@ -9,10 +9,7 @@ use zksync_eth_client::EthInterface;
 use zksync_object_store::ObjectStore;
 use zksync_types::{
     aggregated_operations::AggregatedActionType,
-    block::{
-        BlockGasCount, L1BatchHeader, L1BatchTreeData, L2BlockHasher, L2BlockHeader,
-        UnsealedL1BatchHeader,
-    },
+    block::{L1BatchHeader, L1BatchTreeData, L2BlockHasher, L2BlockHeader, UnsealedL1BatchHeader},
     commitment::{L1BatchCommitmentArtifacts, L1BatchCommitmentHash},
     fee_model::{BatchFeeInput, L1PeggedBatchFeeModelInput},
     snapshots::SnapshotFactoryDependencies,
@@ -140,7 +137,6 @@ pub async fn recover_latest_l1_batch(
                 fee_address: Default::default(),
             },
             &[],
-            BlockGasCount::default(),
             &[],
             &[],
             CircuitStatistic::default(),
@@ -236,13 +232,15 @@ pub async fn recover_eth_sender(
         .await
         .unwrap();
     let mut storage = connection_pool.connection().await.unwrap();
+    let chain_id = Some(l1_client.fetch_chain_id().await.unwrap());
     storage
         .eth_sender_dal()
         .insert_bogus_confirmed_eth_tx(
             last_l1_batch_number,
             AggregatedActionType::Commit,
             H256::random(),
             DateTime::default(),
+            chain_id,
         )
         .await
         .unwrap();
@@ -253,6 +251,7 @@ pub async fn recover_eth_sender(
             AggregatedActionType::PublishProofOnchain,
             H256::random(),
             DateTime::default(),
+            chain_id,
         )
         .await
         .unwrap();
@@ -263,6 +262,7 @@ pub async fn recover_eth_sender(
             AggregatedActionType::Execute,
             H256::random(),
             DateTime::default(),
+            chain_id,
         )
         .await
         .unwrap();

core/lib/dal/.sqlx/query-843b299bbffbade83dd673ed4a488eefd4419e8a9eb05a9528da11163f52b2c7.json

@@ -3,7 +3,6 @@ use std::{num::NonZeroUsize, sync::Arc};
 use zksync_config::{
     configs::object_store::ObjectStoreMode, ContractsConfig, GenesisConfig, ObjectStoreConfig,
 };
-use zksync_dal::CoreDal;
 use zksync_node_storage_init::{
     external_node::NodeRecovery, main_node::MainNodeGenesis, InitializeStorage,
     NodeInitializationStrategy, SnapshotRecoveryConfig,