Zksync os with kl medium interop

AllContractsHashes.json

@@ -1151,12 +1151,12 @@
   },
   {
     "contractName": "l1-contracts/GatewayCTMDeployer",
-    "zkBytecodeHash": "0x010004054b832dd87261d2543c2265d6fa3afaf0a099a3a40288101b85bb81f4",
+    "zkBytecodeHash": "0x010004215d2b568db812b2201238e65626dc7ad3278307424234725a3ad4200e",
     "zkBytecodePath": "/l1-contracts/zkout/GatewayCTMDeployer.sol/GatewayCTMDeployer.json",
-    "evmBytecodeHash": "0x8e87bc30feb7d26fc7c33071be97bfd41ccdbaa6ef24d74d3367468d9abc7d16",
+    "evmBytecodeHash": "0xeb96f7a24ec8b28478686df1bf46b96655e02874de69353a50ba286d5e51938e",
     "evmBytecodePath": "/l1-contracts/out/GatewayCTMDeployer.sol/GatewayCTMDeployer.json",
-    "evmDeployedBytecodeHash": "0x9fc62b52d29b4943f98e2329ef04e479a170e4b7ec6e94f9d33b485d96ff3b36",
-    "evmDeployedBytecodeBlakeHash": "0x86a70661cc07e1cf29ff3093ad7e462acd955b19f3bed92eed3092326cbbd6c1",
+    "evmDeployedBytecodeHash": "0xd6ae2bdf2461a83ba7c72ec6fcc0d1f049ac75aa226ff7c7889f1bc4d779801a",
+    "evmDeployedBytecodeBlakeHash": "0x80277f2a718929bf18676649a5214f9c9d4f3cefb7e0e914af76844856d2c192",
     "evmDeployedBytecodeLength": 1645
   },
   {
@@ -1641,13 +1641,13 @@
   },
   {
     "contractName": "l1-contracts/PrividiumTransactionFilterer",
-    "zkBytecodeHash": "0x01000157226169964afc93eb8a64436f187d7e32275ea1a0c5e1a730894c01cb",
+    "zkBytecodeHash": "0x010001691977d77ea39ce91ddfe6ef10e79e944947a337a50a1be3ecad48dda9",
     "zkBytecodePath": "/l1-contracts/zkout/PrividiumTransactionFilterer.sol/PrividiumTransactionFilterer.json",
-    "evmBytecodeHash": "0x2a5a9c34dee0ecf60cc490e6b31d7ada54e4de873036a1b688d2255adb953ed8",
+    "evmBytecodeHash": "0x46352f04ca971679645b5cf77b197ba82493f07ad26478afcb83e25236c9dae1",
     "evmBytecodePath": "/l1-contracts/out/PrividiumTransactionFilterer.sol/PrividiumTransactionFilterer.json",
-    "evmDeployedBytecodeHash": "0x34ffeabcef8eabb869964a4adfde4c1cfb6bfc3db62e3b24cdc8936205e98eef",
-    "evmDeployedBytecodeBlakeHash": "0x652e68b11fc54892b43e155fa674288a7e2bb2bd20ee46d2a6be1287741f9e04",
-    "evmDeployedBytecodeLength": 4171
+    "evmDeployedBytecodeHash": "0xf0659bc039b12d10e7b2f194c36614e3dc1b4376459852ff954c698a10b5a3e7",
+    "evmDeployedBytecodeBlakeHash": "0x160ca34080b5083673341e27c058711d96ea00423857a92bd65a71fff957f178",
+    "evmDeployedBytecodeLength": 4423
   },
   {
     "contractName": "l1-contracts/ProxyAdmin",
@@ -2031,12 +2031,12 @@
   },
   {
     "contractName": "l1-contracts/ZKsyncOSVerifierPlonk",
-    "zkBytecodeHash": "0x01000dbb07eb714df323bde39a9a9932568c719eb5142eed246fcf6dd5d5ef3b",
+    "zkBytecodeHash": "0x01000dbb9ec136fa5e38c045c50d83b8d40f9c413d8fde1cb2c61b3e41510f44",
     "zkBytecodePath": "/l1-contracts/zkout/ZKsyncOSVerifierPlonk.sol/ZKsyncOSVerifierPlonk.json",
-    "evmBytecodeHash": "0x159b081e1a1b2b2ca029f30f79e36295e4114933fe525e6b0d742c22c61fda8e",
+    "evmBytecodeHash": "0x0a6337f3679fbe14f4d35da5b9bce7a16bb951d7e43b5dfb1a3e42aef4dff8e8",
     "evmBytecodePath": "/l1-contracts/out/ZKsyncOSVerifierPlonk.sol/ZKsyncOSVerifierPlonk.json",
-    "evmDeployedBytecodeHash": "0xdced43cf26e9003d822e9ac706f2da349db08fca651d36a649bea972b3c42622",
-    "evmDeployedBytecodeBlakeHash": "0xbf7b6957a97d220f896b953b077fd8ef0fe043603e89cb3da292ad730630243c",
+    "evmDeployedBytecodeHash": "0xa8e35be1abbfc180d5bad322558428ba9054dca034297742aede45fddd0b2956",
+    "evmDeployedBytecodeBlakeHash": "0xd4fcc40bc646594d5d3482a35dbe85ded4ab8e5a979aa88984727fe8ce9f5942",
     "evmDeployedBytecodeLength": 17226
   },
   {

l1-contracts/contracts/bridge/asset-tracker/L2AssetTracker.sol

@@ -78,9 +78,10 @@ contract L2AssetTracker is AssetTrackerBase, IL2AssetTracker {
 
     function _registerTokenOnL2(bytes32 _assetId) internal {
         /// If the chain is settling on Gateway, then withdrawals are not automatically allowed for new tokens.
-        if (L2_SYSTEM_CONTEXT_SYSTEM_CONTRACT.currentSettlementLayerChainId() == _l1ChainId()) {
-            assetMigrationNumber[block.chainid][_assetId] = L2_CHAIN_ASSET_HANDLER.migrationNumber(block.chainid);
-        }
+        // FIXME
+        // if (L2_SYSTEM_CONTEXT_SYSTEM_CONTRACT.currentSettlementLayerChainId() == _l1ChainId()) {
+        //     assetMigrationNumber[block.chainid][_assetId] = L2_CHAIN_ASSET_HANDLER.migrationNumber(block.chainid);
+        // }
     }
 
     /// @notice Registers a legacy token on this L2 chain for backwards compatibility.
@@ -150,11 +151,12 @@ contract L2AssetTracker is AssetTrackerBase, IL2AssetTracker {
         /// Note we always allow bridging when settling on L1.
         /// On Gateway we require that the tokenBalance be migrated to Gateway from L1,
         /// otherwise withdrawals might fail in the GWAssetTracker when the chain settles.
-        require(
-            savedAssetMigrationNumber == migrationNumber ||
-                L2_SYSTEM_CONTEXT_SYSTEM_CONTRACT.currentSettlementLayerChainId() == _l1ChainId(),
-            TokenBalanceNotMigratedToGateway(_assetId, savedAssetMigrationNumber, migrationNumber)
-        );
+        // FIXME
+        // require(
+        //     savedAssetMigrationNumber == migrationNumber ||
+        //         L2_SYSTEM_CONTEXT_SYSTEM_CONTRACT.currentSettlementLayerChainId() == _l1ChainId(),
+        //     TokenBalanceNotMigratedToGateway(_assetId, savedAssetMigrationNumber, migrationNumber)
+        // );
     }
 
     /// @notice Handles the initiation of base token bridging operations on L2.
@@ -263,35 +265,36 @@ contract L2AssetTracker is AssetTrackerBase, IL2AssetTracker {
     /// @dev This function is permissionless, it does not affect the state of the contract substantially, and can be called multiple times.
     /// @dev The value to migrate is read from the L2, but the tracking is done on L1/GW.
     function initiateL1ToGatewayMigrationOnL2(bytes32 _assetId) external {
-        require(
-            L2_SYSTEM_CONTEXT_SYSTEM_CONTRACT.currentSettlementLayerChainId() != L1_CHAIN_ID,
-            OnlyGatewaySettlementLayer()
-        );
-        address tokenAddress = _tryGetTokenAddress(_assetId);
-
-        uint256 originChainId = L2_NATIVE_TOKEN_VAULT.originChainId(_assetId);
-        address originalToken = L2_NATIVE_TOKEN_VAULT.originToken(_assetId);
-
-        uint256 chainMigrationNumber = _getChainMigrationNumber(block.chainid);
-        uint256 assetMigrationNumber = assetMigrationNumber[block.chainid][_assetId];
-        if (chainMigrationNumber == assetMigrationNumber) {
-            /// In this case the token was either already migrated, or the migration number was set using _forceSetAssetMigrationNumber.
-            return;
-        }
-        uint256 amount = _getOrSaveTotalSupply(_assetId, chainMigrationNumber, originChainId, tokenAddress);
-
-        TokenBalanceMigrationData memory tokenBalanceMigrationData = TokenBalanceMigrationData({
-            version: TOKEN_BALANCE_MIGRATION_DATA_VERSION,
-            chainId: block.chainid,
-            assetId: _assetId,
-            tokenOriginChainId: originChainId,
-            amount: amount,
-            chainMigrationNumber: chainMigrationNumber,
-            assetMigrationNumber: assetMigrationNumber,
-            originToken: originalToken,
-            isL1ToGateway: true
-        });
-        _sendMigrationDataToL1(tokenBalanceMigrationData);
+        revert("Disabled for zksync os");
+        // require(
+        //     L2_SYSTEM_CONTEXT_SYSTEM_CONTRACT.currentSettlementLayerChainId() != L1_CHAIN_ID,
+        //     OnlyGatewaySettlementLayer()
+        // );
+        // address tokenAddress = _tryGetTokenAddress(_assetId);
+
+        // uint256 originChainId = L2_NATIVE_TOKEN_VAULT.originChainId(_assetId);
+        // address originalToken = L2_NATIVE_TOKEN_VAULT.originToken(_assetId);
+
+        // uint256 chainMigrationNumber = _getChainMigrationNumber(block.chainid);
+        // uint256 assetMigrationNumber = assetMigrationNumber[block.chainid][_assetId];
+        // if (chainMigrationNumber == assetMigrationNumber) {
+        //     /// In this case the token was either already migrated, or the migration number was set using _forceSetAssetMigrationNumber.
+        //     return;
+        // }
+        // uint256 amount = _getOrSaveTotalSupply(_assetId, chainMigrationNumber, originChainId, tokenAddress);
+
+        // TokenBalanceMigrationData memory tokenBalanceMigrationData = TokenBalanceMigrationData({
+        //     version: TOKEN_BALANCE_MIGRATION_DATA_VERSION,
+        //     chainId: block.chainid,
+        //     assetId: _assetId,
+        //     tokenOriginChainId: originChainId,
+        //     amount: amount,
+        //     chainMigrationNumber: chainMigrationNumber,
+        //     assetMigrationNumber: assetMigrationNumber,
+        //     originToken: originalToken,
+        //     isL1ToGateway: true
+        // });
+        // _sendMigrationDataToL1(tokenBalanceMigrationData);
     }
 
     /// @notice Confirms a migration operation has been completed and updates the asset migration number.

l1-contracts/contracts/core/bridgehub/L2InteropRootStorage.sol

@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.24;
+
+event InteropRootAdded(uint256 indexed chainId, uint256 indexed blockNumber, bytes32[] sides);
+error SidesLengthNotOne();
+error InteropRootAlreadyExists();
+error MessageRootIsZero();
+
+/**
+ * @author Matter Labs
+ * @custom:security-contact security@matterlabs.dev
+ * @notice InteropRootStorage contract responsible for storing the message roots of other chains on the L2.
+ */
+contract L2InteropRootStorage {
+    /// @notice Mapping of chain ID to block or batch number to message root.
+    mapping(uint256 chainId => mapping(uint256 blockOrBatchNumber => bytes32 interopRoot)) public interopRoots;
+
+    /// @dev Adds a message root to the L2InteropRootStorage contract.
+    /// @dev For both proof-based and commit-based interop, the `sides` parameter contains only the root.
+    /// @dev Once pre-commit interop is introduced, `sides` will include both the root and its associated sides.
+    /// @dev This interface is preserved now so that enabling pre-commit interop later requires no changes in interface.
+    /// @dev In proof-based and pre-commit interop, `blockOrBatchNumber` represents the block number, in commit-based interop,
+    /// it represents the batch number. This distinction reflects the implementation requirements  of each interop finality form.
+    /// @param chainId The chain ID of the chain that the message root is for.
+    /// @param blockOrBatchNumber The block or batch number of the message root. Either of block number or batch number will be used,
+    /// depends on finality form of interop, mentioned above.
+    /// @param sides The message root sides. Note, that `sides` here are coming from `DynamicIncrementalMerkle` nomenclature.
+    /// @dev FIXME: for the demo purposes, remove onlyCallFromBootloader modifier
+    function addInteropRoot(uint256 chainId, uint256 blockOrBatchNumber, bytes32[] calldata sides) external {
+        // In the current code sides should only contain the Interop Root itself, as mentioned above.
+        if (sides.length != 1) {
+            revert SidesLengthNotOne();
+        }
+        if (sides[0] == bytes32(0)) {
+            revert MessageRootIsZero();
+        }
+
+        // Make sure that interopRoots for specified chainId and blockOrBatchNumber wasn't set already.
+        if (interopRoots[chainId][blockOrBatchNumber] != bytes32(0)) {
+            revert InteropRootAlreadyExists();
+        }
+
+        // Set interopRoots for specified chainId and blockOrBatchNumber, emit event.
+        interopRoots[chainId][blockOrBatchNumber] = sides[0];
+
+        emit InteropRootAdded(chainId, blockOrBatchNumber, sides);
+    }
+}

l1-contracts/contracts/core/message-root/MessageRootBase.sol

@@ -19,6 +19,8 @@ import {MessageVerification} from "../../common/MessageVerification.sol";
 
 import {IGetters} from "../../state-transition/chain-interfaces/IGetters.sol";
 
+event AppendedChainRoot(uint256 indexed chainId, uint256 indexed batchNumber, bytes32 indexed chainRoot);
+
 /// @author Matter Labs
 /// @custom:security-contact security@matterlabs.dev
 /// @dev The MessageRoot contract is responsible for storing the cross message roots of the chains and the aggregated root of all chains.
@@ -191,6 +193,8 @@ abstract contract MessageRootBase is IMessageRoot, Initializable, MessageVerific
 
         chainBatchRoots[_chainId][_batchNumber] = _chainBatchRoot;
         ++currentChainBatchNumber[_chainId];
+        emit AppendedChainRoot(_chainId, _batchNumber, _chainBatchRoot);
+
         if (block.chainid == L1_CHAIN_ID()) {
             /// On L1 we only store the chainBatchRoot, but don't update the chainTree or sharedTree.
             return;

l1-contracts/contracts/interop/InteropCenter.sol

@@ -269,8 +269,9 @@ contract InteropCenter is
                 msg.value == _totalBurnedCallsValue + _totalIndirectCallsValue,
                 MsgValueMismatch(_totalBurnedCallsValue + _totalIndirectCallsValue, msg.value)
             );
+            // FIXME: does not burn, just sends to a a bad address.
             // slither-disable-next-line arbitrary-send-eth
-            L2_BASE_TOKEN_SYSTEM_CONTRACT.burnMsgValue{value: _totalBurnedCallsValue}();
+            address(0xdeadbeef).call{value: _totalBurnedCallsValue}("");
         } else {
             require(msg.value == _totalIndirectCallsValue, MsgValueMismatch(_totalIndirectCallsValue, msg.value));
             if (_totalBurnedCallsValue > 0) {
@@ -296,7 +297,8 @@ contract InteropCenter is
         BundleAttributes memory _bundleAttributes,
         bytes[][] memory _originalCallAttributes
     ) internal returns (bytes32 bundleHash) {
-        require(L2_SYSTEM_CONTEXT_SYSTEM_CONTRACT.currentSettlementLayerChainId() != L1_CHAIN_ID, NotInGatewayMode());
+        // FIXME: Turned off for zksync os for now
+        // require(L2_SYSTEM_CONTEXT_SYSTEM_CONTRACT.currentSettlementLayerChainId() != L1_CHAIN_ID, NotInGatewayMode());
 
         // Form an InteropBundle.
         InteropBundle memory bundle = InteropBundle({

l1-contracts/contracts/interop/InteropHandler.sol

@@ -328,15 +328,16 @@ contract InteropHandler is IInteropHandler, ReentrancyGuard {
             _proof: _proof.proof
         });
 
-        require(isIncluded, MessageNotIncluded());
+        // require(isIncluded, MessageNotIncluded());
 
         bundleStatus[_bundleHash] = BundleStatus.Verified;
 
+        // FIXME
         /// We send the fact of verification to L1 so that the GWAssetTracker can process the chainBalance changes.
-        require(L2_SYSTEM_CONTEXT_SYSTEM_CONTRACT.currentSettlementLayerChainId() != L1_CHAIN_ID, NotInGatewayMode());
+        // require(L2_SYSTEM_CONTEXT_SYSTEM_CONTRACT.currentSettlementLayerChainId() != L1_CHAIN_ID, NotInGatewayMode());
 
         // slither-disable-next-line reentrancy-no-eth,unused-return
-        L2_TO_L1_MESSENGER_SYSTEM_CONTRACT.sendToL1(bytes.concat(this.verifyBundle.selector, _bundleHash));
+        // L2_TO_L1_MESSENGER_SYSTEM_CONTRACT.sendToL1(bytes.concat(this.verifyBundle.selector, _bundleHash));
 
         // Emit event stating that the bundle was verified.
         emit BundleVerified(_bundleHash);

l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol

@@ -802,25 +802,25 @@ contract ExecutorFacet is ZKChainBase, IExecutor {
         // Interop is only allowed on GW currently, so we go through the Asset Tracker when on Gateway.
         // When on L1, we append directly to the Message Root, though interop is not allowed there, it is only used for
         // message verification.
-        if (block.chainid != L1_CHAIN_ID) {
-            uint256 messagesLength = messages.length;
-            for (uint256 i = 0; i < messagesLength; i = i.uncheckedInc()) {
-                ProcessLogsInput memory processLogsInput = ProcessLogsInput({
-                    logs: logs[i],
-                    messages: messages[i],
-                    chainId: s.chainId,
-                    batchNumber: batchesData[i].batchNumber,
-                    chainBatchRoot: batchesData[i].l2LogsTreeRoot,
-                    messageRoot: messageRoots[i]
-                });
-                GW_ASSET_TRACKER.processLogsAndMessages(processLogsInput);
-            }
-        } else {
-            uint256 batchesDataLength = batchesData.length;
-            for (uint256 i = 0; i < batchesDataLength; i = i.uncheckedInc()) {
-                _appendMessageRoot(batchesData[i].batchNumber, batchesData[i].l2LogsTreeRoot);
-            }
+        // if (block.chainid != L1_CHAIN_ID) {
+        //     uint256 messagesLength = messages.length;
+        //     for (uint256 i = 0; i < messagesLength; i = i.uncheckedInc()) {
+        //         ProcessLogsInput memory processLogsInput = ProcessLogsInput({
+        //             logs: logs[i],
+        //             messages: messages[i],
+        //             chainId: s.chainId,
+        //             batchNumber: batchesData[i].batchNumber,
+        //             chainBatchRoot: batchesData[i].l2LogsTreeRoot,
+        //             messageRoot: messageRoots[i]
+        //         });
+        //         GW_ASSET_TRACKER.processLogsAndMessages(processLogsInput);
+        //     }
+        // } else {
+        uint256 batchesDataLength = batchesData.length;
+        for (uint256 i = 0; i < batchesDataLength; i = i.uncheckedInc()) {
+            _appendMessageRoot(batchesData[i].batchNumber, batchesData[i].l2LogsTreeRoot);
         }
+        // }
 
         for (uint256 i = 0; i < nBatches; i = i.uncheckedInc()) {
             _executeOneBatch(batchesData[i], priorityOpsData[i], dependencyRoots[i], i);

l1-contracts/contracts/state-transition/verifiers/ZKsyncOSVerifierPlonk.sol

@@ -9,7 +9,7 @@ import {IVerifier} from "../chain-interfaces/IVerifier.sol";
 /// @notice Modified version of the Permutations over Lagrange-bases for Oecumenical Noninteractive arguments of
 /// Knowledge (PLONK) verifier.
 /// Modifications have been made to optimize the proof system for ZK chain circuits.
-/// @dev Contract was generated from a verification key with a hash of 0x996b02b1d0420e997b4dc0d629a3a1bba93ed3185ac463f17b02ff83be139581
+/// @dev Contract was generated from a verification key with a hash of 0x124ebcd537a1e1c152774dd18f67660e35625bba0b669bf3b4836d636b105337
 /// @dev It uses a custom memory layout inside the inline assembly block. Each reserved memory cell is declared in the
 /// constants below.
 /// @dev For a better understanding of the verifier algorithm please refer to the following papers:
@@ -284,8 +284,8 @@ contract ZKsyncOSVerifierPlonk is IVerifier {
     function _loadVerificationKey() internal pure virtual {
         assembly {
             // gate setup commitments
-            mstore(VK_GATE_SETUP_0_X_SLOT, 0x02e3b0b9f13c8d6c357fadb40987391045e4e74d6eb230bcf8e5bbeb1d25d314)
-            mstore(VK_GATE_SETUP_0_Y_SLOT, 0x02581594260d2083c95d4206fb6bc46e63409f179019a0ca85f559f16ec8c8b4)
+            mstore(VK_GATE_SETUP_0_X_SLOT, 0x1106b27c3561b9ffeacfd97e7c2a73e5b3830a71d9cf1e7a13e2c22619df67c6)
+            mstore(VK_GATE_SETUP_0_Y_SLOT, 0x1766dab5ce252fef675ee6ae5a594f2625517b04233609d7d6fa5b0d0e87bf9f)
             mstore(VK_GATE_SETUP_1_X_SLOT, 0x0feda978f4639d0a725df74c4738bf178adca34e6a4f7cc38d6a9ae9ee49f695)
             mstore(VK_GATE_SETUP_1_Y_SLOT, 0x2f7068beedb881aea392246c33ccc026ea9c8f6ea558a055b6df00ebfdf210a3)
             mstore(VK_GATE_SETUP_2_X_SLOT, 0x06eccb685da5c8cc09a13698b2a22e383025abc75393d68c1da5a7dbacffbd9b)
@@ -296,8 +296,8 @@ contract ZKsyncOSVerifierPlonk is IVerifier {
             mstore(VK_GATE_SETUP_4_Y_SLOT, 0x1ac2f036e3de6e4a9bacd5eacc778fa3fbdf5fd4b06e551038c704adecbeb639)
             mstore(VK_GATE_SETUP_5_X_SLOT, 0x048e2130f16d54d7e07df66330b4d892753b5141ecacb4007573d9ea4a8ff028)
             mstore(VK_GATE_SETUP_5_Y_SLOT, 0x13a3819d4cb80114e51de741a5fb48ce4ba20e82c5d39d16f70ca0461f49a131)
-            mstore(VK_GATE_SETUP_6_X_SLOT, 0x270854888de4cbcb787110e1b036811546d4b674b599e664d6f1b27c98d07982)
-            mstore(VK_GATE_SETUP_6_Y_SLOT, 0x04d33456342a1fa5f7eab876d0c1bb47c7fa366a125f858c7e03a4d6b39eff71)
+            mstore(VK_GATE_SETUP_6_X_SLOT, 0x133985cd37d7e76cbe8a87b9eddbc637916035656b2cfe776a2c4a6c23ae938b)
+            mstore(VK_GATE_SETUP_6_Y_SLOT, 0x060b7c13eb18593c67a6cd94f24b8403dd97157a3f4096d1ce3c1e9b2fb53c12)
             mstore(VK_GATE_SETUP_7_X_SLOT, 0x1affeacdceb1b6f018bbb6762bb5aebcd54c3e24801ce01d06146d1bf0938b2c)
             mstore(VK_GATE_SETUP_7_Y_SLOT, 0x19a277dd9eaac40538f3177e3390ec21d097f88afb04158dd59e963a327fe9da)