feat: Kl/asset tracker migration

l1-contracts/contracts/bridge/L1BridgeContractErrors.sol

@@ -6,10 +6,14 @@ pragma solidity ^0.8.21;
 error ClaimFailedDepositFailed();
 // 0x066f53b1
 error EmptyToken();
+// 0x82b0de47
+error EthAlreadyMigratedToL1NTV();
 // 0x6d963f88
 error EthTransferFailed();
 // 0x1c55230b
 error NativeTokenVaultAlreadySet();
+// 0x84204265
+error TokenAlreadyInBridgedTokensList();
 // 0xb4aeddbc
 error WrongCounterpart();
 // 0x636c90db

l1-contracts/contracts/bridge/L1Nullifier.sol

@@ -13,12 +13,11 @@ import {IL1NativeTokenVault} from "./ntv/IL1NativeTokenVault.sol";
 
 import {IL1ERC20Bridge} from "./interfaces/IL1ERC20Bridge.sol";
 import {IL1AssetRouter} from "./asset-router/IL1AssetRouter.sol";
-
-import {FinalizeL1DepositParams, IL1Nullifier} from "./interfaces/IL1Nullifier.sol";
+import {FinalizeL1DepositParams, IL1Nullifier, TRANSIENT_SETTLEMENT_LAYER_SLOT} from "./interfaces/IL1Nullifier.sol";
 
 import {IGetters} from "../state-transition/chain-interfaces/IGetters.sol";
 import {IMailboxImpl} from "../state-transition/chain-interfaces/IMailboxImpl.sol";
-import {L2Message, TxStatus} from "../common/Messaging.sol";
+import {L2Log, L2Message, TxStatus} from "../common/Messaging.sol";
 import {UnsafeBytes} from "../common/libraries/UnsafeBytes.sol";
 import {ReentrancyGuard} from "../common/ReentrancyGuard.sol";
 import {ETH_TOKEN_ADDRESS} from "../common/Config.sol";
@@ -28,7 +27,10 @@ import {IBridgehub} from "../bridgehub/IBridgehub.sol";
 import {IInteropCenter} from "../interop/IInteropCenter.sol";
 import {L2_ASSET_ROUTER_ADDR, L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR} from "../common/l2-helpers/L2ContractAddresses.sol";
 import {AddressAlreadySet, DepositDoesNotExist, DepositExists, InvalidProof, InvalidSelector, L2WithdrawalMessageWrongLength, LegacyBridgeNotSet, LegacyMethodForNonL1Token, SharedBridgeKey, SharedBridgeValueNotSet, TokenNotLegacy, Unauthorized, WithdrawalAlreadyFinalized, ZeroAddress} from "../common/L1ContractErrors.sol";
-import {EthTransferFailed, NativeTokenVaultAlreadySet, WrongL2Sender, WrongMsgLength} from "./L1BridgeContractErrors.sol";
+import {EthAlreadyMigratedToL1NTV, NativeTokenVaultAlreadySet, WrongL2Sender, WrongMsgLength} from "./L1BridgeContractErrors.sol";
+import {MessageHashing, ProofData} from "../common/libraries/MessageHashing.sol";
+import {TransientPrimitivesLib} from "../common/libraries/TransientPrimitives/TransientPrimitives.sol";
+import {IMessageRoot} from "../bridgehub/MessageRoot.sol";
 
 /// @author Matter Labs
 /// @custom:security-contact [email protected]
@@ -50,6 +52,9 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable,
     /// @dev The address of ZKsync Era diamond proxy contract.
     address internal immutable ERA_DIAMOND_PROXY;
 
+    /// @dev MessageRoot smart contract that is used to prove message inclusion.
+    IMessageRoot public immutable MESSAGE_ROOT;
+
     /// @dev Stores the first batch number on the ZKsync Era Diamond Proxy that was settled after Diamond proxy upgrade.
     /// This variable is used to differentiate between pre-upgrade and post-upgrade Eth withdrawals. Withdrawals from batches older
     /// than this value are considered to have been finalized prior to the upgrade and handled separately.
@@ -135,12 +140,14 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable,
     /// @dev Initialize the implementation to prevent Parity hack.
     constructor(
         IBridgehub _bridgehub,
+        IMessageRoot _messageRoot,
         IInteropCenter _interopCenter,
         uint256 _eraChainId,
         address _eraDiamondProxy
     ) reentrancyGuardInitializer {
         _disableInitializers();
         BRIDGE_HUB = _bridgehub;
+        MESSAGE_ROOT = _messageRoot;
         INTEROP_CENTER = _interopCenter;
         ERA_CHAIN_ID = _eraChainId;
         ERA_DIAMOND_PROXY = _eraDiamondProxy;
@@ -177,13 +184,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable,
     function transferTokenToNTV(address _token) external onlyL1NTV {
         address ntvAddress = address(l1NativeTokenVault);
         if (ETH_TOKEN_ADDRESS == _token) {
-            uint256 amount = address(this).balance;
-            bool callSuccess;
-            // Low-level assembly call, to avoid any memory copying (save gas)
-            assembly {
-                callSuccess := call(gas(), ntvAddress, amount, 0, 0, 0, 0)
-            }
-            require(callSuccess, EthTransferFailed());
+            revert EthAlreadyMigratedToL1NTV();
         } else {
             IERC20(_token).safeTransfer(ntvAddress, IERC20(_token).balanceOf(address(this)));
         }
@@ -206,8 +207,10 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable,
     }
 
     /// @notice Legacy function used for migration, do not use!
+    /// @dev Returns the deprecated chain balance for backwards compatibility.
     /// @param _chainId The chain id we want to get the balance for.
     /// @param _token The address of the token.
+    /// @return The balance of the token on the specified chain (deprecated).
     // slither-disable-next-line uninitialized-state-variables
     function chainBalance(uint256 _chainId, address _token) external view returns (uint256) {
         // slither-disable-next-line uninitialized-state-variables
@@ -256,7 +259,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable,
         emit BridgehubDepositFinalized(_chainId, _txDataHash, _txHash);
     }
 
-    /// @dev Calls the library `encodeTxDataHash`. Used as a wrapped for try / catch case.
+    /// @dev Calls the library `encodeTxDataHash`. Used as a wrapper for try / catch case.
     /// @dev Encodes the transaction data hash using either the latest encoding standard or the legacy standard.
     /// @param _encodingVersion EncodingVersion.
     /// @param _originalCaller The address of the entity that initiated the deposit.
@@ -307,6 +310,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable,
     }
 
     /// @dev Withdraw funds from the initiated deposit, that failed when finalizing on L2.
+    /// @param _checkedInLegacyBridge Whether the deposit was already checked in the legacy bridge system.
     /// @param _chainId The ZK chain id to which deposit was initiated.
     /// @param _depositSender The address of the entity that initiated the deposit.
     /// @param _assetId The unique identifier of the deposited L1 token.
@@ -330,7 +334,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable,
         bytes32[] calldata _merkleProof
     ) internal whenNotPaused {
         {
-            bool proofValid = BRIDGE_HUB.proveL1ToL2TransactionStatus({
+            bool proofValid = MESSAGE_ROOT.proveL1ToL2TransactionStatusShared({
                 _chainId: _chainId,
                 _l2TxHash: _l2TxHash,
                 _l2BatchNumber: _l2BatchNumber,
@@ -339,6 +343,22 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable,
                 _merkleProof: _merkleProof,
                 _status: TxStatus.Failure
             });
+            L2Log memory l2Log = MessageHashing.getL2LogFromL1ToL2Transaction(
+                _l2TxNumberInBatch,
+                _l2TxHash,
+                TxStatus.Failure
+            );
+
+            bytes32 leaf = MessageHashing.getLeafHashFromLog(l2Log);
+            ProofData memory proofData = MESSAGE_ROOT.getProofData({
+                _chainId: _chainId,
+                _batchNumber: _l2BatchNumber,
+                _leafProofMask: _l2MessageIndex,
+                _leaf: leaf,
+                _proof: _merkleProof
+            });
+            TransientPrimitivesLib.set(TRANSIENT_SETTLEMENT_LAYER_SLOT, proofData.settlementLayerChainId);
+            emit TransientSettlementLayerSet(proofData.settlementLayerChainId);
             require(proofValid, InvalidProof());
         }
 
@@ -502,24 +522,39 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable,
             });
         }
 
-        bool success = BRIDGE_HUB.proveL2MessageInclusion({
+        bool success = MESSAGE_ROOT.proveL2MessageInclusionShared({
             _chainId: _finalizeWithdrawalParams.chainId,
-            _batchNumber: _finalizeWithdrawalParams.l2BatchNumber,
+            _blockOrBatchNumber: _finalizeWithdrawalParams.l2BatchNumber,
             _index: _finalizeWithdrawalParams.l2MessageIndex,
             _message: l2ToL1Message,
             _proof: _finalizeWithdrawalParams.merkleProof
         });
+        bytes32 leaf = MessageHashing.getLeafHashFromMessage(l2ToL1Message);
+        ProofData memory proofData = MESSAGE_ROOT.getProofData({
+            _chainId: _finalizeWithdrawalParams.chainId,
+            _batchNumber: _finalizeWithdrawalParams.l2BatchNumber,
+            _leafProofMask: _finalizeWithdrawalParams.l2MessageIndex,
+            _leaf: leaf,
+            _proof: _finalizeWithdrawalParams.merkleProof
+        });
+        TransientPrimitivesLib.set(TRANSIENT_SETTLEMENT_LAYER_SLOT, proofData.settlementLayerChainId);
+        emit TransientSettlementLayerSet(proofData.settlementLayerChainId);
         // withdrawal wrong proof
         require(success, InvalidProof());
     }
 
+    /// @inheritdoc IL1Nullifier
+    function getTransientSettlementLayer() external view returns (uint256) {
+        return TransientPrimitivesLib.getUint256(TRANSIENT_SETTLEMENT_LAYER_SLOT);
+    }
+
     /// @notice Parses the withdrawal message and returns withdrawal details.
     /// @dev Currently, 3 different encoding versions are supported: legacy mailbox withdrawal, ERC20 bridge withdrawal,
     /// @dev and the latest version supported by shared bridge. Selectors are used for versioning.
     /// @param _chainId The ZK chain ID.
     /// @param _l2ToL1message The encoded L2 -> L1 message.
     /// @return assetId The ID of the bridged asset.
-    /// @return transferData The transfer data used to finalize withdawal.
+    /// @return transferData The transfer data used to finalize withdrawal.
     function _parseL2WithdrawalMessage(
         uint256 _chainId,
         bytes memory _l2ToL1message

l1-contracts/contracts/bridge/asset-router/AssetRouterBase.sol

@@ -13,11 +13,11 @@ import {IAssetHandler} from "../interfaces/IAssetHandler.sol";
 import {DataEncoding} from "../../common/libraries/DataEncoding.sol";
 
 import {TWO_BRIDGES_MAGIC_VALUE} from "../../common/Config.sol";
-import {L2_ASSET_ROUTER_ADDR, L2_NATIVE_TOKEN_VAULT_ADDR, L2_INTEROP_CENTER_ADDR} from "../../common/l2-helpers/L2ContractAddresses.sol";
+import {L2_ASSET_ROUTER_ADDR, L2_INTEROP_CENTER_ADDR, L2_NATIVE_TOKEN_VAULT_ADDR} from "../../common/l2-helpers/L2ContractAddresses.sol";
 
 import {IBridgehub, L2TransactionRequestTwoBridgesInner} from "../../bridgehub/IBridgehub.sol";
 import {IInteropCenter} from "../../interop/IInteropCenter.sol";
-import {AssetIdNotSupported, Unauthorized, UnsupportedEncodingVersion, AssetHandlerDoesNotExist, BadTransferDataLength} from "../../common/L1ContractErrors.sol";
+import {AssetHandlerDoesNotExist, AssetIdNotSupported, BadTransferDataLength, Unauthorized, UnsupportedEncodingVersion} from "../../common/L1ContractErrors.sol";
 import {INativeTokenVault} from "../ntv/INativeTokenVault.sol";
 
 /// @author Matter Labs

l1-contracts/contracts/bridge/asset-router/IL2AssetRouter.sol

@@ -19,6 +19,8 @@ interface IL2AssetRouter is IAssetRouterBase, IL2CrossChainSender {
 
     function L1_ASSET_ROUTER() external view returns (address);
 
+    function BASE_TOKEN_ASSET_ID() external view returns (bytes32);
+
     function withdrawLegacyBridge(address _l1Receiver, address _l2Token, uint256 _amount, address _sender) external;
 
     function finalizeDepositLegacyBridge(

l1-contracts/contracts/bridge/asset-router/L2AssetRouter.sol

@@ -21,7 +21,7 @@ import {InteropCallStarter} from "../../common/Messaging.sol";
 import {L2_BRIDGEHUB_ADDR, L2_INTEROP_CENTER_ADDR, L2_NATIVE_TOKEN_VAULT_ADDR} from "../../common/l2-helpers/L2ContractAddresses.sol";
 import {L2ContractHelper} from "../../common/l2-helpers/L2ContractHelper.sol";
 import {DataEncoding} from "../../common/libraries/DataEncoding.sol";
-import {AmountMustBeGreaterThanZero, AssetIdNotSupported, EmptyAddress, Unauthorized, TokenNotLegacy, InvalidSelector, PayloadTooShort, ExecuteMessageFailed} from "../../common/L1ContractErrors.sol";
+import {AmountMustBeGreaterThanZero, AssetIdNotSupported, EmptyAddress, ExecuteMessageFailed, InvalidSelector, PayloadTooShort, TokenNotLegacy, Unauthorized} from "../../common/L1ContractErrors.sol";
 import {IERC7786Recipient} from "../../interop/IERC7786Recipient.sol";
 import {IERC7786Attributes} from "../../interop/IERC7786Attributes.sol";
 import {InteroperableAddress} from "@openzeppelin/contracts-master/utils/draft-InteroperableAddress.sol";