Remove bridge config from genesis

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

@@ -710,8 +710,6 @@ impl From<ExternalNodeConfig> for InternalApiConfig {
             bridgehub_proxy_addr: config.remote.bridgehub_proxy_addr,
             state_transition_proxy_addr: config.remote.state_transition_proxy_addr,
             transparent_proxy_admin_addr: config.remote.transparent_proxy_admin_addr,
-            l2_shared_bridge_addr: Some(config.remote.l2_shared_bridge_addr),
-            l1_shared_bridge_addr: Some(config.remote.l1_shared_bridge_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/lib/config/src/configs/genesis.rs

@@ -8,8 +8,6 @@ pub struct SharedBridge {
     pub bridgehub_proxy_addr: Address,
     pub state_transition_proxy_addr: Address,
     pub transparent_proxy_admin_addr: Address,
-    pub l2_shared_bridge_addr: Address,
-    pub l1_shared_bridge_addr: Address,
 }
 
 /// This config represents the genesis state of the chain.
@@ -47,8 +45,6 @@ impl GenesisConfig {
                 bridgehub_proxy_addr: Address::repeat_byte(0x14),
                 state_transition_proxy_addr: Address::repeat_byte(0x16),
                 transparent_proxy_admin_addr: Address::repeat_byte(0x16),
-                l2_shared_bridge_addr: Address::repeat_byte(0x17),
-                l1_shared_bridge_addr: Address::repeat_byte(0x18),
             }),
             recursion_node_level_vk_hash: H256::repeat_byte(0x03),
             recursion_leaf_level_vk_hash: H256::repeat_byte(0x04),

core/lib/config/src/testonly.rs

@@ -704,8 +704,6 @@ impl Distribution<configs::SharedBridge> for EncodeDist {
             bridgehub_proxy_addr: rng.gen(),
             state_transition_proxy_addr: rng.gen(),
             transparent_proxy_admin_addr: rng.gen(),
-            l2_shared_bridge_addr: rng.gen(),
-            l1_shared_bridge_addr: rng.gen(),
         }
     }
 }

core/lib/env_config/src/genesis.rs

@@ -58,12 +58,6 @@ impl FromEnv for GenesisConfig {
                 transparent_proxy_admin_addr: contracts_config
                     .transparent_proxy_admin_addr
                     .context("Must be specified with transparent_proxy_admin_addr")?,
-                l2_shared_bridge_addr: contracts_config
-                    .l2_shared_bridge_addr
-                    .context("Must be specified with l2_shared_bridge_addr")?,
-                l1_shared_bridge_addr: contracts_config
-                    .l1_shared_bridge_proxy_addr
-                    .context("Must be specified with l1_shared_bridge_addr")?,
             })
         } else {
             None

core/lib/protobuf_config/src/genesis.rs

@@ -37,12 +37,6 @@ impl ProtoRepr for proto::Genesis {
                 transparent_proxy_admin_addr: required(&shared_bridge.transparent_proxy_admin_addr)
                     .and_then(|x| parse_h160(x))
                     .context("transparent_proxy_admin_addr")?,
-                l2_shared_bridge_addr: required(&shared_bridge.l2_shared_bridge_addr)
-                    .and_then(|x| parse_h160(x))
-                    .context("transparent_proxy_admin_addr")?,
-                l1_shared_bridge_addr: required(&shared_bridge.l1_shared_bridge_addr)
-                    .and_then(|x| parse_h160(x))
-                    .context("transparent_proxy_admin_addr")?,
             })
         } else {
             None
@@ -126,8 +120,6 @@ impl ProtoRepr for proto::Genesis {
                     "{:?}",
                     shared_bridge.transparent_proxy_admin_addr,
                 )),
-                l2_shared_bridge_addr: Some(format!("{:?}", shared_bridge.l2_shared_bridge_addr)),
-                l1_shared_bridge_addr: Some(format!("{:?}", shared_bridge.l1_shared_bridge_addr,)),
             });
 
         Self {

core/lib/protobuf_config/src/proto/genesis.proto

@@ -19,8 +19,6 @@ message SharedBridge {
   optional string bridgehub_proxy_addr = 1; // optional; h160
   optional string state_transition_proxy_addr = 2; // optional; h160
   optional string transparent_proxy_admin_addr = 3; // optional; h160
-  optional string l1_shared_bridge_addr = 4; // optional; h160
-  optional string l2_shared_bridge_addr = 5; // optional; h160
 }
 
 message Genesis {

core/lib/zksync_core/src/api_server/web3/namespaces/en.rs

@@ -107,16 +107,6 @@ impl EnNamespace {
                     .api_config
                     .transparent_proxy_admin_addr
                     .context("transparent_proxy_admin_addr is not set with state_transition")?,
-                l2_shared_bridge_addr: self
-                    .state
-                    .api_config
-                    .l2_shared_bridge_addr
-                    .context("l2_shared_bridge_addr is not set with state_transition")?,
-                l1_shared_bridge_addr: self
-                    .state
-                    .api_config
-                    .l1_shared_bridge_addr
-                    .context("l1_shared_bridge_addr is not set with state_transition")?,
             })
         } else {
             None

core/lib/zksync_core/src/api_server/web3/state.rs

@@ -93,8 +93,6 @@ pub struct InternalApiConfig {
     pub bridgehub_proxy_addr: Option<Address>,
     pub state_transition_proxy_addr: Option<Address>,
     pub transparent_proxy_admin_addr: Option<Address>,
-    pub l2_shared_bridge_addr: Option<Address>,
-    pub l1_shared_bridge_addr: Option<Address>,
     pub diamond_proxy_addr: Address,
     pub l2_testnet_paymaster_addr: Option<Address>,
     pub req_entities_limit: usize,
@@ -122,16 +120,8 @@ impl InternalApiConfig {
             bridge_addresses: api::BridgeAddresses {
                 l1_erc20_default_bridge: contracts_config.l1_erc20_bridge_proxy_addr,
                 l2_erc20_default_bridge: contracts_config.l2_erc20_bridge_addr,
-                l1_shared_default_bridge: genesis_config
-                    .shared_bridge
-                    .as_ref()
-                    .map(|a| a.l1_shared_bridge_addr)
-                    .unwrap_or_default(),
-                l2_shared_default_bridge: genesis_config
-                    .shared_bridge
-                    .as_ref()
-                    .map(|a| a.l2_shared_bridge_addr)
-                    .unwrap_or_default(),
+                l1_shared_default_bridge: contracts_config.l1_shared_bridge_proxy_addr,
+                l2_shared_default_bridge: contracts_config.l2_shared_bridge_addr,
                 l1_weth_bridge: contracts_config.l1_weth_bridge_proxy_addr,
                 l2_weth_bridge: contracts_config.l2_weth_bridge_addr,
             },
@@ -147,14 +137,6 @@ impl InternalApiConfig {
                 .shared_bridge
                 .as_ref()
                 .map(|a| a.transparent_proxy_admin_addr),
-            l2_shared_bridge_addr: genesis_config
-                .shared_bridge
-                .as_ref()
-                .map(|a| a.l2_shared_bridge_addr),
-            l1_shared_bridge_addr: genesis_config
-                .shared_bridge
-                .as_ref()
-                .map(|a| a.l1_shared_bridge_addr),
             diamond_proxy_addr: contracts_config.diamond_proxy_addr,
             l2_testnet_paymaster_addr: contracts_config.l2_testnet_paymaster_addr,
             req_entities_limit: web3_config.req_entities_limit(),

etc/env/file_based/contracts.yaml

@@ -12,5 +12,8 @@ bridges:
     l1_address: "0xfc073319977e314f251eae6ae6be76b0b3baeecf"
     l2_address: "0xfc073319977e314f251eae6ae6be76b0b3baeecf"
   weth:
+    l1_address: "0xfc073319977e314f251eae6ae6be76b0b3baeecf"
+    l2_address: "0xfc073319977e314f251eae6ae6be76b0b3baeecf"
+  shared:
     l1_address: "0xfc073319977e314f251eae6ae6be76b0b3baeecf"
     l2_address: "0xfc073319977e314f251eae6ae6be76b0b3baeecf"

etc/env/file_based/genesis.yaml

@@ -16,4 +16,4 @@ prover:
 shared_bridge:
   state_transition_proxy_addr: 0x87d456da9ed212eb49d80d96afb44afddf36adf8
   bridgehub_proxy_addr: 0xdd6fa5c14e7550b4caf2aa2818d24c69cbc347e5
-  transparent_proxy_admin_addr: 0xc957c0e82d3bafb5ad46ffbcc66900648784eb05
+  transparent_proxy_admin_addr: 0xc957c0e82d3bafb5ad46ffbcc66900648784eb05