Kl/without 1.5.0 merge dev

l1-contracts/.env

@@ -2,7 +2,7 @@ CHAIN_ETH_NETWORK=hardhat
 CONTRACTS_PRIORITY_TX_MAX_GAS_LIMIT=72000000
 CONTRACTS_DEPLOY_L2_BRIDGE_COUNTERPART_GAS_LIMIT=10000000
 ETH_CLIENT_WEB3_URL=http://127.0.0.1:8545
-CHAIN_ETH_ZKSYNC_NETWORK_ID=270
+CHAIN_ETH_ZKSYNC_NETWORK_ID=271
 CONTRACTS_BRIDGEHUB_PROXY_ADDR=0x0000000000000000000000000000000000000000
 CONTRACTS_BRIDGEHUB_IMPL_ADDR=0x0000000000000000000000000000000000000000
 CONTRACTS_STATE_TRANSITION_PROXY_ADDR=0x0000000000000000000000000000000000000000

l1-contracts/contracts/bridge/L1SharedBridge.sol

@@ -2,8 +2,7 @@
 
 pragma solidity 0.8.24;
 
-import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol";
+import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
 
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
@@ -27,24 +26,25 @@
 /// @custom:security-contact [email protected]
 /// @dev Bridges assets between L1 and hyperchains, supporting both ETH and ERC20 tokens.
 /// @dev Designed for use with a proxy for upgradability.
-contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Initializable, Ownable2Step {
+contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Ownable2StepUpgradeable {
     using SafeERC20 for IERC20;
 
     /// @dev The address of the WETH token on L1.
     address public immutable override l1WethAddress;
 
     /// @dev Bridgehub smart contract that is used to operate with L2 via asynchronous L2 <-> L1 communication.
     IBridgehub public immutable override bridgehub;
 
     /// @dev Era's chainID
     uint256 immutable eraChainId;
 
     /// @dev The address of zkSync Era diamond proxy contract.
     address immutable eraDiamondProxy;
 
     /// @dev Stores the first batch number on the zkSync Era Diamond Proxy that was settled after Shared Bridge upgrade.
     /// This variable is used to differentiate between pre-upgrade and post-upgrade withdrawals. Withdrawals from batches older
     /// than this value are considered to have been finalized prior to the upgrade and handled separately.
+    /// We use this both for Eth and erc20 token withdrawals, so we need to update the diamond and bridge simultaneously.
     uint256 internal eraFirstPostUpgradeBatch;
 
     /// @dev Legacy bridge smart contract that used to hold ERC20 tokens.
@@ -110,13 +110,12 @@
     /// @dev Initializes a contract bridge for later use. Expected to be used in the proxy
     /// @param _owner Address which can change L2 token implementation and upgrade the bridge
     /// implementation. The owner is the Governor and separate from the ProxyAdmin from now on, so that the Governor can call the bridge.
-    function initialize(
-        address _owner,
-        uint256 _eraFirstPostUpgradeBatch
-    ) external reentrancyGuardInitializer initializer {
+    function initialize(address _owner) external reentrancyGuardInitializer initializer {
         require(_owner != address(0), "ShB owner 0");
         _transferOwnership(_owner);
+    }
 
+    function setEraFirstPostUpgradeBatch(uint256 _eraFirstPostUpgradeBatch) external onlyOwner {
         eraFirstPostUpgradeBatch = _eraFirstPostUpgradeBatch;
     }
 
@@ -606,7 +605,7 @@
             address refundRecipient = _refundRecipient;
             if (_refundRecipient == address(0)) {
                 // slither-disable-next-line tx-origin
                 refundRecipient = _prevMsgSender != tx.origin
                     ? AddressAliasHelper.applyL1ToL2Alias(_prevMsgSender)
                     : _prevMsgSender;
             }

l1-contracts/contracts/bridge/interfaces/IL1SharedBridge.sol

@@ -111,6 +111,8 @@ interface IL1SharedBridge {
         bytes32[] calldata _merkleProof
     ) external;
 
+    function setEraFirstPostUpgradeBatch(uint256 _eraFirstPostUpgradeBatch) external;
+
     function l1WethAddress() external view returns (address);
 
     function bridgehub() external view returns (IBridgehub);

l1-contracts/contracts/bridgehub/Bridgehub.sol

@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.24;
 
-import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol";
+import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
 
 import {L2TransactionRequestDirect, L2TransactionRequestTwoBridgesOuter, L2TransactionRequestTwoBridgesInner} from "./IBridgehub.sol";
 import {IBridgehub, IL1SharedBridge} from "../bridge/interfaces/IL1SharedBridge.sol";
@@ -13,7 +13,7 @@
 import {BridgehubL2TransactionRequest, L2Message, L2Log, TxStatus} from "../common/Messaging.sol";
 import {AddressAliasHelper} from "../vendor/AddressAliasHelper.sol";
 
-contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2Step {
+contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable {
     /// @notice all the ether is held by the weth bridge
     IL1SharedBridge public sharedBridge;
 
@@ -321,7 +321,7 @@
     function _actualRefundRecipient(address _refundRecipient) internal view returns (address _recipient) {
         if (_refundRecipient == address(0)) {
             // If the `_refundRecipient` is not provided, we use the `msg.sender` as the recipient.
             _recipient = msg.sender == tx.origin ? msg.sender : AddressAliasHelper.applyL1ToL2Alias(msg.sender);
         } else if (_refundRecipient.code.length > 0) {
             // If the `_refundRecipient` is a smart contract, we apply the L1 to L2 alias to prevent foot guns.
             _recipient = AddressAliasHelper.applyL1ToL2Alias(_refundRecipient);

l1-contracts/contracts/dev-contracts/test/DummyAdminFacet2.sol

@@ -10,14 +10,10 @@ contract DummyAdminFacet2 is ZkSyncHyperchainBase {
     function test() internal virtual {}
 
     function getName() external pure returns (string memory) {
-        return "DummyAdminFacet";
+        return "DummyAdminFacet2";
     }
 
-    function dummySetValidator(address _validator) external {
-        s.validators[_validator] = true;
-    }
-
-    function executeUpgrade(Diamond.DiamondCutData calldata _diamondCut) external {
+    function executeUpgrade2(Diamond.DiamondCutData calldata _diamondCut) external {
         Diamond.diamondCut(_diamondCut);
     }
 }

l1-contracts/contracts/state-transition/StateTransitionManager.sol

@@ -14,7 +14,7 @@
 import {FeeParams} from "./chain-deps/ZkSyncHyperchainStorage.sol";
 import {L2_SYSTEM_CONTEXT_SYSTEM_CONTRACT_ADDR, L2_FORCE_DEPLOYER_ADDR} from "../common/L2ContractAddresses.sol";
 import {L2CanonicalTransaction} from "../common/Messaging.sol";
-import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol";
+import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
 import {ProposedUpgrade} from "../upgrades/BaseZkSyncUpgrade.sol";
 import {ReentrancyGuard} from "../common/ReentrancyGuard.sol";
 import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA, L2_TO_L1_LOG_SERIALIZE_SIZE, DEFAULT_L2_LOGS_TREE_ROOT_HASH, EMPTY_STRING_KECCAK, SYSTEM_UPGRADE_L2_TX_TYPE, PRIORITY_TX_MAX_GAS_LIMIT} from "../common/Config.sol";
@@ -23,9 +23,9 @@
 /// @title StateTransition contract
 /// @author Matter Labs
 /// @custom:security-contact [email protected]
-contract StateTransitionManager is IStateTransitionManager, ReentrancyGuard, Ownable2Step {
+contract StateTransitionManager is IStateTransitionManager, ReentrancyGuard, Ownable2StepUpgradeable {
     /// @notice Address of the bridgehub
     address public immutable bridgehub;
 
     /// @notice The mapping from chainId => hyperchain contract
     mapping(uint256 chainId => address chainContract) public hyperchain;
@@ -42,7 +42,7 @@
     /// @dev The current protocolVersion
     uint256 public protocolVersion;
 
-    /// @dev timestamp when protocolVersion can be last used
+    /// @dev The timestamp when protocolVersion can be last used
     mapping(uint256 _protocolVersion => uint256) public protocolVersionDeadline;
 
     /// @dev The validatorTimelock contract address, used to setChainId
@@ -157,10 +157,10 @@
         uint256 _newProtocolVersion
     ) external onlyOwner {
         bytes32 newCutHash = keccak256(abi.encode(_cutData));
-        protocolVersionDeadline[_oldProtocolVersion] = _oldprotocolVersionDeadline;
+        uint256 previousProtocolVersion = protocolVersion;
         upgradeCutHash[_oldProtocolVersion] = newCutHash;
+        protocolVersionDeadline[_oldProtocolVersion] = _oldprotocolVersionDeadline;
         protocolVersionDeadline[_newProtocolVersion] = type(uint256).max;
-        uint256 previousProtocolVersion = protocolVersion;
         protocolVersion = _newProtocolVersion;
         emit NewProtocolVersion(previousProtocolVersion, _newProtocolVersion);
         emit NewUpgradeCutHash(_oldProtocolVersion, newCutHash);

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

@@ -34,7 +34,7 @@
     string public constant override getName = "MailboxFacet";
 
     /// @dev Era's chainID
     uint256 immutable eraChainId;
 
     constructor(uint256 _eraChainId) {
         eraChainId = _eraChainId;
@@ -42,7 +42,7 @@
 
     /// @inheritdoc IMailbox
     function transferEthToSharedBridge() external onlyBaseTokenBridge {
-        require(s.chainId == eraChainId, "transferEthToSharedBridge only available for Era on mailbox");
+        require(s.chainId == eraChainId, "Mailbox: transferEthToSharedBridge only available for Era on mailbox");
 
         uint256 amount = address(this).balance;
         address baseTokenBridgeAddress = s.baseTokenBridge;
@@ -191,7 +191,7 @@
         bytes calldata _message,
         bytes32[] calldata _merkleProof
     ) external nonReentrant {
-        require(s.chainId == eraChainId, "finalizeEthWithdrawal only available for Era on mailbox");
+        require(s.chainId == eraChainId, "Mailbox: finalizeEthWithdrawal only available for Era on mailbox");
         IL1SharedBridge(s.baseTokenBridge).finalizeWithdrawal({
             _chainId: eraChainId,
             _l2BatchNumber: _l2BatchNumber,
@@ -212,7 +212,7 @@
         bytes[] calldata _factoryDeps,
         address _refundRecipient
     ) external payable returns (bytes32 canonicalTxHash) {
-        require(s.chainId == eraChainId, "legacy interface only available for era token");
+        require(s.chainId == eraChainId, "Mailbox: legacy interface only available for Era");
         canonicalTxHash = _requestL2TransactionSender(
             BridgehubL2TransactionRequest({
                 sender: msg.sender,
@@ -255,7 +255,7 @@
         // Please note, currently zkSync address derivation is different from Ethereum one, but it may be changed in the future.
         address l2Sender = _request.sender;
         // slither-disable-next-line tx-origin
         if (l2Sender != tx.origin) {
             l2Sender = AddressAliasHelper.applyL1ToL2Alias(_request.sender);
         }
 

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

@@ -51,7 +51,7 @@ contract ZkSyncHyperchainBase is ReentrancyGuard {
     }
 
     modifier onlyBaseTokenBridge() {
-        require(msg.sender == s.baseTokenBridge, "Hyperchain: Only shared bridge can call this function");
+        require(msg.sender == s.baseTokenBridge, "Hyperchain: Only base token bridge can call this function");
         _;
     }
 }

l1-contracts/contracts/upgrades/BaseZkSyncUpgradeGenesis.sol

@@ -14,6 +14,7 @@ abstract contract BaseZkSyncUpgradeGenesis is BaseZkSyncUpgrade {
     function _setNewProtocolVersion(uint256 _newProtocolVersion) internal override {
         uint256 previousProtocolVersion = s.protocolVersion;
         require(
+            // !! ONLY CHANGE IS IN THIS LINE !!
             // Genesis Upgrade difference: Note this is the only thing change > to >=
             _newProtocolVersion >= previousProtocolVersion,
             "New protocol version is not greater than the current one"

l1-contracts/contracts/upgrades/UpgradeHyperchains.sol

@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity 0.8.24;
+
+import {Diamond} from "../state-transition/libraries/Diamond.sol";
+import {BaseZkSyncUpgrade, ProposedUpgrade} from "./BaseZkSyncUpgrade.sol";
+
+/// @author Matter Labs
+/// @custom:security-contact [email protected]
+contract UpgradeHyperchains is BaseZkSyncUpgrade {
+    /// @notice The main function that will be called by the upgrade proxy.
+    /// @param _proposedUpgrade The upgrade to be executed.
+    function upgradeWithAdditionalData(
+        ProposedUpgrade calldata _proposedUpgrade,
+        bytes calldata _additionalData
+    ) public returns (bytes32) {
+        (uint256 chainId, address bridgehubAddress, address stateTransitionManager, address sharedBridgeAddress) = abi
+            .decode(_additionalData, (uint256, address, address, address));
+        // Check to make sure that the new blob versioned hash address is not the zero address.
+        require(sharedBridgeAddress != address(0), "b9");
+
+        s.chainId = chainId;
+        s.bridgehub = bridgehubAddress;
+        s.stateTransitionManager = stateTransitionManager;
+        s.baseTokenBridge = sharedBridgeAddress;
+        s.baseToken = 0x0000000000000000000000000000000000000001;
+        s.baseTokenGasPriceMultiplierNominator = 1;
+        s.baseTokenGasPriceMultiplierDenominator = 1;
+
+        super.upgrade(_proposedUpgrade);
+        return Diamond.DIAMOND_INIT_SUCCESS_RETURN_VALUE;
+    }
+}

l1-contracts/package.json

@@ -50,7 +50,7 @@
     "ts-node": "^10.1.0",
     "typechain": "^4.0.0",
     "typescript": "^4.6.4",
-    "zksync-ethers": "https://github.com/kelemeno/zksync-ethers#ethers-v5-feat/bridgehub"
+    "zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub"
   },
   "scripts": {
     "build": "hardhat compile",
@@ -74,7 +74,10 @@
     "initialize-governance": "ts-node scripts/initialize-governance.ts",
     "migrate-governance": "ts-node scripts/migrate-governance.ts",
     "display-governance": "ts-node scripts/display-governance.ts",
-    "upgrade-system": "ts-node upgrade-system/index.ts"
+    "upgrade-system": "ts-node upgrade-system/index.ts",
+    "hyperchain-upgrade-1": "ts-node scripts/hyperchain-upgrade-1.ts",
+    "hyperchain-upgrade-2": "ts-node scripts/hyperchain-upgrade-2.ts",
+    "upgrade-shared-bridge-era": "ts-node scripts/upgrade-shared-bridge-era.ts"
   },
   "dependencies": {
     "dotenv": "^16.0.3",

l1-contracts/scripts/deploy.ts

@@ -55,15 +55,7 @@ async function main() {
         verbose: true,
       });
 
-      await initialBridgehubDeployment(
-        deployer,
-        [],
-        gasPrice,
-        cmd.onlyVerifier,
-        cmd.diamondUpgradeInit,
-        create2Salt,
-        nonce
-      );
+      await initialBridgehubDeployment(deployer, [], gasPrice, cmd.onlyVerifier, create2Salt, nonce);
     });
 
   await program.parseAsync(process.argv);

l1-contracts/scripts/hyperchain-upgrade-1.ts

@@ -0,0 +1,69 @@
+// hardhat import should be the first import in the file
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import * as hardhat from "hardhat";
+import { Command } from "commander";
+import { Wallet, ethers } from "ethers";
+import { Deployer } from "../src.ts/deploy";
+import { formatUnits, parseUnits } from "ethers/lib/utils";
+import { web3Provider, GAS_MULTIPLIER } from "./utils";
+import { deployedAddressesFromEnv } from "../src.ts/deploy-utils";
+import { ethTestConfig } from "../src.ts/utils";
+import { upgradeToHyperchains1 } from "../src.ts/hyperchain-upgrade";
+
+const provider = web3Provider();
+
+async function main() {
+  const program = new Command();
+
+  program.version("0.1.0").name("deploy").description("deploy L1 contracts");
+
+  program
+    .option("--private-key <private-key>")
+    .option("--chain-id <chain-id>")
+    .option("--gas-price <gas-price>")
+    .option("--nonce <nonce>")
+    .option("--owner-address <owner-address>")
+    .option("--create2-salt <create2-salt>")
+    .option("--diamond-upgrade-init <version>")
+    .option("--only-verifier")
+    .action(async (cmd) => {
+      const deployWallet = cmd.privateKey
+        ? new Wallet(cmd.privateKey, provider)
+        : Wallet.fromMnemonic(
+            process.env.MNEMONIC ? process.env.MNEMONIC : ethTestConfig.mnemonic,
+            "m/44'/60'/0'/0/1"
+          ).connect(provider);
+      console.log(`Using deployer wallet: ${deployWallet.address}`);
+
+      const ownerAddress = cmd.ownerAddress ? cmd.ownerAddress : deployWallet.address;
+      console.log(`Using owner address: ${ownerAddress}`);
+
+      const gasPrice = cmd.gasPrice
+        ? parseUnits(cmd.gasPrice, "gwei")
+        : (await provider.getGasPrice()).mul(GAS_MULTIPLIER);
+      console.log(`Using gas price: ${formatUnits(gasPrice, "gwei")} gwei`);
+
+      const nonce = cmd.nonce ? parseInt(cmd.nonce) : await deployWallet.getTransactionCount();
+      console.log(`Using nonce: ${nonce}`);
+
+      const create2Salt = cmd.create2Salt ? cmd.create2Salt : ethers.utils.hexlify(ethers.utils.randomBytes(32));
+
+      const deployer = new Deployer({
+        deployWallet,
+        addresses: deployedAddressesFromEnv(),
+        ownerAddress,
+        verbose: true,
+      });
+
+      await upgradeToHyperchains1(deployer, gasPrice, create2Salt, nonce);
+    });
+
+  await program.parseAsync(process.argv);
+}
+
+main()
+  .then(() => process.exit(0))
+  .catch((err) => {
+    console.error("Error:", err);
+    process.exit(1);
+  });

l1-contracts/scripts/hyperchain-upgrade-2.ts

@@ -0,0 +1,69 @@
+// hardhat import should be the first import in the file
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import * as hardhat from "hardhat";
+import { Command } from "commander";
+import { Wallet, ethers } from "ethers";
+import { Deployer } from "../src.ts/deploy";
+import { formatUnits, parseUnits } from "ethers/lib/utils";
+import { web3Provider, GAS_MULTIPLIER } from "./utils";
+import { deployedAddressesFromEnv } from "../src.ts/deploy-utils";
+import { ethTestConfig } from "../src.ts/utils";
+import { upgradeToHyperchains2 } from "../src.ts/hyperchain-upgrade";
+
+const provider = web3Provider();
+
+async function main() {
+  const program = new Command();
+
+  program.version("0.1.0").name("deploy").description("deploy L1 contracts");
+
+  program
+    .option("--private-key <private-key>")
+    .option("--chain-id <chain-id>")
+    .option("--gas-price <gas-price>")
+    .option("--nonce <nonce>")
+    .option("--owner-address <owner-address>")
+    .option("--create2-salt <create2-salt>")
+    .option("--diamond-upgrade-init <version>")
+    .option("--only-verifier")
+    .action(async (cmd) => {
+      const deployWallet = cmd.privateKey
+        ? new Wallet(cmd.privateKey, provider)
+        : Wallet.fromMnemonic(
+            process.env.MNEMONIC ? process.env.MNEMONIC : ethTestConfig.mnemonic,
+            "m/44'/60'/0'/0/1"
+          ).connect(provider);
+      console.log(`Using deployer wallet: ${deployWallet.address}`);
+
+      const ownerAddress = cmd.ownerAddress ? cmd.ownerAddress : deployWallet.address;
+      console.log(`Using owner address: ${ownerAddress}`);
+
+      const gasPrice = cmd.gasPrice
+        ? parseUnits(cmd.gasPrice, "gwei")
+        : (await provider.getGasPrice()).mul(GAS_MULTIPLIER);
+      console.log(`Using gas price: ${formatUnits(gasPrice, "gwei")} gwei`);
+
+      const nonce = cmd.nonce ? parseInt(cmd.nonce) : await deployWallet.getTransactionCount();
+      console.log(`Using nonce: ${nonce}`);
+
+      const create2Salt = cmd.create2Salt ? cmd.create2Salt : ethers.utils.hexlify(ethers.utils.randomBytes(32));
+
+      const deployer = new Deployer({
+        deployWallet,
+        addresses: deployedAddressesFromEnv(),
+        ownerAddress,
+        verbose: true,
+      });
+
+      await upgradeToHyperchains2(deployer, gasPrice, create2Salt, nonce);
+    });
+
+  await program.parseAsync(process.argv);
+}
+
+main()
+  .then(() => process.exit(0))
+  .catch((err) => {
+    console.error("Error:", err);
+    process.exit(1);
+  });