Merge branch 'sync-layer-stable' of ssh://github.com/matter-labs/era-…

…contracts into kl/l2-native-token

.github/workflows/l1-contracts-ci.yaml

@@ -22,6 +22,9 @@ jobs:
           node-version: 18.18.0
           cache: yarn
 
+      - name: Use Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+
       - name: Install dependencies
         run: yarn
 
@@ -39,19 +42,22 @@ jobs:
       - name: Build l1 artifacts
         run: yarn l1 build
 
+      - name: Build da-contracts artifacts
+        run: yarn da build:foundry
+
       - name: Create cache
         uses: actions/cache/save@v3
         with:
           key: artifacts-l1-${{ github.sha }}
           path: |
+            da-contracts/out
             l1-contracts/artifacts
             l1-contracts/artifacts-zk
             l1-contracts/cache
             l1-contracts/typechain
             l2-contracts/artifacts-zk
             l2-contracts/cache-zk
             l2-contracts/typechain
-            l1-contracts/lib
 
   lint:
     runs-on: ubuntu-latest
@@ -100,14 +106,14 @@ jobs:
           fail-on-cache-miss: true
           key: artifacts-l1-${{ github.sha }}
           path: |
+            da-contracts/out
             l1-contracts/artifacts
             l1-contracts/artifacts-zk
             l1-contracts/cache
             l1-contracts/typechain
             l2-contracts/artifacts-zk
             l2-contracts/cache-zk
             l2-contracts/typechain
-            l1-contracts/lib
 
       - name: Run tests
         working-directory: ./l1-contracts
@@ -141,14 +147,14 @@ jobs:
           fail-on-cache-miss: true
           key: artifacts-l1-${{ github.sha }}
           path: |
+            da-contracts/out
             l1-contracts/artifacts
             l1-contracts/artifacts-zk
             l1-contracts/cache
             l1-contracts/typechain
             l2-contracts/artifacts-zk
             l2-contracts/cache-zk
             l2-contracts/typechain
-            l1-contracts/lib
 
       - name: Install foundry zksync
         run: |
@@ -191,14 +197,14 @@ jobs:
           fail-on-cache-miss: true
           key: artifacts-l1-${{ github.sha }}
           path: |
+            da-contracts/out
             l1-contracts/artifacts
             l1-contracts/artifacts-zk
             l1-contracts/cache
             l1-contracts/typechain
             l2-contracts/artifacts-zk
             l2-contracts/cache-zk
             l2-contracts/typechain
-            l1-contracts/lib
 
       - name: Build L2 contracts
         run: yarn l2 build
@@ -258,14 +264,14 @@ jobs:
           fail-on-cache-miss: true
           key: artifacts-l1-${{ github.sha }}
           path: |
+            da-contracts/out
             l1-contracts/artifacts
             l1-contracts/artifacts-zk
             l1-contracts/cache
             l1-contracts/typechain
             l2-contracts/artifacts-zk
             l2-contracts/cache-zk
             l2-contracts/typechain
-            l1-contracts/lib
 
       - name: Run coverage
         run: FOUNDRY_PROFILE=default yarn test:foundry && FOUNDRY_PROFILE=default yarn coverage:foundry --report summary --report lcov
@@ -280,7 +286,7 @@ jobs:
       - name: Filter directories
         run: |
           sudo apt update && sudo apt install -y lcov
-          lcov --remove lcov.info 'test/*' 'contracts/dev-contracts/*' '../lib/forge-std/*' '../lib/murky/*' 'lib/*' '../lib/*' 'lib/' --output-file lcov.info --rc lcov_branch_coverage=1
+          lcov --remove lcov.info 'test/*' 'contracts/dev-contracts/*' '../lib/forge-std/*' '../lib/murky/*' 'lib/*' '../lib/*' 'lib/' 'deploy-scripts/*' --output-file lcov.info --rc lcov_branch_coverage=1
 
       # This step posts a detailed coverage report as a comment and deletes previous comments on
       # each push. The below step is used to fail coverage if the specified coverage threshold is

.github/workflows/l1-contracts-foundry-ci.yaml

@@ -41,11 +41,15 @@ jobs:
       - name: Build l2 artifacts
         run: yarn l2 build
 
+      - name: Build da-contracts artifacts
+        run: yarn da build:foundry
+
       - name: Create cache
         uses: actions/cache/save@v3
         with:
           key: artifacts-l1-contracts-foudry-${{ github.sha }}
           path: |
+            da-contracts/out
             l1-contracts/cache
             l1-contracts/out
             l1-contracts/artifacts-zk
@@ -72,6 +76,7 @@ jobs:
           fail-on-cache-miss: true
           key: artifacts-l1-contracts-foudry-${{ github.sha }}
           path: |
+            da-contracts/out
             l1-contracts/cache
             l1-contracts/out
             l1-contracts/artifacts-zk

.gitignore

@@ -31,4 +31,6 @@ l1-contracts/test/foundry/l1/integration/deploy-scripts/script-out/*.toml
 !l1-contracts/script-out/.gitkeep
 *.timestamp
 l1-contracts/test/foundry/l1/integration/deploy-scripts/script-out/*
+l1-contracts/test/foundry/l1/integration/deploy-scripts/script-config/config-deploy-zk-chain-*.toml
+l1-contracts/test/foundry/integration/deploy-scripts/script-out/*
 l1-contracts/zkout/*

.solhintignore

@@ -17,6 +17,7 @@ l1-contracts-foundry/lib
 # l2-contracts
 l2-contracts/cache-zk
 l2-contracts/node_modules
+l2-contracts/contracts/dev-contracts
 l2-contracts/test
 
 # system-contracts

da-contracts/package.json

@@ -54,7 +54,7 @@
   },
   "scripts": {
     "build": "hardhat compile ",
-    "build-l1": "harhdat compile",
+    "build:foundry": "forge build",
     "clean": "hardhat clean",
     "clean:foundry": "forge clean",
     "verify": "hardhat run --network env scripts/verify.ts"

l1-contracts/contracts/bridge/L2SharedBridgeLegacy.sol

@@ -22,10 +22,6 @@ import {ZeroAddress, EmptyBytes32, Unauthorized, AmountMustBeGreaterThanZero, De
 /// @notice The "default" bridge implementation for the ERC20 tokens. Note, that it does not
 /// support any custom token logic, i.e. rebase tokens' functionality is not supported.
 contract L2SharedBridgeLegacy is IL2SharedBridgeLegacy, Initializable {
-    /// @dev Contract is expected to be used as proxy implementation.
-    /// @dev Disable the initialization to prevent Parity hack.
-    uint256 public immutable ERA_CHAIN_ID;
-
     /// @dev The address of the L1 shared bridge counterpart.
     address public override l1SharedBridge;
 
@@ -57,19 +53,16 @@ contract L2SharedBridgeLegacy is IL2SharedBridgeLegacy, Initializable {
         _;
     }
 
-    constructor(uint256 _eraChainId) {
-        ERA_CHAIN_ID = _eraChainId;
+    constructor() {
         _disableInitializers();
     }
 
     /// @notice Initializes the bridge contract for later use. Expected to be used in the proxy.
     /// @param _l1SharedBridge The address of the L1 Bridge contract.
-    /// @param _l1Bridge The address of the legacy L1 Bridge contract.
     /// @param _l2TokenProxyBytecodeHash The bytecode hash of the proxy for tokens deployed by the bridge.
     /// @param _aliasedOwner The address of the governor contract.
     function initialize(
         address _l1SharedBridge,
-        address _l1Bridge,
         bytes32 _l2TokenProxyBytecodeHash,
         address _aliasedOwner
     ) external reinitializer(2) {
@@ -87,17 +80,14 @@ contract L2SharedBridgeLegacy is IL2SharedBridgeLegacy, Initializable {
 
         l1SharedBridge = _l1SharedBridge;
 
-        if (block.chainid != ERA_CHAIN_ID) {
+        // The following statement is true only in freshly deployed environments. However,
+        // for those environments we do not need to deploy this contract at all.
+        // This check is primarily for local testing purposes.
+        if (l2TokenProxyBytecodeHash == bytes32(0) && address(l2TokenBeacon) == address(0)) {
             address l2StandardToken = address(new BridgedStandardERC20{salt: bytes32(0)}());
             l2TokenBeacon = new UpgradeableBeacon{salt: bytes32(0)}(l2StandardToken);
             l2TokenProxyBytecodeHash = _l2TokenProxyBytecodeHash;
             l2TokenBeacon.transferOwnership(_aliasedOwner);
-        } else {
-            if (_l1Bridge == address(0)) {
-                revert ZeroAddress();
-            }
-            l1Bridge = _l1Bridge;
-            // l2StandardToken and l2TokenBeacon are already deployed on ERA, and stored in the proxy
         }
     }
 

l1-contracts/contracts/bridgehub/CTMDeploymentTracker.sol

@@ -15,6 +15,9 @@ import {ReentrancyGuard} from "../common/ReentrancyGuard.sol";
 import {TWO_BRIDGES_MAGIC_VALUE} from "../common/Config.sol";
 import {L2_BRIDGEHUB_ADDR} from "../common/L2ContractAddresses.sol";
 
+/// @dev The encoding version of the data.
+bytes1 constant CTM_DEPLOYMENT_TRACKER_ENCODING_VERSION = 0x01;
+
 /// @author Matter Labs
 /// @custom:security-contact [email protected]
 /// @dev Contract to be deployed on L1, can link together other contracts based on AssetInfo.
@@ -25,9 +28,6 @@ contract CTMDeploymentTracker is ICTMDeploymentTracker, ReentrancyGuard, Ownable
     /// @dev Bridgehub smart contract that is used to operate with L2 via asynchronous L2 <-> L1 communication.
     IAssetRouterBase public immutable override L1_ASSET_ROUTER;
 
-    /// @dev The encoding version of the data.
-    bytes1 internal constant ENCODING_VERSION = 0x01;
-
     /// @notice Checks that the message sender is the bridgehub.
     modifier onlyBridgehub() {
         // solhint-disable-next-line gas-custom-errors
@@ -93,7 +93,7 @@ contract CTMDeploymentTracker is ICTMDeploymentTracker, ReentrancyGuard, Ownable
 
         require(_originalCaller == owner(), "CTMDT: not owner");
         bytes1 encodingVersion = _data[0];
-        require(encodingVersion == ENCODING_VERSION, "CTMDT: wrong encoding version");
+        require(encodingVersion == CTM_DEPLOYMENT_TRACKER_ENCODING_VERSION, "CTMDT: wrong encoding version");
         (address _ctmL1Address, address _ctmL2Address) = abi.decode(_data[1:], (address, address));
 
         request = _registerCTMAssetOnL2Bridgehub(_chainId, _ctmL1Address, _ctmL2Address);

l1-contracts/contracts/bridgehub/IBridgehub.sol

@@ -197,6 +197,8 @@ interface IBridgehub is IAssetHandler, IL1AssetHandler {
 
     function registerSettlementLayer(uint256 _newSettlementLayerChainId, bool _isWhitelisted) external;
 
+    function settlementLayer(uint256 _chainId) external view returns (uint256);
+
     // function finalizeMigrationToGateway(
     //     uint256 _chainId,
     //     address _baseToken,

l1-contracts/contracts/governance/IChainAdmin.sol

@@ -35,4 +35,13 @@ interface IChainAdmin {
     /// @param _restriction The address of the restriction contract.
     /// @dev Sometimes restrictions might need to enforce their permanence (e.g. if a chain should be a rollup forever).
     function removeRestriction(address _restriction) external;
+
+    /// @notice Execute multiple calls as part of contract administration.
+    /// @param _calls Array of Call structures defining target, value, and data for each call.
+    /// @param _requireSuccess If true, reverts transaction on any call failure.
+    /// @dev Intended for batch processing of contract interactions, managing gas efficiency and atomicity of operations.
+    /// @dev Note, that this function lacks access control. It is expected that the access control is implemented in a separate restriction contract.
+    /// @dev Even though all the validation from external modules is executed via `staticcall`, the function
+    /// is marked as `nonReentrant` to prevent reentrancy attacks in case the staticcall restriction is lifted in the future.
+    function multicall(Call[] calldata _calls, bool _requireSuccess) external payable;
 }

da-contracts/contracts/ValidiumL1DAValidator.sol → l1-contracts/contracts/state-transition/data-availability/ValidiumL1DAValidator.sol

@@ -4,15 +4,15 @@ pragma solidity 0.8.24;
 
 // solhint-disable gas-custom-errors, reason-string
 
-import {IL1DAValidator, L1DAValidatorOutput} from "./IL1DAValidator.sol";
+import {IL1DAValidator, L1DAValidatorOutput} from "../chain-interfaces/IL1DAValidator.sol";
 
 contract ValidiumL1DAValidator is IL1DAValidator {
     function checkDA(
         uint256, // _chainId
         uint256, // _batchNumber
         bytes32, // _l2DAValidatorOutputHash
         bytes calldata _operatorDAInput,
-        uint256 // maxBlobsSupported
+        uint256 maxBlobsSupported
     ) external override returns (L1DAValidatorOutput memory output) {
         // For Validiums, we expect the operator to just provide the data for us.
         // We don't need to do any checks with regard to the l2DAValidatorOutputHash.
@@ -22,5 +22,8 @@ contract ValidiumL1DAValidator is IL1DAValidator {
 
         // The rest of the fields that relate to blobs are empty.
         output.stateDiffHash = stateDiffHash;
+
+        output.blobsLinearHashes = new bytes32[](maxBlobsSupported);
+        output.blobsOpeningCommitments = new bytes32[](maxBlobsSupported);
     }
 }

l1-contracts/contracts/transactionFilterer/GatewayTransactionFilterer.sol

@@ -10,6 +10,7 @@ import {ITransactionFilterer} from "../state-transition/chain-interfaces/ITransa
 import {IBridgehub} from "../bridgehub/IBridgehub.sol";
 import {IL2Bridge} from "../bridge/interfaces/IL2Bridge.sol";
 import {IAssetRouterBase} from "../bridge/asset-router/IAssetRouterBase.sol";
+import {IL2AssetRouter} from "../bridge/asset-router/IL2AssetRouter.sol";
 
 /// @author Matter Labs
 /// @custom:security-contact [email protected]
@@ -82,18 +83,28 @@ contract GatewayTransactionFilterer is ITransactionFilterer, ReentrancyGuard, Ow
     ) external view returns (bool) {
         if (sender == L1_ASSET_ROUTER) {
             bytes4 l2TxSelector = bytes4(l2Calldata[:4]);
+
+            if (IL2AssetRouter.setAssetHandlerAddress.selector == l2TxSelector) {
+                (, bytes32 decodedAssetId, ) = abi.decode(l2Calldata[4:], (uint256, bytes32, address));
+                return _checkSTMAssetId(decodedAssetId);
+            }
+
             if (
-                (IAssetRouterBase.finalizeDeposit.selector != l2TxSelector) &&
-                (IL2Bridge.finalizeDeposit.selector != l2TxSelector)
+                IAssetRouterBase.finalizeDeposit.selector != l2TxSelector &&
+                IL2Bridge.finalizeDeposit.selector != l2TxSelector
             ) {
                 revert InvalidSelector(l2TxSelector);
             }
 
             (, bytes32 decodedAssetId, ) = abi.decode(l2Calldata[4:], (uint256, bytes32, bytes));
-            address stmAddress = BRIDGE_HUB.ctmAssetIdToAddress(decodedAssetId);
-            return (stmAddress != address(0));
+            return _checkSTMAssetId(decodedAssetId);
         }
 
         return whitelistedSenders[sender];
     }
+
+    function _checkSTMAssetId(bytes32 assetId) internal view returns (bool) {
+        address stmAddress = BRIDGE_HUB.ctmAssetIdToAddress(assetId);
+        return stmAddress != address(0);
+    }
 }