fix: Revert "preparation for shared bridge migration (server)" (#1010)

Reverts #927 Co-authored-by: Roman Brodetski <Roman.Brodetski@gmail.com>
matter-labs · Feb 5, 2024 · d4c984a · d4c984a
1 parent 90ea0fb
commit d4c984a
Show file tree

Hide file tree

Showing 34 changed files with 590 additions and 890 deletions.
diff --git a/checks-config/era.dic b/checks-config/era.dic
@@ -411,10 +411,6 @@ prode
 StorageBatchInfo
 CommitBatchInfo
 IExecutor
-SetChainId
-setChainId
-SetChainIdUpgrade
-state_transition_manager_contract
 
 // Names
 Vyper

diff --git a/core/bin/external_node/src/config/mod.rs b/core/bin/external_node/src/config/mod.rs
@@ -26,7 +26,6 @@ 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,
@@ -47,10 +46,6 @@ impl RemoteENConfig {
             .get_testnet_paymaster()
             .await
             .context("Failed to fetch paymaster")?;
-        let bridgehub_proxy_addr = client
-            .get_bridgehub_contract()
-            .await
-            .context("Failed to fetch L1 bridgehub contract address")?;
         let diamond_proxy_addr = client
             .get_main_contract()
             .await
@@ -72,7 +67,6 @@ impl RemoteENConfig {
         );
 
         Ok(Self {
-            bridgehub_proxy_addr,
             diamond_proxy_addr,
             l2_testnet_paymaster_addr,
             l1_erc20_bridge_proxy_addr: bridges.l1_erc20_default_bridge,
@@ -539,7 +533,6 @@ 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,

diff --git a/core/lib/config/src/configs/contracts.rs b/core/lib/config/src/configs/contracts.rs
@@ -40,13 +40,6 @@ 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 {
@@ -59,7 +52,6 @@ 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),
@@ -85,10 +77,6 @@ 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)),
         }
     }
 }
diff --git a/core/lib/config/src/testonly.rs b/core/lib/config/src/testonly.rs
@@ -363,11 +363,6 @@ 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(),
         }
     }
 }