feat(eth-watch): redesign to support Gateway (#2775)

Signed-off-by: tomg10 <[email protected]>

.github/workflows/ci-core-reusable.yml

@@ -254,7 +254,6 @@ jobs:
           ci_run zk contract migrate-to-sync-layer 
           ci_run zk contract prepare-sync-layer-validators
           ci_run zk contract update-config-for-sync-layer
-          ci_run zk server --clear-l1-txs-history
           ci_run sleep 120
           ci_run zk server >> server2.log 2>&1 &
           ci_run sleep 5

core/bin/external_node/src/node_builder.rs

@@ -182,8 +182,7 @@ impl ExternalNodeBuilder {
         let query_eth_client_layer = QueryEthClientLayer::new(
             self.config.required.settlement_layer_id(),
             self.config.required.eth_client_url.clone(),
-            // TODO(EVM-676): add this config for external node
-            Default::default(),
+            self.config.optional.gateway_url.clone(),
         );
         self.node.add_layer(query_eth_client_layer);
         Ok(self)

core/bin/zksync_server/src/main.rs

@@ -26,7 +26,7 @@ use zksync_core_leftovers::{
     temp_config_store::{decode_yaml_repr, TempConfigStore},
     Component, Components,
 };
-use zksync_env_config::FromEnv;
+use zksync_env_config::{FromEnv, FromEnvVariant};
 
 use crate::node_builder::MainNodeBuilder;
 
@@ -143,6 +143,8 @@ fn main() -> anyhow::Result<()> {
         }
     };
 
+    let gateway_contracts_config = ContractsConfig::from_env_variant("GATEWAY_".to_string()).ok();
+
     let genesis = match opt.genesis_path {
         None => GenesisConfig::from_env().context("Genesis config")?,
         Some(path) => {
@@ -174,7 +176,14 @@ fn main() -> anyhow::Result<()> {
         return Ok(());
     }
 
-    let node = MainNodeBuilder::new(configs, wallets, genesis, contracts_config, secrets)?;
+    let node = MainNodeBuilder::new(
+        configs,
+        wallets,
+        genesis,
+        contracts_config,
+        gateway_contracts_config,
+        secrets,
+    )?;
 
     let observability_guard = {
         // Observability initialization should be performed within tokio context.

core/bin/zksync_server/src/node_builder.rs

@@ -87,6 +87,7 @@ pub struct MainNodeBuilder {
     wallets: Wallets,
     genesis_config: GenesisConfig,
     contracts_config: ContractsConfig,
+    gateway_contracts_config: Option<ContractsConfig>,
     secrets: Secrets,
 }
 
@@ -96,6 +97,7 @@ impl MainNodeBuilder {
         wallets: Wallets,
         genesis_config: GenesisConfig,
         contracts_config: ContractsConfig,
+        gateway_contracts_config: Option<ContractsConfig>,
         secrets: Secrets,
     ) -> anyhow::Result<Self> {
         Ok(Self {
@@ -104,6 +106,7 @@ impl MainNodeBuilder {
             wallets,
             genesis_config,
             contracts_config,
+            gateway_contracts_config,
             secrets,
         })
     }
@@ -147,6 +150,7 @@ impl MainNodeBuilder {
         self.node.add_layer(PKSigningEthClientLayer::new(
             eth_config,
             self.contracts_config.clone(),
+            self.gateway_contracts_config.clone(),
             self.genesis_config.settlement_layer_id(),
             wallets,
         ));
@@ -159,11 +163,7 @@ impl MainNodeBuilder {
         let query_eth_client_layer = QueryEthClientLayer::new(
             genesis.settlement_layer_id(),
             eth_config.l1_rpc_url,
-            self.configs
-                .eth
-                .as_ref()
-                .and_then(|x| Some(x.gas_adjuster?.settlement_mode))
-                .unwrap_or(SettlementMode::SettlesToL1),
+            eth_config.gateway_url,
         );
         self.node.add_layer(query_eth_client_layer);
         Ok(self)
@@ -294,6 +294,12 @@ impl MainNodeBuilder {
             .add_layer(EthWatchLayer::new(
                 try_load_config!(eth_config.watcher),
                 self.contracts_config.clone(),
+                self.gateway_contracts_config.clone(),
+                self.configs
+                    .eth
+                    .as_ref()
+                    .and_then(|x| Some(x.gas_adjuster?.settlement_mode))
+                    .unwrap_or(SettlementMode::SettlesToL1),
             ));
         Ok(self)
     }
@@ -454,6 +460,7 @@ impl MainNodeBuilder {
             .add_layer(EthTxAggregatorLayer::new(
                 eth_sender_config,
                 self.contracts_config.clone(),
+                self.gateway_contracts_config.clone(),
                 self.genesis_config.l2_chain_id,
                 self.genesis_config.l1_batch_commit_data_generator_mode,
                 self.configs

core/lib/config/src/configs/eth_sender.rs

@@ -169,6 +169,14 @@ impl SenderConfig {
             .map(|pk| pk.parse().unwrap())
     }
 
+    // Don't load gateway private key, if it's not required
+    #[deprecated]
+    pub fn private_key_gateway(&self) -> Option<H256> {
+        std::env::var("ETH_SENDER_SENDER_OPERATOR_GATEWAY_PRIVATE_KEY")
+            .ok()
+            .map(|pk| pk.parse().unwrap())
+    }
+
     const fn default_tx_aggregation_paused() -> bool {
         false
     }

core/lib/config/src/configs/secrets.rs

@@ -13,6 +13,7 @@ pub struct DatabaseSecrets {
 #[derive(Debug, Clone, PartialEq)]
 pub struct L1Secrets {
     pub l1_rpc_url: SensitiveUrl,
+    pub gateway_url: Option<SensitiveUrl>,
 }
 
 #[derive(Debug, Clone, PartialEq)]

core/lib/config/src/configs/wallets.rs

@@ -62,6 +62,7 @@ impl Wallet {
 pub struct EthSender {
     pub operator: Wallet,
     pub blob_operator: Option<Wallet>,
+    pub gateway: Option<Wallet>,
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -89,6 +90,7 @@ impl Wallets {
                 blob_operator: Some(
                     Wallet::from_private_key_bytes(H256::repeat_byte(0x2), None).unwrap(),
                 ),
+                gateway: None,
             }),
             state_keeper: Some(StateKeeper {
                 fee_account: AddressWallet::from_address(H160::repeat_byte(0x3)),

core/lib/config/src/testonly.rs

@@ -849,6 +849,7 @@ impl Distribution<configs::secrets::L1Secrets> for EncodeDist {
         use configs::secrets::L1Secrets;
         L1Secrets {
             l1_rpc_url: format!("localhost:{}", rng.gen::<u16>()).parse().unwrap(),
+            gateway_url: Some(format!("localhost:{}", rng.gen::<u16>()).parse().unwrap()),
         }
     }
 }
@@ -900,6 +901,7 @@ impl Distribution<configs::wallets::EthSender> for EncodeDist {
         configs::wallets::EthSender {
             operator: self.sample(rng),
             blob_operator: self.sample_opt(|| self.sample(rng)),
+            gateway: None,
         }
     }
 }

core/lib/contracts/src/lib.rs

@@ -51,6 +51,11 @@ const CHAIN_ADMIN_CONTRACT_FILE: (&str, &str) = ("governance", "IChainAdmin.sol/
 
 const MULTICALL3_CONTRACT_FILE: (&str, &str) = ("dev-contracts", "Multicall3.sol/Multicall3.json");
 const VERIFIER_CONTRACT_FILE: (&str, &str) = ("state-transition", "Verifier.sol/Verifier.json");
+
+const GETTERS_CONTRACT_FILE: (&str, &str) = (
+    "state-transition/chain-interfaces",
+    "IGetters.sol/IGetters.json",
+);
 const _IERC20_CONTRACT_FILE: &str =
     "contracts/l1-contracts/artifacts/contracts/common/interfaces/IERC20.sol/IERC20.json";
 const _FAIL_ON_RECEIVE_CONTRACT_FILE:  &str  =
@@ -161,6 +166,10 @@ pub fn verifier_contract() -> Contract {
     load_contract_for_both_compilers(VERIFIER_CONTRACT_FILE)
 }
 
+pub fn getters_contract() -> Contract {
+    load_contract_for_both_compilers(GETTERS_CONTRACT_FILE)
+}
+
 #[derive(Debug, Clone)]
 pub struct TestContract {
     /// Contract bytecode to be used for sending deploy transaction.