feat(shared bridge): preparation for shared bridge migration (server)

checks-config/era.dic

@@ -411,6 +411,10 @@ prode
 StorageBatchInfo
 CommitBatchInfo
 IExecutor
+SetChainId
+setChainId
+SetChainIdUpgrade
+state_transition_manager_contract
 
 // Names
 Vyper

core/bin/external_node/src/config/mod.rs

@@ -26,6 +26,7 @@ const BYTES_IN_MEGABYTE: usize = 1_024 * 1_024;
 /// This part of the external node config is fetched directly from the main node.
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 pub struct RemoteENConfig {
+    pub bridgehub_proxy_addr: Option<Address>,
     pub diamond_proxy_addr: Address,
     pub l1_erc20_bridge_proxy_addr: Address,
     pub l2_erc20_bridge_addr: Address,
@@ -46,6 +47,8 @@ impl RemoteENConfig {
             .get_testnet_paymaster()
             .await
             .context("Failed to fetch paymaster")?;
+        // In case EN is connected to the old server version without `get_bridgehub_contract` method.
+        let bridgehub_proxy_addr = client.get_bridgehub_contract().await.ok().flatten();
         let diamond_proxy_addr = client
             .get_main_contract()
             .await
@@ -67,6 +70,7 @@ impl RemoteENConfig {
         );
 
         Ok(Self {
+            bridgehub_proxy_addr,
             diamond_proxy_addr,
             l2_testnet_paymaster_addr,
             l1_erc20_bridge_proxy_addr: bridges.l1_erc20_default_bridge,
@@ -549,6 +553,7 @@ impl From<ExternalNodeConfig> for InternalApiConfig {
                 l1_weth_bridge: config.remote.l1_weth_bridge_proxy_addr,
                 l2_weth_bridge: config.remote.l2_weth_bridge_addr,
             },
+            bridgehub_proxy_addr: config.remote.bridgehub_proxy_addr,
             diamond_proxy_addr: config.remote.diamond_proxy_addr,
             l2_testnet_paymaster_addr: config.remote.l2_testnet_paymaster_addr,
             req_entities_limit: config.optional.req_entities_limit,

core/bin/zksync_server/src/main.rs

@@ -37,6 +37,10 @@ struct Cli {
     /// Generate genesis block for the first contract deployment using temporary DB.
     #[arg(long)]
     genesis: bool,
+    /// Wait for the `setChainId` event during genesis.
+    /// If `--genesis` is not set, this flag is ignored.
+    #[arg(long)]
+    set_chain_id: bool,
     /// Rebuild tree.
     #[arg(long)]
     rebuild_tree: bool,
@@ -142,6 +146,7 @@ async fn main() -> anyhow::Result<()> {
             &network,
             &contracts,
             &eth_client.web3_url,
+            opt.set_chain_id,
         )
         .await
         .context("genesis_init")?;

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

@@ -40,6 +40,13 @@ pub struct ContractsConfig {
     pub fri_recursion_leaf_level_vk_hash: H256,
     pub prover_at_genesis: ProverAtGenesis,
     pub snark_wrapper_vk_hash: H256,
+
+    // These contracts will be used after shared bridge integration.
+    pub bridgehub_proxy_addr: Option<Address>,
+    pub bridgehub_impl_addr: Option<Address>,
+    pub state_transition_proxy_addr: Option<Address>,
+    pub state_transition_impl_addr: Option<Address>,
+    pub transparent_proxy_admin_addr: Option<Address>,
 }
 
 impl ContractsConfig {
@@ -52,6 +59,7 @@ impl ContractsConfig {
             mailbox_facet_addr: Address::repeat_byte(0x01),
             executor_facet_addr: Address::repeat_byte(0x02),
             admin_facet_addr: Address::repeat_byte(0x03),
+            transparent_proxy_admin_addr: Some(Address::repeat_byte(0x04)),
             getters_facet_addr: Address::repeat_byte(0x05),
             verifier_addr: Address::repeat_byte(0x06),
             diamond_init_addr: Address::repeat_byte(0x07),
@@ -77,6 +85,10 @@ impl ContractsConfig {
             governance_addr: Address::repeat_byte(0x13),
             prover_at_genesis: ProverAtGenesis::Fri,
             snark_wrapper_vk_hash: H256::repeat_byte(0x09),
+            bridgehub_proxy_addr: Some(Address::repeat_byte(0x14)),
+            bridgehub_impl_addr: Some(Address::repeat_byte(0x15)),
+            state_transition_proxy_addr: Some(Address::repeat_byte(0x16)),
+            state_transition_impl_addr: Some(Address::repeat_byte(0x17)),
         }
     }
 }

core/lib/config/src/testonly.rs

@@ -363,6 +363,11 @@ impl RandomConfig for configs::ContractsConfig {
             fri_recursion_leaf_level_vk_hash: g.gen(),
             prover_at_genesis: g.gen(),
             snark_wrapper_vk_hash: g.gen(),
+            bridgehub_impl_addr: g.gen(),
+            bridgehub_proxy_addr: g.gen(),
+            state_transition_proxy_addr: g.gen(),
+            state_transition_impl_addr: g.gen(),
+            transparent_proxy_admin_addr: g.gen(),
         }
     }
 }