fix: More migration fixes, bumping contracts

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

@@ -47,8 +47,8 @@ pub(crate) struct RemoteENConfig {
     pub state_transition_proxy_addr: Option<Address>,
     pub transparent_proxy_admin_addr: Option<Address>,
     pub diamond_proxy_addr: Address,
-    pub l1_shared_bridge_proxy_addr: Address,
-    pub l2_shared_bridge_addr: Address,
+    pub l1_shared_bridge_proxy_addr: Option<Address>,
+    pub l2_shared_bridge_addr: Option<Address>,
     pub l1_erc20_bridge_proxy_addr: Option<Address>,
     pub l2_erc20_bridge_addr: Option<Address>,
     pub l1_weth_bridge_addr: Option<Address>,
@@ -158,9 +158,9 @@ impl RemoteENConfig {
             l2_chain_id: L2ChainId::default(),
             l1_chain_id: L1ChainId(9),
             base_token_addr: Address::repeat_byte(4),
-            l1_shared_bridge_proxy_addr: Address::repeat_byte(5),
+            l1_shared_bridge_proxy_addr: Some(Address::repeat_byte(5)),
             l1_weth_bridge_addr: None,
-            l2_shared_bridge_addr: Address::repeat_byte(6),
+            l2_shared_bridge_addr: Some(Address::repeat_byte(6)),
             max_pubdata_per_batch: 1 << 17,
             l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode::Rollup,
             dummy_verifier: true,

core/bin/external_node/src/main.rs

@@ -206,7 +206,10 @@ async fn run_core(
 
     let (persistence, miniblock_sealer) = StateKeeperPersistence::new(
         connection_pool.clone(),
-        config.remote.l2_shared_bridge_addr,
+        config
+            .remote
+            .l2_shared_bridge_addr
+            .unwrap_or_else(|| config.remote.l2_erc20_bridge_addr.unwrap()),
         config.optional.miniblock_seal_queue_capacity,
     );
     task_handles.push(tokio::spawn(miniblock_sealer.run()));

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

@@ -11,8 +11,8 @@ pub struct ContractsConfig {
     pub default_upgrade_addr: Address,
     pub diamond_proxy_addr: Address,
     pub validator_timelock_addr: Address,
-    pub l1_shared_bridge_proxy_addr: Address,
-    pub l2_shared_bridge_addr: Address,
+    pub l1_shared_bridge_proxy_addr: Option<Address>,
+    pub l2_shared_bridge_addr: Option<Address>,
     pub l1_erc20_bridge_proxy_addr: Option<Address>,
     pub l2_erc20_bridge_addr: Option<Address>,
     pub l1_weth_bridge_proxy_addr: Option<Address>,
@@ -31,8 +31,8 @@ impl ContractsConfig {
             validator_timelock_addr: Address::repeat_byte(0x0a),
             l1_erc20_bridge_proxy_addr: Some(Address::repeat_byte(0x0b)),
             l2_erc20_bridge_addr: Some(Address::repeat_byte(0x0c)),
-            l1_shared_bridge_proxy_addr: Address::repeat_byte(0x0e),
-            l2_shared_bridge_addr: Address::repeat_byte(0x0f),
+            l1_shared_bridge_proxy_addr: Some(Address::repeat_byte(0x0e)),
+            l2_shared_bridge_addr: Some(Address::repeat_byte(0x0f)),
             l1_weth_bridge_proxy_addr: Some(Address::repeat_byte(0x0b)),
             l2_weth_bridge_addr: Some(Address::repeat_byte(0x0c)),
             l2_testnet_paymaster_addr: Some(Address::repeat_byte(0x11)),

core/lib/env_config/src/contracts.rs

@@ -28,8 +28,8 @@ mod tests {
             l2_erc20_bridge_addr: Some(addr("8656770FA78c830456B00B4fFCeE6b1De0e1b888")),
             l1_weth_bridge_proxy_addr: Some(addr("8656770FA78c830456B00B4fFCeE6b1De0e1b888")),
             l2_weth_bridge_addr: Some(addr("8656770FA78c830456B00B4fFCeE6b1De0e1b888")),
-            l1_shared_bridge_proxy_addr: addr("8656770FA78c830456B00B4fFCeE6b1De0e1b888"),
-            l2_shared_bridge_addr: addr("8656770FA78c830456B00B4fFCeE6b1De0e1b888"),
+            l1_shared_bridge_proxy_addr: Some(addr("8656770FA78c830456B00B4fFCeE6b1De0e1b888")),
+            l2_shared_bridge_addr: Some(addr("8656770FA78c830456B00B4fFCeE6b1De0e1b888")),
             l2_testnet_paymaster_addr: Some(addr("FC073319977e314F251EAE6ae6bE76B0B3BAeeCF")),
             l1_multicall3_addr: addr("0xcA11bde05977b3631167028862bE2a173976CA11"),
             base_token_addr: Some(SHARED_BRIDGE_ETHER_TOKEN_ADDRESS),

core/lib/protobuf_config/src/contracts.rs

@@ -35,18 +35,24 @@ impl ProtoRepr for proto::Contracts {
                 .as_ref()
                 .map(|x| parse_h160(x))
                 .transpose()
-                .context("l1_erc20_bridge_proxy_addr")?,
+                .context("l1_erc20_bridge_addr")?,
             l2_erc20_bridge_addr: erc20
                 .l2_address
                 .as_ref()
                 .map(|x| parse_h160(x))
                 .transpose()
                 .context("l1_erc20_bridge_impl_addr")?,
-            l1_shared_bridge_proxy_addr: required(&shared.l1_address)
-                .and_then(|x| parse_h160(x))
-                .context("l1_shared_bridge_addr")?,
-            l2_shared_bridge_addr: required(&shared.l2_address)
-                .and_then(|x| parse_h160(x))
+            l1_shared_bridge_proxy_addr: shared
+                .l1_address
+                .as_ref()
+                .map(|x| parse_h160(x))
+                .transpose()
+                .context("l1_shared_bridge_proxy_addr")?,
+            l2_shared_bridge_addr: shared
+                .l2_address
+                .as_ref()
+                .map(|x| parse_h160(x))
+                .transpose()
                 .context("l2_shared_bridge_proxy_addr")?,
             l1_weth_bridge_proxy_addr: weth_bridge
                 .l1_address
@@ -94,8 +100,8 @@ impl ProtoRepr for proto::Contracts {
             }),
             bridges: Some(proto::Bridges {
                 shared: Some(proto::Bridge {
-                    l1_address: Some(format!("{:?}", this.l1_shared_bridge_proxy_addr)),
-                    l2_address: Some(format!("{:?}", this.l2_shared_bridge_addr)),
+                    l1_address: this.l1_shared_bridge_proxy_addr.map(|a| format!("{:?}", a)),
+                    l2_address: this.l2_shared_bridge_addr.map(|a| format!("{:?}", a)),
                 }),
                 erc20: Some(proto::Bridge {
                     l1_address: this.l1_erc20_bridge_proxy_addr.map(|a| format!("{:?}", a)),

core/lib/types/src/api/mod.rs

@@ -193,8 +193,8 @@ pub struct L2ToL1LogProof {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct BridgeAddresses {
-    pub l1_shared_default_bridge: Address,
-    pub l2_shared_default_bridge: Address,
+    pub l1_shared_default_bridge: Option<Address>,
+    pub l2_shared_default_bridge: Option<Address>,
     pub l1_erc20_default_bridge: Option<Address>,
     pub l2_erc20_default_bridge: Option<Address>,
     pub l1_weth_bridge: Option<Address>,

core/lib/zksync_core/src/lib.rs

@@ -854,7 +854,9 @@ async fn add_state_keeper_to_task_futures(
         .context("failed to build miniblock_sealer_pool")?;
     let (persistence, miniblock_sealer) = StateKeeperPersistence::new(
         miniblock_sealer_pool,
-        contracts_config.l2_shared_bridge_addr,
+        contracts_config
+            .l2_shared_bridge_addr
+            .unwrap_or_else(|| contracts_config.l2_erc20_bridge_addr.unwrap()),
         state_keeper_config.miniblock_seal_queue_capacity,
     );
     task_futures.push(tokio::spawn(miniblock_sealer.run()));

core/node/node_framework/src/implementations/layers/state_keeper/mempool_io.rs

@@ -86,7 +86,9 @@ impl WiringLayer for MempoolIOLayer {
                 .get_singleton()
                 .await
                 .context("Get master pool")?,
-            self.contracts_config.l2_shared_bridge_addr,
+            self.contracts_config
+                .l2_shared_bridge_addr
+                .unwrap_or_else(|| self.contracts_config.l2_erc20_bridge_addr.unwrap()),
             self.state_keeper_config.miniblock_seal_queue_capacity,
         );
         let output_handler = OutputHandler::new(Box::new(persistence));

core/tests/loadnext/src/sdk/abi/update-abi.sh

@@ -10,4 +10,4 @@ cat $ZKSYNC_HOME/contracts/l1-contracts/artifacts/contracts/state-transition/cha
 cat $ZKSYNC_HOME/contracts/l1-contracts/artifacts/contracts/bridge/interfaces/IL1SharedBridge.sol/IL1SharedBridge.json | jq '{ abi: .abi}' > IL1SharedBridge.json
 cat $ZKSYNC_HOME/contracts/l1-contracts/artifacts/contracts/bridge/interfaces/IL1ERC20Bridge.sol/IL1ERC20Bridge.json | jq '{ abi: .abi}' > IL1ERC20Bridge.json
 # Paymaster interface
-cat $ZKSYNC_HOME/contracts/l2-contracts/artifacts-zk/cache-zk/solpp-generated-contracts/interfaces/IPaymasterFlow.sol/IPaymasterFlow.json | jq '{ abi: .abi}' > IPaymasterFlow.json
+cat $ZKSYNC_HOME/contracts/l2-contracts/artifacts-zk/contracts/interfaces/IPaymasterFlow.sol/IPaymasterFlow.json | jq '{ abi: .abi}' > IPaymasterFlow.json

core/tests/ts-integration/package.json

@@ -1,36 +1,36 @@
 {
-    "name": "ts-integration",
-    "version": "0.1.0",
-    "license": "MIT",
-    "private": true,
-    "scripts": {
-        "test": "zk f jest --forceExit --testTimeout 60000",
-        "long-running-test": "zk f jest",
-        "fee-test": "RUN_FEE_TEST=1 zk f jest -- fees.test.ts",
-        "api-test": "zk f jest -- api/web3.test.ts api/debug.test.ts",
-        "contract-verification-test": "zk f jest -- api/contract-verification.test.ts",
-        "build": "hardhat compile",
-        "build-yul": "hardhat run scripts/compile-yul.ts"
-    },
-    "devDependencies": {
-        "@matterlabs/hardhat-zksync-deploy":  "^0.6.5",
-        "@matterlabs/hardhat-zksync-solc": "0.4.2",
-        "@matterlabs/hardhat-zksync-vyper": "^1.0.0",
-        "@nomiclabs/hardhat-vyper": "^3.0.5",
-        "@types/jest": "^29.0.3",
-        "@types/node": "^18.19.15",
-        "@types/node-fetch": "^2.5.7",
-        "chalk": "^4.0.0",
-        "ethereumjs-abi": "^0.6.8",
-        "ethers": "~5.7.0",
-        "hardhat": "=2.16.0",
-        "jest": "^29.0.3",
-        "jest-matcher-utils": "^29.0.3",
-        "node-fetch": "^2.6.1",
-        "ts-jest": "^29.0.1",
-        "ts-node": "^10.1.0",
-        "typescript": "^4.3.5",
-        "zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#sb-old-sdk",
-        "elliptic": "^6.5.5"
-    }
+  "name": "ts-integration",
+  "version": "0.1.0",
+  "license": "MIT",
+  "private": true,
+  "scripts": {
+    "test": "zk f jest --forceExit --testTimeout 60000",
+    "long-running-test": "zk f jest",
+    "fee-test": "RUN_FEE_TEST=1 zk f jest -- fees.test.ts",
+    "api-test": "zk f jest -- api/web3.test.ts api/debug.test.ts",
+    "contract-verification-test": "zk f jest -- api/contract-verification.test.ts",
+    "build": "hardhat compile",
+    "build-yul": "hardhat run scripts/compile-yul.ts"
+  },
+  "devDependencies": {
+    "@matterlabs/hardhat-zksync-deploy":  "^0.6.5",
+    "@matterlabs/hardhat-zksync-solc": "0.4.2",
+    "@matterlabs/hardhat-zksync-vyper": "^1.0.0",
+    "@nomiclabs/hardhat-vyper": "^3.0.5",
+    "@types/jest": "^29.0.3",
+    "@types/node": "^18.19.15",
+    "@types/node-fetch": "^2.5.7",
+    "chalk": "^4.0.0",
+    "ethereumjs-abi": "^0.6.8",
+    "ethers": "~5.7.0",
+    "hardhat": "=2.16.0",
+    "jest": "^29.0.3",
+    "jest-matcher-utils": "^29.0.3",
+    "node-fetch": "^2.6.1",
+    "ts-jest": "^29.0.1",
+    "ts-node": "^10.1.0",
+    "typescript": "^4.3.5",
+    "zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#sb-old-sdk",
+    "elliptic": "^6.5.5"
+  }
 }

core/tests/upgrade-test/tests/upgrade.test.ts

@@ -20,7 +20,7 @@ const ADMIN_FACET_ABI = new ethers.utils.Interface(
     require(`${L1_CONTRACTS_FOLDER}/state-transition/chain-interfaces/IAdmin.sol/IAdmin.json`).abi
 );
 const L2_FORCE_DEPLOY_UPGRADER_ABI = new ethers.utils.Interface(
-    require(`${process.env.ZKSYNC_HOME}/contracts/l2-contracts/artifacts-zk/cache-zk/solpp-generated-contracts/ForceDeployUpgrader.sol/ForceDeployUpgrader.json`).abi
+    require(`${process.env.ZKSYNC_HOME}/contracts/l2-contracts/artifacts-zk/contracts/ForceDeployUpgrader.sol/ForceDeployUpgrader.json`).abi
 );
 const COMPLEX_UPGRADER_ABI = new ethers.utils.Interface(
     require(`${process.env.ZKSYNC_HOME}/contracts/system-contracts/artifacts-zk/contracts-preprocessed/ComplexUpgrader.sol/ComplexUpgrader.json`).abi

docs/specs/zk_evm/vm_specification/compiler/instructions/evm/environment.md

@@ -12,7 +12,7 @@ is common for Yul and EVMLA representations.
 ### System Contract
 
 This information is requested a System Contract called
-[L2BaseToken](https://github.com/code-423n4/2023-10-zksync/blob/main/code/system-contracts/contracts/L2BaseToken.sol).
+[L2BaseToken](https://github.com/code-423n4/2024-03-zksync/blob/main/code/system-contracts/contracts/L2BaseToken.sol).
 
 On how the System Contract is called, see
 [this section](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/VM%20Section/How%20compiler%20works/system_contracts.md).

etc/env/base/chain.toml

@@ -90,8 +90,8 @@ fee_model_version = "V1"
 validation_computational_gas_limit = 300000
 save_call_traces = true
 
-bootloader_hash = "0x010008bb22aea1e22373cb8d807b15c67eedd65523e9cba4cc556adfa504f7b8"
-default_aa_hash = "0x01000563a7f32f1d97b4697f3bc996132433314b9b17351a7f7cd6073f618569"
+bootloader_hash = "0x010008c5683b01d785f46d7a4237432c3898b0a2c421d362a0729e2ccaa1c076"
+default_aa_hash = "0x01000563dc93ec6220498801ccef18c8e667fe26b7fdd9fb9a8d8e01796144ff"
 
 [chain.operations_manager]
 # Sleep time when there is no new input data

etc/env/base/contracts.toml

@@ -26,8 +26,8 @@ RECURSION_NODE_LEVEL_VK_HASH = "0x1186ec268d49f1905f8d9c1e9d39fc33e98c74f91d91a2
 RECURSION_LEAF_LEVEL_VK_HASH = "0x101e08b00193e529145ee09823378ef51a3bc8966504064f1f6ba3f1ba863210"
 RECURSION_CIRCUITS_SET_VKS_HASH = "0x18c1639094f58177409186e8c48d9f577c9410901d2f1d486b3e7d6cf553ae4c"
 GENESIS_TX_HASH = "0xb99ebfea46cbe05a21cd80fe5597d97b204befc52a16303f579c607dc1ac2e2e"
-GENESIS_ROOT = "0xb0bf9b08e30c0b9382763f62bd6dfe41f0196b65216e9225b9cd6d03120123f1"
-GENESIS_BATCH_COMMITMENT = "0x0754a4d48a5c8cd818b634624180ee3414448044c87d11de5ed75bb59f61d22a"
+GENESIS_ROOT = "0x7fe280b1c2209f4b34a15db4cc74568f59db98d400c8e3f3282163acb74d4b14"
+GENESIS_BATCH_COMMITMENT = "0x600c2128b67ebf9b5e7c46a5dca5f47b4805baefe483951c26f7404c0f0f92e3"
 PRIORITY_TX_MAX_GAS_LIMIT = 72000000
 DEPLOY_L2_BRIDGE_COUNTERPART_GAS_LIMIT = 10000000
 GENESIS_ROLLUP_LEAF_INDEX = "50"
@@ -51,8 +51,10 @@ TRANSPARENT_PROXY_ADMIN_ADDR = "0x0000000000000000000000000000000000000000"
 BASE_TOKEN_ADDR = "0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
 BASE_TOKEN_BRIDGE_ADDR = "0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
 GENESIS_UPGRADE_ADDR = "0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
+MAX_NUMBER_OF_HYPERCHAINS = 100
 L1_SHARED_BRIDGE_PROXY_ADDR = "0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
 L2_SHARED_BRIDGE_ADDR = "0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
+L2_SHARED_BRIDGE_IMPL_ADDR = "0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
 FRI_RECURSION_LEAF_LEVEL_VK_HASH = "0x400a4b532c6f072c00d1806ef299300d4c104f4ac55bd8698ade78894fcadc0a"
 FRI_RECURSION_NODE_LEVEL_VK_HASH = "0x5a3ef282b21e12fe1f4438e5bb158fc5060b160559c5158c6389d62d9fe3d080"
 FRI_RECURSION_SCHEDULER_LEVEL_VK_HASH = "0x1405880dc3317d635bddb0ab62bf5d013e5d1f462161c1f7ac3289c7fef956da"

etc/upgrades/1711451944-hyperchain-upgrade/common.json

@@ -1,5 +1,5 @@
 {
   "name": "hyperchain-upgrade",
   "creationTimestamp": 1711451944,
-  "protocolVersion": "24"
+  "protocolVersion": "23"
 }