Don't mess up with contracts and clients

Signed-off-by: Danil <[email protected]>
matter-labs · Mar 5, 2025 · 0ef2677 · 0ef2677
1 parent 322346b
commit 0ef2677
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/core/bin/external_node/src/config/mod.rs b/core/bin/external_node/src/config/mod.rs
@@ -1567,7 +1567,6 @@ impl From<&ExternalNodeConfig> for L1SpecificContracts {
 
 impl From<&ExternalNodeConfig> for ChainSpecificContracts {
     fn from(config: &ExternalNodeConfig) -> Self {
-        dbg!(&config.remote);
         ChainSpecificContracts {
             ecosystem_contracts: EcosystemCommonContracts {
                 bridgehub_proxy_addr: config.remote.l1_bridgehub_proxy_addr,

diff --git a/core/bin/zksync_server/src/node_builder.rs b/core/bin/zksync_server/src/node_builder.rs
@@ -731,8 +731,8 @@ impl MainNodeBuilder {
             .add_prometheus_exporter_layer()?
             .add_query_eth_client_layer()?
             .add_settlement_mode_data()?
-            .add_gateway_migrator_layer()?
             .add_gateway_client_layer()?
+            .add_gateway_migrator_layer()?
             .add_gas_adjuster_layer()?;
 
         // Add preconditions for all the components.

diff --git a/core/node/node_framework/src/implementations/layers/gateway_migrator_layer.rs b/core/node/node_framework/src/implementations/layers/gateway_migrator_layer.rs
@@ -3,7 +3,8 @@ use zksync_gateway_migrator::GatewayMigrator;
 
 use crate::{
     implementations::resources::{
-        contracts::SettlementLayerContractsResource, eth_interface::EthInterfaceResource,
+        contracts::{L1ChainContractsResource, SettlementLayerContractsResource},
+        eth_interface::EthInterfaceResource,
         settlement_layer::SettlementModeResource,
     },
     wiring_layer::{WiringError, WiringLayer},
@@ -18,7 +19,7 @@ pub struct GatewayMigratorLayer;
 #[context(crate = crate)]
 pub struct Input {
     eth_client: EthInterfaceResource,
-    contracts: SettlementLayerContractsResource,
+    contracts: L1ChainContractsResource,
     settlement_mode_resource: SettlementModeResource,
 }