Kl/v30-rebase-on-this

.github/workflows/build-release.yaml

@@ -27,7 +27,7 @@ jobs:
       - name: Install foundry-zksync
         run: |
           mkdir ./foundry-zksync
-          curl -LO https://github.com/matter-labs/foundry-zksync/releases/download/nightly-27360d4c8d12beddbb730dae07ad33a206b38f4b/foundry_nightly_linux_amd64.tar.gz
+          curl -LO https://github.com/matter-labs/foundry-zksync/releases/download/nightly-34fe0bc655c6b15e869ffd465addde001f6b474d/foundry_nightly_linux_amd64.tar.gz
           tar zxf foundry_nightly_linux_amd64.tar.gz -C ./foundry-zksync
           chmod +x ./foundry-zksync/forge ./foundry-zksync/cast
           echo "$PWD/foundry-zksync" >> $GITHUB_PATH

.github/workflows/invariant-tests.yaml

@@ -38,7 +38,7 @@ jobs:
       - name: Install foundry-zksync
         uses: dutterbutter/foundry-zksync-toolchain@5b0459c3701903f1913b8b2558a22bf49138e495 # v1.0.0
         with:
-          version: nightly-27360d4c8d12beddbb730dae07ad33a206b38f4b
+          version: nightly-34fe0bc655c6b15e869ffd465addde001f6b474d
 
       - name: Show forge version
         shell: bash

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

@@ -270,7 +270,7 @@ jobs:
     defaults:
       run:
         working-directory: l1-contracts
-    needs: [build, lint]
+    needs: [build] # TODO return lint into dependencies when it's fully fixed
     runs-on: ubuntu-latest
 
     steps:
@@ -311,7 +311,7 @@ jobs:
             system-contracts/zkout
 
       - name: Run coverage
-        run: yarn test:foundry && yarn coverage:foundry --report summary --report lcov
+        run: yarn test:foundry --no-match-path 'test/foundry/l1/unit/concrete/Executor/*' && yarn coverage:foundry --report summary --report lcov
 
       # Installing the specific version of `lcov` because of
       # the `genhtml: ERROR: line ... of ... has branchcov but no linecov data` error.

.gitignore

@@ -25,6 +25,7 @@ l1-contracts/out/*
 l1-contracts/zkout/*
 l1-contracts/broadcast/*
 l1-contracts/script-config/*
+l1-contracts/snapshots/*
 !l1-contracts/script-config/artifacts
 l1-contracts/script-out/*
 l1-contracts/test/foundry/l1/integration/deploy-scripts/script-out/*.toml

.solhint.json

@@ -18,6 +18,7 @@
     "func-name-mixedcase": "off",
     "func-named-parameters": ["error", 4],
     "func-visibility": ["error", { "ignoreConstructors": true }],
+    "import-path-check": "off",
     "imports-on-top": "error",
     "max-states-count": "off",
     "modifier-name-mixedcase": "error",

.solhintignore

@@ -8,6 +8,7 @@ l1-contracts/lib
 l1-contracts/node_modules
 l1-contracts/contracts/dev-contracts
 l1-contracts/test
+l1-contracts/snapshots/*
 l1-contracts/deploy-scripts
 !l1-contracts/deploy-scripts/DeployCTM.s.sol
 !l1-contracts/deploy-scripts/DeployUtils.s.sol

docs/chain_management/upgrade_process.md

@@ -22,7 +22,7 @@ Upgrade information is composed in the form of a [DiamondCutData](../../l1-contr
 1. [BaseZkSyncUpgrade](../../l1-contracts/contracts/upgrades/BaseZkSyncUpgrade.sol) - Generic template with function that can be useful for upgrades
 2. [DefaultUpgrade](../../l1-contracts/contracts/upgrades/DefaultUpgrade.sol) - Default implementation of the `BaseZkSyncUpgrade`, contract that is most often planned to be used as diamond initialization when doing upgrades.
 
-> Note, that the Gateway upgrade will be more complex than the usual ones and so a similar, but separate [process](<../upgrade_history/gateway_preparation_upgrade/upgrade_process_(no_gateway_chain).md>) will be used for it. It will also use its own custom implementation of the `BaseZkSyncUpgrade`: [GatewayUpgrade](../../l1-contracts/contracts/upgrades/GatewayUpgrade.sol).
+> Note, that the Gateway upgrade was more complex than the usual ones and so a similar, but separate [process](<../upgrade_history/gateway_preparation_upgrade/upgrade_process_(no_gateway_chain).md>) was used for it. It was done using its own custom implementation of the `BaseZkSyncUpgrade`: [GatewayUpgrade](https://github.com/matter-labs/era-contracts/blob/14961f1efecac1030139c4cf0655b14135197772/l1-contracts/contracts/upgrades/GatewayUpgrade.sol).
 
 ### Protocol version
 

l1-contracts/.env

@@ -61,3 +61,4 @@ GATEWAY_VOTE_PREPARATION_INPUT=/script-config/gateway-vote-preparation.toml
 GATEWAY_VOTE_PREPARATION_OUTPUT=/script-out/gateway-vote-preparation.toml
 ZK_OS_V28_1_UPGRADE_ECOSYSTEM_INPUT=/script-config/zk-os-v28-1-upgrade-ecosystem.toml
 ZK_OS_V28_1_UPGRADE_ECOSYSTEM_OUTPUT=/script-out/zk-os-v28-1-upgrade-ecosystem.toml
+CONTRACTS_PATH=..

l1-contracts/contracts/bridge/BridgeHelper.sol

@@ -12,7 +12,11 @@ import {DataEncoding} from "../common/libraries/DataEncoding.sol";
  * @notice Helper library for working with native tokens on both L1 and L2.
  */
 library BridgeHelper {
-    /// @dev Receives and parses (name, symbol, decimals) from the token contract
+    /// @notice Retrieves and encodes token metadata (name, symbol, decimals) for bridging purposes.
+    /// @dev For ETH_TOKEN_ADDRESS, returns hardcoded ETH metadata.
+    /// @param _token The token address to query metadata from.
+    /// @param _originChainId The chain ID where the token originates.
+    /// @return Encoded token data containing name, symbol, decimals, and origin chain ID.
     function getERC20Getters(address _token, uint256 _originChainId) internal view returns (bytes memory) {
         bytes memory name;
         bytes memory symbol;

l1-contracts/contracts/bridge/BridgedStandardERC20.sol

@@ -34,8 +34,8 @@ contract BridgedStandardERC20 is ERC20PermitUpgradeable, IBridgedStandardToken,
     /// @notice OpenZeppelin token represents `name` and `symbol` as storage variables and `decimals` as constant.
     uint8 private decimals_;
 
-    /// @notice The l2Bridge now is deprecated, use the L2AssetRouter and L2NativeTokenVault instead.
-    /// @dev Address of the L2 bridge that is used as trustee who can mint/burn tokens
+    /// @notice The l2Bridge is deprecated, use the L2AssetRouter and L2NativeTokenVault instead.
+    /// @dev Address of the deprecated L2 bridge that was used as trustee to mint/burn tokens
     address public override l2Bridge;
 
     /// @dev Address of the token on its origin chain that can be deposited to mint this bridged token
@@ -59,18 +59,14 @@ contract BridgedStandardERC20 is ERC20PermitUpgradeable, IBridgedStandardToken,
                 originToken
             );
         }
-        if (msg.sender != ntv) {
-            revert Unauthorized(msg.sender);
-        }
+        require(msg.sender == ntv, Unauthorized(msg.sender));
         _;
     }
 
     modifier onlyNextVersion(uint8 _version) {
         // The version should be incremented by 1. Otherwise, the governor risks disabling
         // future reinitialization of the token by providing too large a version.
-        if (_version != _getInitializedVersion() + 1) {
-            revert NonSequentialVersion();
-        }
+        require(_version == _getInitializedVersion() + 1, NonSequentialVersion());
         _;
     }
 
@@ -87,9 +83,7 @@ contract BridgedStandardERC20 is ERC20PermitUpgradeable, IBridgedStandardToken,
     /// @param _data The additional data that the L1 bridge provide for initialization.
     /// In this case, it is packed `name`/`symbol`/`decimals` of the L1 token.
     function bridgeInitialize(bytes32 _assetId, address _originToken, bytes calldata _data) external initializer {
-        if (_originToken == address(0)) {
-            revert ZeroAddress();
-        }
+        require(_originToken != address(0), ZeroAddress());
         originToken = _originToken;
         assetId = _assetId;
 
@@ -160,9 +154,7 @@ contract BridgedStandardERC20 is ERC20PermitUpgradeable, IBridgedStandardToken,
         // It is expected that this token is deployed as a beacon proxy, so we'll
         // allow the governor of the beacon to reinitialize the token.
         address beaconAddress = _getBeacon();
-        if (msg.sender != UpgradeableBeacon(beaconAddress).owner()) {
-            revert Unauthorized(msg.sender);
-        }
+        require(msg.sender == UpgradeableBeacon(beaconAddress).owner(), Unauthorized(msg.sender));
 
         __ERC20_init_unchained(_newName, _newSymbol);
         __ERC20Permit_init(_newName);
@@ -189,30 +181,40 @@ contract BridgedStandardERC20 is ERC20PermitUpgradeable, IBridgedStandardToken,
         emit BridgeBurn(_from, _amount);
     }
 
-    /// @dev External function to decode a string from bytes.
+    /// @notice Decodes a string from ABI-encoded bytes.
+    /// @param _input The ABI-encoded bytes containing a string.
+    /// @return result The decoded string.
     function decodeString(bytes calldata _input) external pure returns (string memory result) {
         (result) = abi.decode(_input, (string));
     }
 
-    /// @dev External function to decode a uint8 from bytes.
+    /// @notice Decodes a uint8 from ABI-encoded bytes.
+    /// @param _input The ABI-encoded bytes containing a uint8.
+    /// @return result The decoded uint8 value.
     function decodeUint8(bytes calldata _input) external pure returns (uint8 result) {
         (result) = abi.decode(_input, (uint8));
     }
 
+    /// @notice Returns the token name, reverts if name getter is disabled.
+    /// @return The token name string.
     function name() public view override returns (string memory) {
         // If method is not available, behave like a token that does not implement this method - revert on call.
         // solhint-disable-next-line reason-string, gas-custom-errors
         if (availableGetters.ignoreName) revert();
         return super.name();
     }
 
+    /// @notice Returns the token symbol, reverts if symbol getter is disabled.
+    /// @return The token symbol string.
     function symbol() public view override returns (string memory) {
         // If method is not available, behave like a token that does not implement this method - revert on call.
         // solhint-disable-next-line reason-string, gas-custom-errors
         if (availableGetters.ignoreSymbol) revert();
         return super.symbol();
     }
 
+    /// @notice Returns the token decimals, reverts if decimals getter is disabled.
+    /// @return The number of decimals for the token.
     function decimals() public view override returns (uint8) {
         // If method is not available, behave like a token that does not implement this method - revert on call.
         // solhint-disable-next-line reason-string, gas-custom-errors

l1-contracts/contracts/bridge/L1BridgeContractErrors.sol

@@ -6,17 +6,15 @@ pragma solidity ^0.8.21;
 error ClaimFailedDepositFailed();
 // 0x066f53b1
 error EmptyToken();
-// 0x6d963f88
-error EthTransferFailed();
+// 0x82b0de47
+error EthAlreadyMigratedToL1NTV();
 // 0x1c55230b
 error NativeTokenVaultAlreadySet();
-// 0xfeda3bf8
-error WrongAmountTransferred(uint256 balance, uint256 nullifierChainBalance);
+// 0x84204265
+error TokenAlreadyInBridgedTokensList();
 // 0xb4aeddbc
 error WrongCounterpart();
 // 0x636c90db
 error WrongL2Sender(address providedL2Sender);
 // 0x61cdb17e
 error WrongMsgLength(uint256 expected, uint256 length);
-// 0xe4742c42
-error ZeroAmountToTransfer();

l1-contracts/contracts/bridge/L1ERC20Bridge.sol

@@ -82,7 +82,7 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard {
         ERA_CHAIN_ID = _eraChainId;
     }
 
-    /// @dev Initializes the reentrancy guard. Expected to be used in the proxy.
+    /// @notice Initializes the reentrancy guard for the proxy implementation.
     function initialize() external reentrancyGuardInitializer {}
 
     /*//////////////////////////////////////////////////////////////
@@ -131,9 +131,7 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard {
         bytes calldata _message,
         bytes32[] calldata _merkleProof
     ) external nonReentrant {
-        if (isWithdrawalFinalized[_l2BatchNumber][_l2MessageIndex]) {
-            revert WithdrawalAlreadyFinalized();
-        }
+        require(!isWithdrawalFinalized[_l2BatchNumber][_l2MessageIndex], WithdrawalAlreadyFinalized());
         // We don't need to set finalizeWithdrawal here, as we set it in the L1 Nullifier
 
         FinalizeL1DepositParams memory finalizeWithdrawalParams = FinalizeL1DepositParams({
@@ -149,7 +147,6 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard {
     }
 
     /// @notice Initiates a deposit by locking funds on the contract and sending the request
-    /// @dev Initiates a deposit by locking funds on the contract and sending the request
     /// of processing an L2 transaction where tokens would be minted
     /// @dev If the token is bridged for the first time, the L2 token contract will be deployed. Note however, that the
     /// newly-deployed token does not support any custom logic, i.e. rebase tokens' functionality is not supported.
@@ -181,18 +178,12 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard {
         uint256 _l2TxGasPerPubdataByte,
         address _refundRecipient
     ) public payable nonReentrant returns (bytes32 l2TxHash) {
-        if (_amount == 0) {
-            // empty deposit amount
-            revert EmptyDeposit();
-        }
-        if (_l1Token == ETH_TOKEN_ADDRESS) {
-            revert ETHDepositNotSupported();
-        }
+        // empty deposit amount
+        require(_amount != 0, EmptyDeposit());
+        require(_l1Token != ETH_TOKEN_ADDRESS, ETHDepositNotSupported());
         uint256 amount = _approveFundsToAssetRouter(msg.sender, IERC20(_l1Token), _amount);
-        if (amount != _amount) {
-            // The token has non-standard transfer logic
-            revert TokensWithFeesNotSupported();
-        }
+        // The token has non-standard transfer logic
+        require(amount == _amount, TokensWithFeesNotSupported());
 
         l2TxHash = L1_ASSET_ROUTER.depositLegacyErc20Bridge{value: msg.value}({
             _originalCaller: msg.sender,
@@ -204,9 +195,8 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard {
             _refundRecipient: _refundRecipient
         });
         // Ensuring that all the funds that were locked into this bridge were spent by the asset router / native token vault.
-        if (IERC20(_l1Token).allowance(address(this), address(L1_ASSET_ROUTER)) != 0) {
-            revert AssetRouterAllowanceNotZero();
-        }
+        uint256 allowance = IERC20(_l1Token).allowance(address(this), address(L1_ASSET_ROUTER));
+        require(allowance == 0, AssetRouterAllowanceNotZero());
         depositAmount[msg.sender][_l1Token][l2TxHash] = _amount;
         emit DepositInitiated({
             l2DepositTxHash: l2TxHash,
@@ -223,6 +213,9 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard {
 
     /// @dev Transfers tokens from the depositor address to this contract and force approves those
     /// to the asset router address.
+    /// @param _from The address to transfer tokens from.
+    /// @param _token The ERC20 token to transfer.
+    /// @param _amount The amount of tokens to transfer.
     /// @return The difference between the contract balance before and after the transferring of funds.
     function _approveFundsToAssetRouter(address _from, IERC20 _token, uint256 _amount) internal returns (uint256) {
         uint256 balanceBefore = _token.balanceOf(address(this));
@@ -252,9 +245,7 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard {
     ) external nonReentrant {
         uint256 amount = depositAmount[_depositSender][_l1Token][_l2TxHash];
         // empty deposit
-        if (amount == 0) {
-            revert EmptyDeposit();
-        }
+        require(amount != 0, EmptyDeposit());
         delete depositAmount[_depositSender][_l1Token][_l2TxHash];
 
         L1_NULLIFIER.claimFailedDepositLegacyErc20Bridge({
@@ -274,6 +265,8 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard {
                             ERA LEGACY GETTERS
     //////////////////////////////////////////////////////////////*/
 
+    /// @notice Calculates the L2 token address for a given L1 token using CREATE2.
+    /// @param _l1Token The L1 token address to calculate the L2 counterpart for.
     /// @return The L2 token address that would be minted for deposit of the given L1 token on ZKsync Era.
     function l2TokenAddress(address _l1Token) external view returns (address) {
         bytes32 constructorInputHash = keccak256(abi.encode(l2TokenBeacon, ""));