From fd4aebcfe8833b26e096e87e142a5e7e4744f3fa Mon Sep 17 00:00:00 2001 From: Bence Haromi <56651250+benceharomi@users.noreply.github.com> Date: Thu, 15 Aug 2024 17:36:25 +0900 Subject: [PATCH 01/53] fix: zksync-ethers v5 dependency (#702) --- gas-bound-caller/package.json | 4 ++-- l1-contracts/package.json | 2 +- l1-contracts/src.ts/deploy-test-process.ts | 2 +- l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts | 2 +- l1-contracts/test/unit_tests/utils.ts | 4 ++-- system-contracts/package.json | 4 ++-- system-contracts/scripts/verify-on-explorer.ts | 2 +- system-contracts/test/BootloaderUtilities.spec.ts | 2 +- system-contracts/test/Create2Factory.spec.ts | 2 +- yarn.lock | 7 ++++--- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/gas-bound-caller/package.json b/gas-bound-caller/package.json index 8943b4b2b..db6b3d8bf 100644 --- a/gas-bound-caller/package.json +++ b/gas-bound-caller/package.json @@ -15,7 +15,7 @@ "fast-glob": "^3.3.2", "hardhat": "^2.18.3", "preprocess": "^3.2.0", - "zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub" + "zksync-ethers": "^5.9.0" }, "devDependencies": { "@matterlabs/hardhat-zksync-chai-matchers": "^0.1.4", @@ -39,7 +39,7 @@ "ts-node": "^10.1.0", "typechain": "^4.0.0", "typescript": "^4.6.4", - "zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub" + "zksync-ethers": "^5.9.0" }, "mocha": { "timeout": 240000, diff --git a/l1-contracts/package.json b/l1-contracts/package.json index d30c93950..de33649f8 100644 --- a/l1-contracts/package.json +++ b/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/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub" + "zksync-ethers": "^5.9.0" }, "scripts": { "build": "hardhat compile", diff --git a/l1-contracts/src.ts/deploy-test-process.ts b/l1-contracts/src.ts/deploy-test-process.ts index 4762973fd..b8af27b34 100644 --- a/l1-contracts/src.ts/deploy-test-process.ts +++ b/l1-contracts/src.ts/deploy-test-process.ts @@ -7,7 +7,7 @@ import * as ethers from "ethers"; import type { BigNumberish, Wallet } from "ethers"; import { Interface } from "ethers/lib/utils"; import * as zkethers from "zksync-ethers"; -import { ETH_ADDRESS_IN_CONTRACTS } from "zksync-ethers/build/src/utils"; +import { ETH_ADDRESS_IN_CONTRACTS } from "zksync-ethers/build/utils"; import * as fs from "fs"; import type { FacetCut } from "./diamondCut"; diff --git a/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts b/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts index 7352ce8cc..4ea71d99d 100644 --- a/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts +++ b/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts @@ -3,7 +3,7 @@ import type { BigNumberish } from "ethers"; import { Wallet } from "ethers"; import * as ethers from "ethers"; import * as hardhat from "hardhat"; -import { hashBytecode } from "zksync-ethers/build/src/utils"; +import { hashBytecode } from "zksync-ethers/build/utils"; import type { AdminFacet, ExecutorFacet, GettersFacet, StateTransitionManager } from "../../typechain"; import { diff --git a/l1-contracts/test/unit_tests/utils.ts b/l1-contracts/test/unit_tests/utils.ts index c42b55c19..2bbf51733 100644 --- a/l1-contracts/test/unit_tests/utils.ts +++ b/l1-contracts/test/unit_tests/utils.ts @@ -1,8 +1,8 @@ import * as hardhat from "hardhat"; import type { BigNumberish, BytesLike } from "ethers"; import { BigNumber, ethers } from "ethers"; -import type { Address } from "zksync-ethers/build/src/types"; -import { REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_LIMIT } from "zksync-ethers/build/src/utils"; +import type { Address } from "zksync-ethers/build/types"; +import { REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_LIMIT } from "zksync-ethers/build/utils"; import type { IBridgehub } from "../../typechain/IBridgehub"; import type { IL1ERC20Bridge } from "../../typechain/IL1ERC20Bridge"; diff --git a/system-contracts/package.json b/system-contracts/package.json index d7d5ad1b2..95900f654 100644 --- a/system-contracts/package.json +++ b/system-contracts/package.json @@ -15,7 +15,7 @@ "fast-glob": "^3.3.2", "hardhat": "=2.22.2", "preprocess": "^3.2.0", - "zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub" + "zksync-ethers": "^5.9.0" }, "devDependencies": { "@matterlabs/hardhat-zksync-chai-matchers": "^0.1.4", @@ -38,7 +38,7 @@ "ts-node": "^10.1.0", "typechain": "^4.0.0", "typescript": "^4.6.4", - "zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub" + "zksync-ethers": "^5.9.0" }, "mocha": { "timeout": 240000, diff --git a/system-contracts/scripts/verify-on-explorer.ts b/system-contracts/scripts/verify-on-explorer.ts index 95fa65218..9aa37e3e6 100644 --- a/system-contracts/scripts/verify-on-explorer.ts +++ b/system-contracts/scripts/verify-on-explorer.ts @@ -6,7 +6,7 @@ import { SYSTEM_CONTRACTS } from "./constants"; import { query } from "./utils"; import { Command } from "commander"; import * as fs from "fs"; -import { sleep } from "zksync-ethers/build/src/utils"; +import { sleep } from "zksync-ethers/build/utils"; const VERIFICATION_URL = hre.network?.config?.verifyURL; diff --git a/system-contracts/test/BootloaderUtilities.spec.ts b/system-contracts/test/BootloaderUtilities.spec.ts index 2c4176a17..998b98e8b 100644 --- a/system-contracts/test/BootloaderUtilities.spec.ts +++ b/system-contracts/test/BootloaderUtilities.spec.ts @@ -2,7 +2,7 @@ import { expect } from "chai"; import { ethers } from "hardhat"; import type { Wallet } from "zksync-ethers"; import * as zksync from "zksync-ethers"; -import { serialize } from "zksync-ethers/build/src/utils"; +import { serialize } from "zksync-ethers/build/utils"; import type { BootloaderUtilities } from "../typechain"; import { BootloaderUtilitiesFactory } from "../typechain"; import { TEST_BOOTLOADER_UTILITIES_ADDRESS } from "./shared/constants"; diff --git a/system-contracts/test/Create2Factory.spec.ts b/system-contracts/test/Create2Factory.spec.ts index 7e84478e0..fc2e689f6 100644 --- a/system-contracts/test/Create2Factory.spec.ts +++ b/system-contracts/test/Create2Factory.spec.ts @@ -3,7 +3,7 @@ import { ethers } from "hardhat"; import type { Wallet } from "zksync-ethers"; import type { Create2Factory } from "../typechain"; import { deployContract, getWallets, loadArtifact } from "./shared/utils"; -import { create2Address, getDeployedContracts, hashBytecode } from "zksync-ethers/build/src/utils"; +import { create2Address, getDeployedContracts, hashBytecode } from "zksync-ethers/build/utils"; describe("Create2Factory tests", function () { let wallet: Wallet; diff --git a/yarn.lock b/yarn.lock index 01159ecf0..f83d0f620 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7654,9 +7654,10 @@ zksync-ethers@^5.0.0: dependencies: ethers "~5.7.0" -"zksync-ethers@https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub": - version "5.1.0" - resolved "https://github.com/zksync-sdk/zksync-ethers#28ccbe7d67b170c202b17475e06a82002e6e3acc" +zksync-ethers@^5.9.0: + version "5.9.2" + resolved "https://registry.yarnpkg.com/zksync-ethers/-/zksync-ethers-5.9.2.tgz#1c5f34cb25ac0b040fd1a6118f2ba1c2c3bda090" + integrity sha512-Y2Mx6ovvxO6UdC2dePLguVzvNToOY8iLWeq5ne+jgGSJxAi/f4He/NF6FNsf6x1aWX0o8dy4Df8RcOQXAkj5qw== dependencies: ethers "~5.7.0" From 5853c3a7ea80ede2a65c264f6a2239c87873b0de Mon Sep 17 00:00:00 2001 From: Grzegorz Prusak Date: Tue, 20 Aug 2024 11:58:38 +0200 Subject: [PATCH 02/53] feat(consensus): add L2 registry contract (BFT-434) (#555) (#718) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Moshe Shababo <17073733+moshababo@users.noreply.github.com> Co-authored-by: Akosh Farkash Co-authored-by: Bruno França Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com> Co-authored-by: Roman Brodetski Co-authored-by: vladbochok --- l2-contracts/contracts/ConsensusRegistry.sol | 486 +++++++++++++++++ .../interfaces/IConsensusRegistry.sol | 161 ++++++ l2-contracts/package.json | 3 +- l2-contracts/src/deploy-consensus-registry.ts | 90 ++++ l2-contracts/src/utils.ts | 21 + l2-contracts/test/consensusRegistry.test.ts | 499 ++++++++++++++++++ 6 files changed, 1259 insertions(+), 1 deletion(-) create mode 100644 l2-contracts/contracts/ConsensusRegistry.sol create mode 100644 l2-contracts/contracts/interfaces/IConsensusRegistry.sol create mode 100644 l2-contracts/src/deploy-consensus-registry.ts create mode 100644 l2-contracts/test/consensusRegistry.test.ts diff --git a/l2-contracts/contracts/ConsensusRegistry.sol b/l2-contracts/contracts/ConsensusRegistry.sol new file mode 100644 index 000000000..514a4f205 --- /dev/null +++ b/l2-contracts/contracts/ConsensusRegistry.sol @@ -0,0 +1,486 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.20; + +import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol"; +import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol"; +import {IConsensusRegistry} from "./interfaces/IConsensusRegistry.sol"; + +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +/// @title ConsensusRegistry +/// @dev Manages consensus nodes and committees for the L2 consensus protocol, +/// owned by Matter Labs Multisig. Nodes act as both validators and attesters, +/// each playing a distinct role in the consensus process. This contract facilitates +/// the rotation of validator and attester committees, which represent a subset of nodes +/// expected to actively participate in the consensus process during a specific time window. +/// @dev Designed for use with a proxy for upgradability. +contract ConsensusRegistry is IConsensusRegistry, Initializable, Ownable2StepUpgradeable { + /// @dev An array to keep track of node owners. + address[] public nodeOwners; + /// @dev A mapping of node owners => nodes. + mapping(address => Node) public nodes; + /// @dev A mapping for enabling efficient lookups when checking whether a given attester public key exists. + mapping(bytes32 => bool) public attesterPubKeyHashes; + /// @dev A mapping for enabling efficient lookups when checking whether a given validator public key exists. + mapping(bytes32 => bool) public validatorPubKeyHashes; + /// @dev Counter that increments with each new commit to the attester committee. + uint32 public attestersCommit; + /// @dev Counter that increments with each new commit to the validator committee. + uint32 public validatorsCommit; + + modifier onlyOwnerOrNodeOwner(address _nodeOwner) { + if (owner() != msg.sender && _nodeOwner != msg.sender) { + revert UnauthorizedOnlyOwnerOrNodeOwner(); + } + _; + } + + function initialize(address _initialOwner) external initializer { + if (_initialOwner == address(0)) { + revert InvalidInputNodeOwnerAddress(); + } + _transferOwnership(_initialOwner); + } + + /// @notice Adds a new node to the registry. + /// @dev Fails if node owner already exists. + /// @dev Fails if a validator/attester with the same public key already exists. + /// @param _nodeOwner The address of the new node's owner. + /// @param _validatorWeight The voting weight of the validator. + /// @param _validatorPubKey The BLS12-381 public key of the validator. + /// @param _validatorPoP The proof-of-possession (PoP) of the validator's public key. + /// @param _attesterWeight The voting weight of the attester. + /// @param _attesterPubKey The ECDSA public key of the attester. + function add( + address _nodeOwner, + uint32 _validatorWeight, + BLS12_381PublicKey calldata _validatorPubKey, + BLS12_381Signature calldata _validatorPoP, + uint32 _attesterWeight, + Secp256k1PublicKey calldata _attesterPubKey + ) external onlyOwner { + // Verify input. + _verifyInputAddress(_nodeOwner); + _verifyInputBLS12_381PublicKey(_validatorPubKey); + _verifyInputBLS12_381Signature(_validatorPoP); + _verifyInputSecp256k1PublicKey(_attesterPubKey); + + // Verify storage. + _verifyNodeOwnerDoesNotExist(_nodeOwner); + bytes32 attesterPubKeyHash = _hashAttesterPubKey(_attesterPubKey); + _verifyAttesterPubKeyDoesNotExist(attesterPubKeyHash); + bytes32 validatorPubKeyHash = _hashValidatorPubKey(_validatorPubKey); + _verifyValidatorPubKeyDoesNotExist(validatorPubKeyHash); + + uint32 nodeOwnerIdx = uint32(nodeOwners.length); + nodeOwners.push(_nodeOwner); + nodes[_nodeOwner] = Node({ + attesterLatest: AttesterAttr({ + active: true, + removed: false, + weight: _attesterWeight, + pubKey: _attesterPubKey + }), + attesterSnapshot: AttesterAttr({ + active: false, + removed: false, + weight: 0, + pubKey: Secp256k1PublicKey({tag: bytes1(0), x: bytes32(0)}) + }), + attesterLastUpdateCommit: attestersCommit, + validatorLatest: ValidatorAttr({ + active: true, + removed: false, + weight: _validatorWeight, + pubKey: _validatorPubKey, + proofOfPossession: _validatorPoP + }), + validatorSnapshot: ValidatorAttr({ + active: false, + removed: false, + weight: 0, + pubKey: BLS12_381PublicKey({a: bytes32(0), b: bytes32(0), c: bytes32(0)}), + proofOfPossession: BLS12_381Signature({a: bytes32(0), b: bytes16(0)}) + }), + validatorLastUpdateCommit: validatorsCommit, + nodeOwnerIdx: nodeOwnerIdx + }); + attesterPubKeyHashes[attesterPubKeyHash] = true; + validatorPubKeyHashes[validatorPubKeyHash] = true; + + emit NodeAdded({ + nodeOwner: _nodeOwner, + validatorWeight: _validatorWeight, + validatorPubKey: _validatorPubKey, + validatorPoP: _validatorPoP, + attesterWeight: _attesterWeight, + attesterPubKey: _attesterPubKey + }); + } + + /// @notice Deactivates a node, preventing it from participating in committees. + /// @dev Only callable by the contract owner or the node owner. + /// @dev Verifies that the node owner exists in the registry. + /// @param _nodeOwner The address of the node's owner to be inactivated. + function deactivate(address _nodeOwner) external onlyOwnerOrNodeOwner(_nodeOwner) { + _verifyNodeOwnerExists(_nodeOwner); + (Node storage node, bool deleted) = _getNodeAndDeleteIfRequired(_nodeOwner); + if (deleted) { + return; + } + + _ensureAttesterSnapshot(node); + node.attesterLatest.active = false; + _ensureValidatorSnapshot(node); + node.validatorLatest.active = false; + + emit NodeDeactivated(_nodeOwner); + } + + /// @notice Activates a previously inactive node, allowing it to participate in committees. + /// @dev Only callable by the contract owner or the node owner. + /// @dev Verifies that the node owner exists in the registry. + /// @param _nodeOwner The address of the node's owner to be activated. + function activate(address _nodeOwner) external onlyOwnerOrNodeOwner(_nodeOwner) { + _verifyNodeOwnerExists(_nodeOwner); + (Node storage node, bool deleted) = _getNodeAndDeleteIfRequired(_nodeOwner); + if (deleted) { + return; + } + + _ensureAttesterSnapshot(node); + node.attesterLatest.active = true; + _ensureValidatorSnapshot(node); + node.validatorLatest.active = true; + + emit NodeActivated(_nodeOwner); + } + + /// @notice Removes a node from the registry. + /// @dev Only callable by the contract owner. + /// @dev Verifies that the node owner exists in the registry. + /// @param _nodeOwner The address of the node's owner to be removed. + function remove(address _nodeOwner) external onlyOwner { + _verifyNodeOwnerExists(_nodeOwner); + (Node storage node, bool deleted) = _getNodeAndDeleteIfRequired(_nodeOwner); + if (deleted) { + return; + } + + _ensureAttesterSnapshot(node); + node.attesterLatest.removed = true; + _ensureValidatorSnapshot(node); + node.validatorLatest.removed = true; + + emit NodeRemoved(_nodeOwner); + } + + /// @notice Changes the validator weight of a node in the registry. + /// @dev Only callable by the contract owner. + /// @dev Verifies that the node owner exists in the registry. + /// @param _nodeOwner The address of the node's owner whose validator weight will be changed. + /// @param _weight The new validator weight to assign to the node. + function changeValidatorWeight(address _nodeOwner, uint32 _weight) external onlyOwner { + _verifyNodeOwnerExists(_nodeOwner); + (Node storage node, bool deleted) = _getNodeAndDeleteIfRequired(_nodeOwner); + if (deleted) { + return; + } + + _ensureValidatorSnapshot(node); + node.validatorLatest.weight = _weight; + + emit NodeValidatorWeightChanged(_nodeOwner, _weight); + } + + /// @notice Changes the attester weight of a node in the registry. + /// @dev Only callable by the contract owner. + /// @dev Verifies that the node owner exists in the registry. + /// @param _nodeOwner The address of the node's owner whose attester weight will be changed. + /// @param _weight The new attester weight to assign to the node. + function changeAttesterWeight(address _nodeOwner, uint32 _weight) external onlyOwner { + _verifyNodeOwnerExists(_nodeOwner); + (Node storage node, bool deleted) = _getNodeAndDeleteIfRequired(_nodeOwner); + if (deleted) { + return; + } + + _ensureAttesterSnapshot(node); + node.attesterLatest.weight = _weight; + + emit NodeAttesterWeightChanged(_nodeOwner, _weight); + } + + /// @notice Changes the validator's public key and proof-of-possession in the registry. + /// @dev Only callable by the contract owner or the node owner. + /// @dev Verifies that the node owner exists in the registry. + /// @param _nodeOwner The address of the node's owner whose validator key and PoP will be changed. + /// @param _pubKey The new BLS12-381 public key to assign to the node's validator. + /// @param _pop The new proof-of-possession (PoP) to assign to the node's validator. + function changeValidatorKey( + address _nodeOwner, + BLS12_381PublicKey calldata _pubKey, + BLS12_381Signature calldata _pop + ) external onlyOwnerOrNodeOwner(_nodeOwner) { + _verifyInputBLS12_381PublicKey(_pubKey); + _verifyInputBLS12_381Signature(_pop); + _verifyNodeOwnerExists(_nodeOwner); + (Node storage node, bool deleted) = _getNodeAndDeleteIfRequired(_nodeOwner); + if (deleted) { + return; + } + + bytes32 prevHash = _hashValidatorPubKey(node.validatorLatest.pubKey); + delete validatorPubKeyHashes[prevHash]; + bytes32 newHash = _hashValidatorPubKey(_pubKey); + _verifyValidatorPubKeyDoesNotExist(newHash); + validatorPubKeyHashes[newHash] = true; + _ensureValidatorSnapshot(node); + node.validatorLatest.pubKey = _pubKey; + node.validatorLatest.proofOfPossession = _pop; + + emit NodeValidatorKeyChanged(_nodeOwner, _pubKey, _pop); + } + + /// @notice Changes the attester's public key of a node in the registry. + /// @dev Only callable by the contract owner or the node owner. + /// @dev Verifies that the node owner exists in the registry. + /// @param _nodeOwner The address of the node's owner whose attester public key will be changed. + /// @param _pubKey The new ECDSA public key to assign to the node's attester. + function changeAttesterKey( + address _nodeOwner, + Secp256k1PublicKey calldata _pubKey + ) external onlyOwnerOrNodeOwner(_nodeOwner) { + _verifyInputSecp256k1PublicKey(_pubKey); + _verifyNodeOwnerExists(_nodeOwner); + (Node storage node, bool deleted) = _getNodeAndDeleteIfRequired(_nodeOwner); + if (deleted) { + return; + } + + bytes32 prevHash = _hashAttesterPubKey(node.attesterLatest.pubKey); + delete attesterPubKeyHashes[prevHash]; + bytes32 newHash = _hashAttesterPubKey(_pubKey); + _verifyAttesterPubKeyDoesNotExist(newHash); + attesterPubKeyHashes[newHash] = true; + + _ensureAttesterSnapshot(node); + node.attesterLatest.pubKey = _pubKey; + + emit NodeAttesterKeyChanged(_nodeOwner, _pubKey); + } + + /// @notice Adds a new commit to the attester committee. + /// @dev Implicitly updates the attester committee by affecting readers based on the current state of a node's attester attributes: + /// - If "attestersCommit" > "node.attesterLastUpdateCommit", read "node.attesterLatest". + /// - If "attestersCommit" == "node.attesterLastUpdateCommit", read "node.attesterSnapshot". + /// @dev Only callable by the contract owner. + function commitAttesterCommittee() external onlyOwner { + ++attestersCommit; + + emit AttestersCommitted(attestersCommit); + } + + /// @notice Adds a new commit to the validator committee. + /// @dev Implicitly updates the validator committee by affecting readers based on the current state of a node's validator attributes: + /// - If "validatorsCommit" > "node.validatorLastUpdateCommit", read "node.validatorLatest". + /// - If "validatorsCommit" == "node.validatorLastUpdateCommit", read "node.validatorSnapshot". + /// @dev Only callable by the contract owner. + function commitValidatorCommittee() external onlyOwner { + ++validatorsCommit; + + emit ValidatorsCommitted(validatorsCommit); + } + + /// @notice Returns an array of `AttesterAttr` structs representing the current attester committee. + /// @dev Collects active and non-removed attesters based on the latest commit to the committee. + function getAttesterCommittee() public view returns (CommitteeAttester[] memory) { + uint256 len = nodeOwners.length; + CommitteeAttester[] memory committee = new CommitteeAttester[](len); + uint256 count = 0; + + for (uint256 i = 0; i < len; ++i) { + Node storage node = nodes[nodeOwners[i]]; + AttesterAttr memory attester = attestersCommit > node.attesterLastUpdateCommit + ? node.attesterLatest + : node.attesterSnapshot; + if (attester.active && !attester.removed) { + committee[count] = CommitteeAttester({weight: attester.weight, pubKey: attester.pubKey}); + ++count; + } + } + + // Resize the array. + assembly { + mstore(committee, count) + } + return committee; + } + + /// @notice Returns an array of `ValidatorAttr` structs representing the current attester committee. + /// @dev Collects active and non-removed validators based on the latest commit to the committee. + function getValidatorCommittee() public view returns (CommitteeValidator[] memory) { + uint256 len = nodeOwners.length; + CommitteeValidator[] memory committee = new CommitteeValidator[](len); + uint256 count = 0; + + for (uint256 i = 0; i < len; ++i) { + Node storage node = nodes[nodeOwners[i]]; + ValidatorAttr memory validator = validatorsCommit > node.validatorLastUpdateCommit + ? node.validatorLatest + : node.validatorSnapshot; + if (validator.active && !validator.removed) { + committee[count] = CommitteeValidator({ + weight: validator.weight, + pubKey: validator.pubKey, + proofOfPossession: validator.proofOfPossession + }); + ++count; + } + } + + // Resize the array. + assembly { + mstore(committee, count) + } + return committee; + } + + function numNodes() public view returns (uint256) { + return nodeOwners.length; + } + + function _getNodeAndDeleteIfRequired(address _nodeOwner) private returns (Node storage, bool) { + Node storage node = nodes[_nodeOwner]; + bool pendingDeletion = _isNodePendingDeletion(node); + if (pendingDeletion) { + _deleteNode(_nodeOwner, node); + } + return (node, pendingDeletion); + } + + function _isNodePendingDeletion(Node storage _node) private returns (bool) { + bool attesterRemoved = (attestersCommit > _node.attesterLastUpdateCommit) + ? _node.attesterLatest.removed + : _node.attesterSnapshot.removed; + bool validatorRemoved = (validatorsCommit > _node.validatorLastUpdateCommit) + ? _node.validatorLatest.removed + : _node.validatorSnapshot.removed; + return attesterRemoved && validatorRemoved; + } + + function _deleteNode(address _nodeOwner, Node storage _node) private { + // Delete from array by swapping the last node owner (gas-efficient, not preserving order). + address lastNodeOwner = nodeOwners[nodeOwners.length - 1]; + nodeOwners[_node.nodeOwnerIdx] = lastNodeOwner; + nodeOwners.pop(); + // Update the node owned by the last node owner. + nodes[lastNodeOwner].nodeOwnerIdx = _node.nodeOwnerIdx; + + // Delete from the remaining mapping. + delete attesterPubKeyHashes[_hashAttesterPubKey(_node.attesterLatest.pubKey)]; + delete validatorPubKeyHashes[_hashValidatorPubKey(_node.validatorLatest.pubKey)]; + delete nodes[_nodeOwner]; + + emit NodeDeleted(_nodeOwner); + } + + function _ensureAttesterSnapshot(Node storage _node) private { + if (_node.attesterLastUpdateCommit < attestersCommit) { + _node.attesterSnapshot = _node.attesterLatest; + _node.attesterLastUpdateCommit = attestersCommit; + } + } + + function _ensureValidatorSnapshot(Node storage _node) private { + if (_node.validatorLastUpdateCommit < validatorsCommit) { + _node.validatorSnapshot = _node.validatorLatest; + _node.validatorLastUpdateCommit = validatorsCommit; + } + } + + function _isNodeOwnerExists(address _nodeOwner) private view returns (bool) { + BLS12_381PublicKey storage pubKey = nodes[_nodeOwner].validatorLatest.pubKey; + if (pubKey.a == bytes32(0) && pubKey.b == bytes32(0) && pubKey.c == bytes32(0)) { + return false; + } + return true; + } + + function _verifyNodeOwnerExists(address _nodeOwner) private view { + if (!_isNodeOwnerExists(_nodeOwner)) { + revert NodeOwnerDoesNotExist(); + } + } + + function _verifyNodeOwnerDoesNotExist(address _nodeOwner) private view { + if (_isNodeOwnerExists(_nodeOwner)) { + revert NodeOwnerExists(); + } + } + + function _hashAttesterPubKey(Secp256k1PublicKey storage _pubKey) private view returns (bytes32) { + return keccak256(abi.encode(_pubKey.tag, _pubKey.x)); + } + + function _hashAttesterPubKey(Secp256k1PublicKey calldata _pubKey) private pure returns (bytes32) { + return keccak256(abi.encode(_pubKey.tag, _pubKey.x)); + } + + function _hashValidatorPubKey(BLS12_381PublicKey storage _pubKey) private view returns (bytes32) { + return keccak256(abi.encode(_pubKey.a, _pubKey.b, _pubKey.c)); + } + + function _hashValidatorPubKey(BLS12_381PublicKey calldata _pubKey) private pure returns (bytes32) { + return keccak256(abi.encode(_pubKey.a, _pubKey.b, _pubKey.c)); + } + + function _verifyInputAddress(address _nodeOwner) private pure { + if (_nodeOwner == address(0)) { + revert InvalidInputNodeOwnerAddress(); + } + } + + function _verifyAttesterPubKeyDoesNotExist(bytes32 _hash) private view { + if (attesterPubKeyHashes[_hash]) { + revert AttesterPubKeyExists(); + } + } + + function _verifyValidatorPubKeyDoesNotExist(bytes32 _hash) private { + if (validatorPubKeyHashes[_hash]) { + revert ValidatorPubKeyExists(); + } + } + + function _verifyInputBLS12_381PublicKey(BLS12_381PublicKey calldata _pubKey) private pure { + if (_isEmptyBLS12_381PublicKey(_pubKey)) { + revert InvalidInputBLS12_381PublicKey(); + } + } + + function _verifyInputBLS12_381Signature(BLS12_381Signature calldata _pop) private pure { + if (_isEmptyBLS12_381Signature(_pop)) { + revert InvalidInputBLS12_381Signature(); + } + } + + function _verifyInputSecp256k1PublicKey(Secp256k1PublicKey calldata _pubKey) private pure { + if (_isEmptySecp256k1PublicKey(_pubKey)) { + revert InvalidInputSecp256k1PublicKey(); + } + } + + function _isEmptyBLS12_381PublicKey(BLS12_381PublicKey calldata _pubKey) private pure returns (bool) { + return _pubKey.a == bytes32(0) && _pubKey.b == bytes32(0) && _pubKey.c == bytes32(0); + } + + function _isEmptyBLS12_381Signature(BLS12_381Signature calldata _pop) private pure returns (bool) { + return _pop.a == bytes32(0) && _pop.b == bytes16(0); + } + + function _isEmptySecp256k1PublicKey(Secp256k1PublicKey calldata _pubKey) private pure returns (bool) { + return _pubKey.tag == bytes1(0) && _pubKey.x == bytes32(0); + } +} diff --git a/l2-contracts/contracts/interfaces/IConsensusRegistry.sol b/l2-contracts/contracts/interfaces/IConsensusRegistry.sol new file mode 100644 index 000000000..e3ddd118a --- /dev/null +++ b/l2-contracts/contracts/interfaces/IConsensusRegistry.sol @@ -0,0 +1,161 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.20; + +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +/// @title ConsensusRegistry contract interface +interface IConsensusRegistry { + /// @dev Represents a consensus node. + /// @param attesterLastUpdateCommit The latest `attestersCommit` where the node's attester attributes were updated. + /// @param attesterLatest Attester attributes to read if `node.attesterLastUpdateCommit` < `attestersCommit`. + /// @param attesterSnapshot Attester attributes to read if `node.attesterLastUpdateCommit` == `attestersCommit`. + /// @param validatorLastUpdateCommit The latest `validatorsCommit` where the node's validator attributes were updated. + /// @param validatorLatest Validator attributes to read if `node.validatorLastUpdateCommit` < `validatorsCommit`. + /// @param validatorSnapshot Validator attributes to read if `node.validatorLastUpdateCommit` == `validatorsCommit`. + /// @param nodeOwnerIdx Index of the node owner within the array of node owners. + struct Node { + uint32 attesterLastUpdateCommit; + uint32 validatorLastUpdateCommit; + uint32 nodeOwnerIdx; + AttesterAttr attesterLatest; + AttesterAttr attesterSnapshot; + ValidatorAttr validatorLatest; + ValidatorAttr validatorSnapshot; + } + + /// @dev Represents the attester attributes of a consensus node. + /// @param active A flag stating if the attester is active. + /// @param removed A flag stating if the attester has been removed (and is pending a deletion). + /// @param weight Attester's voting weight. + /// @param pubKey Attester's Secp256k1 public key. + struct AttesterAttr { + bool active; + bool removed; + uint32 weight; + Secp256k1PublicKey pubKey; + } + + /// @dev Represents an attester within a committee. + /// @param weight Attester's voting weight. + /// @param pubKey Attester's Secp256k1 public key. + struct CommitteeAttester { + uint32 weight; + Secp256k1PublicKey pubKey; + } + + /// @dev Represents the validator attributes of a consensus node. + /// @param active A flag stating if the validator is active. + /// @param removed A flag stating if the validator has been removed (and is pending a deletion). + /// @param weight Validator's voting weight. + /// @param pubKey Validator's BLS12-381 public key. + /// @param proofOfPossession Validator's Proof-of-possession (a signature over the public key). + struct ValidatorAttr { + bool active; + bool removed; + uint32 weight; + BLS12_381PublicKey pubKey; + BLS12_381Signature proofOfPossession; + } + + /// @dev Represents a validator within a committee. + /// @param weight Validator's voting weight. + /// @param pubKey Validator's BLS12-381 public key. + /// @param proofOfPossession Validator's Proof-of-possession (a signature over the public key). + struct CommitteeValidator { + uint32 weight; + BLS12_381PublicKey pubKey; + BLS12_381Signature proofOfPossession; + } + + /// @dev Represents BLS12_381 public key. + /// @param a First component of the BLS12-381 public key. + /// @param b Second component of the BLS12-381 public key. + /// @param c Third component of the BLS12-381 public key. + struct BLS12_381PublicKey { + bytes32 a; + bytes32 b; + bytes32 c; + } + + /// @dev Represents BLS12_381 signature. + /// @param a First component of the BLS12-381 signature. + /// @param b Second component of the BLS12-381 signature. + struct BLS12_381Signature { + bytes32 a; + bytes16 b; + } + + /// @dev Represents Secp256k1 public key. + /// @param tag Y-coordinate's even/odd indicator of the Secp256k1 public key. + /// @param x X-coordinate component of the Secp256k1 public key. + struct Secp256k1PublicKey { + bytes1 tag; + bytes32 x; + } + + error UnauthorizedOnlyOwnerOrNodeOwner(); + error NodeOwnerExists(); + error NodeOwnerDoesNotExist(); + error NodeOwnerNotFound(); + error ValidatorPubKeyExists(); + error AttesterPubKeyExists(); + error InvalidInputNodeOwnerAddress(); + error InvalidInputBLS12_381PublicKey(); + error InvalidInputBLS12_381Signature(); + error InvalidInputSecp256k1PublicKey(); + + event NodeAdded( + address indexed nodeOwner, + uint32 validatorWeight, + BLS12_381PublicKey validatorPubKey, + BLS12_381Signature validatorPoP, + uint32 attesterWeight, + Secp256k1PublicKey attesterPubKey + ); + event NodeDeactivated(address indexed nodeOwner); + event NodeActivated(address indexed nodeOwner); + event NodeRemoved(address indexed nodeOwner); + event NodeDeleted(address indexed nodeOwner); + event NodeValidatorWeightChanged(address indexed nodeOwner, uint32 newWeight); + event NodeAttesterWeightChanged(address indexed nodeOwner, uint32 newWeight); + event NodeValidatorKeyChanged(address indexed nodeOwner, BLS12_381PublicKey newPubKey, BLS12_381Signature newPoP); + event NodeAttesterKeyChanged(address indexed nodeOwner, Secp256k1PublicKey newPubKey); + event ValidatorsCommitted(uint32 commit); + event AttestersCommitted(uint32 commit); + + function add( + address _nodeOwner, + uint32 _validatorWeight, + BLS12_381PublicKey calldata _validatorPubKey, + BLS12_381Signature calldata _validatorPoP, + uint32 _attesterWeight, + Secp256k1PublicKey calldata _attesterPubKey + ) external; + + function deactivate(address _nodeOwner) external; + + function activate(address _nodeOwner) external; + + function remove(address _nodeOwner) external; + + function changeValidatorWeight(address _nodeOwner, uint32 _weight) external; + + function changeAttesterWeight(address _nodeOwner, uint32 _weight) external; + + function changeValidatorKey( + address _nodeOwner, + BLS12_381PublicKey calldata _pubKey, + BLS12_381Signature calldata _pop + ) external; + + function changeAttesterKey(address _nodeOwner, Secp256k1PublicKey calldata _pubKey) external; + + function commitAttesterCommittee() external; + + function commitValidatorCommittee() external; + + function getAttesterCommittee() external view returns (CommitteeAttester[] memory); + + function getValidatorCommittee() external view returns (CommitteeValidator[] memory); +} diff --git a/l2-contracts/package.json b/l2-contracts/package.json index 2f5907461..891b348a3 100644 --- a/l2-contracts/package.json +++ b/l2-contracts/package.json @@ -42,7 +42,8 @@ "deploy-l2-weth": "ts-node src/deploy-l2-weth.ts", "upgrade-bridge-contracts": "ts-node src/upgrade-bridge-impl.ts", "update-l2-erc20-metadata": "ts-node src/update-l2-erc20-metadata.ts", - "upgrade-consistency-checker": "ts-node src/upgrade-consistency-checker.ts" + "upgrade-consistency-checker": "ts-node src/upgrade-consistency-checker.ts", + "deploy-consensus-registry": "ts-node src/deploy-consensus-registry.ts" }, "dependencies": { "dotenv": "^16.0.3" diff --git a/l2-contracts/src/deploy-consensus-registry.ts b/l2-contracts/src/deploy-consensus-registry.ts new file mode 100644 index 000000000..ffbf903f9 --- /dev/null +++ b/l2-contracts/src/deploy-consensus-registry.ts @@ -0,0 +1,90 @@ +import { Command } from "commander"; +import { ethers } from "ethers"; +import { computeL2Create2Address, create2DeployFromL2 } from "./utils"; +import { Interface } from "ethers/lib/utils"; +import { ethTestConfig } from "./deploy-utils"; + +import * as hre from "hardhat"; +import { Provider, Wallet } from "zksync-ethers"; + +const I_TRANSPARENT_UPGRADEABLE_PROXY_ARTIFACT = hre.artifacts.readArtifactSync("ITransparentUpgradeableProxy"); +const TRANSPARENT_UPGRADEABLE_PROXY_ARTIFACT = hre.artifacts.readArtifactSync("TransparentUpgradeableProxy"); +const CONSENSUS_REGISTRY_ARTIFACT = hre.artifacts.readArtifactSync("ConsensusRegistry"); +const PROXY_ADMIN_ARTIFACT = hre.artifacts.readArtifactSync("ConsensusRegistry"); + +const CONSENSUS_REGISTRY_INTERFACE = new Interface(CONSENSUS_REGISTRY_ARTIFACT.abi); +const I_TRANSPARENT_UPGRADEABLE_PROXY_INTERFACE = new Interface(I_TRANSPARENT_UPGRADEABLE_PROXY_ARTIFACT.abi); + +// Script to deploy the consensus registry contract and output its address. +// Note, that this script expects that the L2 contracts have been compiled PRIOR +// to running this script. +async function main() { + const program = new Command(); + + program + .version("0.1.0") + .name("deploy-consensus-registry") + .description("Deploys the consensus registry contract to L2"); + + program.option("--private-key ").action(async (cmd) => { + const zksProvider = new Provider(process.env.API_WEB3_JSON_RPC_HTTP_URL); + const deployWallet = cmd.privateKey + ? new Wallet(cmd.privateKey, zksProvider) + : Wallet.fromMnemonic( + process.env.MNEMONIC ? process.env.MNEMONIC : ethTestConfig.mnemonic, + "m/44'/60'/0'/0/1" + ).connect(zksProvider); + console.log(`Using deployer wallet: ${deployWallet.address}`); + + // Deploy Consensus Registry contract + const consensusRegistryImplementation = await computeL2Create2Address( + deployWallet, + CONSENSUS_REGISTRY_ARTIFACT.bytecode, + "0x", + ethers.constants.HashZero + ); + await create2DeployFromL2(deployWallet, CONSENSUS_REGISTRY_ARTIFACT.bytecode, "0x", ethers.constants.HashZero); + + // Deploy Proxy Admin contract + const proxyAdminContract = await computeL2Create2Address( + deployWallet, + PROXY_ADMIN_ARTIFACT.bytecode, + "0x", + ethers.constants.HashZero + ); + await create2DeployFromL2(deployWallet, PROXY_ADMIN_ARTIFACT.bytecode, "0x", ethers.constants.HashZero); + + const proxyInitializationParams = CONSENSUS_REGISTRY_INTERFACE.encodeFunctionData("initialize", [ + deployWallet.address, + ]); + const proxyConstructor = I_TRANSPARENT_UPGRADEABLE_PROXY_INTERFACE.encodeDeploy([ + consensusRegistryImplementation, + proxyAdminContract, + proxyInitializationParams, + ]); + + await create2DeployFromL2( + deployWallet, + TRANSPARENT_UPGRADEABLE_PROXY_ARTIFACT.bytecode, + proxyConstructor, + ethers.constants.HashZero + ); + + const address = computeL2Create2Address( + deployWallet, + TRANSPARENT_UPGRADEABLE_PROXY_ARTIFACT.bytecode, + proxyConstructor, + ethers.constants.HashZero + ); + console.log(`CONTRACTS_L2_CONSENSUS_REGISTRY_ADDR=${address}`); + }); + + await program.parseAsync(process.argv); +} + +main() + .then(() => process.exit(0)) + .catch((err) => { + console.error("Error:", err); + process.exit(1); + }); diff --git a/l2-contracts/src/utils.ts b/l2-contracts/src/utils.ts index 30fe0876e..b4e7d5c1e 100644 --- a/l2-contracts/src/utils.ts +++ b/l2-contracts/src/utils.ts @@ -143,6 +143,27 @@ export async function create2DeployFromL1( ); } +export async function create2DeployFromL2( + wallet: ethers.Wallet, + bytecode: ethers.BytesLike, + constructor: ethers.BytesLike, + create2Salt: ethers.BytesLike, + extraFactoryDeps?: ethers.BytesLike[] +) { + const deployerSystemContracts = new Interface(artifacts.readArtifactSync("IContractDeployer").abi); + const bytecodeHash = hashL2Bytecode(bytecode); + const calldata = deployerSystemContracts.encodeFunctionData("create2", [create2Salt, bytecodeHash, constructor]); + + const factoryDeps = extraFactoryDeps ? [bytecode, ...extraFactoryDeps] : [bytecode]; + return await wallet.call({ + to: DEPLOYER_SYSTEM_CONTRACT_ADDRESS, + data: calldata, + customData: { + factoryDeps, + }, + }); +} + export async function publishBytecodeFromL1( chainId: ethers.BigNumberish, wallet: ethers.Wallet, diff --git a/l2-contracts/test/consensusRegistry.test.ts b/l2-contracts/test/consensusRegistry.test.ts new file mode 100644 index 000000000..66c0309bd --- /dev/null +++ b/l2-contracts/test/consensusRegistry.test.ts @@ -0,0 +1,499 @@ +import { Deployer } from "@matterlabs/hardhat-zksync-deploy"; +import * as hre from "hardhat"; +import { Provider, Wallet } from "zksync-ethers"; +import type { ConsensusRegistry } from "../typechain"; +import { ConsensusRegistryFactory } from "../typechain"; +import { expect } from "chai"; +import { ethers } from "ethers"; +import { Interface } from "ethers/lib/utils"; + +const richAccount = { + address: "0x36615Cf349d7F6344891B1e7CA7C72883F5dc049", + privateKey: "0x7726827caac94a7f9e1b160f7ea819f172f7b6f9d2a97f992c38edeab82d4110", +}; + +const gasLimit = 100_000_000; + +const CONSENSUS_REGISTRY_ARTIFACT = hre.artifacts.readArtifactSync("ConsensusRegistry"); +const CONSENSUS_REGISTRY_INTERFACE = new Interface(CONSENSUS_REGISTRY_ARTIFACT.abi); + +describe("ConsensusRegistry", function () { + const provider = new Provider(hre.config.networks.localhost.url); + const owner = new Wallet(richAccount.privateKey, provider); + const nonOwner = new Wallet(Wallet.createRandom().privateKey, provider); + const nodes = []; + const nodeEntries = []; + let registry: ConsensusRegistry; + + before("Initialize", async function () { + // Deploy. + const deployer = new Deployer(hre, owner); + const registryInstance = await deployer.deploy(await deployer.loadArtifact("ConsensusRegistry"), []); + const proxyAdmin = await deployer.deploy(await deployer.loadArtifact("ProxyAdmin"), []); + const proxyInitializationParams = CONSENSUS_REGISTRY_INTERFACE.encodeFunctionData("initialize", [owner.address]); + const proxyInstance = await deployer.deploy(await deployer.loadArtifact("TransparentUpgradeableProxy"), [ + registryInstance.address, + proxyAdmin.address, + proxyInitializationParams, + ]); + registry = ConsensusRegistryFactory.connect(proxyInstance.address, owner); + + // Fund nonOwner. + await ( + await owner.sendTransaction({ + to: nonOwner.address, + value: ethers.utils.parseEther("100"), + }) + ).wait(); + + // Prepare the node list. + const numNodes = 10; + for (let i = 0; i < numNodes; i++) { + const node = makeRandomNode(provider); + const nodeEntry = makeRandomNodeEntry(node, i); + nodes.push(node); + nodeEntries.push(nodeEntry); + } + + // Fund the first node owner. + await ( + await owner.sendTransaction({ + to: nodes[0].ownerKey.address, + value: ethers.utils.parseEther("100"), + }) + ).wait(); + }); + + it("Should set the owner as provided in constructor", async function () { + expect(await registry.owner()).to.equal(owner.address); + }); + + it("Should add nodes to both registries", async function () { + for (let i = 0; i < nodes.length; i++) { + await ( + await registry.add( + nodeEntries[i].ownerAddr, + nodeEntries[i].validatorWeight, + nodeEntries[i].validatorPubKey, + nodeEntries[i].validatorPoP, + nodeEntries[i].attesterWeight, + nodeEntries[i].attesterPubKey + ) + ).wait(); + } + + expect(await registry.numNodes()).to.equal(nodes.length); + + for (let i = 0; i < nodes.length; i++) { + const nodeOwner = await registry.nodeOwners(i); + expect(nodeOwner).to.equal(nodeEntries[i].ownerAddr); + const node = await registry.nodes(nodeOwner); + expect(node.attesterLastUpdateCommit).to.equal(0); + expect(node.validatorLastUpdateCommit).to.equal(0); + + // 'Latest' is expected to match the added node's attributes. + expect(node.attesterLatest.active).to.equal(true); + expect(node.attesterLatest.removed).to.equal(false); + expect(node.attesterLatest.weight).to.equal(nodeEntries[i].attesterWeight); + expect(node.attesterLatest.pubKey.tag).to.equal(nodeEntries[i].attesterPubKey.tag); + expect(node.attesterLatest.pubKey.x).to.equal(nodeEntries[i].attesterPubKey.x); + expect(node.validatorLastUpdateCommit).to.equal(0); + expect(node.validatorLatest.active).to.equal(true); + expect(node.validatorLatest.removed).to.equal(false); + expect(node.validatorLatest.weight).to.equal(nodeEntries[i].attesterWeight); + expect(node.validatorLatest.pubKey.a).to.equal(nodeEntries[i].validatorPubKey.a); + expect(node.validatorLatest.pubKey.b).to.equal(nodeEntries[i].validatorPubKey.b); + expect(node.validatorLatest.pubKey.c).to.equal(nodeEntries[i].validatorPubKey.c); + expect(node.validatorLatest.proofOfPossession.a).to.equal(nodeEntries[i].validatorPoP.a); + expect(node.validatorLatest.proofOfPossession.b).to.equal(nodeEntries[i].validatorPoP.b); + + // 'Snapshot' is expected to have zero values. + expect(node.attesterSnapshot.active).to.equal(false); + expect(node.attesterSnapshot.removed).to.equal(false); + expect(node.attesterSnapshot.weight).to.equal(0); + expect(ethers.utils.arrayify(node.attesterSnapshot.pubKey.tag)).to.deep.equal(new Uint8Array(1)); + expect(ethers.utils.arrayify(node.attesterSnapshot.pubKey.x)).to.deep.equal(new Uint8Array(32)); + expect(node.validatorSnapshot.active).to.equal(false); + expect(node.validatorSnapshot.removed).to.equal(false); + expect(node.validatorSnapshot.weight).to.equal(0); + expect(ethers.utils.arrayify(node.validatorSnapshot.pubKey.a)).to.deep.equal(new Uint8Array(32)); + expect(ethers.utils.arrayify(node.validatorSnapshot.pubKey.b)).to.deep.equal(new Uint8Array(32)); + expect(ethers.utils.arrayify(node.validatorSnapshot.pubKey.c)).to.deep.equal(new Uint8Array(32)); + expect(ethers.utils.arrayify(node.validatorSnapshot.proofOfPossession.a)).to.deep.equal(new Uint8Array(32)); + expect(ethers.utils.arrayify(node.validatorSnapshot.proofOfPossession.b)).to.deep.equal(new Uint8Array(16)); + } + }); + + it("Should not allow nonOwner to add", async function () { + await expect( + registry + .connect(nonOwner) + .add( + ethers.Wallet.createRandom().address, + 0, + { a: new Uint8Array(32), b: new Uint8Array(32), c: new Uint8Array(32) }, + { a: new Uint8Array(32), b: new Uint8Array(16) }, + 0, + { tag: new Uint8Array(1), x: new Uint8Array(32) }, + { gasLimit } + ) + ).to.be.reverted; + }); + + it("Should allow owner to deactivate", async function () { + const nodeOwner = nodeEntries[0].ownerAddr; + expect((await registry.nodes(nodeOwner)).validatorLatest.active).to.equal(true); + + await (await registry.connect(owner).deactivate(nodeOwner, { gasLimit })).wait(); + expect((await registry.nodes(nodeOwner)).validatorLatest.active).to.equal(false); + + // Restore state. + await (await registry.connect(owner).activate(nodeOwner, { gasLimit })).wait(); + }); + + it("Should not allow nonOwner, nonNodeOwner to deactivate", async function () { + const nodeOwner = nodeEntries[0].ownerAddr; + await expect(registry.connect(nonOwner).deactivate(nodeOwner, { gasLimit })).to.be.reverted; + }); + + it("Should change validator weight", async function () { + const entry = nodeEntries[0]; + expect((await registry.nodes(entry.ownerAddr)).validatorLatest.weight).to.equal(entry.validatorWeight); + + const baseWeight = entry.validatorWeight; + const newWeight = getRandomNumber(100, 1000); + await (await registry.changeValidatorWeight(entry.ownerAddr, newWeight, { gasLimit })).wait(); + expect((await registry.nodes(entry.ownerAddr)).validatorLatest.weight).to.equal(newWeight); + expect((await registry.nodes(entry.ownerAddr)).attesterLatest.weight).to.equal(entry.attesterWeight); + + // Restore state. + await (await registry.changeValidatorWeight(entry.ownerAddr, baseWeight, { gasLimit })).wait(); + }); + + it("Should not allow nodeOwner to change validator weight", async function () { + const node = nodes[0]; + await expect(registry.connect(node.ownerKey).changeValidatorWeight(node.ownerKey.address, 0, { gasLimit })).to.be + .reverted; + }); + + it("Should not allow nonOwner to change validator weight", async function () { + const node = nodes[0]; + await expect(registry.connect(nonOwner).changeValidatorWeight(node.ownerKey.address, 0, { gasLimit })).to.be + .reverted; + }); + + it("Should change attester weight", async function () { + const entry = nodeEntries[0]; + expect((await registry.nodes(entry.ownerAddr)).attesterLatest.weight).to.equal(entry.attesterWeight); + + const baseWeight = entry.attesterWeight; + const newWeight = getRandomNumber(100, 1000); + await (await registry.changeAttesterWeight(entry.ownerAddr, newWeight, { gasLimit })).wait(); + expect((await registry.nodes(entry.ownerAddr)).attesterLatest.weight).to.equal(newWeight); + expect((await registry.nodes(entry.ownerAddr)).validatorLatest.weight).to.equal(entry.validatorWeight); + + // Restore state. + await (await registry.changeAttesterWeight(entry.ownerAddr, baseWeight, { gasLimit })).wait(); + }); + + it("Should not allow nodeOwner to change attester weight", async function () { + const node = nodes[0]; + await expect(registry.connect(node.ownerKey).changeAttesterWeight(node.ownerKey.address, 0, { gasLimit })).to.be + .reverted; + }); + + it("Should not allow nonOwner to change attester weight", async function () { + const node = nodes[0]; + await expect(registry.connect(nonOwner).changeAttesterWeight(node.ownerKey.address, 0, { gasLimit })).to.be + .reverted; + }); + + it("Should not allow to add a node with a validator public key which already exist", async function () { + const newEntry = makeRandomNodeEntry(makeRandomNode(), 0); + await expect( + registry.add( + newEntry.ownerAddr, + newEntry.validatorWeight, + nodeEntries[0].validatorPubKey, + newEntry.validatorPoP, + newEntry.attesterWeight, + newEntry.attesterPubKey, + { gasLimit } + ) + ).to.be.reverted; + }); + + it("Should not allow to add a node with an attester public key which already exist", async function () { + const newEntry = makeRandomNodeEntry(makeRandomNode(), 0); + await expect( + registry.add( + newEntry.ownerAddr, + newEntry.validatorWeight, + newEntry.validatorPubKey, + newEntry.validatorPoP, + newEntry.attesterWeight, + nodeEntries[0].attesterPubKey, + { gasLimit } + ) + ).to.be.reverted; + }); + + it("Should return attester committee once committed to", async function () { + // Verify that committee was not committed to. + expect((await registry.getAttesterCommittee()).length).to.equal(0); + + // Commit. + await (await registry.commitAttesterCommittee({ gasLimit })).wait(); + + // Read committee. + const attesterCommittee = await registry.getAttesterCommittee(); + expect(attesterCommittee.length).to.equal(nodes.length); + for (let i = 0; i < attesterCommittee.length; i++) { + const entry = nodeEntries[i]; + const attester = attesterCommittee[i]; + expect(attester.weight).to.equal(entry.attesterWeight); + expect(attester.pubKey.tag).to.equal(entry.attesterPubKey.tag); + expect(attester.pubKey.x).to.equal(entry.attesterPubKey.x); + } + }); + + it("Should return validator committee once committed to", async function () { + // Verify that committee was not committed to. + expect((await registry.getValidatorCommittee()).length).to.equal(0); + + // Commit. + await (await registry.commitValidatorCommittee({ gasLimit })).wait(); + + // Read committee. + const validatorCommittee = await registry.getValidatorCommittee(); + expect(validatorCommittee.length).to.equal(nodes.length); + for (let i = 0; i < validatorCommittee.length; i++) { + const entry = nodeEntries[i]; + const validator = validatorCommittee[i]; + expect(validator.weight).to.equal(entry.validatorWeight); + expect(validator.pubKey.a).to.equal(entry.validatorPubKey.a); + expect(validator.pubKey.b).to.equal(entry.validatorPubKey.b); + expect(validator.pubKey.c).to.equal(entry.validatorPubKey.c); + expect(validator.proofOfPossession.a).to.equal(entry.validatorPoP.a); + expect(validator.proofOfPossession.b).to.equal(entry.validatorPoP.b); + } + }); + + it("Should not include inactive nodes in attester and validator committees when committed to", async function () { + const idx = nodeEntries.length - 1; + const entry = nodeEntries[idx]; + + // Deactivate attribute. + await (await registry.deactivate(entry.ownerAddr, { gasLimit })).wait(); + + // Verify no change. + expect((await registry.getAttesterCommittee()).length).to.equal(nodes.length); + expect((await registry.getValidatorCommittee()).length).to.equal(nodes.length); + + // Commit attester committee and verify. + await (await registry.commitAttesterCommittee({ gasLimit })).wait(); + expect((await registry.getAttesterCommittee()).length).to.equal(nodes.length - 1); + expect((await registry.getValidatorCommittee()).length).to.equal(nodes.length); + + // Commit validator committee and verify. + await (await registry.commitValidatorCommittee({ gasLimit })).wait(); + expect((await registry.getAttesterCommittee()).length).to.equal(nodes.length - 1); + expect((await registry.getValidatorCommittee()).length).to.equal(nodes.length - 1); + + // Restore state. + await (await registry.activate(entry.ownerAddr, { gasLimit })).wait(); + await (await registry.commitAttesterCommittee({ gasLimit })).wait(); + await (await registry.commitValidatorCommittee({ gasLimit })).wait(); + }); + + it("Should not include removed nodes in attester and validator committees when committed to", async function () { + const idx = nodeEntries.length - 1; + const entry = nodeEntries[idx]; + + // Remove node. + await (await registry.remove(entry.ownerAddr, { gasLimit })).wait(); + + // Verify no change. + expect((await registry.getAttesterCommittee()).length).to.equal(nodes.length); + expect((await registry.getValidatorCommittee()).length).to.equal(nodes.length); + + // Commit attester committee and verify. + await (await registry.commitAttesterCommittee({ gasLimit })).wait(); + expect((await registry.getAttesterCommittee()).length).to.equal(nodes.length - 1); + expect((await registry.getValidatorCommittee()).length).to.equal(nodes.length); + + // Commit validator committee and verify. + await (await registry.commitValidatorCommittee({ gasLimit })).wait(); + expect((await registry.getAttesterCommittee()).length).to.equal(nodes.length - 1); + expect((await registry.getValidatorCommittee()).length).to.equal(nodes.length - 1); + + // Restore state. + await (await registry.remove(entry.ownerAddr, { gasLimit })).wait(); + await ( + await registry.add( + entry.ownerAddr, + entry.validatorWeight, + entry.validatorPubKey, + entry.validatorPoP, + entry.attesterWeight, + entry.attesterPubKey + ) + ).wait(); + await (await registry.commitAttesterCommittee({ gasLimit })).wait(); + await (await registry.commitValidatorCommittee({ gasLimit })).wait(); + }); + + it("Should not include node attribute change in attester committee before committed to", async function () { + const idx = nodeEntries.length - 1; + const entry = nodeEntries[idx]; + + // Change attribute. + await (await registry.changeAttesterWeight(entry.ownerAddr, entry.attesterWeight + 1, { gasLimit })).wait(); + + // Verify no change. + const attester = (await registry.getAttesterCommittee())[idx]; + expect(attester.weight).to.equal(entry.attesterWeight); + + // Commit. + await (await registry.commitAttesterCommittee({ gasLimit })).wait(); + + // Verify change. + const committedAttester = (await registry.getAttesterCommittee())[idx]; + expect(committedAttester.weight).to.equal(entry.attesterWeight + 1); + + // Restore state. + await (await registry.changeAttesterWeight(entry.ownerAddr, entry.attesterWeight, { gasLimit })).wait(); + await (await registry.commitAttesterCommittee({ gasLimit })).wait(); + }); + + it("Should not include node attribute change in validator committee before committed to", async function () { + const idx = nodeEntries.length - 1; + const entry = nodeEntries[idx]; + + // Change attribute. + await (await registry.changeValidatorWeight(entry.ownerAddr, entry.attesterWeight + 1, { gasLimit })).wait(); + + // Verify no change. + const validator = (await registry.getValidatorCommittee())[idx]; + expect(validator.weight).to.equal(entry.validatorWeight); + + // Commit. + await (await registry.commitValidatorCommittee({ gasLimit })).wait(); + + // Verify change. + const committedValidator = (await registry.getValidatorCommittee())[idx]; + expect(committedValidator.weight).to.equal(entry.validatorWeight + 1); + + // Restore state. + await (await registry.changeValidatorWeight(entry.ownerAddr, entry.validatorWeight, { gasLimit })).wait(); + await (await registry.commitValidatorCommittee({ gasLimit })).wait(); + }); + + it("Should finalize node removal by fully deleting it from storage", async function () { + const idx = nodeEntries.length - 1; + const entry = nodeEntries[idx]; + + // Remove. + expect((await registry.nodes(entry.ownerAddr)).attesterLatest.removed).to.equal(false); + expect((await registry.nodes(entry.ownerAddr)).validatorLatest.removed).to.equal(false); + await (await registry.remove(entry.ownerAddr, { gasLimit })).wait(); + expect((await registry.nodes(entry.ownerAddr)).attesterLatest.removed).to.equal(true); + expect((await registry.nodes(entry.ownerAddr)).validatorLatest.removed).to.equal(true); + + // Commit committees. + await (await registry.commitAttesterCommittee({ gasLimit })).wait(); + await (await registry.commitValidatorCommittee({ gasLimit })).wait(); + + // Verify node was not yet deleted. + expect(await registry.numNodes()).to.equal(nodes.length); + const attesterPubKeyHash = hashAttesterPubKey(entry.attesterPubKey); + expect(await registry.attesterPubKeyHashes(attesterPubKeyHash)).to.be.equal(true); + const validatorPubKeyHash = hashValidatorPubKey(entry.validatorPubKey); + expect(await registry.validatorPubKeyHashes(validatorPubKeyHash)).to.be.equal(true); + + // Trigger node deletion. + await (await registry.remove(entry.ownerAddr, { gasLimit })).wait(); + + // Verify the deletion. + expect(await registry.numNodes()).to.equal(nodes.length - 1); + expect(await registry.attesterPubKeyHashes(attesterPubKeyHash)).to.be.equal(false); + expect(await registry.validatorPubKeyHashes(attesterPubKeyHash)).to.be.equal(false); + const node = await registry.nodes(entry.ownerAddr, { gasLimit }); + expect(ethers.utils.arrayify(node.attesterLatest.pubKey.tag)).to.deep.equal(new Uint8Array(1)); + expect(ethers.utils.arrayify(node.attesterLatest.pubKey.x)).to.deep.equal(new Uint8Array(32)); + + // Restore state. + await ( + await registry.add( + entry.ownerAddr, + entry.validatorWeight, + entry.validatorPubKey, + entry.validatorPoP, + entry.attesterWeight, + entry.attesterPubKey + ) + ).wait(); + await (await registry.commitAttesterCommittee({ gasLimit })).wait(); + await (await registry.commitValidatorCommittee({ gasLimit })).wait(); + }); + + function makeRandomNode() { + return { + ownerKey: new Wallet(Wallet.createRandom().privateKey, provider), + validatorKey: Wallet.createRandom(), + attesterKey: Wallet.createRandom(), + }; + } + + function makeRandomNodeEntry(node, weight: number) { + return { + ownerAddr: node.ownerKey.address, + validatorWeight: weight, + validatorPubKey: getRandomValidatorPubKey(), + validatorPoP: getRandomValidatorPoP(), + attesterWeight: weight, + attesterPubKey: getRandomAttesterPubKey(), + }; + } +}); + +function getRandomNumber(min, max) { + return Math.floor(Math.random() * (max - min + 1)) + min; +} + +function getRandomValidatorPubKey() { + return { + a: ethers.utils.hexlify(ethers.utils.randomBytes(32)), + b: ethers.utils.hexlify(ethers.utils.randomBytes(32)), + c: ethers.utils.hexlify(ethers.utils.randomBytes(32)), + }; +} + +function getRandomValidatorPoP() { + return { + a: ethers.utils.hexlify(ethers.utils.randomBytes(32)), + b: ethers.utils.hexlify(ethers.utils.randomBytes(16)), + }; +} + +function getRandomAttesterPubKey() { + return { + tag: ethers.utils.hexlify(ethers.utils.randomBytes(1)), + x: ethers.utils.hexlify(ethers.utils.randomBytes(32)), + }; +} + +function hashAttesterPubKey(attesterPubKey) { + return ethers.utils.keccak256( + ethers.utils.defaultAbiCoder.encode(["bytes1", "bytes32"], [attesterPubKey.tag, attesterPubKey.x]) + ); +} + +function hashValidatorPubKey(validatorPubKey) { + return ethers.utils.keccak256( + ethers.utils.defaultAbiCoder.encode( + ["bytes32", "bytes32", "bytes32"], + [validatorPubKey.a, validatorPubKey.b, validatorPubKey.c] + ) + ); +} From 446d391d34bdb48255d5f8fef8a8248925fc98b9 Mon Sep 17 00:00:00 2001 From: Stanislav Bezkorovainyi Date: Wed, 21 Aug 2024 18:43:27 +0200 Subject: [PATCH 03/53] Add admin role to shared bridge (#727) --- .../contracts/bridge/L1SharedBridge.sol | 53 ++++++++++++++++++- .../bridge/interfaces/IL1SharedBridge.sol | 15 ++++++ .../L1SharedBridge/L1SharedBridgeAdmin.t.sol | 26 +++++++++ .../L1SharedBridge/L1SharedBridgeFails.t.sol | 6 +-- .../_L1SharedBridge_Shared.t.sol | 8 ++- 5 files changed, 103 insertions(+), 5 deletions(-) create mode 100644 l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeAdmin.t.sol diff --git a/l1-contracts/contracts/bridge/L1SharedBridge.sol b/l1-contracts/contracts/bridge/L1SharedBridge.sol index f74a771b0..42058fe33 100644 --- a/l1-contracts/contracts/bridge/L1SharedBridge.sol +++ b/l1-contracts/contracts/bridge/L1SharedBridge.sol @@ -89,6 +89,12 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Ownable2StepUpgrade /// NOTE: this function may be removed in the future, don't rely on it! mapping(uint256 chainId => mapping(address l1Token => uint256 balance)) public chainBalance; + /// @dev Admin has the ability to register new chains within the shared bridge. + address public admin; + + /// @dev The pending admin, i.e. the candidate to the admin role. + address public pendingAdmin; + /// @notice Checks that the message sender is the bridgehub. modifier onlyBridgehub() { require(msg.sender == address(BRIDGE_HUB), "ShB not BH"); @@ -116,6 +122,12 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Ownable2StepUpgrade _; } + /// @notice Checks that the message sender is either the owner or admin. + modifier onlyOwnerOrAdmin() { + require(msg.sender == owner() || msg.sender == admin, "ShB not owner or admin"); + _; + } + /// @dev Contract is expected to be used as proxy implementation. /// @dev Initialize the implementation to prevent Parity hack. constructor( @@ -139,6 +151,31 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Ownable2StepUpgrade _transferOwnership(_owner); } + /// @inheritdoc IL1SharedBridge + /// @dev Please note, if the owner wants to enforce the admin change it must execute both `setPendingAdmin` and + /// `acceptAdmin` atomically. Otherwise `admin` can set different pending admin and so fail to accept the admin rights. + function setPendingAdmin(address _newPendingAdmin) external onlyOwnerOrAdmin { + // Save previous value into the stack to put it into the event later + address oldPendingAdmin = pendingAdmin; + // Change pending admin + pendingAdmin = _newPendingAdmin; + emit NewPendingAdmin(oldPendingAdmin, _newPendingAdmin); + } + + /// @inheritdoc IL1SharedBridge + /// @notice Accepts transfer of admin rights. Only pending admin can accept the role. + function acceptAdmin() external { + address currentPendingAdmin = pendingAdmin; + require(msg.sender == currentPendingAdmin, "ShB not pending admin"); // Only proposed by current admin address can claim the admin rights + + address previousAdmin = admin; + admin = currentPendingAdmin; + delete pendingAdmin; + + emit NewPendingAdmin(currentPendingAdmin, address(0)); + emit NewAdmin(previousAdmin, currentPendingAdmin); + } + /// @dev This sets the first post diamond upgrade batch for era, used to check old eth withdrawals /// @param _eraPostDiamondUpgradeFirstBatch The first batch number on the zkSync Era Diamond Proxy that was settled after diamond proxy upgrade. function setEraPostDiamondUpgradeFirstBatch(uint256 _eraPostDiamondUpgradeFirstBatch) external onlyOwner { @@ -207,7 +244,21 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Ownable2StepUpgrade } /// @dev Initializes the l2Bridge address by governance for a specific chain. - function initializeChainGovernance(uint256 _chainId, address _l2BridgeAddress) external onlyOwner { + /// @param _chainId The chain ID for which the l2Bridge address is being initialized. + /// @param _l2BridgeAddress The address of the L2 bridge contract. + function initializeChainGovernance(uint256 _chainId, address _l2BridgeAddress) external onlyOwnerOrAdmin { + require(l2BridgeAddress[_chainId] == address(0), "ShB: l2 bridge already set"); + require(_l2BridgeAddress != address(0), "ShB: l2 bridge 0"); + l2BridgeAddress[_chainId] = _l2BridgeAddress; + } + + /// @dev Reinitializes the l2Bridge address by governance for a specific chain. + /// @dev Only accessible to the owner of the bridge to prevent malicious admin from changing the bridge address for + /// an existing chain. + /// @param _chainId The chain ID for which the l2Bridge address is being initialized. + /// @param _l2BridgeAddress The address of the L2 bridge contract. + function reinitializeChainGovernance(uint256 _chainId, address _l2BridgeAddress) external onlyOwner { + require(l2BridgeAddress[_chainId] != address(0), "ShB: l2 bridge not yet set"); l2BridgeAddress[_chainId] = _l2BridgeAddress; } diff --git a/l1-contracts/contracts/bridge/interfaces/IL1SharedBridge.sol b/l1-contracts/contracts/bridge/interfaces/IL1SharedBridge.sol index 45db2d02a..ef7e74165 100644 --- a/l1-contracts/contracts/bridge/interfaces/IL1SharedBridge.sol +++ b/l1-contracts/contracts/bridge/interfaces/IL1SharedBridge.sol @@ -10,6 +10,13 @@ import {IL1ERC20Bridge} from "./IL1ERC20Bridge.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev interface IL1SharedBridge { + /// @notice pendingAdmin is changed + /// @dev Also emitted when new admin is accepted and in this case, `newPendingAdmin` would be zero address + event NewPendingAdmin(address indexed oldPendingAdmin, address indexed newPendingAdmin); + + /// @notice Admin changed + event NewAdmin(address indexed oldAdmin, address indexed newAdmin); + event LegacyDepositInitiated( uint256 indexed chainId, bytes32 indexed l2DepositTxHash, @@ -151,4 +158,12 @@ interface IL1SharedBridge { function bridgehubConfirmL2Transaction(uint256 _chainId, bytes32 _txDataHash, bytes32 _txHash) external; function receiveEth(uint256 _chainId) external payable; + + /// @notice Starts the transfer of admin rights. Only the current admin can propose a new pending one. + /// @notice New admin can accept admin rights by calling `acceptAdmin` function. + /// @param _newPendingAdmin Address of the new admin + function setPendingAdmin(address _newPendingAdmin) external; + + /// @notice Accepts transfer of admin rights. Only pending admin can accept the role. + function acceptAdmin() external; } diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeAdmin.t.sol b/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeAdmin.t.sol new file mode 100644 index 000000000..af97e3ed2 --- /dev/null +++ b/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeAdmin.t.sol @@ -0,0 +1,26 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.8.24; + +import {L1SharedBridgeTest} from "./_L1SharedBridge_Shared.t.sol"; + +/// We are testing all the specified revert and require cases. +contract L1SharedBridgeAdminTest is L1SharedBridgeTest { + uint256 internal randomChainId = 123456; + + function testAdminCanInitializeChainGovernance() public { + address randomL2Bridge = makeAddr("randomL2Bridge"); + + vm.prank(admin); + sharedBridge.initializeChainGovernance(randomChainId, randomL2Bridge); + + assertEq(sharedBridge.l2BridgeAddress(randomChainId), randomL2Bridge); + } + + function testAdminCanNotReinitializeChainGovernance() public { + address randomNewBridge = makeAddr("randomNewBridge"); + + vm.expectRevert("Ownable: caller is not the owner"); + vm.prank(admin); + sharedBridge.reinitializeChainGovernance(randomChainId, randomNewBridge); + } +} diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol b/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol index 15ef94080..97bbe2ec2 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol @@ -21,7 +21,7 @@ contract L1SharedBridgeFailTest is L1SharedBridgeTest { vm.expectRevert("ShB owner 0"); new TransparentUpgradeableProxy( address(sharedBridgeImpl), - admin, + proxyAdmin, // solhint-disable-next-line func-named-parameters abi.encodeWithSelector(L1SharedBridge.initialize.selector, address(0), eraPostUpgradeFirstBatch) ); @@ -59,7 +59,7 @@ contract L1SharedBridgeFailTest is L1SharedBridgeTest { function test_bridgehubDeposit_Eth_l2BridgeNotDeployed() public { vm.prank(owner); - sharedBridge.initializeChainGovernance(chainId, address(0)); + sharedBridge.reinitializeChainGovernance(chainId, address(0)); vm.deal(bridgehubAddress, amount); vm.prank(bridgehubAddress); vm.mockCall( @@ -551,7 +551,7 @@ contract L1SharedBridgeFailTest is L1SharedBridgeTest { address refundRecipient = address(0); vm.prank(owner); - sharedBridge.initializeChainGovernance(eraChainId, address(0)); + sharedBridge.reinitializeChainGovernance(eraChainId, address(0)); vm.expectRevert("ShB b. n dep"); vm.prank(l1ERC20BridgeAddress); diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol b/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol index cad8482fb..4554e4a36 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol @@ -69,6 +69,7 @@ contract L1SharedBridgeTest is Test { address owner; address admin; + address proxyAdmin; address zkSync; address alice; address bob; @@ -90,6 +91,7 @@ contract L1SharedBridgeTest is Test { function setUp() public { owner = makeAddr("owner"); admin = makeAddr("admin"); + proxyAdmin = makeAddr("proxyAdmin"); // zkSync = makeAddr("zkSync"); bridgehubAddress = makeAddr("bridgehub"); alice = makeAddr("alice"); @@ -119,7 +121,7 @@ contract L1SharedBridgeTest is Test { }); TransparentUpgradeableProxy sharedBridgeProxy = new TransparentUpgradeableProxy( address(sharedBridgeImpl), - admin, + proxyAdmin, abi.encodeWithSelector(L1SharedBridge.initialize.selector, owner) ); sharedBridge = L1SharedBridge(payable(sharedBridgeProxy)); @@ -135,6 +137,10 @@ contract L1SharedBridgeTest is Test { sharedBridge.initializeChainGovernance(chainId, l2SharedBridge); vm.prank(owner); sharedBridge.initializeChainGovernance(eraChainId, l2SharedBridge); + vm.prank(owner); + sharedBridge.setPendingAdmin(admin); + vm.prank(admin); + sharedBridge.acceptAdmin(); } function _setSharedBridgeDepositHappened(uint256 _chainId, bytes32 _txHash, bytes32 _txDataHash) internal { From 8d9240f54e29fe6e842f2bcb63f9159f00686e54 Mon Sep 17 00:00:00 2001 From: Dima Zhornyk <55756184+dimazhornyk@users.noreply.github.com> Date: Wed, 28 Aug 2024 12:31:09 +0200 Subject: [PATCH 04/53] feat: add a script to prepare chain registration calldata (#671) --- .gitignore | 1 + .../config-prepare-registration-calldata.toml | 12 + .../PrepareZKChainRegistrationCalldata.s.sol | 366 ++++++++++++++++++ .../script-config/artifacts/BeaconProxy.json | 81 ++++ .../artifacts/L2SharedBridge.json | 262 +++++++++++++ .../TransparentUpgradeableProxy.json | 86 ++++ 6 files changed, 808 insertions(+) create mode 100644 l1-contracts/deploy-script-config-template/config-prepare-registration-calldata.toml create mode 100644 l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol create mode 100644 l1-contracts/script-config/artifacts/BeaconProxy.json create mode 100644 l1-contracts/script-config/artifacts/L2SharedBridge.json create mode 100644 l1-contracts/script-config/artifacts/TransparentUpgradeableProxy.json diff --git a/.gitignore b/.gitignore index 1897dead9..21c173828 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ l1-contracts/coverage/* l1-contracts/out/* l1-contracts/broadcast/* l1-contracts/script-config/* +!l1-contracts/script-config/artifacts l1-contracts/script-out/* !l1-contracts/script-out/.gitkeep *.timestamp diff --git a/l1-contracts/deploy-script-config-template/config-prepare-registration-calldata.toml b/l1-contracts/deploy-script-config-template/config-prepare-registration-calldata.toml new file mode 100644 index 000000000..99ff2e7ce --- /dev/null +++ b/l1-contracts/deploy-script-config-template/config-prepare-registration-calldata.toml @@ -0,0 +1,12 @@ +[deployed_addresses] +state_transition_proxy_addr = "0x635853efd1d388f597feb9fe06e666efda397911" +erc20_bridge_proxy_addr = "0x147CDc5DD347bA141545Ad08fce748484Ed7fDbA" + + +[chain] +chain_id = 123 +era_chain_id = 9 +admin = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" +diamond_cut_data = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000cf3cd7fa8948f7748d20f7f33e85a0320b6c5d4d0000000000000000000000000000000000000000000000000000000000000c400000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000a200000000000000000000000003fe9b8f276c1a2e26d2190f2d9fd1897a04eb90a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf50000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db865000000000000000000000000000000000000000000000000000000000000000000000000000000000e70df06c0938e724ce23e49b3c4f01abed6bbfc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002906d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005518c73b0000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da0000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000000000000000000000000000006e2e077311fb218b80404298c9a227c42b792b610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008042901c70000000000000000000000000000000000000000000000000000000012f43dab00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000c924de3500000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000000000000000000000000000a226529de193f2153b25d7d9ad774689b78c301e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000080f23da4300000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006edd4f12000000000000000000000000000000000000000000000000000000006f497ac600000000000000000000000000000000000000000000000000000000701f58c5000000000000000000000000000000000000000000000000000000007f61885c0000000000000000000000000000000000000000000000000000000097c09d3400000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c00000000000000000000000007bd175a72991f0a30ed333eaf1cb215c42e7492c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e3200000000000000000000000000000000000000000000000000000000044aa200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000baa109e4e90cc08a3c5069a0173aace4e934d57e" +bridgehub_create_new_chain_salt = 0 +base_token_addr = "0x0000000000000000000000000000000000000001" diff --git a/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol new file mode 100644 index 000000000..3810805c8 --- /dev/null +++ b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol @@ -0,0 +1,366 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.8.24; + +// solhint-disable no-console + +import {Script, console2 as console} from "forge-std/Script.sol"; +import {stdToml} from "forge-std/StdToml.sol"; + +import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; +import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; +import {L2ContractHelper} from "contracts/common/libraries/L2ContractHelper.sol"; +import {AddressAliasHelper} from "contracts/vendor/AddressAliasHelper.sol"; +import {L1SharedBridge} from "contracts/bridge/L1SharedBridge.sol"; +import {IStateTransitionManager} from "contracts/state-transition/IStateTransitionManager.sol"; +import {IGovernance} from "contracts/governance/IGovernance.sol"; +import {IERC20} from "forge-std/interfaces/IERC20.sol"; +import {Utils} from "./Utils.sol"; + +/** + * @title Prepare ZKChain Registration Calldata + * @dev Script to prepare calldata for registering a new ZKChain on the bridgehub + * + * This script prepares calldata for registering a new ZKChain on the bridgehub + * That includes 3 steps: + * 1. Register base token on the bridgehub + * 2. Register the new ZKChain on the bridgehub + * 3. Initialize the L2 bridge on the L1 shared bridge + * + * The script precomputes the address of the L2 bridge to generate the calldata for the third step. + * It assumes that L1 governance is the owner of the L2 bridge and the L2 bridge is deployed by the msg.sender of the script. + * + * The script reads the configuration from a TOML file `script-config/prepare-registration-calldata.toml` + * and writes the output to a TOML file `script-out/output-prepare-registration-calldata.toml`. + * + * The output contains 4 fields: + * - scheduleCalldataStageOne: calldata for scheduling the first stage + * - executeCalldataStageOne: calldata for executing the first stage + * - scheduleCalldataStageTwo: calldata for scheduling the second stage + * - executeCalldataStageTwo: calldata for executing the second stage + * (stage 2 of the execution is the registration of the L2 bridge on the L1 shared bridge) + * + * The separation is required to ensure that there is no period of time where the L2 bridge is registered, so users + * can send their funds there, but they will be burned in case L2 bridge is not initialized by the chain operator. + * It is meant to be executed only after the L2 bridge is deployed. + * + * How to use: + * 1. Create a TOML file `script-config/prepare-registration-calldata.toml`, reference config at `deploy-script-config-template/config-prepare-registration-calldata.toml`. + * 2. Run the script impersonating the address that will deploy the L2 bridge, `forge script --rpc-url $RPC --sender $DEPLOYER PrepareZKChainRegistrationCalldata.s.sol` + * 3. Run the `scheduleCalldataStageOne` and `executeCalldataStageOne` on the L1 chain using governance. + * 4. Deploy the L2 bridge using the address from step 2. This address doesn't need any special permissions, just has to be consistent across all the stages. + * 5. Run the `scheduleCalldataStageTwo` and `executeCalldataStageTwo` on the L1 chain using governance. + * + */ +contract PrepareZKChainRegistrationCalldataScript is Script { + using stdToml for string; + + address internal constant ADDRESS_ONE = 0x0000000000000000000000000000000000000001; + + struct Config { + // Admin of the yet-to-be-registered chain (L1-based address) + address chainAdmin; + // STM proxy address + address stateTransitionProxy; + // Chain ID of the new chain + uint256 chainId; + // Chain ID of the era (required for the L2 bridge deployment) + uint256 eraChainId; + // Salt for createNewChain call, also used as a governance operation salt + uint256 bridgehubCreateNewChainSalt; + // Address of the new chain's base token + address baseToken; + // Diamond cut data is a "configuration" for the Diamond proxy that will be created for a new chain. + // It can only be the one that's allowed by the STM. It can be generated by the other scripts or taken from the + // `etc/env/ecosystems/ENV.yaml` file in `zksync-era` repository + bytes diamondCutData; + // Address of the L1 ERC20 bridge proxy (required for the L2 bridge deployment) + address erc20BridgeProxy; + } + + // Addresses of the contracts in the L1 ecosystem that are fetched from the chain + struct EcosystemContracts { + // Address of the L1 shared bridge proxy + address l1SharedBridgeProxy; + // Bridgehub proxy address + address bridgehub; + // Address of the governance contract for the L1 ecosystem + address governance; + } + + struct ContractsBytecodes { + // Default bytecode of the ERC-20 on L2 (BeaconProxy) + bytes beaconProxy; + // Bytecode of the L2 shared bridge + bytes l2SharedBridgeBytecode; + // Bytecode of the L2 shared bridge proxy (TransparentUpgradeableProxy) + bytes l2SharedBridgeProxyBytecode; + } + + Config internal config; + EcosystemContracts internal ecosystem; + ContractsBytecodes internal bytecodes; + + function run() public { + console.log("Preparing ZK chain registration calldata"); + + initializeConfig(); + + checkBaseTokenAddress(); + + IGovernance.Call[] memory calls; + uint256 cnt = 0; + if (!IBridgehub(ecosystem.bridgehub).tokenIsRegistered(config.baseToken)) { + calls = new IGovernance.Call[](2); + console.log("Adding a call to register base token on the bridgehub"); + IGovernance.Call memory baseTokenRegistrationCall = prepareRegisterBaseTokenCall(); + calls[cnt] = baseTokenRegistrationCall; + ++cnt; + } else { + calls = new IGovernance.Call[](1); + } + + IGovernance.Call memory registerChainCall = prepareRegisterHyperchainCall(); + calls[cnt] = registerChainCall; + ++cnt; + + address l2SharedBridgeProxy = computeL2BridgeAddress(); + IGovernance.Call memory initChainCall = prepareInitializeChainGovernanceCall(l2SharedBridgeProxy); + + scheduleTransparentCalldata(calls, initChainCall); + } + + function initializeConfig() internal { + // Grab config from output of l1 deployment + string memory root = vm.projectRoot(); + string memory path = string.concat(root, "/script-config/prepare-registration-calldata.toml"); + console.log("Reading a config from", path); + string memory toml = vm.readFile(path); + + // Config file must be parsed key by key, otherwise values returned + // are parsed alphabetically and not by key. + // https://book.getfoundry.sh/cheatcodes/parse-toml + config.stateTransitionProxy = toml.readAddress("$.deployed_addresses.state_transition_proxy_addr"); + config.erc20BridgeProxy = toml.readAddress("$.deployed_addresses.erc20_bridge_proxy_addr"); + + ecosystem.bridgehub = IStateTransitionManager(config.stateTransitionProxy).BRIDGE_HUB(); + ecosystem.l1SharedBridgeProxy = address(Bridgehub(ecosystem.bridgehub).sharedBridge()); + ecosystem.governance = Bridgehub(ecosystem.bridgehub).owner(); + + config.chainId = toml.readUint("$.chain.chain_id"); + config.eraChainId = toml.readUint("$.chain.era_chain_id"); + config.chainAdmin = toml.readAddress("$.chain.admin"); + config.diamondCutData = toml.readBytes("$.chain.diamond_cut_data"); + config.bridgehubCreateNewChainSalt = toml.readUint("$.chain.bridgehub_create_new_chain_salt"); + config.baseToken = toml.readAddress("$.chain.base_token_addr"); + + bytecodes.l2SharedBridgeBytecode = Utils.readHardhatBytecode("/script-config/artifacts/L2SharedBridge.json"); + bytecodes.beaconProxy = Utils.readHardhatBytecode("/script-config/artifacts/BeaconProxy.json"); + bytecodes.l2SharedBridgeProxyBytecode = Utils.readHardhatBytecode( + "/script-config/artifacts/TransparentUpgradeableProxy.json" + ); + } + + function checkBaseTokenAddress() internal view { + if (config.baseToken == address(0)) { + revert("Base token address is not set"); + } + + // Check if it's ethereum address + if (config.baseToken == ADDRESS_ONE) { + return; + } + + // Does not prevent registering a non-ERC-20 contract as a token + // But calling the ERC-20 methods here on non-ERC-20 will fail without a readable revert message + if (config.baseToken.code.length == 0) { + revert("Token address is an EOA"); + } + + console.log("Using base token address:", config.baseToken); + } + + function prepareRegisterBaseTokenCall() internal view returns (IGovernance.Call memory) { + Bridgehub bridgehub = Bridgehub(ecosystem.bridgehub); + + bytes memory data = abi.encodeCall(bridgehub.addToken, (config.baseToken)); + + return IGovernance.Call({target: ecosystem.bridgehub, value: 0, data: data}); + } + + // @dev Computes the address of the L2 bridge and the L2 bridge proxy + // The variables that are used to compute the address are: + // - Salt + // - L2 bridge impl bytecode hash + // - Era chain ID + // - Beacon proxy bytecode hash + // - L1 governance address(owner of the L2 bridge) + // - L1 ERC20 bridge proxy address + // - Default ERC20 proxy address + // - Deployer's address + function computeL2BridgeAddress() internal view returns (address) { + bytes32 salt = ""; + bytes32 bridgeBytecodeHash = L2ContractHelper.hashL2Bytecode(bytecodes.l2SharedBridgeBytecode); + bytes memory bridgeConstructorData = abi.encode(config.eraChainId); + + address deployer; + address l2GovernanceAddress; + + // ZKsync's protocol design assumes that the addresses of all the smart contracts that are sending L1->L2 + // messages are aliased. We have to check if the sender is an EOA and apply the alias if it is not. + if (isEOA(msg.sender)) { + deployer = msg.sender; + } else { + deployer = AddressAliasHelper.applyL1ToL2Alias(msg.sender); + } + + // If the governance address is an EOA, we use it directly, otherwise we apply the alias. On the Mainnet/Testnet + // the governance address is a smart contract, but in case someone uses the script with different envs, we have + // to check if the address is an EOA. + if (isEOA(ecosystem.governance)) { + l2GovernanceAddress = ecosystem.governance; + } else { + l2GovernanceAddress = AddressAliasHelper.applyL1ToL2Alias(ecosystem.governance); + } + + address implContractAddress = L2ContractHelper.computeCreate2Address( + deployer, + salt, + bridgeBytecodeHash, + keccak256(bridgeConstructorData) + ); + + console.log("Computed L2 bridge impl address:", implContractAddress); + console.log("Bridge bytecode hash:"); + console.logBytes32(bridgeBytecodeHash); + console.log("Bridge constructor data:"); + console.logBytes(bridgeConstructorData); + console.log("Deployer:", deployer); + + bytes32 l2StandardErc20BytecodeHash = L2ContractHelper.hashL2Bytecode(bytecodes.beaconProxy); + + // solhint-disable-next-line func-named-parameters + bytes memory proxyInitializationParams = abi.encodeWithSignature( + "initialize(address,address,bytes32,address)", + ecosystem.l1SharedBridgeProxy, + config.erc20BridgeProxy, + l2StandardErc20BytecodeHash, + l2GovernanceAddress + ); + + bytes memory l2SharedBridgeProxyConstructorData = abi.encode( + implContractAddress, + l2GovernanceAddress, + proxyInitializationParams + ); + + address proxyContractAddress = L2ContractHelper.computeCreate2Address( + deployer, + salt, + L2ContractHelper.hashL2Bytecode(bytecodes.l2SharedBridgeProxyBytecode), + keccak256(l2SharedBridgeProxyConstructorData) + ); + + console.log("Computed L2 bridge proxy address:", proxyContractAddress); + console.log("L1 shared bridge proxy:", ecosystem.l1SharedBridgeProxy); + console.log("L1 ERC20 bridge proxy:", config.erc20BridgeProxy); + console.log("L2 governor addr:", l2GovernanceAddress); + + return proxyContractAddress; + } + + function prepareRegisterHyperchainCall() internal view returns (IGovernance.Call memory) { + Bridgehub bridgehub = Bridgehub(ecosystem.bridgehub); + + bytes memory data = abi.encodeCall( + bridgehub.createNewChain, + ( + config.chainId, + config.stateTransitionProxy, + config.baseToken, + config.bridgehubCreateNewChainSalt, + config.chainAdmin, + config.diamondCutData + ) + ); + + return IGovernance.Call({target: ecosystem.bridgehub, value: 0, data: data}); + } + + function prepareInitializeChainGovernanceCall( + address l2SharedBridgeProxy + ) internal view returns (IGovernance.Call memory) { + L1SharedBridge bridge = L1SharedBridge(ecosystem.l1SharedBridgeProxy); + + bytes memory data = abi.encodeCall(bridge.initializeChainGovernance, (config.chainId, l2SharedBridgeProxy)); + + return IGovernance.Call({target: ecosystem.l1SharedBridgeProxy, value: 0, data: data}); + } + + // @dev Prepares a call to schedule a transparent operation on the governance contract + // `calls` is an array of calls that will be executed in the first stage (add a token to BH, create a new chain) + // `initChainGovCall` is a call that will be executed in the second stage (register the L2 bridge on the L1 shared bridge) + function scheduleTransparentCalldata( + IGovernance.Call[] memory calls, + IGovernance.Call memory initChainGovCall + ) internal { + IGovernance governance = IGovernance(ecosystem.governance); + + IGovernance.Operation memory operation = IGovernance.Operation({ + calls: calls, + predecessor: bytes32(0), + salt: bytes32(config.bridgehubCreateNewChainSalt) + }); + + bytes memory scheduleCalldata = abi.encodeCall(governance.scheduleTransparent, (operation, 0)); + bytes memory executeCalldata = abi.encodeCall(governance.execute, (operation)); + + IGovernance.Call[] memory initChainGovArray = new IGovernance.Call[](1); + initChainGovArray[0] = initChainGovCall; + + IGovernance.Operation memory operation2 = IGovernance.Operation({ + calls: initChainGovArray, + predecessor: bytes32(0), + salt: bytes32(config.bridgehubCreateNewChainSalt) + }); + + bytes memory scheduleCalldata2 = abi.encodeCall(governance.scheduleTransparent, (operation2, 0)); + bytes memory executeCalldata2 = abi.encodeCall(governance.execute, (operation2)); + + saveOutput(scheduleCalldata, executeCalldata, scheduleCalldata2, executeCalldata2); + } + + // Writes the output to a TOML file `script-out/output-prepare-registration-calldata.toml + // For the detailed explanation of the output - look into the contract description + function saveOutput( + bytes memory schedule, + bytes memory execute, + bytes memory schedule2, + bytes memory execute2 + ) internal { + vm.serializeBytes("root", "scheduleCalldataStageOne", schedule); + vm.serializeBytes("root", "executeCalldataStageOne", execute); + vm.serializeBytes("root", "scheduleCalldataStageTwo", schedule2); + string memory toml = vm.serializeBytes("root", "executeCalldataStageTwo", execute2); + + string memory root = vm.projectRoot(); + string memory path = string.concat(root, "/script-out/output-prepare-registration-calldata.toml"); + + console.log("Writing the output to", path); + vm.writeToml(toml, path); + } + + function isEOA(address _addr) private view returns (bool) { + uint32 size; + assembly { + size := extcodesize(_addr) + } + + return (size == 0); + } +} + +// Done by the chain admin separately from this script: +// - add validators +// - deploy L2 contracts +// - set pubdata sending mode +// - set base token gas price multiplier diff --git a/l1-contracts/script-config/artifacts/BeaconProxy.json b/l1-contracts/script-config/artifacts/BeaconProxy.json new file mode 100644 index 000000000..258780377 --- /dev/null +++ b/l1-contracts/script-config/artifacts/BeaconProxy.json @@ -0,0 +1,81 @@ +{ + "_format": "hh-zksolc-artifact-1", + "contractName": "BeaconProxy", + "sourceName": "@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol", + "abi": [ + { + "inputs": [ + { + "internalType": "address", + "name": "beacon", + "type": "address" + }, + { + "internalType": "bytes", + "name": "data", + "type": "bytes" + } + ], + "stateMutability": "payable", + "type": "constructor" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "previousAdmin", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "newAdmin", + "type": "address" + } + ], + "name": "AdminChanged", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "beacon", + "type": "address" + } + ], + "name": "BeaconUpgraded", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "implementation", + "type": "address" + } + ], + "name": "Upgraded", + "type": "event" + }, + { + "stateMutability": "payable", + "type": "fallback" + }, + { + "stateMutability": "payable", + "type": "receive" + } + ], + "bytecode": "0x0004000000000002000700000000000200000000030100190000006003300270000001020030019d0000010203300197000300000031035500020000000103550000008008000039000000400080043f00000001022001900000001c0000c13d000000000131034f0000010d02000041000000000202041a0000010b04000041000000800040043f00000106022001970000000004000414000000000303004b000000250000c13d000000040320008c000000ab0000c13d0000000103000031000000200230008c00000000040300190000002004008039000000d60000013d0000010302300041000001040220009c0000002c0000213d0000011d0100004100000000001004350000004101000039000000040010043f0000011e010000410000040400010430000000040320008c000001160000c13d0000000103000031000000200230008c00000000040300190000002004008039000001410000013d0000009f023000390000010502200197000000400020043f0000001f0230018f00000005043002720000003b0000613d00000000050000190000000506500210000000000761034f000000000707043b000000800660003900000000007604350000000105500039000000000645004b000000330000413d000000000502004b0000004a0000613d0000000504400210000000000141034f00000003022002100000008004400039000000000504043300000000052501cf000000000525022f000000000101043b0000010002200089000000000121022f00000000012101cf000000000151019f00000000001404350000003f0130008c0000014a0000a13d000000800a00043d0000010601a0009c0000014a0000213d000000a00200043d000001070120009c0000014a0000213d0000001f012000390000010804000041000000000531004b000000000500001900000000050480190000010801100197000000000601004b0000000004008019000001080110009c000000000405c019000000000104004b0000014a0000c13d00000080012000390000000001010433000001070410009c0000001f0000213d0000003f04100039000000200700008a000000000474016f000000400900043d0000000004490019000000000594004b00000000050000190000000105004039000001070640009c0000001f0000213d00000001055001900000001f0000c13d0000008003300039000000400040043f0000000006190436000000a0022000390000000004210019000000000334004b0000014a0000213d000600000009001d000500000007001d000400000008001d000000000301004b000000820000613d000000000300001900000000046300190000000005230019000000000505043300000000005404350000002003300039000000000413004b0000007b0000413d000300000006001d000000000116001900000000000104350000010901000041000000000010043900070000000a001d0000000400a0044300000102010000410000000002000414000001020320009c0000000002018019000000c0012002100000010a011001c70000800202000039040203f80000040f0000000102200190000003db0000613d000000400a00043d000000000101043b000000000101004b000002200000c13d0000006401a000390000011b0200004100000000002104350000004401a000390000011c0200004100000000002104350000002401a0003900000025020000390000000000210435000001150100004100000000001a04350000000401a000390000002002000039000000000021043500000102010000410000010202a0009c000000000a0180190000004001a002100000011a011001c700000404000104300000010201000041000001020340009c0000000004018019000000c0014002100000011f011001c7040203f80000040f000000000301001900000060033002700000010203300197000000200430008c000000000403001900000020040080390000001f0540018f0000000506400272000000c30000613d00000000070000190000000508700210000000000981034f000000000909043b000000800880003900000000009804350000000107700039000000000867004b000000bb0000413d000000000705004b000000d20000613d0000000506600210000000000761034f00000003055002100000008006600039000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f000300000001035500000001022001900000014c0000613d0000009f02400039000000e00220018f000000400020043f000000200230008c0000014a0000413d000000800200043d000001060420009c0000014a0000213d000000020500036700000000040000310000001f0740018f0000000506400272000000eb0000613d00000000080000190000000509800210000000000a95034f000000000a0a043b0000000000a904350000000108800039000000000968004b000000e40000413d000000000807004b000000f90000613d00000003077002100000000506600210000000000806043300000000087801cf000000000878022f000000000565034f000000000505043b0000010007700089000000000575022f00000000057501cf000000000585019f00000000005604350000000005000414000000040620008c000001c40000c13d0000001f0430018f0000000502300272000001070000613d00000000050000190000000506500210000000000761034f000000000707043b00000000007604350000000105500039000000000625004b000001000000413d000000000504004b000001ed0000613d00000003044002100000000502200210000000000502043300000000054501cf000000000545022f000000000121034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000151019f0000000000120435000001ed0000013d0000010201000041000001020340009c0000000004018019000000c0014002100000011f011001c7040203f80000040f000000000301001900000060033002700000010203300197000000200430008c000000000403001900000020040080390000001f0540018f00000005064002720000012e0000613d00000000070000190000000508700210000000000981034f000000000909043b000000800880003900000000009804350000000107700039000000000867004b000001260000413d000000000705004b0000013d0000613d0000000506600210000000000761034f00000003055002100000008006600039000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f00030000000103550000000102200190000001690000613d0000001f02400039000000600220018f00000080022001bf000000400020043f000000200230008c0000014a0000413d000000800200043d000001060420009c0000018c0000a13d00000000010000190000040400010430000000400200043d0000001f0430018f0000000505300272000001590000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000001510000413d000000000604004b000001680000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001850000013d000000400200043d0000001f0430018f0000000505300272000001760000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b0000016e0000413d000000000604004b000001850000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f00000000001504350000010201000041000001020420009c000000000201801900000040012002100000006002300210000000000121019f0000040400010430000000020500036700000000040000310000001f0740018f0000000506400272000001990000613d00000000080000190000000509800210000000000a95034f000000000a0a043b0000000000a904350000000108800039000000000968004b000001920000413d000000000807004b000001a70000613d00000003077002100000000506600210000000000806043300000000087801cf000000000878022f000000000565034f000000000505043b0000010007700089000000000575022f00000000057501cf000000000585019f00000000005604350000000005000414000000040620008c000001ee0000c13d0000001f0430018f0000000502300272000001b50000613d00000000050000190000000506500210000000000761034f000000000707043b00000000007604350000000105500039000000000625004b000001ae0000413d000000000504004b000002170000613d00000003044002100000000502200210000000000502043300000000054501cf000000000545022f000000000121034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000151019f0000000000120435000002170000013d0000010201000041000001020350009c0000000005018019000001020340009c00000000040180190000006001400210000000c003500210000000000113019f040203fd0000040f0003000000010355000000000301001900000060033002700000001f0430018f000101020030019d00000102033001970000000505300272000001dd0000613d00000000060000190000000507600210000000000871034f000000000808043b00000000008704350000000106600039000000000756004b000001d60000413d000000000604004b000001eb0000613d00000003044002100000000505500210000000000605043300000000064601cf000000000646022f000000000151034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f000000000015043500000001012001900000021c0000613d000002170000013d0000010201000041000001020350009c0000000005018019000001020340009c00000000040180190000006001400210000000c003500210000000000113019f040203fd0000040f0003000000010355000000000301001900000060033002700000001f0430018f000101020030019d00000102033001970000000505300272000002070000613d00000000060000190000000507600210000000000871034f000000000808043b00000000008704350000000106600039000000000756004b000002000000413d000000000604004b000002150000613d00000003044002100000000505500210000000000605043300000000064601cf000000000646022f000000000151034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f000000000015043500000001012001900000021e0000613d0000010201000041000001020230009c00000000030180190000006001300210000004030001042e00000060013002100000040400010430000000600130021000000404000104300000010b0100004100000000001a0435000000000100041400000007020000290000010602200197000000040320008c000700000002001d0000022d0000c13d0000000103000031000000200130008c000000000403001900000020040080390000025e0000013d0000010204000041000001020310009c00000000010480190000010203a0009c00000000040a40190000004003400210000000c001100210000000000131019f0000010c011001c700020000000a001d040203f80000040f000000020a000029000000000301001900000060033002700000010203300197000000200430008c000000000403001900000020040080390000001f0540018f00000005064002720000024b0000613d0000000007000019000000050870021000000000098a0019000000000881034f000000000808043b00000000008904350000000107700039000000000867004b000002430000413d000000000705004b0000025a0000613d0000000506600210000000000761034f00000000066a00190000000305500210000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f00030000000103550000000102200190000002950000613d0000001f01400039000000600210018f0000000001a20019000000000221004b00000000020000190000000102004039000001070410009c0000001f0000213d00000001022001900000001f0000c13d000000400010043f000000200130008c0000014a0000413d00000000010a0433000001060210009c0000014a0000213d00000109020000410000000000200439000000040010044300000102010000410000000002000414000001020320009c0000000002018019000000c0012002100000010a011001c70000800202000039040203f80000040f0000000102200190000003db0000613d000000400200043d000200000002001d000000000101043b000000000101004b000002b20000c13d0000000203000029000000640130003900000118020000410000000000210435000000440130003900000119020000410000000000210435000000240130003900000030020000390000000000210435000001150100004100000000001304350000000401300039000000200200003900000000002104350000010201000041000001020230009c000000000301801900000040013002100000011a011001c70000040400010430000000400200043d0000001f0430018f0000000505300272000002a20000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b0000029a0000413d000000000604004b000001850000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001850000013d0000010d01000041000000000201041a0000010e022001970000000705000029000000000252019f000000000021041b00000102010000410000000002000414000001020320009c0000000002018019000000c0012002100000010f011001c70000800d0200003900000002030000390000011004000041040203f30000040f000000010120019000000006010000290000014a0000613d0000000001010433000000000101004b000002cd0000c13d0000002001000039000001000010044300000120000004430000011701000041000004030001042e0000010b010000410000000202000029000000000012043500000000010004140000000702000029000000040220008c000002d90000c13d0000000103000031000000200130008c000000000403001900000020040080390000030b0000013d0000010202000041000001020310009c00000000010280190000000204000029000001020340009c00000000020440190000004002200210000000c001100210000000000121019f0000010c011001c70000000702000029040203f80000040f000000020a000029000000000301001900000060033002700000010203300197000000200430008c000000000403001900000020040080390000001f0540018f0000000506400272000002f80000613d0000000007000019000000050870021000000000098a0019000000000881034f000000000808043b00000000008904350000000107700039000000000867004b000002f00000413d000000000705004b000003070000613d0000000506600210000000000761034f00000002066000290000000305500210000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f00030000000103550000000102200190000003380000613d0000001f01400039000000600110018f0000000202100029000000000112004b00000000010000190000000101004039000700000002001d000001070220009c00000006040000290000001f0000213d00000001011001900000001f0000c13d0000000701000029000000400010043f000000200130008c0000014a0000413d00000002010000290000000001010433000200000001001d000001060110009c0000014a0000213d0000000701000029000001110110009c0000001f0000213d00000007050000290000006001500039000000400010043f000000400150003900000112020000410000000000210435000000270100003900000000021504360000011301000041000100000002001d0000000000120435000000000204043300000000010004140000000204000029000000040440008c000003550000c13d0000000102000039000001070130009c00000005050000290000001f0000213d0000036d0000013d000000400200043d0000001f0430018f0000000505300272000003450000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b0000033d0000413d000000000604004b000003540000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001850000013d00000102030000410000000305000029000001020450009c00000000050380190000004004500210000001020520009c00000000020380190000006002200210000000000242019f000001020410009c0000000001038019000000c001100210000000000121019f0000000202000029040203fd0000040f0000006004000039000000010220018f00030000000103550000006001100270000101020010019d000001020310019800000004090000290000000505000029000003960000613d0000003f01300039000000000151016f000000400400043d0000000001140019000000000541004b00000000050000190000000105004039000001070610009c0000001f0000213d00000001055001900000001f0000c13d000000400010043f0000001f0130018f000000000934043600000003050003670000000503300272000003870000613d000000000600001900000005076002100000000008790019000000000775034f000000000707043b00000000007804350000000106600039000000000736004b0000037f0000413d000000000601004b000003960000613d0000000503300210000000000535034f00000000033900190000000301100210000000000603043300000000061601cf000000000616022f000000000505043b0000010001100089000000000515022f00000000011501cf000000000161019f00000000001304350000000001040433000000000202004b000003b60000c13d000000000201004b000003dc0000c13d000000400400043d000600000004001d0000011501000041000000000014043500000004014000390000002002000039000000000021043500000007010000290000000003010433000700000003001d0000002401400039000000000031043500000044024000390000000101000029040203e50000040f00000007010000290000001f01100039000000050110017f00000044011000390000010202000041000001020310009c00000000010280190000000604000029000001020340009c00000000040280190000004002400210000003e20000013d000000000101004b000002c80000c13d000001090100004100000000001004390000000201000029000000040010044300000102010000410000000002000414000001020320009c0000000002018019000000c0012002100000010a011001c70000800202000039040203f80000040f0000000102200190000003db0000613d000000000101043b000000000101004b000002c80000c13d000000400100043d00000044021000390000011403000041000000000032043500000024021000390000001d030000390000000000320435000001150200004100000000002104350000000402100039000000200300003900000000003204350000010202000041000001020310009c0000000001028019000000400110021000000116011001c70000040400010430000000000001042f0000010202000041000001020310009c0000000001028019000001020390009c000000000902801900000040029002100000006001100210000000000121019f0000040400010430000000000403004b000003ef0000613d000000000400001900000000052400190000000006140019000000000606043300000000006504350000002004400039000000000534004b000003e80000413d00000000012300190000000000010435000000000001042d000000000001042f000003f6002104210000000102000039000000000001042d0000000002000019000000000001042d000003fb002104230000000102000039000000000001042d0000000002000019000000000001042d00000400002104250000000102000039000000000001042d0000000002000019000000000001042d0000040200000432000004030001042e000004040001043000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000009fffffffffffffffffffffffffffffffffffffffffffffffff000000000000007f00000000000000000000000000000000000000000000000000000001ffffffe0000000000000000000000000ffffffffffffffffffffffffffffffffffffffff000000000000000000000000000000000000000000000000ffffffffffffffff80000000000000000000000000000000000000000000000000000000000000001806aa1896bbf26568e884a7374b41e002500962caba6a15023a8d90e8508b8302000002000000000000000000000000000000240000000000000000000000005c60da1b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000a3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50ffffffffffffffffffffffff000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001cf3b03a6cf19fa2baba4df148e9dcabedea7f8a5c07840e207e5c089be95d3e000000000000000000000000000000000000000000000000ffffffffffffff9f206661696c656400000000000000000000000000000000000000000000000000416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000008c379a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064000000000000000000000000000000020000000000000000000000000000004000000100000000000000000073206e6f74206120636f6e747261637400000000000000000000000000000000455243313936373a20626561636f6e20696d706c656d656e746174696f6e206900000000000000000000000000000000000000840000000000000000000000007472616374000000000000000000000000000000000000000000000000000000455243313936373a206e657720626561636f6e206973206e6f74206120636f6e4e487b710000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000004000000800000000000000000d32177e88b033622e0bc848f24ab73d0795ed87730981120fcdf94fbc134fa5d", + "deployedBytecode": "0x0004000000000002000700000000000200000000030100190000006003300270000001020030019d0000010203300197000300000031035500020000000103550000008008000039000000400080043f00000001022001900000001c0000c13d000000000131034f0000010d02000041000000000202041a0000010b04000041000000800040043f00000106022001970000000004000414000000000303004b000000250000c13d000000040320008c000000ab0000c13d0000000103000031000000200230008c00000000040300190000002004008039000000d60000013d0000010302300041000001040220009c0000002c0000213d0000011d0100004100000000001004350000004101000039000000040010043f0000011e010000410000040400010430000000040320008c000001160000c13d0000000103000031000000200230008c00000000040300190000002004008039000001410000013d0000009f023000390000010502200197000000400020043f0000001f0230018f00000005043002720000003b0000613d00000000050000190000000506500210000000000761034f000000000707043b000000800660003900000000007604350000000105500039000000000645004b000000330000413d000000000502004b0000004a0000613d0000000504400210000000000141034f00000003022002100000008004400039000000000504043300000000052501cf000000000525022f000000000101043b0000010002200089000000000121022f00000000012101cf000000000151019f00000000001404350000003f0130008c0000014a0000a13d000000800a00043d0000010601a0009c0000014a0000213d000000a00200043d000001070120009c0000014a0000213d0000001f012000390000010804000041000000000531004b000000000500001900000000050480190000010801100197000000000601004b0000000004008019000001080110009c000000000405c019000000000104004b0000014a0000c13d00000080012000390000000001010433000001070410009c0000001f0000213d0000003f04100039000000200700008a000000000474016f000000400900043d0000000004490019000000000594004b00000000050000190000000105004039000001070640009c0000001f0000213d00000001055001900000001f0000c13d0000008003300039000000400040043f0000000006190436000000a0022000390000000004210019000000000334004b0000014a0000213d000600000009001d000500000007001d000400000008001d000000000301004b000000820000613d000000000300001900000000046300190000000005230019000000000505043300000000005404350000002003300039000000000413004b0000007b0000413d000300000006001d000000000116001900000000000104350000010901000041000000000010043900070000000a001d0000000400a0044300000102010000410000000002000414000001020320009c0000000002018019000000c0012002100000010a011001c70000800202000039040203f80000040f0000000102200190000003db0000613d000000400a00043d000000000101043b000000000101004b000002200000c13d0000006401a000390000011b0200004100000000002104350000004401a000390000011c0200004100000000002104350000002401a0003900000025020000390000000000210435000001150100004100000000001a04350000000401a000390000002002000039000000000021043500000102010000410000010202a0009c000000000a0180190000004001a002100000011a011001c700000404000104300000010201000041000001020340009c0000000004018019000000c0014002100000011f011001c7040203f80000040f000000000301001900000060033002700000010203300197000000200430008c000000000403001900000020040080390000001f0540018f0000000506400272000000c30000613d00000000070000190000000508700210000000000981034f000000000909043b000000800880003900000000009804350000000107700039000000000867004b000000bb0000413d000000000705004b000000d20000613d0000000506600210000000000761034f00000003055002100000008006600039000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f000300000001035500000001022001900000014c0000613d0000009f02400039000000e00220018f000000400020043f000000200230008c0000014a0000413d000000800200043d000001060420009c0000014a0000213d000000020500036700000000040000310000001f0740018f0000000506400272000000eb0000613d00000000080000190000000509800210000000000a95034f000000000a0a043b0000000000a904350000000108800039000000000968004b000000e40000413d000000000807004b000000f90000613d00000003077002100000000506600210000000000806043300000000087801cf000000000878022f000000000565034f000000000505043b0000010007700089000000000575022f00000000057501cf000000000585019f00000000005604350000000005000414000000040620008c000001c40000c13d0000001f0430018f0000000502300272000001070000613d00000000050000190000000506500210000000000761034f000000000707043b00000000007604350000000105500039000000000625004b000001000000413d000000000504004b000001ed0000613d00000003044002100000000502200210000000000502043300000000054501cf000000000545022f000000000121034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000151019f0000000000120435000001ed0000013d0000010201000041000001020340009c0000000004018019000000c0014002100000011f011001c7040203f80000040f000000000301001900000060033002700000010203300197000000200430008c000000000403001900000020040080390000001f0540018f00000005064002720000012e0000613d00000000070000190000000508700210000000000981034f000000000909043b000000800880003900000000009804350000000107700039000000000867004b000001260000413d000000000705004b0000013d0000613d0000000506600210000000000761034f00000003055002100000008006600039000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f00030000000103550000000102200190000001690000613d0000001f02400039000000600220018f00000080022001bf000000400020043f000000200230008c0000014a0000413d000000800200043d000001060420009c0000018c0000a13d00000000010000190000040400010430000000400200043d0000001f0430018f0000000505300272000001590000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000001510000413d000000000604004b000001680000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001850000013d000000400200043d0000001f0430018f0000000505300272000001760000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b0000016e0000413d000000000604004b000001850000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f00000000001504350000010201000041000001020420009c000000000201801900000040012002100000006002300210000000000121019f0000040400010430000000020500036700000000040000310000001f0740018f0000000506400272000001990000613d00000000080000190000000509800210000000000a95034f000000000a0a043b0000000000a904350000000108800039000000000968004b000001920000413d000000000807004b000001a70000613d00000003077002100000000506600210000000000806043300000000087801cf000000000878022f000000000565034f000000000505043b0000010007700089000000000575022f00000000057501cf000000000585019f00000000005604350000000005000414000000040620008c000001ee0000c13d0000001f0430018f0000000502300272000001b50000613d00000000050000190000000506500210000000000761034f000000000707043b00000000007604350000000105500039000000000625004b000001ae0000413d000000000504004b000002170000613d00000003044002100000000502200210000000000502043300000000054501cf000000000545022f000000000121034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000151019f0000000000120435000002170000013d0000010201000041000001020350009c0000000005018019000001020340009c00000000040180190000006001400210000000c003500210000000000113019f040203fd0000040f0003000000010355000000000301001900000060033002700000001f0430018f000101020030019d00000102033001970000000505300272000001dd0000613d00000000060000190000000507600210000000000871034f000000000808043b00000000008704350000000106600039000000000756004b000001d60000413d000000000604004b000001eb0000613d00000003044002100000000505500210000000000605043300000000064601cf000000000646022f000000000151034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f000000000015043500000001012001900000021c0000613d000002170000013d0000010201000041000001020350009c0000000005018019000001020340009c00000000040180190000006001400210000000c003500210000000000113019f040203fd0000040f0003000000010355000000000301001900000060033002700000001f0430018f000101020030019d00000102033001970000000505300272000002070000613d00000000060000190000000507600210000000000871034f000000000808043b00000000008704350000000106600039000000000756004b000002000000413d000000000604004b000002150000613d00000003044002100000000505500210000000000605043300000000064601cf000000000646022f000000000151034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f000000000015043500000001012001900000021e0000613d0000010201000041000001020230009c00000000030180190000006001300210000004030001042e00000060013002100000040400010430000000600130021000000404000104300000010b0100004100000000001a0435000000000100041400000007020000290000010602200197000000040320008c000700000002001d0000022d0000c13d0000000103000031000000200130008c000000000403001900000020040080390000025e0000013d0000010204000041000001020310009c00000000010480190000010203a0009c00000000040a40190000004003400210000000c001100210000000000131019f0000010c011001c700020000000a001d040203f80000040f000000020a000029000000000301001900000060033002700000010203300197000000200430008c000000000403001900000020040080390000001f0540018f00000005064002720000024b0000613d0000000007000019000000050870021000000000098a0019000000000881034f000000000808043b00000000008904350000000107700039000000000867004b000002430000413d000000000705004b0000025a0000613d0000000506600210000000000761034f00000000066a00190000000305500210000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f00030000000103550000000102200190000002950000613d0000001f01400039000000600210018f0000000001a20019000000000221004b00000000020000190000000102004039000001070410009c0000001f0000213d00000001022001900000001f0000c13d000000400010043f000000200130008c0000014a0000413d00000000010a0433000001060210009c0000014a0000213d00000109020000410000000000200439000000040010044300000102010000410000000002000414000001020320009c0000000002018019000000c0012002100000010a011001c70000800202000039040203f80000040f0000000102200190000003db0000613d000000400200043d000200000002001d000000000101043b000000000101004b000002b20000c13d0000000203000029000000640130003900000118020000410000000000210435000000440130003900000119020000410000000000210435000000240130003900000030020000390000000000210435000001150100004100000000001304350000000401300039000000200200003900000000002104350000010201000041000001020230009c000000000301801900000040013002100000011a011001c70000040400010430000000400200043d0000001f0430018f0000000505300272000002a20000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b0000029a0000413d000000000604004b000001850000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001850000013d0000010d01000041000000000201041a0000010e022001970000000705000029000000000252019f000000000021041b00000102010000410000000002000414000001020320009c0000000002018019000000c0012002100000010f011001c70000800d0200003900000002030000390000011004000041040203f30000040f000000010120019000000006010000290000014a0000613d0000000001010433000000000101004b000002cd0000c13d0000002001000039000001000010044300000120000004430000011701000041000004030001042e0000010b010000410000000202000029000000000012043500000000010004140000000702000029000000040220008c000002d90000c13d0000000103000031000000200130008c000000000403001900000020040080390000030b0000013d0000010202000041000001020310009c00000000010280190000000204000029000001020340009c00000000020440190000004002200210000000c001100210000000000121019f0000010c011001c70000000702000029040203f80000040f000000020a000029000000000301001900000060033002700000010203300197000000200430008c000000000403001900000020040080390000001f0540018f0000000506400272000002f80000613d0000000007000019000000050870021000000000098a0019000000000881034f000000000808043b00000000008904350000000107700039000000000867004b000002f00000413d000000000705004b000003070000613d0000000506600210000000000761034f00000002066000290000000305500210000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f00030000000103550000000102200190000003380000613d0000001f01400039000000600110018f0000000202100029000000000112004b00000000010000190000000101004039000700000002001d000001070220009c00000006040000290000001f0000213d00000001011001900000001f0000c13d0000000701000029000000400010043f000000200130008c0000014a0000413d00000002010000290000000001010433000200000001001d000001060110009c0000014a0000213d0000000701000029000001110110009c0000001f0000213d00000007050000290000006001500039000000400010043f000000400150003900000112020000410000000000210435000000270100003900000000021504360000011301000041000100000002001d0000000000120435000000000204043300000000010004140000000204000029000000040440008c000003550000c13d0000000102000039000001070130009c00000005050000290000001f0000213d0000036d0000013d000000400200043d0000001f0430018f0000000505300272000003450000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b0000033d0000413d000000000604004b000003540000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001850000013d00000102030000410000000305000029000001020450009c00000000050380190000004004500210000001020520009c00000000020380190000006002200210000000000242019f000001020410009c0000000001038019000000c001100210000000000121019f0000000202000029040203fd0000040f0000006004000039000000010220018f00030000000103550000006001100270000101020010019d000001020310019800000004090000290000000505000029000003960000613d0000003f01300039000000000151016f000000400400043d0000000001140019000000000541004b00000000050000190000000105004039000001070610009c0000001f0000213d00000001055001900000001f0000c13d000000400010043f0000001f0130018f000000000934043600000003050003670000000503300272000003870000613d000000000600001900000005076002100000000008790019000000000775034f000000000707043b00000000007804350000000106600039000000000736004b0000037f0000413d000000000601004b000003960000613d0000000503300210000000000535034f00000000033900190000000301100210000000000603043300000000061601cf000000000616022f000000000505043b0000010001100089000000000515022f00000000011501cf000000000161019f00000000001304350000000001040433000000000202004b000003b60000c13d000000000201004b000003dc0000c13d000000400400043d000600000004001d0000011501000041000000000014043500000004014000390000002002000039000000000021043500000007010000290000000003010433000700000003001d0000002401400039000000000031043500000044024000390000000101000029040203e50000040f00000007010000290000001f01100039000000050110017f00000044011000390000010202000041000001020310009c00000000010280190000000604000029000001020340009c00000000040280190000004002400210000003e20000013d000000000101004b000002c80000c13d000001090100004100000000001004390000000201000029000000040010044300000102010000410000000002000414000001020320009c0000000002018019000000c0012002100000010a011001c70000800202000039040203f80000040f0000000102200190000003db0000613d000000000101043b000000000101004b000002c80000c13d000000400100043d00000044021000390000011403000041000000000032043500000024021000390000001d030000390000000000320435000001150200004100000000002104350000000402100039000000200300003900000000003204350000010202000041000001020310009c0000000001028019000000400110021000000116011001c70000040400010430000000000001042f0000010202000041000001020310009c0000000001028019000001020390009c000000000902801900000040029002100000006001100210000000000121019f0000040400010430000000000403004b000003ef0000613d000000000400001900000000052400190000000006140019000000000606043300000000006504350000002004400039000000000534004b000003e80000413d00000000012300190000000000010435000000000001042d000000000001042f000003f6002104210000000102000039000000000001042d0000000002000019000000000001042d000003fb002104230000000102000039000000000001042d0000000002000019000000000001042d00000400002104250000000102000039000000000001042d0000000002000019000000000001042d0000040200000432000004030001042e000004040001043000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000009fffffffffffffffffffffffffffffffffffffffffffffffff000000000000007f00000000000000000000000000000000000000000000000000000001ffffffe0000000000000000000000000ffffffffffffffffffffffffffffffffffffffff000000000000000000000000000000000000000000000000ffffffffffffffff80000000000000000000000000000000000000000000000000000000000000001806aa1896bbf26568e884a7374b41e002500962caba6a15023a8d90e8508b8302000002000000000000000000000000000000240000000000000000000000005c60da1b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000a3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50ffffffffffffffffffffffff000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001cf3b03a6cf19fa2baba4df148e9dcabedea7f8a5c07840e207e5c089be95d3e000000000000000000000000000000000000000000000000ffffffffffffff9f206661696c656400000000000000000000000000000000000000000000000000416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000008c379a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064000000000000000000000000000000020000000000000000000000000000004000000100000000000000000073206e6f74206120636f6e747261637400000000000000000000000000000000455243313936373a20626561636f6e20696d706c656d656e746174696f6e206900000000000000000000000000000000000000840000000000000000000000007472616374000000000000000000000000000000000000000000000000000000455243313936373a206e657720626561636f6e206973206e6f74206120636f6e4e487b710000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000004000000800000000000000000d32177e88b033622e0bc848f24ab73d0795ed87730981120fcdf94fbc134fa5d", + "linkReferences": {}, + "deployedLinkReferences": {}, + "factoryDeps": {} +} diff --git a/l1-contracts/script-config/artifacts/L2SharedBridge.json b/l1-contracts/script-config/artifacts/L2SharedBridge.json new file mode 100644 index 000000000..a74e5c9ad --- /dev/null +++ b/l1-contracts/script-config/artifacts/L2SharedBridge.json @@ -0,0 +1,262 @@ +{ + "_format": "hh-zksolc-artifact-1", + "contractName": "L2SharedBridge", + "sourceName": "contracts/bridge/L2SharedBridge.sol", + "abi": [ + { + "inputs": [ + { + "internalType": "uint256", + "name": "_eraChainId", + "type": "uint256" + } + ], + "stateMutability": "nonpayable", + "type": "constructor" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "l1Sender", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "l2Receiver", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "l2Token", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "FinalizeDeposit", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "uint8", + "name": "version", + "type": "uint8" + } + ], + "name": "Initialized", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "l2Sender", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "l1Receiver", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "l2Token", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "WithdrawalInitiated", + "type": "event" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "_l1Sender", + "type": "address" + }, + { + "internalType": "address", + "name": "_l2Receiver", + "type": "address" + }, + { + "internalType": "address", + "name": "_l1Token", + "type": "address" + }, + { + "internalType": "uint256", + "name": "_amount", + "type": "uint256" + }, + { + "internalType": "bytes", + "name": "_data", + "type": "bytes" + } + ], + "name": "finalizeDeposit", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "_l1SharedBridge", + "type": "address" + }, + { + "internalType": "address", + "name": "_l1Bridge", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "_l2TokenProxyBytecodeHash", + "type": "bytes32" + }, + { + "internalType": "address", + "name": "_aliasedOwner", + "type": "address" + } + ], + "name": "initialize", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "l1Bridge", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "l1SharedBridge", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "l2TokenAddress", + "type": "address" + } + ], + "name": "l1TokenAddress", + "outputs": [ + { + "internalType": "address", + "name": "l1TokenAddress", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "_l1Token", + "type": "address" + } + ], + "name": "l2TokenAddress", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "l2TokenBeacon", + "outputs": [ + { + "internalType": "contract UpgradeableBeacon", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "_l1Receiver", + "type": "address" + }, + { + "internalType": "address", + "name": "_l2Token", + "type": "address" + }, + { + "internalType": "uint256", + "name": "_amount", + "type": "uint256" + } + ], + "name": "withdraw", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + } + ], + "bytecode": "0x0004000000000002001000000000000200000000030100190000006004300270000001a20340019700030000003103550002000000010355000001a20040019d00000001022001900000001d0000c13d0000008002000039000000400020043f000000040230008c000000400000413d000000000201043b000000e002200270000001ab0420009c000000420000213d000001b10420009c0000008a0000213d000001b40120009c000000c10000613d000001b50120009c000000400000c13d0000000001000416000000000101004b000000400000c13d0000000401000039000001d90000013d0000000002000416000000000202004b000000400000c13d000000bf02300039000001a302200197000000400020043f0000001f0230018f00000005043002720000002f0000613d00000000050000190000000506500210000000000761034f000000000707043b000000a00660003900000000007604350000000105500039000000000645004b000000270000413d000000000502004b0000003e0000613d0000000504400210000000000141034f0000000302200210000000a004400039000000000504043300000000052501cf000000000525022f000000000101043b0000010002200089000000000121022f00000000012101cf000000000151019f0000000000140435000000200130008c000000640000813d00000000010000190000068300010430000001ac0420009c000000940000213d000001af0420009c000000c60000613d000001b00220009c000000400000c13d0000000002000416000000000202004b000000400000c13d000000040230008a000000600220008c000000400000413d0000000402100370000000000402043b000001b60240009c000000400000213d0000002402100370000000000302043b000001b60230009c000000400000213d0000004401100370000000000201043b000000000102004b000001de0000c13d000001a601000041000000800010043f0000002001000039000000840010043f0000001501000039000000a40010043f000001c501000041000000c40010043f000001c6010000410000068300010430000000a00100043d000000800010043f000000000200041a0000ff0003200190000000ac0000c13d000000ff0320018f000000ff0330008c000000820000613d000000ff012001bf000000000010041b000000ff01000039000000400200043d0000000000120435000001a2010000410000000003000414000001a20430009c0000000003018019000001a20420009c00000000020180190000004001200210000000c002300210000000000112019f000001a8011001c70000800d020000390000000103000039000001a904000041068106770000040f0000000101200190000000400000613d000000800100043d000001400000044300000160001004430000002001000039000001000010044300000001010000390000012000100443000001aa01000041000006820001042e000001b20420009c000001a50000613d000001b30120009c000000400000c13d0000000001000416000000000101004b000000400000c13d000000000100041a0000001001100270000001da0000013d000001ad0420009c000001c90000613d000001ae0220009c000000400000c13d0000000002000416000000000202004b000000400000c13d000000040230008a000000200220008c000000400000413d0000000401100370000000000101043b000001b60210009c000000400000213d068106050000040f000001b601100197000000400200043d0000000000120435000001a201000041000001a20320009c00000000020180190000004001200210000001b7011001c7000006820001042e000000400100043d0000006402100039000001a40300004100000000003204350000004402100039000001a5030000410000000000320435000000240210003900000027030000390000000000320435000001a6020000410000000000210435000000040210003900000020030000390000000000320435000001a202000041000001a20310009c00000000010280190000004001100210000001a7011001c700000683000104300000000001000416000000000101004b000000400000c13d0000000101000039000001d90000013d0000000002000416000000000202004b000000400000c13d000000040230008a000000a00220008c000000400000413d0000000402100370000000000802043b000001b60280009c000000400000213d0000002402100370000000000902043b000001b60290009c000000400000213d0000004402100370000000000a02043b000001b602a0009c000000400000213d0000008402100370000000000202043b000001bd0420009c000000400000213d0000002304200039000001c705000041000000000634004b00000000060000190000000006058019000001c704400197000000000704004b0000000005008019000001c70440009c000000000506c019000000000405004b000000400000c13d0000000404200039000000000441034f000000000504043b000001bd0450009c000000400000213d001000240020003d0000001002500029000000000232004b000000400000213d000b00000005001d000f0000000a001d000e00000009001d000c00000008001d0000006401100370000000000101043b000d00000001001d0000000001000411000001c801100041000001b6011001970000000402000039000000000202041a000001b602200197000000000221004b000001050000613d000000000200041a0000001002200270000001b602200197000000000121004b000002c10000c13d0000000101000039000800000001001d000000000101041a000001b601100197000000a00010043f0000004001000039000900000001001d000000c00010043f000000e00000043f0000006001000039000a00000001001d000000800010043f0000010001000039000000400010043f000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ca011001c700008010020000390681067c0000040f00000001022001900000000f05000029000000400000613d0000000202000039000700000002001d000000000202041a000000000301043b000000400100043d000000a004100039000000000034043500000080031000390000000000230435000000600210003900000000005204350000004002100039000000000300041000000000003204350000002002100039000001cb030000410000000000320435000000a0030000390000000000310435000001cc0310009c000002170000213d000000c003100039000000400030043f000001a204000041000001a20320009c000000000204801900000040022002100000000001010433000001a20310009c00000000010480190000006001100210000000000121019f0000000002000414000001a20320009c0000000002048019000000c002200210000000000112019f000001cd011001c700008010020000390681067c0000040f0000000102200190000000400000613d000000000101043b000500000001001d000001b601100197000600000001001d00000000001004350000000301000039000400000001001d000000200010043f0000000001000414000001a20210009c000001a201008041000000c001100210000001be011001c700008010020000390681067c0000040f0000000102200190000000400000613d000000000101043b000000000101041a000001b601100198000003ad0000c13d00000000010004140000000702000029000000000402041a0000000802000029000000000202041a000000400300043d000000400530003900000009060000290000000000650435000001b602200197000000200530003900000000002504350000000a02000029000000000023043500000060023000390000000000020435000001c00230009c000002170000213d0000008002300039000000400020043f000000a005300039000001cf060000410000000000650435000000e4053000390000000a060000290000000000650435000000c4053000390000000000450435000000a4043000390000000f0500002900000000005404350000010405300039000000000403043300000000004504350000012405300039000000000604004b0000018a0000613d000000000600001900000000075600190000002006600039000000000836001900000000080804330000000000870435000000000746004b000001830000413d000000000354001900000000000304350000001f03400039000a0020000000920000000a0330017f00000084043000390000000000420435000000c3033000390000000a0430017f0000000003240019000000000443004b00000000040000190000000104004039000001bd0530009c000002170000213d0000000104400190000002170000c13d000000400030043f0000000004020433000001d00540009c0000045f0000413d0000004401300039000001dc02000041000000000021043500000024013000390000000802000039000002b50000013d0000000002000416000000000202004b000000400000c13d000000040230008a000000800220008c000000400000413d0000000402100370000000000202043b000001b60320009c000000400000213d0000002403100370000000000603043b000001b60360009c000000400000213d0000006403100370000000000503043b000001b60350009c000000400000213d000000000300041a0000fffe043001900000021d0000c13d000001e00330019700000102033001bf000000000030041b0000004401100370000000000401043b000000000102004b000002290000c13d000001a601000041000000800010043f0000002001000039000000840010043f0000000201000039000000a40010043f000001f501000041000000610000013d0000000002000416000000000202004b000000400000c13d000000040230008a000000200220008c000000400000413d0000000401100370000000000101043b000001b60210009c000000400000213d00000000001004350000000301000039000000200010043f00000040020000390000000001000019068106610000040f000000000101041a000001b601100197000000800010043f000001b801000041000006820001042e000f00000002001d000e00000004001d000001b9010000410000000000100439001000000003001d0000000400300443000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ba011001c700008002020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000000000101004b0000001004000029000000400000613d000000400500043d00000024015000390000000f020000290000000000210435000001bb0100004100000000001504350000000001000411000d00000001001d000001b601100197000000040250003900000000001204350000000001000414000000040240008c000002150000613d000001a202000041000001a20310009c0000000001028019000001a20350009c00000000020540190000004002200210000000c001100210000000000121019f000001bc011001c70000000002040019000c00000005001d068106770000040f0000000c05000029000000100400002900000000030100190000006003300270000101a20030019d000001a20330019700030000000103550000000102200190000002640000613d000001bd0150009c000002400000a13d000001f00100004100000000001004350000004101000039000000040010043f000001ef010000410000068300010430000001a601000041000000800010043f0000002001000039000000840010043f0000002e01000039000000a40010043f000001dd01000041000000c40010043f000001de01000041000000e40010043f000001df010000410000068300010430000000000104004b000002330000c13d000001a601000041000000800010043f0000002001000039000000840010043f0000000201000039000000a40010043f000001f401000041000000610000013d001000000006001d000f00000004001d000e00000005001d000000000105004b000002870000c13d000001a601000041000000800010043f0000002001000039000000840010043f0000000201000039000000a40010043f000001f301000041000000610000013d000000400050043f00000000004004350000000301000039000000200010043f000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001be011001c700008010020000390681067c0000040f0000000102200190000000400000613d000000400200043d0000002403200039000000000101043b000000000101041a000001b601100198000002c90000c13d000001a6010000410000000000120435000000040120003900000020040000390000000000410435000000020100003900000000001304350000004401200039000001c3030000410000000000310435000001a201000041000001a20320009c00000000020180190000004001200210000001c4011001c70000068300010430000000400200043d0000001f0430018f0000000505300272000002710000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000002690000413d000000000604004b000002800000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001a201000041000001a20420009c000000000201801900000040012002100000006002300210000000000121019f0000068300010430000001e1013001970000001002200210000001e202200197000000000121019f000000000010041b000001e3010000410000000000100439000000000100041200000004001004430000002400000443000001a2030000410000000001000414000001a20210009c0000000001038019000000c001100210000001e4011001c700008005020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000d00000001001d000001e50100004100000000001004390000000001000414000001a20210009c000001a201008041000000c001100210000001e6011001c70000800b020000390681067c0000040f00000001022001900000059c0000613d000000400200043d000c00000002001d000000000101043b0000000d0110006c0000034d0000c13d000000100100006b0000038f0000c13d0000000c030000290000004401300039000001f2020000410000000000210435000000240130003900000003020000390000000000210435000001a6010000410000000000130435000000040130003900000020020000390000000000210435000001a201000041000001a20230009c00000000030180190000004001300210000001c4011001c70000068300010430000001a601000041000000800010043f0000002001000039000000840010043f0000000201000039000000a40010043f000001c901000041000000610000013d0000002004200039000001bf0500004100000000005404350000000e04000029000000600440021000000000004304350000006001100210000000380320003900000000001304350000004c012000390000000f0300002900000000003104350000004c010000390000000000120435000001c00120009c000002170000213d0000008003200039000000400030043f000001c101000041000c00000003001d0000000000130435000000840120003900000020030000390000000000310435000000a40320003900000000010204330000000000130435000000c403200039000000000401004b000002ef0000613d000000000400001900000000053400190000002004400039000000000624001900000000060604330000000000650435000000000514004b000002e80000413d000000000231001900000000000204350000001f01100039000000200200008a000000000121016f000001a2020000410000000c04000029000001a20340009c0000000003020019000000000304401900000040033002100000004401100039000001a20410009c00000000010280190000006001100210000000000131019f0000000003000414000001a20430009c0000000003028019000000c002300210000000000112019f0000800802000039068106770000040f0000000c0a00002900000000030100190000006003300270000001a203300197000000200430008c000000000403001900000020040080390000001f0540018f0000000506400272000003190000613d0000000007000019000000050870021000000000098a0019000000000881034f000000000808043b00000000008904350000000107700039000000000867004b000003110000413d000000000705004b000003280000613d0000000506600210000000000761034f0000000c066000290000000305500210000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f00030000000103550000000102200190000003720000613d0000001f01400039000000600210018f0000000c01200029000000000221004b00000000020000190000000102004039000001bd0410009c00000010070000290000000e05000029000002170000213d0000000102200190000002170000c13d000000400010043f000000200230008c000000400000413d0000000f020000290000000000210435000001a2020000410000000003000414000001a20430009c0000000003028019000001a20410009c00000000010280190000004001100210000000c002300210000000000112019f000001a8011001c7000001b6065001970000800d020000390000000403000039000001c2040000410000000d05000029000003a80000013d0000000c01000029000001e70110009c000002170000813d0000000c040000290000002401400039000001e8020000410000000000210435000000440140003900000000020004140000006003000039001000000003001d0000000000310435000001e90100004100000000001404350000006401400039000000000001043500000004014000390000000000010435000001a201000041000001a20320009c0000000002018019000001a20340009c00000000040180190000004001400210000000c002200210000000000121019f000001ea011001c70000800602000039068106770000040f0000000102200190000003fc0000613d000000000201043b000000000102004b000004380000c13d00000003010003670000000102000031000004010000013d000000400200043d0000001f0430018f00000005053002720000037f0000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000003770000413d000000000604004b0000038e0000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000002800000013d0000000401000039000000000201041a000001d90220019700000010022001af000000000021041b000001f101000041000000000200041a000000000112016f000000000010041b00000002010000390000000c040000290000000000140435000001a2010000410000000002000414000001a20320009c0000000002018019000001a20340009c00000000040180190000004001400210000000c002200210000000000112019f000001a8011001c70000800d020000390000000103000039000001a904000041068106770000040f0000000101200190000000400000613d0000000001000019000006820001042e0000000f0110006c000004260000c13d000001b901000041000000000010043900000006010000290000000400100443000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ba011001c700008002020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000000000101004b0000000e02000029000000400000613d000000400400043d00000024014000390000000d030000290000000000310435000001da010000410000000000140435000001b602200197001000000004001d0000000401400039000f00000002001d000000000021043500000000010004140000000602000029000000040220008c000003e30000613d000001a202000041000001a20310009c00000000010280190000001004000029000001a20340009c00000000020440190000004002200210000000c001100210000000000121019f000001bc011001c70000000602000029068106770000040f00000000030100190000006003300270000101a20030019d000001a203300197000300000001035500000001022001900000059d0000613d0000001001000029000001bd0110009c000002170000213d0000001004000029000000400040043f0000000d010000290000000000140435000001a2010000410000000002000414000001a20320009c0000000002018019000001a20340009c00000000040180190000004001400210000000c002200210000000000112019f000001a8011001c70000000c02000029000001b6052001970000800d020000390000000403000039000001db040000410000000f060000290000000607000029000003a80000013d000300000001035500000000020100190000006002200270000101a20020019d000001a202200197000000400300043d0000001f0420018f00000005052002720000040e0000613d000000000600001900000005076002100000000008730019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000004060000413d000000000604004b0000041d0000613d0000000505500210000000000151034f00000000055300190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001a201000041000001a20430009c0000000003018019000001a20420009c000000000201801900000060012002100000004002300210000000000112019f0000068300010430000000400100043d0000004402100039000001ce030000410000000000320435000000240210003900000007030000290000000000320435000001a6020000410000000000210435000000040210003900000020030000390000000000320435000001a202000041000001a20310009c00000000010280190000004001100210000001c4011001c70000068300010430000000400100043d000001eb0310009c000002170000213d000001b602200197000000840310003900000000002304350000002402100039000001ec0300004100000000003204350000006402100039000000000300041400000020040000390000000000420435000000440210003900000010040000290000000000420435000001e902000041000000000021043500000004021000390000000000020435000001a202000041000001a20430009c0000000003028019000001a20410009c00000000010280190000004001100210000000c002300210000000000121019f000001ed011001c70000800602000039068106770000040f00000001022001900000053c0000613d000000000101043b000000000201004b0000055e0000c13d00000003010003670000000102000031000005410000013d000000c001100210000001d1011001970000004002200210000001d202200041000001d302200197000000000121019f0000006002400210000001d402200197000000000121019f000001d5011001c700008006020000390000000003000019000000000400001900000000050000190000000006000019068106770000040f000300000001035500000000030100190000006003300270000101a20030019d000001a2053001970000003f03500039000001a306300197000000400400043d0000000003460019000000000663004b00000000060000190000000106004039000001bd0730009c000002170000213d0000000106600190000002170000c13d000000400030043f00000000035404360000001f0650003900000005066002720000048f0000613d0000000007000031000000020770036700000000080000190000000509800210000000000a930019000000000997034f000000000909043b00000000009a04350000000108800039000000000968004b000004870000413d000000000600004b000004910000613d0000001f0650018f00000005055002720000049d0000613d000000000700001900000005087002100000000009830019000000000881034f000000000808043b00000000008904350000000107700039000000000857004b000004950000413d000000000706004b000004ac0000613d0000000505500210000000000151034f00000000055300190000000306600210000000000705043300000000076701cf000000000767022f000000000101043b0000010006600089000000000161022f00000000016101cf000000000171019f00000000001504350000000101200190000005ba0000613d0000000001040433000001c702000041000000200410008c00000000040000190000000004024019000001c701100197000000000501004b000000000200a019000001c70110009c000000000204c019000000000102004b000000400000c13d0000000001030433000800000001001d000001b60110009c000000400000213d000001b901000041000000000010043900000008010000290000000400100443000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ba011001c700008002020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000000000101004b0000000f020000290000000b04000029000000400000613d000000400300043d000001d701000041000000000013043500000024053000390000000901000029000300000005001d00000000001504350000000401300039000200000001001d00000000002104350000001f0240018f0000006401300039000900000003001d0000004403300039000100000003001d0000000000430435000000100300002900000002033003670000000504400272000004ee0000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000004e60000413d000000000502004b000004fd0000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f00000000002404350000000b01100029000000000001043500000000010004140000000802000029000000040220008c0000051e0000613d0000000b020000290000001f022000390000000a0220017f000001a2030000410000000905000029000001a20450009c0000000004030019000000000405401900000040044002100000006402200039000001a20520009c00000000020380190000006002200210000000000224019f000001a20410009c0000000001038019000000c001100210000000000121019f0000000802000029068106770000040f00000000030100190000006003300270000101a20030019d000001a20330019700030000000103550000000102200190000005db0000613d0000000901000029000001bd0110009c000002170000213d0000000901000029000000400010043f0000000802000029000000050120014f000001b601100198000005f80000c13d000000060100002900000000001004350000000401000029000000200010043f000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001be011001c700008010020000390681067c0000040f00000001022001900000000f03000029000000400000613d000000000101043b000000000201041a000001d902200197000000000232019f000000000021041b000003af0000013d000300000001035500000000020100190000006002200270000101a20020019d000001a202200197000000400300043d0000001f0420018f00000005052002720000054e0000613d000000000600001900000005076002100000000008730019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000005460000413d000000000604004b0000055d0000613d0000000505500210000000000151034f00000000055300190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f00000000001504350000041d0000013d000001b6031001970000000101000039000000000201041a000001d902200197000000000232019f000000000021041b00000002010000390000000f02000029000000000021041b000001b9010000410000000000100439001000000003001d0000000400300443000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ba011001c700008002020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000000000101004b0000000e02000029000000400000613d000000400300043d000001ee010000410000000000130435000c00000003001d0000000401300039000000000021043500000000010004140000001002000029000000040220008c000005960000613d000001a202000041000001a20310009c00000000010280190000000c04000029000001a20340009c00000000020440190000004002200210000000c001100210000000000121019f000001ef011001c70000001002000029068106770000040f00000000030100190000006003300270000101a20030019d000001a20330019700030000000103550000000102200190000005be0000613d0000000c01000029000001bd0110009c000002170000213d0000000c01000029000000400010043f000003940000013d000000000001042f000000400200043d0000001f0430018f0000000505300272000005aa0000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000005a20000413d000000000604004b000005b90000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000002800000013d000000400100043d0000004402100039000001d603000041000004290000013d000000400200043d0000001f0430018f0000000505300272000005cb0000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000005c30000413d000000000604004b000002800000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000002800000013d000000400200043d0000001f0430018f0000000505300272000005e80000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000005e00000413d000000000604004b000005f70000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000002800000013d000001a60100004100000009030000290000000000130435000000200100003900000002020000290000000000120435000000070100002900000003020000290000000000120435000001d80100004100000001020000290000000000120435000002bb0000013d0001000000000002000100000001001d0000000101000039000000000301041a000000400100043d00000040021000390000004004000039000000000042043500000060020000390000000002210436000001b603300197000000000032043500000060031000390000000000030435000001f60310009c000006580000813d0000008003100039000000400030043f000001a203000041000001a20420009c000000000203801900000040022002100000000001010433000001a20410009c00000000010380190000006001100210000000000121019f0000000002000414000001a20420009c0000000002038019000000c002200210000000000112019f000001cd011001c700008010020000390681067c0000040f00000001022001900000065e0000613d0000000202000039000000000202041a000000000301043b000000400100043d000000a0041000390000000000340435000000800310003900000000002304350000000102000029000001b602200197000000600310003900000000002304350000004002100039000000000300041000000000003204350000002002100039000001cb030000410000000000320435000000a0030000390000000000310435000001cc0310009c000006580000213d000000c003100039000000400030043f000001a203000041000001a20420009c000000000203801900000040022002100000000001010433000001a20410009c00000000010380190000006001100210000000000121019f0000000002000414000001a20420009c0000000002038019000000c002200210000000000112019f000001cd011001c700008010020000390681067c0000040f00000001022001900000065e0000613d000000000101043b000001b601100197000000000001042d000001f00100004100000000001004350000004101000039000000040010043f000001ef01000041000006830001043000000000010000190000068300010430000000000001042f000001a203000041000001a20410009c00000000010380190000004001100210000001a20420009c00000000020380190000006002200210000000000112019f0000000002000414000001a20420009c0000000002038019000000c002200210000000000112019f000001cd011001c700008010020000390681067c0000040f0000000102200190000006750000613d000000000101043b000000000001042d000000000100001900000683000104300000067a002104210000000102000039000000000001042d0000000002000019000000000001042d0000067f002104230000000102000039000000000001042d0000000002000019000000000001042d0000068100000432000006820001042e0000068300010430000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000000000001ffffffe0616c697a696e6700000000000000000000000000000000000000000000000000496e697469616c697a61626c653a20636f6e747261637420697320696e69746908c379a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008400000000000000000000000002000000000000000000000000000000000000200000000000000000000000007f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498000000020000000000000000000000000000008000000100000000000000000000000000000000000000000000000000000000000000000000000000cfe7af7b00000000000000000000000000000000000000000000000000000000f54266a100000000000000000000000000000000000000000000000000000000f54266a200000000000000000000000000000000000000000000000000000000f5f1516800000000000000000000000000000000000000000000000000000000cfe7af7c00000000000000000000000000000000000000000000000000000000d9caed1200000000000000000000000000000000000000000000000000000000a31ee5af00000000000000000000000000000000000000000000000000000000a31ee5b000000000000000000000000000000000000000000000000000000000b852ad36000000000000000000000000000000000000000000000000000000006dde720900000000000000000000000000000000000000000000000000000000969b53da000000000000000000000000ffffffffffffffffffffffffffffffffffffffff000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000008000000000000000001806aa1896bbf26568e884a7374b41e002500962caba6a15023a8d90e8508b83020000020000000000000000000000000000002400000000000000000000000074f4f547000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000044000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff020000000000000000000000000000000000004000000000000000000000000011a2ccc100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff7f62f84b24000000000000000000000000000000000000000000000000000000002fc3848834aac8e883a2d2a17a7514dc4f2d3dd268089df9b9f5d918259ef3b079680000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064000000000000000000000000416d6f756e742063616e6e6f74206265207a65726f000000000000000000000000000000000000000000000000000000000000640000008000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000eeeeffffffffffffffffffffffffffffffffeeef6d710000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000060000000a000000000000000002020dba91b30cc0006188af794c2fb30dd8520db7e2c088b7fc7c103c00ca494000000000000000000000000000000000000000000000000ffffffffffffff3f020000000000000000000000000000000000000000000000000000000000000067670000000000000000000000000000000000000000000000000000000000003cda335100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000ffffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000ffffffff00000000000000000000000001000000000000000000000000000000000000000000000000000000000000006d6b00000000000000000000000000000000000000000000000000000000000095f11a40000000000000000000000000000000000000000000000000000000006d74000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000008c2a993e00000000000000000000000000000000000000000000000000000000b84fba9af218da60d299dc177abd5805e7ac541d2673cbee7808c10017874f634f766572666c6f77000000000000000000000000000000000000000000000000496e697469616c697a61626c653a20636f6e747261637420697320616c726561647920696e697469616c697a65640000000000000000000000000000000000000000000000000000000000000000000000000084000000800000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000ffffffffffffffffffff0000000000000000000000000000000000000000010200000000000000000000ffffffffffffffffffffffffffffffffffffffff0000310ab089e4439a4c15d089f94afb7896ff553aecb10793d0ab882de59d99a32e02000002000000000000000000000000000000440000000000000000000000009a8a0592ac89c5ad3bc6df8224c17b485976f597df104ee20d0df415241f670b0200000200000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff7c010004751688ab9322961547058fd0f36d3edf69880b64cbb2857041d33f4a133cda33511d41a8a5431b1770c5bc0ddd62e1cd30555d16659b89c0d60f4f9f570200000000000000000000000000000000000084000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff7b010000691fa4f751f8312bc555242f18ed78cdc9aabc0ea77d7d5a675ee8ac6f02000000000000000000000000000000000000a4000000000000000000000000f2fde38b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000240000000000000000000000004e487b7100000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff6266320000000000000000000000000000000000000000000000000000000000736600000000000000000000000000000000000000000000000000000000000064660000000000000000000000000000000000000000000000000000000000006266000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff800000000000000000000000000000000000000000000000000000000000000000f5cf0be6820df44d868e986d4d5cafabd5702ac45d181a5ac4eb5ed59a001b03", + "deployedBytecode": "0x0004000000000002001000000000000200000000030100190000006004300270000001a20340019700030000003103550002000000010355000001a20040019d00000001022001900000001d0000c13d0000008002000039000000400020043f000000040230008c000000400000413d000000000201043b000000e002200270000001ab0420009c000000420000213d000001b10420009c0000008a0000213d000001b40120009c000000c10000613d000001b50120009c000000400000c13d0000000001000416000000000101004b000000400000c13d0000000401000039000001d90000013d0000000002000416000000000202004b000000400000c13d000000bf02300039000001a302200197000000400020043f0000001f0230018f00000005043002720000002f0000613d00000000050000190000000506500210000000000761034f000000000707043b000000a00660003900000000007604350000000105500039000000000645004b000000270000413d000000000502004b0000003e0000613d0000000504400210000000000141034f0000000302200210000000a004400039000000000504043300000000052501cf000000000525022f000000000101043b0000010002200089000000000121022f00000000012101cf000000000151019f0000000000140435000000200130008c000000640000813d00000000010000190000068300010430000001ac0420009c000000940000213d000001af0420009c000000c60000613d000001b00220009c000000400000c13d0000000002000416000000000202004b000000400000c13d000000040230008a000000600220008c000000400000413d0000000402100370000000000402043b000001b60240009c000000400000213d0000002402100370000000000302043b000001b60230009c000000400000213d0000004401100370000000000201043b000000000102004b000001de0000c13d000001a601000041000000800010043f0000002001000039000000840010043f0000001501000039000000a40010043f000001c501000041000000c40010043f000001c6010000410000068300010430000000a00100043d000000800010043f000000000200041a0000ff0003200190000000ac0000c13d000000ff0320018f000000ff0330008c000000820000613d000000ff012001bf000000000010041b000000ff01000039000000400200043d0000000000120435000001a2010000410000000003000414000001a20430009c0000000003018019000001a20420009c00000000020180190000004001200210000000c002300210000000000112019f000001a8011001c70000800d020000390000000103000039000001a904000041068106770000040f0000000101200190000000400000613d000000800100043d000001400000044300000160001004430000002001000039000001000010044300000001010000390000012000100443000001aa01000041000006820001042e000001b20420009c000001a50000613d000001b30120009c000000400000c13d0000000001000416000000000101004b000000400000c13d000000000100041a0000001001100270000001da0000013d000001ad0420009c000001c90000613d000001ae0220009c000000400000c13d0000000002000416000000000202004b000000400000c13d000000040230008a000000200220008c000000400000413d0000000401100370000000000101043b000001b60210009c000000400000213d068106050000040f000001b601100197000000400200043d0000000000120435000001a201000041000001a20320009c00000000020180190000004001200210000001b7011001c7000006820001042e000000400100043d0000006402100039000001a40300004100000000003204350000004402100039000001a5030000410000000000320435000000240210003900000027030000390000000000320435000001a6020000410000000000210435000000040210003900000020030000390000000000320435000001a202000041000001a20310009c00000000010280190000004001100210000001a7011001c700000683000104300000000001000416000000000101004b000000400000c13d0000000101000039000001d90000013d0000000002000416000000000202004b000000400000c13d000000040230008a000000a00220008c000000400000413d0000000402100370000000000802043b000001b60280009c000000400000213d0000002402100370000000000902043b000001b60290009c000000400000213d0000004402100370000000000a02043b000001b602a0009c000000400000213d0000008402100370000000000202043b000001bd0420009c000000400000213d0000002304200039000001c705000041000000000634004b00000000060000190000000006058019000001c704400197000000000704004b0000000005008019000001c70440009c000000000506c019000000000405004b000000400000c13d0000000404200039000000000441034f000000000504043b000001bd0450009c000000400000213d001000240020003d0000001002500029000000000232004b000000400000213d000b00000005001d000f0000000a001d000e00000009001d000c00000008001d0000006401100370000000000101043b000d00000001001d0000000001000411000001c801100041000001b6011001970000000402000039000000000202041a000001b602200197000000000221004b000001050000613d000000000200041a0000001002200270000001b602200197000000000121004b000002c10000c13d0000000101000039000800000001001d000000000101041a000001b601100197000000a00010043f0000004001000039000900000001001d000000c00010043f000000e00000043f0000006001000039000a00000001001d000000800010043f0000010001000039000000400010043f000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ca011001c700008010020000390681067c0000040f00000001022001900000000f05000029000000400000613d0000000202000039000700000002001d000000000202041a000000000301043b000000400100043d000000a004100039000000000034043500000080031000390000000000230435000000600210003900000000005204350000004002100039000000000300041000000000003204350000002002100039000001cb030000410000000000320435000000a0030000390000000000310435000001cc0310009c000002170000213d000000c003100039000000400030043f000001a204000041000001a20320009c000000000204801900000040022002100000000001010433000001a20310009c00000000010480190000006001100210000000000121019f0000000002000414000001a20320009c0000000002048019000000c002200210000000000112019f000001cd011001c700008010020000390681067c0000040f0000000102200190000000400000613d000000000101043b000500000001001d000001b601100197000600000001001d00000000001004350000000301000039000400000001001d000000200010043f0000000001000414000001a20210009c000001a201008041000000c001100210000001be011001c700008010020000390681067c0000040f0000000102200190000000400000613d000000000101043b000000000101041a000001b601100198000003ad0000c13d00000000010004140000000702000029000000000402041a0000000802000029000000000202041a000000400300043d000000400530003900000009060000290000000000650435000001b602200197000000200530003900000000002504350000000a02000029000000000023043500000060023000390000000000020435000001c00230009c000002170000213d0000008002300039000000400020043f000000a005300039000001cf060000410000000000650435000000e4053000390000000a060000290000000000650435000000c4053000390000000000450435000000a4043000390000000f0500002900000000005404350000010405300039000000000403043300000000004504350000012405300039000000000604004b0000018a0000613d000000000600001900000000075600190000002006600039000000000836001900000000080804330000000000870435000000000746004b000001830000413d000000000354001900000000000304350000001f03400039000a0020000000920000000a0330017f00000084043000390000000000420435000000c3033000390000000a0430017f0000000003240019000000000443004b00000000040000190000000104004039000001bd0530009c000002170000213d0000000104400190000002170000c13d000000400030043f0000000004020433000001d00540009c0000045f0000413d0000004401300039000001dc02000041000000000021043500000024013000390000000802000039000002b50000013d0000000002000416000000000202004b000000400000c13d000000040230008a000000800220008c000000400000413d0000000402100370000000000202043b000001b60320009c000000400000213d0000002403100370000000000603043b000001b60360009c000000400000213d0000006403100370000000000503043b000001b60350009c000000400000213d000000000300041a0000fffe043001900000021d0000c13d000001e00330019700000102033001bf000000000030041b0000004401100370000000000401043b000000000102004b000002290000c13d000001a601000041000000800010043f0000002001000039000000840010043f0000000201000039000000a40010043f000001f501000041000000610000013d0000000002000416000000000202004b000000400000c13d000000040230008a000000200220008c000000400000413d0000000401100370000000000101043b000001b60210009c000000400000213d00000000001004350000000301000039000000200010043f00000040020000390000000001000019068106610000040f000000000101041a000001b601100197000000800010043f000001b801000041000006820001042e000f00000002001d000e00000004001d000001b9010000410000000000100439001000000003001d0000000400300443000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ba011001c700008002020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000000000101004b0000001004000029000000400000613d000000400500043d00000024015000390000000f020000290000000000210435000001bb0100004100000000001504350000000001000411000d00000001001d000001b601100197000000040250003900000000001204350000000001000414000000040240008c000002150000613d000001a202000041000001a20310009c0000000001028019000001a20350009c00000000020540190000004002200210000000c001100210000000000121019f000001bc011001c70000000002040019000c00000005001d068106770000040f0000000c05000029000000100400002900000000030100190000006003300270000101a20030019d000001a20330019700030000000103550000000102200190000002640000613d000001bd0150009c000002400000a13d000001f00100004100000000001004350000004101000039000000040010043f000001ef010000410000068300010430000001a601000041000000800010043f0000002001000039000000840010043f0000002e01000039000000a40010043f000001dd01000041000000c40010043f000001de01000041000000e40010043f000001df010000410000068300010430000000000104004b000002330000c13d000001a601000041000000800010043f0000002001000039000000840010043f0000000201000039000000a40010043f000001f401000041000000610000013d001000000006001d000f00000004001d000e00000005001d000000000105004b000002870000c13d000001a601000041000000800010043f0000002001000039000000840010043f0000000201000039000000a40010043f000001f301000041000000610000013d000000400050043f00000000004004350000000301000039000000200010043f000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001be011001c700008010020000390681067c0000040f0000000102200190000000400000613d000000400200043d0000002403200039000000000101043b000000000101041a000001b601100198000002c90000c13d000001a6010000410000000000120435000000040120003900000020040000390000000000410435000000020100003900000000001304350000004401200039000001c3030000410000000000310435000001a201000041000001a20320009c00000000020180190000004001200210000001c4011001c70000068300010430000000400200043d0000001f0430018f0000000505300272000002710000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000002690000413d000000000604004b000002800000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001a201000041000001a20420009c000000000201801900000040012002100000006002300210000000000121019f0000068300010430000001e1013001970000001002200210000001e202200197000000000121019f000000000010041b000001e3010000410000000000100439000000000100041200000004001004430000002400000443000001a2030000410000000001000414000001a20210009c0000000001038019000000c001100210000001e4011001c700008005020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000d00000001001d000001e50100004100000000001004390000000001000414000001a20210009c000001a201008041000000c001100210000001e6011001c70000800b020000390681067c0000040f00000001022001900000059c0000613d000000400200043d000c00000002001d000000000101043b0000000d0110006c0000034d0000c13d000000100100006b0000038f0000c13d0000000c030000290000004401300039000001f2020000410000000000210435000000240130003900000003020000390000000000210435000001a6010000410000000000130435000000040130003900000020020000390000000000210435000001a201000041000001a20230009c00000000030180190000004001300210000001c4011001c70000068300010430000001a601000041000000800010043f0000002001000039000000840010043f0000000201000039000000a40010043f000001c901000041000000610000013d0000002004200039000001bf0500004100000000005404350000000e04000029000000600440021000000000004304350000006001100210000000380320003900000000001304350000004c012000390000000f0300002900000000003104350000004c010000390000000000120435000001c00120009c000002170000213d0000008003200039000000400030043f000001c101000041000c00000003001d0000000000130435000000840120003900000020030000390000000000310435000000a40320003900000000010204330000000000130435000000c403200039000000000401004b000002ef0000613d000000000400001900000000053400190000002004400039000000000624001900000000060604330000000000650435000000000514004b000002e80000413d000000000231001900000000000204350000001f01100039000000200200008a000000000121016f000001a2020000410000000c04000029000001a20340009c0000000003020019000000000304401900000040033002100000004401100039000001a20410009c00000000010280190000006001100210000000000131019f0000000003000414000001a20430009c0000000003028019000000c002300210000000000112019f0000800802000039068106770000040f0000000c0a00002900000000030100190000006003300270000001a203300197000000200430008c000000000403001900000020040080390000001f0540018f0000000506400272000003190000613d0000000007000019000000050870021000000000098a0019000000000881034f000000000808043b00000000008904350000000107700039000000000867004b000003110000413d000000000705004b000003280000613d0000000506600210000000000761034f0000000c066000290000000305500210000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f00030000000103550000000102200190000003720000613d0000001f01400039000000600210018f0000000c01200029000000000221004b00000000020000190000000102004039000001bd0410009c00000010070000290000000e05000029000002170000213d0000000102200190000002170000c13d000000400010043f000000200230008c000000400000413d0000000f020000290000000000210435000001a2020000410000000003000414000001a20430009c0000000003028019000001a20410009c00000000010280190000004001100210000000c002300210000000000112019f000001a8011001c7000001b6065001970000800d020000390000000403000039000001c2040000410000000d05000029000003a80000013d0000000c01000029000001e70110009c000002170000813d0000000c040000290000002401400039000001e8020000410000000000210435000000440140003900000000020004140000006003000039001000000003001d0000000000310435000001e90100004100000000001404350000006401400039000000000001043500000004014000390000000000010435000001a201000041000001a20320009c0000000002018019000001a20340009c00000000040180190000004001400210000000c002200210000000000121019f000001ea011001c70000800602000039068106770000040f0000000102200190000003fc0000613d000000000201043b000000000102004b000004380000c13d00000003010003670000000102000031000004010000013d000000400200043d0000001f0430018f00000005053002720000037f0000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000003770000413d000000000604004b0000038e0000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000002800000013d0000000401000039000000000201041a000001d90220019700000010022001af000000000021041b000001f101000041000000000200041a000000000112016f000000000010041b00000002010000390000000c040000290000000000140435000001a2010000410000000002000414000001a20320009c0000000002018019000001a20340009c00000000040180190000004001400210000000c002200210000000000112019f000001a8011001c70000800d020000390000000103000039000001a904000041068106770000040f0000000101200190000000400000613d0000000001000019000006820001042e0000000f0110006c000004260000c13d000001b901000041000000000010043900000006010000290000000400100443000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ba011001c700008002020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000000000101004b0000000e02000029000000400000613d000000400400043d00000024014000390000000d030000290000000000310435000001da010000410000000000140435000001b602200197001000000004001d0000000401400039000f00000002001d000000000021043500000000010004140000000602000029000000040220008c000003e30000613d000001a202000041000001a20310009c00000000010280190000001004000029000001a20340009c00000000020440190000004002200210000000c001100210000000000121019f000001bc011001c70000000602000029068106770000040f00000000030100190000006003300270000101a20030019d000001a203300197000300000001035500000001022001900000059d0000613d0000001001000029000001bd0110009c000002170000213d0000001004000029000000400040043f0000000d010000290000000000140435000001a2010000410000000002000414000001a20320009c0000000002018019000001a20340009c00000000040180190000004001400210000000c002200210000000000112019f000001a8011001c70000000c02000029000001b6052001970000800d020000390000000403000039000001db040000410000000f060000290000000607000029000003a80000013d000300000001035500000000020100190000006002200270000101a20020019d000001a202200197000000400300043d0000001f0420018f00000005052002720000040e0000613d000000000600001900000005076002100000000008730019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000004060000413d000000000604004b0000041d0000613d0000000505500210000000000151034f00000000055300190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001a201000041000001a20430009c0000000003018019000001a20420009c000000000201801900000060012002100000004002300210000000000112019f0000068300010430000000400100043d0000004402100039000001ce030000410000000000320435000000240210003900000007030000290000000000320435000001a6020000410000000000210435000000040210003900000020030000390000000000320435000001a202000041000001a20310009c00000000010280190000004001100210000001c4011001c70000068300010430000000400100043d000001eb0310009c000002170000213d000001b602200197000000840310003900000000002304350000002402100039000001ec0300004100000000003204350000006402100039000000000300041400000020040000390000000000420435000000440210003900000010040000290000000000420435000001e902000041000000000021043500000004021000390000000000020435000001a202000041000001a20430009c0000000003028019000001a20410009c00000000010280190000004001100210000000c002300210000000000121019f000001ed011001c70000800602000039068106770000040f00000001022001900000053c0000613d000000000101043b000000000201004b0000055e0000c13d00000003010003670000000102000031000005410000013d000000c001100210000001d1011001970000004002200210000001d202200041000001d302200197000000000121019f0000006002400210000001d402200197000000000121019f000001d5011001c700008006020000390000000003000019000000000400001900000000050000190000000006000019068106770000040f000300000001035500000000030100190000006003300270000101a20030019d000001a2053001970000003f03500039000001a306300197000000400400043d0000000003460019000000000663004b00000000060000190000000106004039000001bd0730009c000002170000213d0000000106600190000002170000c13d000000400030043f00000000035404360000001f0650003900000005066002720000048f0000613d0000000007000031000000020770036700000000080000190000000509800210000000000a930019000000000997034f000000000909043b00000000009a04350000000108800039000000000968004b000004870000413d000000000600004b000004910000613d0000001f0650018f00000005055002720000049d0000613d000000000700001900000005087002100000000009830019000000000881034f000000000808043b00000000008904350000000107700039000000000857004b000004950000413d000000000706004b000004ac0000613d0000000505500210000000000151034f00000000055300190000000306600210000000000705043300000000076701cf000000000767022f000000000101043b0000010006600089000000000161022f00000000016101cf000000000171019f00000000001504350000000101200190000005ba0000613d0000000001040433000001c702000041000000200410008c00000000040000190000000004024019000001c701100197000000000501004b000000000200a019000001c70110009c000000000204c019000000000102004b000000400000c13d0000000001030433000800000001001d000001b60110009c000000400000213d000001b901000041000000000010043900000008010000290000000400100443000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ba011001c700008002020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000000000101004b0000000f020000290000000b04000029000000400000613d000000400300043d000001d701000041000000000013043500000024053000390000000901000029000300000005001d00000000001504350000000401300039000200000001001d00000000002104350000001f0240018f0000006401300039000900000003001d0000004403300039000100000003001d0000000000430435000000100300002900000002033003670000000504400272000004ee0000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000004e60000413d000000000502004b000004fd0000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f00000000002404350000000b01100029000000000001043500000000010004140000000802000029000000040220008c0000051e0000613d0000000b020000290000001f022000390000000a0220017f000001a2030000410000000905000029000001a20450009c0000000004030019000000000405401900000040044002100000006402200039000001a20520009c00000000020380190000006002200210000000000224019f000001a20410009c0000000001038019000000c001100210000000000121019f0000000802000029068106770000040f00000000030100190000006003300270000101a20030019d000001a20330019700030000000103550000000102200190000005db0000613d0000000901000029000001bd0110009c000002170000213d0000000901000029000000400010043f0000000802000029000000050120014f000001b601100198000005f80000c13d000000060100002900000000001004350000000401000029000000200010043f000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001be011001c700008010020000390681067c0000040f00000001022001900000000f03000029000000400000613d000000000101043b000000000201041a000001d902200197000000000232019f000000000021041b000003af0000013d000300000001035500000000020100190000006002200270000101a20020019d000001a202200197000000400300043d0000001f0420018f00000005052002720000054e0000613d000000000600001900000005076002100000000008730019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000005460000413d000000000604004b0000055d0000613d0000000505500210000000000151034f00000000055300190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f00000000001504350000041d0000013d000001b6031001970000000101000039000000000201041a000001d902200197000000000232019f000000000021041b00000002010000390000000f02000029000000000021041b000001b9010000410000000000100439001000000003001d0000000400300443000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ba011001c700008002020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000000000101004b0000000e02000029000000400000613d000000400300043d000001ee010000410000000000130435000c00000003001d0000000401300039000000000021043500000000010004140000001002000029000000040220008c000005960000613d000001a202000041000001a20310009c00000000010280190000000c04000029000001a20340009c00000000020440190000004002200210000000c001100210000000000121019f000001ef011001c70000001002000029068106770000040f00000000030100190000006003300270000101a20030019d000001a20330019700030000000103550000000102200190000005be0000613d0000000c01000029000001bd0110009c000002170000213d0000000c01000029000000400010043f000003940000013d000000000001042f000000400200043d0000001f0430018f0000000505300272000005aa0000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000005a20000413d000000000604004b000005b90000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000002800000013d000000400100043d0000004402100039000001d603000041000004290000013d000000400200043d0000001f0430018f0000000505300272000005cb0000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000005c30000413d000000000604004b000002800000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000002800000013d000000400200043d0000001f0430018f0000000505300272000005e80000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000005e00000413d000000000604004b000005f70000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000002800000013d000001a60100004100000009030000290000000000130435000000200100003900000002020000290000000000120435000000070100002900000003020000290000000000120435000001d80100004100000001020000290000000000120435000002bb0000013d0001000000000002000100000001001d0000000101000039000000000301041a000000400100043d00000040021000390000004004000039000000000042043500000060020000390000000002210436000001b603300197000000000032043500000060031000390000000000030435000001f60310009c000006580000813d0000008003100039000000400030043f000001a203000041000001a20420009c000000000203801900000040022002100000000001010433000001a20410009c00000000010380190000006001100210000000000121019f0000000002000414000001a20420009c0000000002038019000000c002200210000000000112019f000001cd011001c700008010020000390681067c0000040f00000001022001900000065e0000613d0000000202000039000000000202041a000000000301043b000000400100043d000000a0041000390000000000340435000000800310003900000000002304350000000102000029000001b602200197000000600310003900000000002304350000004002100039000000000300041000000000003204350000002002100039000001cb030000410000000000320435000000a0030000390000000000310435000001cc0310009c000006580000213d000000c003100039000000400030043f000001a203000041000001a20420009c000000000203801900000040022002100000000001010433000001a20410009c00000000010380190000006001100210000000000121019f0000000002000414000001a20420009c0000000002038019000000c002200210000000000112019f000001cd011001c700008010020000390681067c0000040f00000001022001900000065e0000613d000000000101043b000001b601100197000000000001042d000001f00100004100000000001004350000004101000039000000040010043f000001ef01000041000006830001043000000000010000190000068300010430000000000001042f000001a203000041000001a20410009c00000000010380190000004001100210000001a20420009c00000000020380190000006002200210000000000112019f0000000002000414000001a20420009c0000000002038019000000c002200210000000000112019f000001cd011001c700008010020000390681067c0000040f0000000102200190000006750000613d000000000101043b000000000001042d000000000100001900000683000104300000067a002104210000000102000039000000000001042d0000000002000019000000000001042d0000067f002104230000000102000039000000000001042d0000000002000019000000000001042d0000068100000432000006820001042e0000068300010430000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000000000001ffffffe0616c697a696e6700000000000000000000000000000000000000000000000000496e697469616c697a61626c653a20636f6e747261637420697320696e69746908c379a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008400000000000000000000000002000000000000000000000000000000000000200000000000000000000000007f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498000000020000000000000000000000000000008000000100000000000000000000000000000000000000000000000000000000000000000000000000cfe7af7b00000000000000000000000000000000000000000000000000000000f54266a100000000000000000000000000000000000000000000000000000000f54266a200000000000000000000000000000000000000000000000000000000f5f1516800000000000000000000000000000000000000000000000000000000cfe7af7c00000000000000000000000000000000000000000000000000000000d9caed1200000000000000000000000000000000000000000000000000000000a31ee5af00000000000000000000000000000000000000000000000000000000a31ee5b000000000000000000000000000000000000000000000000000000000b852ad36000000000000000000000000000000000000000000000000000000006dde720900000000000000000000000000000000000000000000000000000000969b53da000000000000000000000000ffffffffffffffffffffffffffffffffffffffff000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000008000000000000000001806aa1896bbf26568e884a7374b41e002500962caba6a15023a8d90e8508b83020000020000000000000000000000000000002400000000000000000000000074f4f547000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000044000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff020000000000000000000000000000000000004000000000000000000000000011a2ccc100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff7f62f84b24000000000000000000000000000000000000000000000000000000002fc3848834aac8e883a2d2a17a7514dc4f2d3dd268089df9b9f5d918259ef3b079680000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064000000000000000000000000416d6f756e742063616e6e6f74206265207a65726f000000000000000000000000000000000000000000000000000000000000640000008000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000eeeeffffffffffffffffffffffffffffffffeeef6d710000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000060000000a000000000000000002020dba91b30cc0006188af794c2fb30dd8520db7e2c088b7fc7c103c00ca494000000000000000000000000000000000000000000000000ffffffffffffff3f020000000000000000000000000000000000000000000000000000000000000067670000000000000000000000000000000000000000000000000000000000003cda335100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000ffffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000ffffffff00000000000000000000000001000000000000000000000000000000000000000000000000000000000000006d6b00000000000000000000000000000000000000000000000000000000000095f11a40000000000000000000000000000000000000000000000000000000006d74000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000008c2a993e00000000000000000000000000000000000000000000000000000000b84fba9af218da60d299dc177abd5805e7ac541d2673cbee7808c10017874f634f766572666c6f77000000000000000000000000000000000000000000000000496e697469616c697a61626c653a20636f6e747261637420697320616c726561647920696e697469616c697a65640000000000000000000000000000000000000000000000000000000000000000000000000084000000800000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000ffffffffffffffffffff0000000000000000000000000000000000000000010200000000000000000000ffffffffffffffffffffffffffffffffffffffff0000310ab089e4439a4c15d089f94afb7896ff553aecb10793d0ab882de59d99a32e02000002000000000000000000000000000000440000000000000000000000009a8a0592ac89c5ad3bc6df8224c17b485976f597df104ee20d0df415241f670b0200000200000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff7c010004751688ab9322961547058fd0f36d3edf69880b64cbb2857041d33f4a133cda33511d41a8a5431b1770c5bc0ddd62e1cd30555d16659b89c0d60f4f9f570200000000000000000000000000000000000084000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff7b010000691fa4f751f8312bc555242f18ed78cdc9aabc0ea77d7d5a675ee8ac6f02000000000000000000000000000000000000a4000000000000000000000000f2fde38b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000240000000000000000000000004e487b7100000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff6266320000000000000000000000000000000000000000000000000000000000736600000000000000000000000000000000000000000000000000000000000064660000000000000000000000000000000000000000000000000000000000006266000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff800000000000000000000000000000000000000000000000000000000000000000f5cf0be6820df44d868e986d4d5cafabd5702ac45d181a5ac4eb5ed59a001b03", + "linkReferences": {}, + "deployedLinkReferences": {}, + "factoryDeps": { + "0x010000691fa4f751f8312bc555242f18ed78cdc9aabc0ea77d7d5a675ee8ac6f": "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol:UpgradeableBeacon", + "0x010004751688ab9322961547058fd0f36d3edf69880b64cbb2857041d33f4a13": "contracts/bridge/L2StandardERC20.sol:L2StandardERC20" + } +} diff --git a/l1-contracts/script-config/artifacts/TransparentUpgradeableProxy.json b/l1-contracts/script-config/artifacts/TransparentUpgradeableProxy.json new file mode 100644 index 000000000..c8880c120 --- /dev/null +++ b/l1-contracts/script-config/artifacts/TransparentUpgradeableProxy.json @@ -0,0 +1,86 @@ +{ + "_format": "hh-zksolc-artifact-1", + "contractName": "TransparentUpgradeableProxy", + "sourceName": "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol", + "abi": [ + { + "inputs": [ + { + "internalType": "address", + "name": "_logic", + "type": "address" + }, + { + "internalType": "address", + "name": "admin_", + "type": "address" + }, + { + "internalType": "bytes", + "name": "_data", + "type": "bytes" + } + ], + "stateMutability": "payable", + "type": "constructor" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "previousAdmin", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "newAdmin", + "type": "address" + } + ], + "name": "AdminChanged", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "beacon", + "type": "address" + } + ], + "name": "BeaconUpgraded", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "implementation", + "type": "address" + } + ], + "name": "Upgraded", + "type": "event" + }, + { + "stateMutability": "payable", + "type": "fallback" + }, + { + "stateMutability": "payable", + "type": "receive" + } + ], + "bytecode": "0x00020000000000020008000000000002000000000301001900000060033002700000012c0330019700010000003103550000008008000039000000400080043f00000001022001900000001e0000c13d000000000431034f00000000050004110000013d02000041000000000702041a0000013002700197000000000603004b000000270000c13d000000000325004b0000010c0000c13d000000000101043b0000014101100197000001420310009c0000001b0000613d000001430310009c000002c20000613d000001440310009c000002680000c13d00000000010004160000000001000019000004ac000104300000012d023000410000012e0220009c0000005f0000213d000001520100004100000000001004350000004101000039000000040010043f0000015301000041000004ac00010430000000000525004b0000012d0000c13d000000000401043b0000014104400197000001420540009c000001670000c13d0000000002000416000000000202004b000002c20000c13d000000240230008c000002c20000413d0000000401100370000000000201043b000001300120009c000002c20000213d000000a001000039000000400010043f000000800000043f00000133010000410000000000100439000800000002001d00000004002004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b000002a80000c13d000000400100043d00000064021000390000015403000041000000000032043500000044021000390000015503000041000000000032043500000024021000390000002d0300003900000000003204350000013c0200004100000000002104350000000402100039000000200300003900000000003204350000012c020000410000012c0310009c000000000102801900000040011002100000014c011001c7000004ac000104300000009f023000390000012f02200197000000400020043f0000001f0230018f00000005043002720000006e0000613d00000000050000190000000506500210000000000761034f000000000707043b000000800660003900000000007604350000000105500039000000000645004b000000660000413d000000000502004b0000007d0000613d0000000504400210000000000141034f00000003022002100000008004400039000000000504043300000000052501cf000000000525022f000000000101043b0000010002200089000000000121022f00000000012101cf000000000151019f00000000001404350000005f0130008c000002c20000a13d000000800900043d000001300190009c000002c20000213d000000a00700043d000001300170009c000002c20000213d000000c00200043d000001310120009c000002c20000213d0000001f012000390000013204000041000000000531004b000000000500001900000000050480190000013201100197000000000601004b0000000004008019000001320110009c000000000405c019000000000104004b000002c20000c13d00000080012000390000000001010433000001310410009c000000210000213d0000003f04100039000000200a00008a0000000004a4016f000000400b00043d00000000044b00190000000005b4004b00000000050000190000000105004039000001310640009c000000210000213d0000000105500190000000210000c13d0000008003300039000000400040043f00000000061b0436000000a0022000390000000004210019000000000334004b000002c20000213d00060000000b001d00050000000a001d000700000007001d000300000008001d000000000301004b000000b90000613d000000000300001900000000046300190000000005230019000000000505043300000000005404350000002003300039000000000413004b000000b20000413d000400000006001d0000000001160019000000000001043500000133010000410000000000100439000800000009001d00000004009004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b0000004a0000613d000000080100002900000130051001970000013501000041000000000201041a0000013602200197000000000252019f000000000021041b0000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000137011001c70000800d020000390000000203000039000001380400004104aa049b0000040f0000000803000029000000010120019000000007020000290000000605000029000002c20000613d0000000001050433000000000101004b000003770000c13d0000013d01000041000000000301041a0000013004200197000000400100043d0000002002100039000800000004001d0000000000420435000700000003001d000001300230019700000000002104350000012c0200004100000000030004140000012c0430009c00000000030280190000012c0410009c00000000010280190000004001100210000000c002300210000000000112019f0000013e011001c70000800d0200003900000001030000390000013f0400004104aa049b0000040f0000000101200190000002c20000613d000000080100006b0000025a0000613d0000000701000029000001360110019700000008011001af0000013d02000041000000000012041b0000002001000039000001000010044300000120000004430000014001000041000004ab0001042e0000013501000041000000000201041a00000000010004140000013002200197000000040320008c000001e90000c13d00000000030000310000001f0230018f00000005013002720000011e0000613d00000000050000190000000506500210000000000764034f000000000707043b00000000007604350000000105500039000000000615004b000001170000413d000000000502004b0000020e0000613d00000003022002100000000501100210000000000501043300000000052501cf000000000525022f000000000414034f000000000404043b0000010002200089000000000424022f00000000022401cf000000000252019f00000000002104350000020e0000013d0000001f0530018f0000013502000041000000000202041a000001300220019700000005063002720000013b0000613d00000000070000190000000508700210000000000981034f000000000909043b00000000009804350000000107700039000000000867004b000001340000413d000000000705004b000001490000613d00000003055002100000000506600210000000000706043300000000075701cf000000000757022f000000000161034f000000000101043b0000010005500089000000000151022f00000000015101cf000000000171019f00000000001604350000000001000414000000040520008c0000020f0000c13d00000000030000310000001f0230018f0000000501300272000001580000613d00000000050000190000000506500210000000000764034f000000000707043b00000000007604350000000105500039000000000615004b000001510000413d000000000502004b000002360000613d00000003022002100000000501100210000000000501043300000000052501cf000000000525022f000000000414034f000000000404043b0000010002200089000000000424022f00000000022401cf000000000252019f0000000000210435000002360000013d000001430540009c0000023b0000c13d000000440230008c000002c20000413d0000000402100370000000000802043b000001300280009c000002c20000213d0000002402100370000000000402043b000001310240009c000002c20000213d00000023024000390000013205000041000000000632004b000000000600001900000000060580190000013202200197000000000702004b0000000005008019000001320220009c000000000506c019000000000205004b000002c20000c13d0000000405400039000000000251034f000000000202043b000001310620009c000000210000213d000000bf06200039000000200900008a000000000696016f000001310760009c000000210000213d000000400060043f000000800020043f00000000042400190000002404400039000000000334004b000002c20000213d0000002003500039000000000131034f0000001f0320018f00000005042002720000019d0000613d00000000050000190000000506500210000000000761034f000000000707043b000000a00660003900000000007604350000000105500039000000000645004b000001950000413d000700000009001d000000000503004b000001ad0000613d0000000504400210000000000141034f0000000303300210000000a004400039000000000504043300000000053501cf000000000535022f000000000101043b0000010003300089000000000131022f00000000013101cf000000000151019f0000000000140435000000a001200039000000000001043500000133010000410000000000100439000800000008001d00000004008004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b0000004a0000613d0000013501000041000000000201041a000001360220019700000008022001af0000000805000029000000000021041b0000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000137011001c70000800d020000390000000203000039000001380400004104aa049b0000040f00000008030000290000000101200190000002c20000613d000000400100043d000600000001001d000001390110009c000000210000213d00000006040000290000006001400039000000400010043f00000040014000390000013a02000041000000000021043500000020014000390000013b02000041000000000021043500000027010000390000000000140435000000800200043d0000000001000414000000040330008c0000040d0000c13d000000010200003900000000040000310000041d0000013d0000012c030000410000012c0410009c0000000001038019000000c00110021004aa04a50000040f0001000000010355000000000301001900000060033002700000001f0430018f0000012c0030019d0000012c033001970000000505300272000001fe0000613d00000000060000190000000507600210000000000871034f000000000808043b00000000008704350000000106600039000000000756004b000001f70000413d000000000604004b0000020c0000613d00000003044002100000000505500210000000000605043300000000064601cf000000000646022f000000000151034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f00000000001504350000000101200190000002640000613d000002360000013d0000012c040000410000012c0510009c0000000001048019000000c0011002100000006003300210000000000131019f04aa04a50000040f0001000000010355000000000301001900000060033002700000001f0430018f0000012c0030019d0000012c033001970000000505300272000002260000613d00000000060000190000000507600210000000000871034f000000000808043b00000000008704350000000106600039000000000756004b0000021f0000413d000000000604004b000002340000613d00000003044002100000000505500210000000000605043300000000064601cf000000000646022f000000000151034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f00000000001504350000000101200190000002660000613d0000012c010000410000012c0230009c00000000030180190000006001300210000004ab0001042e000001440540009c0000026e0000c13d0000000004000416000000000404004b000002c20000c13d000000240330008c000002c20000413d0000000401100370000000000401043b000001300140009c000002c20000213d000000800020043f000000a00040043f0000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000148011001c70000800d020000390000000103000039000700000004001d0000013f04000041000800000007001d04aa049b0000040f000000070400002900000008030000290000000101200190000002c20000613d000000000104004b000002c40000c13d000000400100043d00000064021000390000014a03000041000000000032043500000044021000390000014b03000041000000000032043500000024021000390000002603000039000000530000013d0000006001300210000004ac000104300000006001300210000004ac00010430000001450310009c000002750000c13d0000000001000416000000000101004b000002c20000c13d0000027d0000013d000001450140009c000002840000c13d0000000001000416000000000101004b000002c20000c13d000000a00020043f0000028d0000013d000001460110009c0000029a0000c13d0000000001000416000000000101004b000002c20000c13d0000013501000041000000000101041a0000013002100197000000a00020043f0000002001000039000000800010043f000000c001000039000000400010043f0000015a01000041000004ab0001042e000001460140009c0000029a0000c13d0000000001000416000000000101004b000002c20000c13d0000013501000041000000000101041a0000013001100197000000a00010043f0000002001000039000000800010043f000000c001000039000000400010043f000000800100003900000147020000410000015003000041000001500410009c000000000103801900000040011002100000015101100041000000000121019f000004ab0001042e0000013c01000041000000800010043f0000002001000039000000840010043f0000004201000039000000a40010043f0000015601000041000000c40010043f0000015701000041000000e40010043f0000015801000041000001040010043f0000015901000041000004ac000104300000013501000041000000000201041a000001360220019700000008022001af0000000805000029000000000021041b0000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000137011001c70000800d020000390000000203000039000001380400004104aa049b0000040f00000008080000290000000101200190000002c20000613d000000800100043d000000000101004b000002d00000c13d000000400100043d000001490210009c000000210000213d000002cb0000013d0000000001000019000004ac000104300000013601300197000000000114019f0000013d02000041000000000012041b000000400100043d000001490210009c000000210000213d0000002002100039000000400020043f00000000000104350000000002000019000002930000013d000000400900043d000001390190009c000000210000213d0000006001900039000000400010043f00000040019000390000013a02000041000000000021043500000020019000390000013b02000041000000000021043500000027010000390000000000190435000000800200043d0000000001000414000000040380008c000002e40000c13d00000001020000390000000004000031000002f70000013d0000012c030000410000012c0410009c00000000010380190000012c0420009c00000000020380190000006002200210000000c001100210000000000121019f0000014d011001c70000000002080019000700000009001d04aa04a50000040f00000007090000290000000808000029000000010220018f000100000001035500000060011002700000012c0010019d0000012c0410019700000060030000390000008001000039000000000504004b000003230000c13d0000000003030433000000000202004b000003530000c13d000000000203004b0000038c0000c13d000000400100043d0000013c0200004100000000002104350000000402100039000000200300003900000000003204350000000002090433000000240310003900000000002304350000004403100039000000000402004b000003140000613d000000000400001900000000053400190000002004400039000000000694001900000000060604330000000000650435000000000524004b0000030d0000413d0000001f04200039000000200500008a000000000454016f0000000002320019000000000002043500000044024000390000012c030000410000012c0420009c00000000020380190000012c0410009c000000000103801900000040011002100000006002200210000000000112019f000004ac00010430000001310140009c000000210000213d0000003f01400039000000200300008a000000000131016f000000400300043d0000000001130019000000000531004b00000000050000190000000105004039000001310610009c000000210000213d0000000105500190000000210000c13d000000000a090019000000400010043f0000001f0540018f000000000143043600000001060003670000000504400272000003410000613d000000000700001900000005087002100000000009810019000000000886034f000000000808043b00000000008904350000000107700039000000000847004b000003390000413d000000000705004b000000080800002900000000090a0019000002fb0000613d0000000504400210000000000646034f00000000044100190000000305500210000000000704043300000000075701cf000000000757022f000000000606043b0000010005500089000000000656022f00000000055601cf000000000575019f0000000000540435000002fb0000013d000000000103004b000002be0000c13d0000013301000041000000000010043900000004008004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b000002be0000c13d000000400100043d00000044021000390000014e03000041000000000032043500000024021000390000001d0300003900000000003204350000013c0200004100000000002104350000000402100039000000200300003900000000003204350000012c020000410000012c0310009c000000000102801900000040011002100000014f011001c7000004ac00010430000000400400043d000001390140009c000000210000213d0000006001400039000000400010043f00000040014000390000013a0200004100000000002104350000002701000039000200000004001d00000000021404360000013b01000041000100000002001d000000000012043500000000020504330000000001000414000000040330008c000003950000c13d00000001020000390000000003000031000003a90000013d0000012c020000410000012c0430009c00000000030280190000012c0410009c000000000102801900000040011002100000006002300210000000000112019f000004ac000104300000012c0300004100000004050000290000012c0450009c000000000503801900000040045002100000012c0520009c00000000020380190000006002200210000000000242019f0000012c0410009c0000000001038019000000c001100210000000000112019f000000080200002904aa04a50000040f000000010220018f000100000001035500000060011002700000012c0010019d0000012c031001970000006001000039000000000403004b000003c90000c13d0000000001010433000000000202004b000003f70000c13d000000000201004b000004830000c13d000000400400043d000800000004001d0000013c01000041000000000014043500000004014000390000002002000039000000000021043500000002010000290000000003010433000700000003001d000000240140003900000000003104350000004402400039000000010100002904aa048d0000040f00000007010000290000001f01100039000000050110017f00000044011000390000012c020000410000012c0310009c00000000010280190000000804000029000004870000013d000001310130009c0000000504000029000000210000213d0000003f01300039000000000441016f000000400100043d0000000004410019000000000514004b00000000050000190000000105004039000001310640009c000000210000213d0000000105500190000000210000c13d000000400040043f0000001f0430018f000000000931043600000001050003670000000503300272000003e60000613d000000000600001900000005076002100000000008790019000000000775034f000000000707043b00000000007804350000000106600039000000000736004b000003de0000413d000300000009001d000000000604004b000003ac0000613d0000000503300210000000000535034f00000003033000290000000304400210000000000603043300000000064601cf000000000646022f000000000505043b0000010004400089000000000545022f00000000044501cf000000000464019f0000000000430435000003ac0000013d000000000101004b00000007020000290000000803000029000000e60000c13d0000013301000041000000000010043900000004003004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b0000000702000029000000e60000c13d000003650000013d0000012c030000410000012c0410009c00000000010380190000012c0420009c00000000020380190000006002200210000000c001100210000000000121019f0000014d011001c7000000080200002904aa04a50000040f000000010220018f000100000001035500000060011002700000012c0010019d0000012c0410019700000060030000390000008001000039000000000504004b0000043e0000c13d0000000003030433000000000202004b0000046b0000c13d000000000203004b0000038c0000c13d000000400100043d0000013c02000041000000000021043500000004021000390000002003000039000000000032043500000006070000290000000002070433000000240310003900000000002304350000004403100039000000000402004b0000043b0000613d000000000400001900000000053400190000002004400039000000000674001900000000060604330000000000650435000000000524004b000004340000413d0000001f042000390000000705000029000003160000013d000001310140009c0000000703000029000000210000213d0000003f01400039000000000131016f000000400300043d0000000001130019000000000531004b00000000050000190000000105004039000001310610009c000000210000213d0000000105500190000000210000c13d000000400010043f0000001f0540018f0000000001430436000000010600036700000005044002720000045b0000613d000000000700001900000005087002100000000009810019000000000886034f000000000808043b00000000008904350000000107700039000000000847004b000004530000413d000000000705004b000004210000613d0000000504400210000000000646034f00000000044100190000000305500210000000000704043300000000075701cf000000000757022f000000000606043b0000010005500089000000000656022f00000000055601cf000000000575019f0000000000540435000004210000013d000000000103004b0000047e0000c13d00000133010000410000000000100439000000080100002900000004001004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b000003650000613d000000400100043d000001490210009c000000210000213d000002cb0000013d000000000001042f0000012c020000410000012c0310009c000000000102801900000003040000290000012c0340009c000000000402801900000040024002100000006001100210000000000121019f000004ac00010430000000000403004b000004970000613d000000000400001900000000052400190000000006140019000000000606043300000000006504350000002004400039000000000534004b000004900000413d00000000012300190000000000010435000000000001042d000000000001042f0000049e002104210000000102000039000000000001042d0000000002000019000000000001042d000004a3002104230000000102000039000000000001042d0000000002000019000000000001042d000004a8002104250000000102000039000000000001042d0000000002000019000000000001042d000004aa00000432000004ab0001042e000004ac0001043000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000009fffffffffffffffffffffffffffffffffffffffffffffffff000000000000007f00000000000000000000000000000000000000000000000000000001ffffffe0000000000000000000000000ffffffffffffffffffffffffffffffffffffffff000000000000000000000000000000000000000000000000ffffffffffffffff80000000000000000000000000000000000000000000000000000000000000001806aa1896bbf26568e884a7374b41e002500962caba6a15023a8d90e8508b830200000200000000000000000000000000000024000000000000000000000000360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbcffffffffffffffffffffffff00000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000bc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b000000000000000000000000000000000000000000000000ffffffffffffff9f206661696c656400000000000000000000000000000000000000000000000000416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c08c379a000000000000000000000000000000000000000000000000000000000b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610302000000000000000000000000000000000000400000000000000000000000007e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f0000000200000000000000000000000000000040000001000000000000000000ffffffff000000000000000000000000000000000000000000000000000000003659cfe6000000000000000000000000000000000000000000000000000000004f1ef286000000000000000000000000000000000000000000000000000000008f28397000000000000000000000000000000000000000000000000000000000f851a440000000000000000000000000000000000000000000000000000000005c60da1b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000200000000000000000000000000000000000040000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffdf6464726573730000000000000000000000000000000000000000000000000000455243313936373a206e65772061646d696e20697320746865207a65726f206100000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000000000000000000000000000000000000000006400000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffdf00000000000000000000000000000000000000000000002000000000000000004e487b710000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000240000000000000000000000006f74206120636f6e747261637400000000000000000000000000000000000000455243313936373a206e657720696d706c656d656e746174696f6e206973206e5472616e73706172656e745570677261646561626c6550726f78793a2061646d696e2063616e6e6f742066616c6c6261636b20746f2070726f78792074617267657400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a40000008000000000000000000000000000000000000000000000000000000020000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000007444ff0b02dc9864c7dbf97ccd7719c286d6972190eeb0285ea9e04a713977c0", + "deployedBytecode": "0x00020000000000020008000000000002000000000301001900000060033002700000012c0330019700010000003103550000008008000039000000400080043f00000001022001900000001e0000c13d000000000431034f00000000050004110000013d02000041000000000702041a0000013002700197000000000603004b000000270000c13d000000000325004b0000010c0000c13d000000000101043b0000014101100197000001420310009c0000001b0000613d000001430310009c000002c20000613d000001440310009c000002680000c13d00000000010004160000000001000019000004ac000104300000012d023000410000012e0220009c0000005f0000213d000001520100004100000000001004350000004101000039000000040010043f0000015301000041000004ac00010430000000000525004b0000012d0000c13d000000000401043b0000014104400197000001420540009c000001670000c13d0000000002000416000000000202004b000002c20000c13d000000240230008c000002c20000413d0000000401100370000000000201043b000001300120009c000002c20000213d000000a001000039000000400010043f000000800000043f00000133010000410000000000100439000800000002001d00000004002004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b000002a80000c13d000000400100043d00000064021000390000015403000041000000000032043500000044021000390000015503000041000000000032043500000024021000390000002d0300003900000000003204350000013c0200004100000000002104350000000402100039000000200300003900000000003204350000012c020000410000012c0310009c000000000102801900000040011002100000014c011001c7000004ac000104300000009f023000390000012f02200197000000400020043f0000001f0230018f00000005043002720000006e0000613d00000000050000190000000506500210000000000761034f000000000707043b000000800660003900000000007604350000000105500039000000000645004b000000660000413d000000000502004b0000007d0000613d0000000504400210000000000141034f00000003022002100000008004400039000000000504043300000000052501cf000000000525022f000000000101043b0000010002200089000000000121022f00000000012101cf000000000151019f00000000001404350000005f0130008c000002c20000a13d000000800900043d000001300190009c000002c20000213d000000a00700043d000001300170009c000002c20000213d000000c00200043d000001310120009c000002c20000213d0000001f012000390000013204000041000000000531004b000000000500001900000000050480190000013201100197000000000601004b0000000004008019000001320110009c000000000405c019000000000104004b000002c20000c13d00000080012000390000000001010433000001310410009c000000210000213d0000003f04100039000000200a00008a0000000004a4016f000000400b00043d00000000044b00190000000005b4004b00000000050000190000000105004039000001310640009c000000210000213d0000000105500190000000210000c13d0000008003300039000000400040043f00000000061b0436000000a0022000390000000004210019000000000334004b000002c20000213d00060000000b001d00050000000a001d000700000007001d000300000008001d000000000301004b000000b90000613d000000000300001900000000046300190000000005230019000000000505043300000000005404350000002003300039000000000413004b000000b20000413d000400000006001d0000000001160019000000000001043500000133010000410000000000100439000800000009001d00000004009004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b0000004a0000613d000000080100002900000130051001970000013501000041000000000201041a0000013602200197000000000252019f000000000021041b0000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000137011001c70000800d020000390000000203000039000001380400004104aa049b0000040f0000000803000029000000010120019000000007020000290000000605000029000002c20000613d0000000001050433000000000101004b000003770000c13d0000013d01000041000000000301041a0000013004200197000000400100043d0000002002100039000800000004001d0000000000420435000700000003001d000001300230019700000000002104350000012c0200004100000000030004140000012c0430009c00000000030280190000012c0410009c00000000010280190000004001100210000000c002300210000000000112019f0000013e011001c70000800d0200003900000001030000390000013f0400004104aa049b0000040f0000000101200190000002c20000613d000000080100006b0000025a0000613d0000000701000029000001360110019700000008011001af0000013d02000041000000000012041b0000002001000039000001000010044300000120000004430000014001000041000004ab0001042e0000013501000041000000000201041a00000000010004140000013002200197000000040320008c000001e90000c13d00000000030000310000001f0230018f00000005013002720000011e0000613d00000000050000190000000506500210000000000764034f000000000707043b00000000007604350000000105500039000000000615004b000001170000413d000000000502004b0000020e0000613d00000003022002100000000501100210000000000501043300000000052501cf000000000525022f000000000414034f000000000404043b0000010002200089000000000424022f00000000022401cf000000000252019f00000000002104350000020e0000013d0000001f0530018f0000013502000041000000000202041a000001300220019700000005063002720000013b0000613d00000000070000190000000508700210000000000981034f000000000909043b00000000009804350000000107700039000000000867004b000001340000413d000000000705004b000001490000613d00000003055002100000000506600210000000000706043300000000075701cf000000000757022f000000000161034f000000000101043b0000010005500089000000000151022f00000000015101cf000000000171019f00000000001604350000000001000414000000040520008c0000020f0000c13d00000000030000310000001f0230018f0000000501300272000001580000613d00000000050000190000000506500210000000000764034f000000000707043b00000000007604350000000105500039000000000615004b000001510000413d000000000502004b000002360000613d00000003022002100000000501100210000000000501043300000000052501cf000000000525022f000000000414034f000000000404043b0000010002200089000000000424022f00000000022401cf000000000252019f0000000000210435000002360000013d000001430540009c0000023b0000c13d000000440230008c000002c20000413d0000000402100370000000000802043b000001300280009c000002c20000213d0000002402100370000000000402043b000001310240009c000002c20000213d00000023024000390000013205000041000000000632004b000000000600001900000000060580190000013202200197000000000702004b0000000005008019000001320220009c000000000506c019000000000205004b000002c20000c13d0000000405400039000000000251034f000000000202043b000001310620009c000000210000213d000000bf06200039000000200900008a000000000696016f000001310760009c000000210000213d000000400060043f000000800020043f00000000042400190000002404400039000000000334004b000002c20000213d0000002003500039000000000131034f0000001f0320018f00000005042002720000019d0000613d00000000050000190000000506500210000000000761034f000000000707043b000000a00660003900000000007604350000000105500039000000000645004b000001950000413d000700000009001d000000000503004b000001ad0000613d0000000504400210000000000141034f0000000303300210000000a004400039000000000504043300000000053501cf000000000535022f000000000101043b0000010003300089000000000131022f00000000013101cf000000000151019f0000000000140435000000a001200039000000000001043500000133010000410000000000100439000800000008001d00000004008004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b0000004a0000613d0000013501000041000000000201041a000001360220019700000008022001af0000000805000029000000000021041b0000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000137011001c70000800d020000390000000203000039000001380400004104aa049b0000040f00000008030000290000000101200190000002c20000613d000000400100043d000600000001001d000001390110009c000000210000213d00000006040000290000006001400039000000400010043f00000040014000390000013a02000041000000000021043500000020014000390000013b02000041000000000021043500000027010000390000000000140435000000800200043d0000000001000414000000040330008c0000040d0000c13d000000010200003900000000040000310000041d0000013d0000012c030000410000012c0410009c0000000001038019000000c00110021004aa04a50000040f0001000000010355000000000301001900000060033002700000001f0430018f0000012c0030019d0000012c033001970000000505300272000001fe0000613d00000000060000190000000507600210000000000871034f000000000808043b00000000008704350000000106600039000000000756004b000001f70000413d000000000604004b0000020c0000613d00000003044002100000000505500210000000000605043300000000064601cf000000000646022f000000000151034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f00000000001504350000000101200190000002640000613d000002360000013d0000012c040000410000012c0510009c0000000001048019000000c0011002100000006003300210000000000131019f04aa04a50000040f0001000000010355000000000301001900000060033002700000001f0430018f0000012c0030019d0000012c033001970000000505300272000002260000613d00000000060000190000000507600210000000000871034f000000000808043b00000000008704350000000106600039000000000756004b0000021f0000413d000000000604004b000002340000613d00000003044002100000000505500210000000000605043300000000064601cf000000000646022f000000000151034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f00000000001504350000000101200190000002660000613d0000012c010000410000012c0230009c00000000030180190000006001300210000004ab0001042e000001440540009c0000026e0000c13d0000000004000416000000000404004b000002c20000c13d000000240330008c000002c20000413d0000000401100370000000000401043b000001300140009c000002c20000213d000000800020043f000000a00040043f0000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000148011001c70000800d020000390000000103000039000700000004001d0000013f04000041000800000007001d04aa049b0000040f000000070400002900000008030000290000000101200190000002c20000613d000000000104004b000002c40000c13d000000400100043d00000064021000390000014a03000041000000000032043500000044021000390000014b03000041000000000032043500000024021000390000002603000039000000530000013d0000006001300210000004ac000104300000006001300210000004ac00010430000001450310009c000002750000c13d0000000001000416000000000101004b000002c20000c13d0000027d0000013d000001450140009c000002840000c13d0000000001000416000000000101004b000002c20000c13d000000a00020043f0000028d0000013d000001460110009c0000029a0000c13d0000000001000416000000000101004b000002c20000c13d0000013501000041000000000101041a0000013002100197000000a00020043f0000002001000039000000800010043f000000c001000039000000400010043f0000015a01000041000004ab0001042e000001460140009c0000029a0000c13d0000000001000416000000000101004b000002c20000c13d0000013501000041000000000101041a0000013001100197000000a00010043f0000002001000039000000800010043f000000c001000039000000400010043f000000800100003900000147020000410000015003000041000001500410009c000000000103801900000040011002100000015101100041000000000121019f000004ab0001042e0000013c01000041000000800010043f0000002001000039000000840010043f0000004201000039000000a40010043f0000015601000041000000c40010043f0000015701000041000000e40010043f0000015801000041000001040010043f0000015901000041000004ac000104300000013501000041000000000201041a000001360220019700000008022001af0000000805000029000000000021041b0000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000137011001c70000800d020000390000000203000039000001380400004104aa049b0000040f00000008080000290000000101200190000002c20000613d000000800100043d000000000101004b000002d00000c13d000000400100043d000001490210009c000000210000213d000002cb0000013d0000000001000019000004ac000104300000013601300197000000000114019f0000013d02000041000000000012041b000000400100043d000001490210009c000000210000213d0000002002100039000000400020043f00000000000104350000000002000019000002930000013d000000400900043d000001390190009c000000210000213d0000006001900039000000400010043f00000040019000390000013a02000041000000000021043500000020019000390000013b02000041000000000021043500000027010000390000000000190435000000800200043d0000000001000414000000040380008c000002e40000c13d00000001020000390000000004000031000002f70000013d0000012c030000410000012c0410009c00000000010380190000012c0420009c00000000020380190000006002200210000000c001100210000000000121019f0000014d011001c70000000002080019000700000009001d04aa04a50000040f00000007090000290000000808000029000000010220018f000100000001035500000060011002700000012c0010019d0000012c0410019700000060030000390000008001000039000000000504004b000003230000c13d0000000003030433000000000202004b000003530000c13d000000000203004b0000038c0000c13d000000400100043d0000013c0200004100000000002104350000000402100039000000200300003900000000003204350000000002090433000000240310003900000000002304350000004403100039000000000402004b000003140000613d000000000400001900000000053400190000002004400039000000000694001900000000060604330000000000650435000000000524004b0000030d0000413d0000001f04200039000000200500008a000000000454016f0000000002320019000000000002043500000044024000390000012c030000410000012c0420009c00000000020380190000012c0410009c000000000103801900000040011002100000006002200210000000000112019f000004ac00010430000001310140009c000000210000213d0000003f01400039000000200300008a000000000131016f000000400300043d0000000001130019000000000531004b00000000050000190000000105004039000001310610009c000000210000213d0000000105500190000000210000c13d000000000a090019000000400010043f0000001f0540018f000000000143043600000001060003670000000504400272000003410000613d000000000700001900000005087002100000000009810019000000000886034f000000000808043b00000000008904350000000107700039000000000847004b000003390000413d000000000705004b000000080800002900000000090a0019000002fb0000613d0000000504400210000000000646034f00000000044100190000000305500210000000000704043300000000075701cf000000000757022f000000000606043b0000010005500089000000000656022f00000000055601cf000000000575019f0000000000540435000002fb0000013d000000000103004b000002be0000c13d0000013301000041000000000010043900000004008004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b000002be0000c13d000000400100043d00000044021000390000014e03000041000000000032043500000024021000390000001d0300003900000000003204350000013c0200004100000000002104350000000402100039000000200300003900000000003204350000012c020000410000012c0310009c000000000102801900000040011002100000014f011001c7000004ac00010430000000400400043d000001390140009c000000210000213d0000006001400039000000400010043f00000040014000390000013a0200004100000000002104350000002701000039000200000004001d00000000021404360000013b01000041000100000002001d000000000012043500000000020504330000000001000414000000040330008c000003950000c13d00000001020000390000000003000031000003a90000013d0000012c020000410000012c0430009c00000000030280190000012c0410009c000000000102801900000040011002100000006002300210000000000112019f000004ac000104300000012c0300004100000004050000290000012c0450009c000000000503801900000040045002100000012c0520009c00000000020380190000006002200210000000000242019f0000012c0410009c0000000001038019000000c001100210000000000112019f000000080200002904aa04a50000040f000000010220018f000100000001035500000060011002700000012c0010019d0000012c031001970000006001000039000000000403004b000003c90000c13d0000000001010433000000000202004b000003f70000c13d000000000201004b000004830000c13d000000400400043d000800000004001d0000013c01000041000000000014043500000004014000390000002002000039000000000021043500000002010000290000000003010433000700000003001d000000240140003900000000003104350000004402400039000000010100002904aa048d0000040f00000007010000290000001f01100039000000050110017f00000044011000390000012c020000410000012c0310009c00000000010280190000000804000029000004870000013d000001310130009c0000000504000029000000210000213d0000003f01300039000000000441016f000000400100043d0000000004410019000000000514004b00000000050000190000000105004039000001310640009c000000210000213d0000000105500190000000210000c13d000000400040043f0000001f0430018f000000000931043600000001050003670000000503300272000003e60000613d000000000600001900000005076002100000000008790019000000000775034f000000000707043b00000000007804350000000106600039000000000736004b000003de0000413d000300000009001d000000000604004b000003ac0000613d0000000503300210000000000535034f00000003033000290000000304400210000000000603043300000000064601cf000000000646022f000000000505043b0000010004400089000000000545022f00000000044501cf000000000464019f0000000000430435000003ac0000013d000000000101004b00000007020000290000000803000029000000e60000c13d0000013301000041000000000010043900000004003004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b0000000702000029000000e60000c13d000003650000013d0000012c030000410000012c0410009c00000000010380190000012c0420009c00000000020380190000006002200210000000c001100210000000000121019f0000014d011001c7000000080200002904aa04a50000040f000000010220018f000100000001035500000060011002700000012c0010019d0000012c0410019700000060030000390000008001000039000000000504004b0000043e0000c13d0000000003030433000000000202004b0000046b0000c13d000000000203004b0000038c0000c13d000000400100043d0000013c02000041000000000021043500000004021000390000002003000039000000000032043500000006070000290000000002070433000000240310003900000000002304350000004403100039000000000402004b0000043b0000613d000000000400001900000000053400190000002004400039000000000674001900000000060604330000000000650435000000000524004b000004340000413d0000001f042000390000000705000029000003160000013d000001310140009c0000000703000029000000210000213d0000003f01400039000000000131016f000000400300043d0000000001130019000000000531004b00000000050000190000000105004039000001310610009c000000210000213d0000000105500190000000210000c13d000000400010043f0000001f0540018f0000000001430436000000010600036700000005044002720000045b0000613d000000000700001900000005087002100000000009810019000000000886034f000000000808043b00000000008904350000000107700039000000000847004b000004530000413d000000000705004b000004210000613d0000000504400210000000000646034f00000000044100190000000305500210000000000704043300000000075701cf000000000757022f000000000606043b0000010005500089000000000656022f00000000055601cf000000000575019f0000000000540435000004210000013d000000000103004b0000047e0000c13d00000133010000410000000000100439000000080100002900000004001004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b000003650000613d000000400100043d000001490210009c000000210000213d000002cb0000013d000000000001042f0000012c020000410000012c0310009c000000000102801900000003040000290000012c0340009c000000000402801900000040024002100000006001100210000000000121019f000004ac00010430000000000403004b000004970000613d000000000400001900000000052400190000000006140019000000000606043300000000006504350000002004400039000000000534004b000004900000413d00000000012300190000000000010435000000000001042d000000000001042f0000049e002104210000000102000039000000000001042d0000000002000019000000000001042d000004a3002104230000000102000039000000000001042d0000000002000019000000000001042d000004a8002104250000000102000039000000000001042d0000000002000019000000000001042d000004aa00000432000004ab0001042e000004ac0001043000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000009fffffffffffffffffffffffffffffffffffffffffffffffff000000000000007f00000000000000000000000000000000000000000000000000000001ffffffe0000000000000000000000000ffffffffffffffffffffffffffffffffffffffff000000000000000000000000000000000000000000000000ffffffffffffffff80000000000000000000000000000000000000000000000000000000000000001806aa1896bbf26568e884a7374b41e002500962caba6a15023a8d90e8508b830200000200000000000000000000000000000024000000000000000000000000360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbcffffffffffffffffffffffff00000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000bc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b000000000000000000000000000000000000000000000000ffffffffffffff9f206661696c656400000000000000000000000000000000000000000000000000416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c08c379a000000000000000000000000000000000000000000000000000000000b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610302000000000000000000000000000000000000400000000000000000000000007e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f0000000200000000000000000000000000000040000001000000000000000000ffffffff000000000000000000000000000000000000000000000000000000003659cfe6000000000000000000000000000000000000000000000000000000004f1ef286000000000000000000000000000000000000000000000000000000008f28397000000000000000000000000000000000000000000000000000000000f851a440000000000000000000000000000000000000000000000000000000005c60da1b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000200000000000000000000000000000000000040000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffdf6464726573730000000000000000000000000000000000000000000000000000455243313936373a206e65772061646d696e20697320746865207a65726f206100000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000000000000000000000000000000000000000006400000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffdf00000000000000000000000000000000000000000000002000000000000000004e487b710000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000240000000000000000000000006f74206120636f6e747261637400000000000000000000000000000000000000455243313936373a206e657720696d706c656d656e746174696f6e206973206e5472616e73706172656e745570677261646561626c6550726f78793a2061646d696e2063616e6e6f742066616c6c6261636b20746f2070726f78792074617267657400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a40000008000000000000000000000000000000000000000000000000000000020000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000007444ff0b02dc9864c7dbf97ccd7719c286d6972190eeb0285ea9e04a713977c0", + "linkReferences": {}, + "deployedLinkReferences": {}, + "factoryDeps": {} +} From 1e0df108611136e48d5aa6c9739041ed1014e0d8 Mon Sep 17 00:00:00 2001 From: Bence Haromi <56651250+benceharomi@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:16:08 +0100 Subject: [PATCH 05/53] feat(l2): solidity 0.8.24 and zksolc 1.5.0 (#743) --- l2-contracts/contracts/ForceDeployUpgrader.sol | 2 +- l2-contracts/contracts/bridge/L2SharedBridge.sol | 2 +- l2-contracts/contracts/bridge/L2StandardERC20.sol | 2 +- l2-contracts/contracts/bridge/L2WrappedBaseToken.sol | 2 +- l2-contracts/contracts/dev-contracts/DevL2SharedBridge.sol | 2 +- l2-contracts/hardhat.config.ts | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/l2-contracts/contracts/ForceDeployUpgrader.sol b/l2-contracts/contracts/ForceDeployUpgrader.sol index 9abb22555..46f9e4fd8 100644 --- a/l2-contracts/contracts/ForceDeployUpgrader.sol +++ b/l2-contracts/contracts/ForceDeployUpgrader.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT OR Apache-2.0 -pragma solidity 0.8.20; +pragma solidity 0.8.24; import {IContractDeployer, DEPLOYER_SYSTEM_CONTRACT} from "./L2ContractHelper.sol"; diff --git a/l2-contracts/contracts/bridge/L2SharedBridge.sol b/l2-contracts/contracts/bridge/L2SharedBridge.sol index 1db972714..d4e7b7900 100644 --- a/l2-contracts/contracts/bridge/L2SharedBridge.sol +++ b/l2-contracts/contracts/bridge/L2SharedBridge.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.20; +pragma solidity 0.8.24; import {Initializable} from "@openzeppelin/contracts-v4/proxy/utils/Initializable.sol"; import {BeaconProxy} from "@openzeppelin/contracts-v4/proxy/beacon/BeaconProxy.sol"; diff --git a/l2-contracts/contracts/bridge/L2StandardERC20.sol b/l2-contracts/contracts/bridge/L2StandardERC20.sol index e28cf41b5..90db45814 100644 --- a/l2-contracts/contracts/bridge/L2StandardERC20.sol +++ b/l2-contracts/contracts/bridge/L2StandardERC20.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.20; +pragma solidity 0.8.24; import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/token/ERC20/extensions/draft-ERC20PermitUpgradeable.sol"; import {UpgradeableBeacon} from "@openzeppelin/contracts-v4/proxy/beacon/UpgradeableBeacon.sol"; diff --git a/l2-contracts/contracts/bridge/L2WrappedBaseToken.sol b/l2-contracts/contracts/bridge/L2WrappedBaseToken.sol index 1166fa008..8ff9f814e 100644 --- a/l2-contracts/contracts/bridge/L2WrappedBaseToken.sol +++ b/l2-contracts/contracts/bridge/L2WrappedBaseToken.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.20; +pragma solidity 0.8.24; import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/token/ERC20/extensions/draft-ERC20PermitUpgradeable.sol"; diff --git a/l2-contracts/contracts/dev-contracts/DevL2SharedBridge.sol b/l2-contracts/contracts/dev-contracts/DevL2SharedBridge.sol index e383d83c3..e93d5c987 100644 --- a/l2-contracts/contracts/dev-contracts/DevL2SharedBridge.sol +++ b/l2-contracts/contracts/dev-contracts/DevL2SharedBridge.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.20; +pragma solidity 0.8.24; import {L2SharedBridge} from "../bridge/L2SharedBridge.sol"; import {L2StandardERC20} from "../bridge/L2StandardERC20.sol"; diff --git a/l2-contracts/hardhat.config.ts b/l2-contracts/hardhat.config.ts index c0aaca03e..282ab7b96 100644 --- a/l2-contracts/hardhat.config.ts +++ b/l2-contracts/hardhat.config.ts @@ -12,14 +12,14 @@ if (!process.env.CHAIN_ETH_NETWORK) { export default { zksolc: { - version: "1.3.18", + version: "1.5.0", compilerSource: "binary", settings: { isSystem: true, }, }, solidity: { - version: "0.8.20", + version: "0.8.24", }, defaultNetwork: "localhost", networks: { From f2d553b34f0eeb99e5668c33b57659d683cf99cb Mon Sep 17 00:00:00 2001 From: Bence Haromi <56651250+benceharomi@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:17:06 +0100 Subject: [PATCH 06/53] feat(l1): added missing foundry lib symlinks (#741) --- l1-contracts/foundry.toml | 10 +++++----- l1-contracts/lib/forge-std | 1 + l1-contracts/lib/murky | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) create mode 120000 l1-contracts/lib/forge-std create mode 120000 l1-contracts/lib/murky diff --git a/l1-contracts/foundry.toml b/l1-contracts/foundry.toml index 04fd5c656..4d52d0400 100644 --- a/l1-contracts/foundry.toml +++ b/l1-contracts/foundry.toml @@ -1,7 +1,7 @@ [profile.default] src = "contracts" out = "out" -libs = ["node_modules", "../lib"] +libs = ["lib"] cache_path = "cache-forge" test = "test/foundry" solc_version = "0.8.24" @@ -20,9 +20,9 @@ fs_permissions = [ ignored_error_codes = ["missing-receive-ether", "code-size"] ignored_warnings_from = ["test", "contracts/dev-contracts"] remappings = [ - "forge-std/=../lib/forge-std/src/", - "murky/=../lib/murky/src/", + "forge-std/=lib/forge-std/src/", + "murky/=lib/murky/src/", "foundry-test/=test/foundry/", - "@openzeppelin/contracts-v4/=./lib/openzeppelin-contracts-v4/contracts/", - "@openzeppelin/contracts-upgradeable-v4/=./lib/openzeppelin-contracts-upgradeable-v4/contracts/", + "@openzeppelin/contracts-v4/=lib/openzeppelin-contracts-v4/contracts/", + "@openzeppelin/contracts-upgradeable-v4/=lib/openzeppelin-contracts-upgradeable-v4/contracts/", ] diff --git a/l1-contracts/lib/forge-std b/l1-contracts/lib/forge-std new file mode 120000 index 000000000..edce15694 --- /dev/null +++ b/l1-contracts/lib/forge-std @@ -0,0 +1 @@ +../../lib/forge-std \ No newline at end of file diff --git a/l1-contracts/lib/murky b/l1-contracts/lib/murky new file mode 120000 index 000000000..a556a15e5 --- /dev/null +++ b/l1-contracts/lib/murky @@ -0,0 +1 @@ +../../lib/murky \ No newline at end of file From 383e1b0147f3d23f2cba416b1003b208f9724a6a Mon Sep 17 00:00:00 2001 From: Bence Haromi <56651250+benceharomi@users.noreply.github.com> Date: Wed, 28 Aug 2024 14:18:14 +0100 Subject: [PATCH 07/53] docs: update zkSync casing to ZKsync (#733) --- CONTRIBUTING.md | 2 +- README.md | 12 ++-- docs/Overview.md | 24 ++++---- gas-bound-caller/README.md | 2 +- .../test-contracts/SystemContractsCaller.sol | 2 +- l1-contracts/README.md | 6 +- .../contracts/bridge/L1ERC20Bridge.sol | 14 ++--- .../contracts/bridge/L1SharedBridge.sol | 32 +++++------ .../bridge/interfaces/IL1ERC20Bridge.sol | 4 +- .../bridge/interfaces/IL1SharedBridge.sol | 2 +- .../contracts/bridge/interfaces/IL2Bridge.sol | 2 +- .../contracts/bridge/interfaces/IWETH9.sol | 2 +- .../contracts/bridgehub/IBridgehub.sol | 2 +- l1-contracts/contracts/common/Config.sol | 6 +- .../contracts/common/Dependencies.sol | 2 +- .../contracts/common/L2ContractAddresses.sol | 2 +- l1-contracts/contracts/common/Messaging.sol | 2 +- .../contracts/common/ReentrancyGuard.sol | 2 +- .../common/interfaces/IL2ContractDeployer.sol | 4 +- .../common/libraries/L2ContractHelper.sol | 2 +- .../contracts/common/libraries/SemVer.sol | 2 +- .../common/libraries/UncheckedMath.sol | 2 +- .../common/libraries/UnsafeBytes.sol | 2 +- .../dev-contracts/RevertReceiveAccount.sol | 2 +- .../dev-contracts/RevertTransferERC20.sol | 2 +- .../contracts/governance/Governance.sol | 2 +- .../contracts/governance/IGovernance.sol | 2 +- .../IStateTransitionManager.sol | 2 +- .../state-transition/ValidatorTimelock.sol | 4 +- .../contracts/state-transition/Verifier.sol | 4 +- .../chain-deps/facets/Executor.sol | 2 +- .../chain-deps/facets/Mailbox.sol | 4 +- .../chain-interfaces/IAdmin.sol | 2 +- .../chain-interfaces/IDiamondInit.sol | 2 +- .../chain-interfaces/IExecutor.sol | 10 ++-- .../chain-interfaces/IGetters.sol | 2 +- .../chain-interfaces/ILegacyGetters.sol | 4 +- .../chain-interfaces/IMailbox.sol | 4 +- .../chain-interfaces/ITransactionFilterer.sol | 2 +- .../chain-interfaces/IVerifier.sol | 2 +- .../chain-interfaces/IZkSyncHyperchain.sol | 2 +- .../IZkSyncHyperchainBase.sol | 4 +- .../l2-deps/ISystemContext.sol | 2 +- .../state-transition/libraries/Diamond.sol | 2 +- .../state-transition/libraries/LibMap.sol | 2 +- .../state-transition/libraries/Merkle.sol | 2 +- .../libraries/PriorityQueue.sol | 2 +- .../libraries/TransactionValidator.sol | 6 +- .../contracts/vendor/AddressAliasHelper.sol | 2 +- l2-contracts/contracts/Dependencies.sol | 2 +- l2-contracts/contracts/L2ContractHelper.sol | 4 +- .../contracts/SystemContractsCaller.sol | 2 +- l2-contracts/contracts/TestnetPaymaster.sol | 2 +- .../bridge/interfaces/IL1ERC20Bridge.sol | 2 +- .../bridge/interfaces/IL1SharedBridge.sol | 2 +- .../bridge/interfaces/IL2SharedBridge.sol | 2 +- .../bridge/interfaces/IL2StandardToken.sol | 2 +- .../bridge/interfaces/IL2WrappedBaseToken.sol | 2 +- .../contracts/errors/L2ContractErrors.sol | 2 +- .../contracts/interfaces/IPaymaster.sol | 2 +- .../contracts/interfaces/IPaymasterFlow.sol | 2 +- .../contracts/vendor/AddressAliasHelper.sol | 2 +- system-contracts/README.md | 14 ++--- system-contracts/SystemContractsHashes.json | 56 +++++++++---------- system-contracts/bootloader/bootloader.yul | 24 ++++---- .../contracts/AccountCodeStorage.sol | 2 +- .../contracts/BootloaderUtilities.sol | 4 +- system-contracts/contracts/Constants.sol | 5 +- .../contracts/ContractDeployer.sol | 2 +- .../contracts/SystemContractErrors.sol | 3 +- .../contracts/abstract/SystemContractBase.sol | 2 +- .../contracts/interfaces/IAccount.sol | 2 +- .../interfaces/IAccountCodeStorage.sol | 2 +- .../contracts/interfaces/IBaseToken.sol | 2 +- .../interfaces/IBootloaderUtilities.sol | 2 +- .../contracts/interfaces/IComplexUpgrader.sol | 2 +- .../contracts/interfaces/ICompressor.sol | 2 +- .../interfaces/IContractDeployer.sol | 2 +- .../interfaces/IImmutableSimulator.sol | 2 +- .../interfaces/IKnownCodesStorage.sol | 2 +- .../contracts/interfaces/IL1Messenger.sol | 2 +- .../contracts/interfaces/IL2StandardToken.sol | 2 +- .../contracts/interfaces/IMailbox.sol | 2 +- .../contracts/interfaces/INonceHolder.sol | 2 +- .../contracts/interfaces/IPaymaster.sol | 2 +- .../contracts/interfaces/IPaymasterFlow.sol | 2 +- .../interfaces/IPubdataChunkPublisher.sol | 2 +- .../contracts/interfaces/ISystemContext.sol | 2 +- .../interfaces/ISystemContextDeprecated.sol | 2 +- .../contracts/libraries/EfficientCall.sol | 2 +- .../contracts/libraries/RLPEncoder.sol | 2 +- .../libraries/SystemContractHelper.sol | 2 +- .../libraries/SystemContractsCaller.sol | 4 +- .../contracts/libraries/TransactionHelper.sol | 16 +++--- .../libraries/UnsafeBytesCalldata.sol | 2 +- .../contracts/libraries/Utils.sol | 4 +- .../openzeppelin/token/ERC20/IERC20.sol | 2 +- .../token/ERC20/extensions/IERC20Permit.sol | 2 +- .../token/ERC20/utils/SafeERC20.sol | 2 +- .../contracts/openzeppelin/utils/Address.sol | 2 +- system-contracts/scripts/constants.ts | 2 +- system-contracts/scripts/deploy-preimages.ts | 6 +- system-contracts/scripts/utils.ts | 2 +- tools/data/verifier_contract_template.txt | 4 +- 104 files changed, 218 insertions(+), 220 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dd3d45842..46bdeebac 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,7 +34,7 @@ We aim to make it as easy as possible to contribute to the mission. This is stil and suggestions here too. Some resources to help: 1. [In-repo docs aimed at developers](docs) -2. [zkSync Era docs!](https://era.zksync.io/docs/) +2. [ZKsync Era docs!](https://era.zksync.io/docs/) 3. Company links can be found in the [repo's readme](README.md) ## Code of Conduct diff --git a/README.md b/README.md index 6e3e06aba..cc1425b5b 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -# zkSync Era: Smart Contracts +# ZKsync Era: Smart Contracts [![Logo](eraLogo.svg)](https://zksync.io/) -zkSync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or +ZKsync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or decentralization. Since it's EVM compatible (Solidity/Vyper), 99% of Ethereum projects can redeploy without refactoring -or re-auditing a single line of code. zkSync Era also uses an LLVM-based compiler that will eventually let developers +or re-auditing a single line of code. ZKsync Era also uses an LLVM-based compiler that will eventually let developers write smart contracts in C++, Rust and other popular languages. -This repository contains both L1 and L2 zkSync smart contracts. For their description see the +This repository contains both L1 and L2 ZKsync smart contracts. For their description see the [system overview](docs/Overview.md). ## Disclaimer @@ -17,7 +17,7 @@ others may not. ## License -zkSync Era contracts are distributed under the terms of the MIT license. +ZKsync Era contracts are distributed under the terms of the MIT license. See [LICENSE-MIT](LICENSE-MIT) for details. @@ -33,7 +33,7 @@ See [LICENSE-MIT](LICENSE-MIT) for details. ## Disclaimer -zkSync Era has been through lots of testing and audits. Although it is live, it is still in alpha state and will go +ZKsync Era has been through lots of testing and audits. Although it is live, it is still in alpha state and will go through more audits and bug bounties programs. We would love to hear our community's thoughts and suggestions about it! It is important to state that forking it now can potentially lead to missing important security updates, critical features, and performance improvements. diff --git a/docs/Overview.md b/docs/Overview.md index 6af3d407d..1db994729 100644 --- a/docs/Overview.md +++ b/docs/Overview.md @@ -1,6 +1,6 @@ # Overview -zkSync Era is a permissionless general-purpose ZK rollup. Similar to many L1 blockchains and sidechains it enables +ZKsync Era is a permissionless general-purpose ZK rollup. Similar to many L1 blockchains and sidechains it enables deployment and interaction with Turing-complete smart contracts. - L2 smart contracts are executed on a zkEVM. @@ -10,7 +10,7 @@ deployment and interaction with Turing-complete smart contracts. - There is no escape hatch mechanism yet, but there will be one. All data that is needed to restore the L2 state are also pushed on-chain. There are two approaches, publishing inputs of -L2 transactions on-chain and publishing the state transition diff. zkSync follows the second option. +L2 transactions on-chain and publishing the state transition diff. ZKsync follows the second option. See the [documentation](https://era.zksync.io/docs/dev/fundamentals/rollups.html) to read more! @@ -25,13 +25,13 @@ See the [documentation](https://era.zksync.io/docs/dev/fundamentals/rollups.html L2 blocks. - **Facet** - implementation contract. The word comes from the EIP-2535. - **Gas** - a unit that measures the amount of computational effort required to execute specific operations on the - zkSync Era network. + ZKsync Era network. ### L1 Smart contracts #### Diamond -Technically, this L1 smart contract acts as a connector between Ethereum (L1) and zkSync (L2). This contract checks the +Technically, this L1 smart contract acts as a connector between Ethereum (L1) and ZKsync (L2). This contract checks the validity proof and data availability, handles L2 <-> L1 communication, finalizes L2 state transition, and more. There are also important contracts deployed on the L2 that can also execute logic called _system contracts_. Using L2 @@ -73,7 +73,7 @@ execution of upgrades in the diamond proxy. This contract manages operations (calls with preconditions) for governance tasks. The contract allows for operations to be scheduled, executed, and canceled with appropriate permissions and delays. It is used for managing and coordinating -upgrades and changes in all zkSync Era governed contracts. +upgrades and changes in all ZKsync Era governed contracts. Each upgrade consists of two steps: @@ -122,8 +122,8 @@ function applyL1ToL2Alias(address l1Address) internal pure returns (address l2Ad ``` For most of the rollups the address aliasing needs to prevent cross-chain exploits that would otherwise be possible if -we simply reused the same L1 addresses as the L2 sender. In zkSync Era address derivation rule is different from the -Ethereum, so cross-chain exploits are already impossible. However, zkSync Era may add full EVM support in the future, so +we simply reused the same L1 addresses as the L2 sender. In ZKsync Era address derivation rule is different from the +Ethereum, so cross-chain exploits are already impossible. However, ZKsync Era may add full EVM support in the future, so applying address aliasing leave room for future EVM compatibility. The L1 -> L2 communication is also used for bridging ether. The user should include a `msg.value` when initiating a @@ -253,8 +253,8 @@ the L1 recipient. #### ValidatorTimelock -An intermediate smart contract between the validator EOA account and the zkSync smart contract. Its primary purpose is -to provide a trustless means of delaying batch execution without modifying the main zkSync contract. zkSync actively +An intermediate smart contract between the validator EOA account and the ZKsync smart contract. Its primary purpose is +to provide a trustless means of delaying batch execution without modifying the main ZKsync contract. ZKsync actively monitors the chain activity and reacts to any suspicious activity by freezing the chain. This allows time for investigation and mitigation before resuming normal operations. @@ -264,12 +264,12 @@ the Alpha stage. This contract consists of four main functions `commitBatches`, `proveBatches`, `executeBatches`, and `revertBatches`, that can be called only by the validator. -When the validator calls `commitBatches`, the same calldata will be propagated to the zkSync contract (`DiamondProxy` +When the validator calls `commitBatches`, the same calldata will be propagated to the ZKsync contract (`DiamondProxy` through `call` where it invokes the `ExecutorFacet` through `delegatecall`), and also a timestamp is assigned to these batches to track the time these batches are committed by the validator to enforce a delay between committing and execution of batches. Then, the validator can prove the already committed batches regardless of the mentioned timestamp, -and again the same calldata (related to the `proveBatches` function) will be propagated to the zkSync contract. After, -the `delay` is elapsed, the validator is allowed to call `executeBatches` to propagate the same calldata to zkSync +and again the same calldata (related to the `proveBatches` function) will be propagated to the ZKsync contract. After, +the `delay` is elapsed, the validator is allowed to call `executeBatches` to propagate the same calldata to ZKsync contract. ### L2 specifics diff --git a/gas-bound-caller/README.md b/gas-bound-caller/README.md index 00f2868df..17b647539 100644 --- a/gas-bound-caller/README.md +++ b/gas-bound-caller/README.md @@ -46,4 +46,4 @@ Since `GasBoundCaller` would be the contract that calls the `_to` contract, the It should be deployed via a built-in CREATE2 factory on each individual chain. -The current address on both sepolia testnet and mainnet for zkSync Era is `0xc706EC7dfA5D4Dc87f29f859094165E8290530f5`. +The current address on both sepolia testnet and mainnet for ZKsync Era is `0xc706EC7dfA5D4Dc87f29f859094165E8290530f5`. diff --git a/gas-bound-caller/contracts/test-contracts/SystemContractsCaller.sol b/gas-bound-caller/contracts/test-contracts/SystemContractsCaller.sol index ca7c870c7..1f154e270 100644 --- a/gas-bound-caller/contracts/test-contracts/SystemContractsCaller.sol +++ b/gas-bound-caller/contracts/test-contracts/SystemContractsCaller.sol @@ -6,7 +6,7 @@ import {MSG_VALUE_SYSTEM_CONTRACT, MSG_VALUE_SIMULATOR_IS_SYSTEM_BIT} from "@mat import {Utils} from "@matterlabs/zksync-contracts/l2/system-contracts/libraries/Utils.sol"; // Addresses used for the compiler to be replaced with the -// zkSync-specific opcodes during the compilation. +// ZKsync-specific opcodes during the compilation. // IMPORTANT: these are just compile-time constants and are used // only if used in-place by Yul optimizer. address constant TO_L1_CALL_ADDRESS = address((1 << 16) - 1); diff --git a/l1-contracts/README.md b/l1-contracts/README.md index 30ffc8399..8fb04bb86 100644 --- a/l1-contracts/README.md +++ b/l1-contracts/README.md @@ -1,10 +1,10 @@ -# zkSync Era: L1 Contracts +# ZKsync Era: L1 Contracts [![Logo](../eraLogo.svg)](https://zksync.io/) -zkSync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or +ZKsync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or decentralization. Since it's EVM compatible (Solidity/Vyper), 99% of Ethereum projects can redeploy without refactoring -or re-auditing a single line of code. zkSync Era also uses an LLVM-based compiler that will eventually let developers +or re-auditing a single line of code. ZKsync Era also uses an LLVM-based compiler that will eventually let developers write smart contracts in C++, Rust and other popular languages. ## L1 Contracts diff --git a/l1-contracts/contracts/bridge/L1ERC20Bridge.sol b/l1-contracts/contracts/bridge/L1ERC20Bridge.sol index a3b6e1426..ccd4a2a88 100644 --- a/l1-contracts/contracts/bridge/L1ERC20Bridge.sol +++ b/l1-contracts/contracts/bridge/L1ERC20Bridge.sol @@ -16,7 +16,7 @@ import {Unauthorized, EmptyDeposit, TokensWithFeesNotSupported, WithdrawalAlread /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev /// @notice Smart contract that allows depositing ERC20 tokens from Ethereum to hyperchains -/// @dev It is a legacy bridge from zkSync Era, that was deprecated in favour of shared bridge. +/// @dev It is a legacy bridge from ZKsync Era, that was deprecated in favour of shared bridge. /// It is needed for backward compatibility with already integrated projects. contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { using SafeERC20 for IERC20; @@ -25,25 +25,25 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { IL1SharedBridge public immutable override SHARED_BRIDGE; /// @dev A mapping L2 batch number => message number => flag. - /// @dev Used to indicate that L2 -> L1 message was already processed for zkSync Era withdrawals. + /// @dev Used to indicate that L2 -> L1 message was already processed for ZKsync Era withdrawals. // slither-disable-next-line uninitialized-state mapping(uint256 l2BatchNumber => mapping(uint256 l2ToL1MessageNumber => bool isFinalized)) public isWithdrawalFinalized; /// @dev A mapping account => L1 token address => L2 deposit transaction hash => amount. - /// @dev Used for saving the number of deposited funds, to claim them in case the deposit transaction will fail in zkSync Era. + /// @dev Used for saving the number of deposited funds, to claim them in case the deposit transaction will fail in ZKsync Era. mapping(address account => mapping(address l1Token => mapping(bytes32 depositL2TxHash => uint256 amount))) public depositAmount; - /// @dev The address that is used as a L2 bridge counterpart in zkSync Era. + /// @dev The address that is used as a L2 bridge counterpart in ZKsync Era. // slither-disable-next-line uninitialized-state address public l2Bridge; - /// @dev The address that is used as a beacon for L2 tokens in zkSync Era. + /// @dev The address that is used as a beacon for L2 tokens in ZKsync Era. // slither-disable-next-line uninitialized-state address public l2TokenBeacon; - /// @dev Stores the hash of the L2 token proxy contract's bytecode on zkSync Era. + /// @dev Stores the hash of the L2 token proxy contract's bytecode on ZKsync Era. // slither-disable-next-line uninitialized-state bytes32 public l2TokenProxyBytecodeHash; @@ -78,7 +78,7 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { ERA LEGACY GETTERS //////////////////////////////////////////////////////////////*/ - /// @return The L2 token address that would be minted for deposit of the given L1 token on zkSync Era. + /// @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, "")); bytes32 salt = bytes32(uint256(uint160(_l1Token))); diff --git a/l1-contracts/contracts/bridge/L1SharedBridge.sol b/l1-contracts/contracts/bridge/L1SharedBridge.sol index 2b5a8887a..eec3c2e69 100644 --- a/l1-contracts/contracts/bridge/L1SharedBridge.sol +++ b/l1-contracts/contracts/bridge/L1SharedBridge.sol @@ -40,20 +40,20 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Ownable2StepUpgrade /// @dev Era's chainID uint256 internal immutable ERA_CHAIN_ID; - /// @dev The address of zkSync Era diamond proxy contract. + /// @dev The address of ZKsync Era diamond proxy contract. address internal immutable ERA_DIAMOND_PROXY; - /// @dev Stores the first batch number on the zkSync Era Diamond Proxy that was settled after Diamond proxy upgrade. + /// @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. uint256 internal eraPostDiamondUpgradeFirstBatch; - /// @dev Stores the first batch number on the zkSync Era Diamond Proxy that was settled after L1ERC20 Bridge upgrade. + /// @dev Stores the first batch number on the ZKsync Era Diamond Proxy that was settled after L1ERC20 Bridge upgrade. /// This variable is used to differentiate between pre-upgrade and post-upgrade ERC20 withdrawals. Withdrawals from batches older /// than this value are considered to have been finalized prior to the upgrade and handled separately. uint256 internal eraPostLegacyBridgeUpgradeFirstBatch; - /// @dev Stores the zkSync Era batch number that processes the last deposit tx initiated by the legacy bridge + /// @dev Stores the ZKsync Era batch number that processes the last deposit tx initiated by the legacy bridge /// This variable (together with eraLegacyBridgeLastDepositTxNumber) is used to differentiate between pre-upgrade and post-upgrade deposits. Deposits processed in older batches /// than this value are considered to have been processed prior to the upgrade and handled separately. /// We use this both for Eth and erc20 token deposits, so we need to update the diamond and bridge simultaneously. @@ -98,7 +98,7 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Ownable2StepUpgrade _; } - /// @notice Checks that the message sender is the bridgehub or zkSync Era Diamond Proxy. + /// @notice Checks that the message sender is the bridgehub or ZKsync Era Diamond Proxy. modifier onlyBridgehubOrEra(uint256 _chainId) { if (msg.sender != address(BRIDGE_HUB) && (_chainId != ERA_CHAIN_ID || msg.sender != ERA_DIAMOND_PROXY)) { revert Unauthorized(msg.sender); @@ -148,7 +148,7 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Ownable2StepUpgrade } /// @dev This sets the first post diamond upgrade batch for era, used to check old eth withdrawals - /// @param _eraPostDiamondUpgradeFirstBatch The first batch number on the zkSync Era Diamond Proxy that was settled after diamond proxy upgrade. + /// @param _eraPostDiamondUpgradeFirstBatch The first batch number on the ZKsync Era Diamond Proxy that was settled after diamond proxy upgrade. function setEraPostDiamondUpgradeFirstBatch(uint256 _eraPostDiamondUpgradeFirstBatch) external onlyOwner { if (eraPostDiamondUpgradeFirstBatch != 0) { revert SharedBridgeValueAlreadySet(SharedBridgeKey.PostUpgradeFirstBatch); @@ -157,7 +157,7 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Ownable2StepUpgrade } /// @dev This sets the first post upgrade batch for era, used to check old token withdrawals - /// @param _eraPostLegacyBridgeUpgradeFirstBatch The first batch number on the zkSync Era Diamond Proxy that was settled after legacy bridge upgrade. + /// @param _eraPostLegacyBridgeUpgradeFirstBatch The first batch number on the ZKsync Era Diamond Proxy that was settled after legacy bridge upgrade. function setEraPostLegacyBridgeUpgradeFirstBatch(uint256 _eraPostLegacyBridgeUpgradeFirstBatch) external onlyOwner { if (eraPostLegacyBridgeUpgradeFirstBatch != 0) { revert SharedBridgeValueAlreadySet(SharedBridgeKey.LegacyBridgeFirstBatch); @@ -166,7 +166,7 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Ownable2StepUpgrade } /// @dev This sets the first post upgrade batch for era, used to check old withdrawals - /// @param _eraLegacyBridgeLastDepositBatch The the zkSync Era batch number that processes the last deposit tx initiated by the legacy bridge + /// @param _eraLegacyBridgeLastDepositBatch The the ZKsync Era batch number that processes the last deposit tx initiated by the legacy bridge /// @param _eraLegacyBridgeLastDepositTxNumber The tx number in the _eraLegacyBridgeLastDepositBatch of the last deposit tx initiated by the legacy bridge function setEraLegacyBridgeLastDepositTime( uint256 _eraLegacyBridgeLastDepositBatch, @@ -537,10 +537,10 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Ownable2StepUpgrade emit ClaimedFailedDepositSharedBridge(_chainId, _depositSender, _l1Token, _amount); } - /// @dev Determines if an eth withdrawal was initiated on zkSync Era before the upgrade to the Shared Bridge. + /// @dev Determines if an eth withdrawal was initiated on ZKsync Era before the upgrade to the Shared Bridge. /// @param _chainId The chain ID of the transaction to check. /// @param _l2BatchNumber The L2 batch number for the withdrawal. - /// @return Whether withdrawal was initiated on zkSync Era before diamond proxy upgrade. + /// @return Whether withdrawal was initiated on ZKsync Era before diamond proxy upgrade. function _isEraLegacyEthWithdrawal(uint256 _chainId, uint256 _l2BatchNumber) internal view returns (bool) { if ((_chainId == ERA_CHAIN_ID) && eraPostDiamondUpgradeFirstBatch == 0) { revert SharedBridgeValueNotSet(SharedBridgeKey.PostUpgradeFirstBatch); @@ -548,10 +548,10 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Ownable2StepUpgrade return (_chainId == ERA_CHAIN_ID) && (_l2BatchNumber < eraPostDiamondUpgradeFirstBatch); } - /// @dev Determines if a token withdrawal was initiated on zkSync Era before the upgrade to the Shared Bridge. + /// @dev Determines if a token withdrawal was initiated on ZKsync Era before the upgrade to the Shared Bridge. /// @param _chainId The chain ID of the transaction to check. /// @param _l2BatchNumber The L2 batch number for the withdrawal. - /// @return Whether withdrawal was initiated on zkSync Era before Legacy Bridge upgrade. + /// @return Whether withdrawal was initiated on ZKsync Era before Legacy Bridge upgrade. function _isEraLegacyTokenWithdrawal(uint256 _chainId, uint256 _l2BatchNumber) internal view returns (bool) { if ((_chainId == ERA_CHAIN_ID) && eraPostLegacyBridgeUpgradeFirstBatch == 0) { revert SharedBridgeValueNotSet(SharedBridgeKey.LegacyBridgeFirstBatch); @@ -559,11 +559,11 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Ownable2StepUpgrade return (_chainId == ERA_CHAIN_ID) && (_l2BatchNumber < eraPostLegacyBridgeUpgradeFirstBatch); } - /// @dev Determines if a deposit was initiated on zkSync Era before the upgrade to the Shared Bridge. + /// @dev Determines if a deposit was initiated on ZKsync Era before the upgrade to the Shared Bridge. /// @param _chainId The chain ID of the transaction to check. /// @param _l2BatchNumber The L2 batch number for the deposit where it was processed. /// @param _l2TxNumberInBatch The L2 transaction number in the batch, in which the deposit was processed. - /// @return Whether deposit was initiated on zkSync Era before Shared Bridge upgrade. + /// @return Whether deposit was initiated on ZKsync Era before Shared Bridge upgrade. function _isEraLegacyDeposit( uint256 _chainId, uint256 _l2BatchNumber, @@ -632,7 +632,7 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Ownable2StepUpgrade } isWithdrawalFinalized[_chainId][_l2BatchNumber][_l2MessageIndex] = true; - // Handling special case for withdrawal from zkSync Era initiated before Shared Bridge. + // Handling special case for withdrawal from ZKsync Era initiated before Shared Bridge. if (_isEraLegacyEthWithdrawal(_chainId, _l2BatchNumber)) { // Checks that the withdrawal wasn't finalized already. bool alreadyFinalized = IGetters(ERA_DIAMOND_PROXY).isEthWithdrawalFinalized( @@ -866,7 +866,7 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Ownable2StepUpgrade }); } - /// @notice Withdraw funds from the initiated deposit, that failed when finalizing on zkSync Era chain. + /// @notice Withdraw funds from the initiated deposit, that failed when finalizing on ZKsync Era chain. /// This function is specifically designed for maintaining backward-compatibility with legacy `claimFailedDeposit` /// method in `L1ERC20Bridge`. /// diff --git a/l1-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol b/l1-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol index 615536de0..722eeedc1 100644 --- a/l1-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol +++ b/l1-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {IL1SharedBridge} from "./IL1SharedBridge.sol"; @@ -7,7 +7,7 @@ import {IL1SharedBridge} from "./IL1SharedBridge.sol"; /// @title L1 Bridge contract legacy interface /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev -/// @notice Legacy Bridge interface before hyperchain migration, used for backward compatibility with zkSync Era +/// @notice Legacy Bridge interface before hyperchain migration, used for backward compatibility with ZKsync Era interface IL1ERC20Bridge { event DepositInitiated( bytes32 indexed l2DepositTxHash, diff --git a/l1-contracts/contracts/bridge/interfaces/IL1SharedBridge.sol b/l1-contracts/contracts/bridge/interfaces/IL1SharedBridge.sol index 3a0838312..8038d6bdb 100644 --- a/l1-contracts/contracts/bridge/interfaces/IL1SharedBridge.sol +++ b/l1-contracts/contracts/bridge/interfaces/IL1SharedBridge.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {L2TransactionRequestTwoBridgesInner} from "../../bridgehub/IBridgehub.sol"; diff --git a/l1-contracts/contracts/bridge/interfaces/IL2Bridge.sol b/l1-contracts/contracts/bridge/interfaces/IL2Bridge.sol index 87b0c6c9f..39c6b423f 100644 --- a/l1-contracts/contracts/bridge/interfaces/IL2Bridge.sol +++ b/l1-contracts/contracts/bridge/interfaces/IL2Bridge.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @author Matter Labs diff --git a/l1-contracts/contracts/bridge/interfaces/IWETH9.sol b/l1-contracts/contracts/bridge/interfaces/IWETH9.sol index 2634cc5d5..e1536f4fb 100644 --- a/l1-contracts/contracts/bridge/interfaces/IWETH9.sol +++ b/l1-contracts/contracts/bridge/interfaces/IWETH9.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; interface IWETH9 { diff --git a/l1-contracts/contracts/bridgehub/IBridgehub.sol b/l1-contracts/contracts/bridgehub/IBridgehub.sol index 31c89f289..4216a6840 100644 --- a/l1-contracts/contracts/bridgehub/IBridgehub.sol +++ b/l1-contracts/contracts/bridgehub/IBridgehub.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {IL1SharedBridge} from "../bridge/interfaces/IL1SharedBridge.sol"; diff --git a/l1-contracts/contracts/common/Config.sol b/l1-contracts/contracts/common/Config.sol index a39d27f97..c0e05f1fc 100644 --- a/l1-contracts/contracts/common/Config.sol +++ b/l1-contracts/contracts/common/Config.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @dev `keccak256("")` @@ -21,10 +21,10 @@ bytes32 constant L2_L1_LOGS_TREE_DEFAULT_LEAF_HASH = 0x72abee45b59e344af8a6e5202 // TODO: change constant to the real root hash of empty Merkle tree (SMA-184) bytes32 constant DEFAULT_L2_LOGS_TREE_ROOT_HASH = bytes32(0); -/// @dev Denotes the type of the zkSync transaction that came from L1. +/// @dev Denotes the type of the ZKsync transaction that came from L1. uint256 constant PRIORITY_OPERATION_L2_TX_TYPE = 255; -/// @dev Denotes the type of the zkSync transaction that is used for system upgrades. +/// @dev Denotes the type of the ZKsync transaction that is used for system upgrades. uint256 constant SYSTEM_UPGRADE_L2_TX_TYPE = 254; /// @dev The maximal allowed difference between protocol minor versions in an upgrade. The 100 gap is needed diff --git a/l1-contracts/contracts/common/Dependencies.sol b/l1-contracts/contracts/common/Dependencies.sol index 017b6177e..fceaa77dd 100644 --- a/l1-contracts/contracts/common/Dependencies.sol +++ b/l1-contracts/contracts/common/Dependencies.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /* solhint-disable-next-line no-unused-import */ diff --git a/l1-contracts/contracts/common/L2ContractAddresses.sol b/l1-contracts/contracts/common/L2ContractAddresses.sol index e8dbb1c83..571ef3d76 100644 --- a/l1-contracts/contracts/common/L2ContractAddresses.sol +++ b/l1-contracts/contracts/common/L2ContractAddresses.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @dev The formal address of the initial program of the system: the bootloader diff --git a/l1-contracts/contracts/common/Messaging.sol b/l1-contracts/contracts/common/Messaging.sol index 526d526dd..a7a2db944 100644 --- a/l1-contracts/contracts/common/Messaging.sol +++ b/l1-contracts/contracts/common/Messaging.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @dev The enum that represents the transaction execution status diff --git a/l1-contracts/contracts/common/ReentrancyGuard.sol b/l1-contracts/contracts/common/ReentrancyGuard.sol index 7d3899658..b1f8e556a 100644 --- a/l1-contracts/contracts/common/ReentrancyGuard.sol +++ b/l1-contracts/contracts/common/ReentrancyGuard.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {SlotOccupied, NotInitializedReentrancyGuard, Reentrancy} from "./L1ContractErrors.sol"; diff --git a/l1-contracts/contracts/common/interfaces/IL2ContractDeployer.sol b/l1-contracts/contracts/common/interfaces/IL2ContractDeployer.sol index 99890dcca..3d5b597df 100644 --- a/l1-contracts/contracts/common/interfaces/IL2ContractDeployer.sol +++ b/l1-contracts/contracts/common/interfaces/IL2ContractDeployer.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /** * @author Matter Labs - * @notice System smart contract that is responsible for deploying other smart contracts on a zkSync hyperchain. + * @notice System smart contract that is responsible for deploying other smart contracts on a ZKsync hyperchain. */ interface IL2ContractDeployer { /// @notice A struct that describes a forced deployment on an address. diff --git a/l1-contracts/contracts/common/libraries/L2ContractHelper.sol b/l1-contracts/contracts/common/libraries/L2ContractHelper.sol index e21e7de72..21199f069 100644 --- a/l1-contracts/contracts/common/libraries/L2ContractHelper.sol +++ b/l1-contracts/contracts/common/libraries/L2ContractHelper.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {BytecodeError, MalformedBytecode, LengthIsNotDivisibleBy32} from "../L1ContractErrors.sol"; diff --git a/l1-contracts/contracts/common/libraries/SemVer.sol b/l1-contracts/contracts/common/libraries/SemVer.sol index 8d9fd10ac..c46051626 100644 --- a/l1-contracts/contracts/common/libraries/SemVer.sol +++ b/l1-contracts/contracts/common/libraries/SemVer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @dev The number of bits dedicated to the "patch" portion of the protocol version. diff --git a/l1-contracts/contracts/common/libraries/UncheckedMath.sol b/l1-contracts/contracts/common/libraries/UncheckedMath.sol index 91c3e652c..a41a9c6ea 100644 --- a/l1-contracts/contracts/common/libraries/UncheckedMath.sol +++ b/l1-contracts/contracts/common/libraries/UncheckedMath.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /** diff --git a/l1-contracts/contracts/common/libraries/UnsafeBytes.sol b/l1-contracts/contracts/common/libraries/UnsafeBytes.sol index 3b8fc3cb5..d20bcbac8 100644 --- a/l1-contracts/contracts/common/libraries/UnsafeBytes.sol +++ b/l1-contracts/contracts/common/libraries/UnsafeBytes.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /** diff --git a/l1-contracts/contracts/dev-contracts/RevertReceiveAccount.sol b/l1-contracts/contracts/dev-contracts/RevertReceiveAccount.sol index 31575de1b..663afdfdc 100644 --- a/l1-contracts/contracts/dev-contracts/RevertReceiveAccount.sol +++ b/l1-contracts/contracts/dev-contracts/RevertReceiveAccount.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.24; /// @title RevertReceiveAccount - An account which reverts receiving funds depending on the flag -/// @dev Used for testing failed withdrawals from the zkSync smart contract +/// @dev Used for testing failed withdrawals from the ZKsync smart contract contract RevertReceiveAccount { // add this to be excluded from coverage report function test() internal virtual {} diff --git a/l1-contracts/contracts/dev-contracts/RevertTransferERC20.sol b/l1-contracts/contracts/dev-contracts/RevertTransferERC20.sol index bd018276d..dcc1f71f7 100644 --- a/l1-contracts/contracts/dev-contracts/RevertTransferERC20.sol +++ b/l1-contracts/contracts/dev-contracts/RevertTransferERC20.sol @@ -5,7 +5,7 @@ pragma solidity 0.8.24; import {TestnetERC20Token} from "./TestnetERC20Token.sol"; /// @title RevertTransferERC20Token - A ERC20 token contract which can revert transfers depending on a flag -/// @dev Used for testing failed ERC-20 withdrawals from the zkSync smart contract +/// @dev Used for testing failed ERC-20 withdrawals from the ZKsync smart contract contract RevertTransferERC20 is TestnetERC20Token { // add this to be excluded from coverage report function test() internal override {} diff --git a/l1-contracts/contracts/governance/Governance.sol b/l1-contracts/contracts/governance/Governance.sol index 45aa431da..790b79a26 100644 --- a/l1-contracts/contracts/governance/Governance.sol +++ b/l1-contracts/contracts/governance/Governance.sol @@ -12,7 +12,7 @@ import {ZeroAddress, Unauthorized, OperationMustBeReady, OperationMustBePending, /// @notice This contract manages operations (calls with preconditions) for governance tasks. /// The contract allows for operations to be scheduled, executed, and canceled with /// appropriate permissions and delays. It is used for managing and coordinating upgrades -/// and changes in all zkSync hyperchain governed contracts. +/// and changes in all ZKsync hyperchain governed contracts. /// /// Operations can be proposed as either fully transparent upgrades with on-chain data, /// or "shadow" upgrades where upgrade data is not published on-chain before execution. Proposed operations diff --git a/l1-contracts/contracts/governance/IGovernance.sol b/l1-contracts/contracts/governance/IGovernance.sol index e2a600175..2b03ed4c9 100644 --- a/l1-contracts/contracts/governance/IGovernance.sol +++ b/l1-contracts/contracts/governance/IGovernance.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @title Governance contract interface diff --git a/l1-contracts/contracts/state-transition/IStateTransitionManager.sol b/l1-contracts/contracts/state-transition/IStateTransitionManager.sol index d0111cf82..fec1c31fd 100644 --- a/l1-contracts/contracts/state-transition/IStateTransitionManager.sol +++ b/l1-contracts/contracts/state-transition/IStateTransitionManager.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {Diamond} from "./libraries/Diamond.sol"; diff --git a/l1-contracts/contracts/state-transition/ValidatorTimelock.sol b/l1-contracts/contracts/state-transition/ValidatorTimelock.sol index 32d92b7b1..61576f74c 100644 --- a/l1-contracts/contracts/state-transition/ValidatorTimelock.sol +++ b/l1-contracts/contracts/state-transition/ValidatorTimelock.sol @@ -14,7 +14,7 @@ import {Unauthorized, TimeNotReached, ZeroAddress} from "../common/L1ContractErr /// @dev The primary purpose of this contract is to provide a trustless means of delaying batch execution without /// modifying the main hyperchain diamond contract. As such, even if this contract is compromised, it will not impact the main /// contract. -/// @dev zkSync actively monitors the chain activity and reacts to any suspicious activity by freezing the chain. +/// @dev ZKsync actively monitors the chain activity and reacts to any suspicious activity by freezing the chain. /// This allows time for investigation and mitigation before resuming normal operations. /// @dev The contract overloads all of the 4 methods, that are used in state transition. When the batch is committed, /// the timestamp is stored for it. Later, when the owner calls the batch execution, the contract checks that batch @@ -210,7 +210,7 @@ contract ValidatorTimelock is IExecutor, Ownable2Step { // Note: if the `commitBatchTimestamp` is zero, that means either: // * The batch was committed, but not through this contract. - // * The batch wasn't committed at all, so execution will fail in the zkSync contract. + // * The batch wasn't committed at all, so execution will fail in the ZKsync contract. // We allow executing such batches. if (block.timestamp < commitBatchTimestamp + delay) { diff --git a/l1-contracts/contracts/state-transition/Verifier.sol b/l1-contracts/contracts/state-transition/Verifier.sol index cfc1f848b..a74ecb12c 100644 --- a/l1-contracts/contracts/state-transition/Verifier.sol +++ b/l1-contracts/contracts/state-transition/Verifier.sol @@ -8,14 +8,14 @@ import {IVerifier} from "./chain-interfaces/IVerifier.sol"; /// @author Matter Labs /// @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 zkSync hyperchain circuits. +/// Modifications have been made to optimize the proof system for ZKsync hyperchain circuits. /// @dev Contract was generated from a verification key with a hash of 0x14f97b81e54b35fe673d8708cc1a19e1ea5b5e348e12d31e39824ed4f42bbca2 /// @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: /// * Original Plonk Article: https://eprint.iacr.org/2019/953.pdf /// * Original LookUp Article: https://eprint.iacr.org/2020/315.pdf -/// * Plonk for zkSync v1.1: https://github.com/matter-labs/solidity_plonk_verifier/raw/recursive/bellman_vk_codegen_recursive/RecursivePlonkUnrolledForEthereum.pdf +/// * Plonk for ZKsync v1.1: https://github.com/matter-labs/solidity_plonk_verifier/raw/recursive/bellman_vk_codegen_recursive/RecursivePlonkUnrolledForEthereum.pdf /// The notation used in the code is the same as in the papers. /* solhint-enable max-line-length */ contract Verifier is IVerifier { diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol index f47870345..07995642b 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol @@ -16,7 +16,7 @@ import {BatchNumberMismatch, TimeNotReached, TooManyBlobs, ValueMismatch, Invali // While formally the following import is not used, it is needed to inherit documentation from it import {IZkSyncHyperchainBase} from "../../chain-interfaces/IZkSyncHyperchainBase.sol"; -/// @title zkSync hyperchain Executor contract capable of processing events emitted in the zkSync hyperchain protocol. +/// @title ZKsync hyperchain Executor contract capable of processing events emitted in the ZKsync hyperchain protocol. /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev contract ExecutorFacet is ZkSyncHyperchainBase, IExecutor { diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol index 1f380941c..43f6b04e7 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol @@ -25,7 +25,7 @@ import {OnlyEraSupported, BatchNotExecuted, HashedLogIsDefault, BaseTokenGasPric // While formally the following import is not used, it is needed to inherit documentation from it import {IZkSyncHyperchainBase} from "../../chain-interfaces/IZkSyncHyperchainBase.sol"; -/// @title zkSync Mailbox contract providing interfaces for L1 <-> L2 interaction. +/// @title ZKsync Mailbox contract providing interfaces for L1 <-> L2 interaction. /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev contract MailboxFacet is ZkSyncHyperchainBase, IMailbox { @@ -299,7 +299,7 @@ contract MailboxFacet is ZkSyncHyperchainBase, IMailbox { request.refundRecipient = AddressAliasHelper.actualRefundRecipient(request.refundRecipient, request.sender); // Change the sender address if it is a smart contract to prevent address collision between L1 and L2. - // Please note, currently zkSync address derivation is different from Ethereum one, but it may be changed in the future. + // Please note, currently ZKsync address derivation is different from Ethereum one, but it may be changed in the future. // solhint-disable avoid-tx-origin // slither-disable-next-line tx-origin if (request.sender != tx.origin) { diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol index 79c034f36..643c6114d 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {IZkSyncHyperchainBase} from "../chain-interfaces/IZkSyncHyperchainBase.sol"; diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol index e222a623e..189ae69fa 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {IVerifier, VerifierParams} from "./IVerifier.sol"; diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol index 7679be75e..d74e4288b 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {IZkSyncHyperchainBase} from "./IZkSyncHyperchainBase.sol"; @@ -75,7 +75,7 @@ uint256 constant MAX_NUMBER_OF_BLOBS = 6; /// than the maximal number of blobs supported by the contract (`MAX_NUMBER_OF_BLOBS`). uint256 constant TOTAL_BLOBS_IN_COMMITMENT = 16; -/// @title The interface of the zkSync Executor contract capable of processing events emitted in the zkSync protocol. +/// @title The interface of the ZKsync Executor contract capable of processing events emitted in the ZKsync protocol. /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev interface IExecutor is IZkSyncHyperchainBase { @@ -87,7 +87,7 @@ interface IExecutor is IZkSyncHyperchainBase { /// @param priorityOperationsHash Hash of all priority operations from this batch /// @param l2LogsTreeRoot Root hash of tree that contains L2 -> L1 messages from this batch /// @param timestamp Rollup batch timestamp, have the same format as Ethereum batch constant - /// @param commitment Verified input for the zkSync circuit + /// @param commitment Verified input for the ZKsync circuit // solhint-disable-next-line gas-struct-packing struct StoredBatchInfo { uint64 batchNumber; @@ -195,7 +195,7 @@ interface IExecutor is IZkSyncHyperchainBase { /// @notice Event emitted when a batch is committed /// @param batchNumber Number of the batch committed /// @param batchHash Hash of the L2 batch - /// @param commitment Calculated input for the zkSync circuit + /// @param commitment Calculated input for the ZKsync circuit /// @dev It has the name "BlockCommit" and not "BatchCommit" due to backward compatibility considerations event BlockCommit(uint256 indexed batchNumber, bytes32 indexed batchHash, bytes32 indexed commitment); @@ -208,7 +208,7 @@ interface IExecutor is IZkSyncHyperchainBase { /// @notice Event emitted when a batch is executed /// @param batchNumber Number of the batch executed /// @param batchHash Hash of the L2 batch - /// @param commitment Verified input for the zkSync circuit + /// @param commitment Verified input for the ZKsync circuit /// @dev It has the name "BlockExecution" and not "BatchExecution" due to backward compatibility considerations event BlockExecution(uint256 indexed batchNumber, bytes32 indexed batchHash, bytes32 indexed commitment); diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol index 38e2adbfe..4d06f9e8e 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {PriorityOperation} from "../libraries/PriorityQueue.sol"; diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/ILegacyGetters.sol b/l1-contracts/contracts/state-transition/chain-interfaces/ILegacyGetters.sol index 4d6941edf..cb62f5087 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/ILegacyGetters.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/ILegacyGetters.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {IZkSyncHyperchainBase} from "./IZkSyncHyperchainBase.sol"; /// @author Matter Labs -/// @dev This interface contains getters for the zkSync contract that should not be used, +/// @dev This interface contains getters for the ZKsync contract that should not be used, /// but still are kept for backward compatibility. /// @custom:security-contact security@matterlabs.dev interface ILegacyGetters is IZkSyncHyperchainBase { diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IMailbox.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IMailbox.sol index 065b3819d..9daffebcf 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IMailbox.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IMailbox.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {IZkSyncHyperchainBase} from "./IZkSyncHyperchainBase.sol"; import {L2CanonicalTransaction, L2Log, L2Message, TxStatus, BridgehubL2TransactionRequest} from "../../common/Messaging.sol"; -/// @title The interface of the zkSync Mailbox contract that provides interfaces for L1 <-> L2 interaction. +/// @title The interface of the ZKsync Mailbox contract that provides interfaces for L1 <-> L2 interaction. /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev interface IMailbox is IZkSyncHyperchainBase { diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/ITransactionFilterer.sol b/l1-contracts/contracts/state-transition/chain-interfaces/ITransactionFilterer.sol index 49dee07fd..a3776cacd 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/ITransactionFilterer.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/ITransactionFilterer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @title The interface of the L1 -> L2 transaction filterer. diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IVerifier.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IVerifier.sol index dbca3bf0c..97872c370 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IVerifier.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IVerifier.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @notice Part of the configuration parameters of ZKP circuits diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol index bf9a88a5e..14aa123b0 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {IAdmin} from "./IAdmin.sol"; diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchainBase.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchainBase.sol index 15fda726d..24fe3b482 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchainBase.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchainBase.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: UNLICENSED -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; -/// @title The interface of the zkSync contract, responsible for the main zkSync logic. +/// @title The interface of the ZKsync contract, responsible for the main ZKsync logic. /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev interface IZkSyncHyperchainBase { diff --git a/l1-contracts/contracts/state-transition/l2-deps/ISystemContext.sol b/l1-contracts/contracts/state-transition/l2-deps/ISystemContext.sol index 6aa1b09ff..d09e76491 100644 --- a/l1-contracts/contracts/state-transition/l2-deps/ISystemContext.sol +++ b/l1-contracts/contracts/state-transition/l2-deps/ISystemContext.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; interface ISystemContext { diff --git a/l1-contracts/contracts/state-transition/libraries/Diamond.sol b/l1-contracts/contracts/state-transition/libraries/Diamond.sol index 6d8416fde..b43a673c5 100644 --- a/l1-contracts/contracts/state-transition/libraries/Diamond.sol +++ b/l1-contracts/contracts/state-transition/libraries/Diamond.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {SafeCast} from "@openzeppelin/contracts-v4/utils/math/SafeCast.sol"; diff --git a/l1-contracts/contracts/state-transition/libraries/LibMap.sol b/l1-contracts/contracts/state-transition/libraries/LibMap.sol index 9bedb1cce..2cbad0b78 100644 --- a/l1-contracts/contracts/state-transition/libraries/LibMap.sol +++ b/l1-contracts/contracts/state-transition/libraries/LibMap.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @notice Library for storage of packed unsigned integers. diff --git a/l1-contracts/contracts/state-transition/libraries/Merkle.sol b/l1-contracts/contracts/state-transition/libraries/Merkle.sol index 79287d00b..57701f338 100644 --- a/l1-contracts/contracts/state-transition/libraries/Merkle.sol +++ b/l1-contracts/contracts/state-transition/libraries/Merkle.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {UncheckedMath} from "../../common/libraries/UncheckedMath.sol"; diff --git a/l1-contracts/contracts/state-transition/libraries/PriorityQueue.sol b/l1-contracts/contracts/state-transition/libraries/PriorityQueue.sol index 762350039..141cd40c0 100644 --- a/l1-contracts/contracts/state-transition/libraries/PriorityQueue.sol +++ b/l1-contracts/contracts/state-transition/libraries/PriorityQueue.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {QueueIsEmpty} from "../../common/L1ContractErrors.sol"; diff --git a/l1-contracts/contracts/state-transition/libraries/TransactionValidator.sol b/l1-contracts/contracts/state-transition/libraries/TransactionValidator.sol index 485aef9a2..f196053f4 100644 --- a/l1-contracts/contracts/state-transition/libraries/TransactionValidator.sol +++ b/l1-contracts/contracts/state-transition/libraries/TransactionValidator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {Math} from "@openzeppelin/contracts-v4/utils/math/Math.sol"; @@ -8,7 +8,7 @@ import {L2CanonicalTransaction} from "../../common/Messaging.sol"; import {TX_SLOT_OVERHEAD_L2_GAS, MEMORY_OVERHEAD_GAS, L1_TX_INTRINSIC_L2_GAS, L1_TX_DELTA_544_ENCODING_BYTES, L1_TX_DELTA_FACTORY_DEPS_L2_GAS, L1_TX_MIN_L2_GAS_BASE, L1_TX_INTRINSIC_PUBDATA, L1_TX_DELTA_FACTORY_DEPS_PUBDATA} from "../../common/Config.sol"; import {TooMuchGas, InvalidUpgradeTxn, UpgradeTxVerifyParam, PubdataGreaterThanLimit, ValidateTxnNotEnoughGas, TxnBodyGasLimitNotEnoughGas} from "../../common/L1ContractErrors.sol"; -/// @title zkSync Library for validating L1 -> L2 transactions +/// @title ZKsync Library for validating L1 -> L2 transactions /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev library TransactionValidator { @@ -157,7 +157,7 @@ library TransactionValidator { /// @notice Based on the total L2 gas limit and several other parameters of the transaction /// returns the part of the L2 gas that will be spent on the batch's overhead. /// @dev The details of how this function works can be checked in the documentation - /// of the fee model of zkSync. The appropriate comments are also present + /// of the fee model of ZKsync. The appropriate comments are also present /// in the Rust implementation description of function `get_maximal_allowed_overhead`. /// @param _encodingLength The length of the binary encoding of the transaction in bytes function getOverheadForTransaction( diff --git a/l1-contracts/contracts/vendor/AddressAliasHelper.sol b/l1-contracts/contracts/vendor/AddressAliasHelper.sol index e5bc1da07..ad80f3483 100644 --- a/l1-contracts/contracts/vendor/AddressAliasHelper.sol +++ b/l1-contracts/contracts/vendor/AddressAliasHelper.sol @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; library AddressAliasHelper { diff --git a/l2-contracts/contracts/Dependencies.sol b/l2-contracts/contracts/Dependencies.sol index 591cb9fd9..8a606d45a 100644 --- a/l2-contracts/contracts/Dependencies.sol +++ b/l2-contracts/contracts/Dependencies.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /* solhint-disable-next-line no-unused-import */ diff --git a/l2-contracts/contracts/L2ContractHelper.sol b/l2-contracts/contracts/L2ContractHelper.sol index 60442bad0..842d4b4f4 100644 --- a/l2-contracts/contracts/L2ContractHelper.sol +++ b/l2-contracts/contracts/L2ContractHelper.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** @@ -114,7 +114,7 @@ library L2ContractHelper { } } -/// @notice Structure used to represent a zkSync transaction. +/// @notice Structure used to represent a ZKsync transaction. struct Transaction { // The type of the transaction. uint256 txType; diff --git a/l2-contracts/contracts/SystemContractsCaller.sol b/l2-contracts/contracts/SystemContractsCaller.sol index 79161eaaf..ba3136792 100644 --- a/l2-contracts/contracts/SystemContractsCaller.sol +++ b/l2-contracts/contracts/SystemContractsCaller.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // solhint-disable one-contract-per-file -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {MSG_VALUE_SYSTEM_CONTRACT} from "./L2ContractHelper.sol"; diff --git a/l2-contracts/contracts/TestnetPaymaster.sol b/l2-contracts/contracts/TestnetPaymaster.sol index 36087352d..54558fe3b 100644 --- a/l2-contracts/contracts/TestnetPaymaster.sol +++ b/l2-contracts/contracts/TestnetPaymaster.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; diff --git a/l2-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol b/l2-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol index 02a16b990..84d412245 100644 --- a/l2-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol +++ b/l2-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /// @author Matter Labs diff --git a/l2-contracts/contracts/bridge/interfaces/IL1SharedBridge.sol b/l2-contracts/contracts/bridge/interfaces/IL1SharedBridge.sol index 5f196f1a5..cc468ab87 100644 --- a/l2-contracts/contracts/bridge/interfaces/IL1SharedBridge.sol +++ b/l2-contracts/contracts/bridge/interfaces/IL1SharedBridge.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /// @title L1 Bridge contract interface diff --git a/l2-contracts/contracts/bridge/interfaces/IL2SharedBridge.sol b/l2-contracts/contracts/bridge/interfaces/IL2SharedBridge.sol index 71e569795..ee31f6691 100644 --- a/l2-contracts/contracts/bridge/interfaces/IL2SharedBridge.sol +++ b/l2-contracts/contracts/bridge/interfaces/IL2SharedBridge.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /// @author Matter Labs diff --git a/l2-contracts/contracts/bridge/interfaces/IL2StandardToken.sol b/l2-contracts/contracts/bridge/interfaces/IL2StandardToken.sol index 4c2aaa323..6fefafa63 100644 --- a/l2-contracts/contracts/bridge/interfaces/IL2StandardToken.sol +++ b/l2-contracts/contracts/bridge/interfaces/IL2StandardToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; interface IL2StandardToken { diff --git a/l2-contracts/contracts/bridge/interfaces/IL2WrappedBaseToken.sol b/l2-contracts/contracts/bridge/interfaces/IL2WrappedBaseToken.sol index df447e0f8..ae7e1a916 100644 --- a/l2-contracts/contracts/bridge/interfaces/IL2WrappedBaseToken.sol +++ b/l2-contracts/contracts/bridge/interfaces/IL2WrappedBaseToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; interface IL2WrappedBaseToken { diff --git a/l2-contracts/contracts/errors/L2ContractErrors.sol b/l2-contracts/contracts/errors/L2ContractErrors.sol index 59fc9eaaa..c5177f3eb 100644 --- a/l2-contracts/contracts/errors/L2ContractErrors.sol +++ b/l2-contracts/contracts/errors/L2ContractErrors.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; // 0x1f73225f diff --git a/l2-contracts/contracts/interfaces/IPaymaster.sol b/l2-contracts/contracts/interfaces/IPaymaster.sol index f7246457c..ed7e5c50f 100644 --- a/l2-contracts/contracts/interfaces/IPaymaster.sol +++ b/l2-contracts/contracts/interfaces/IPaymaster.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {Transaction} from "../L2ContractHelper.sol"; diff --git a/l2-contracts/contracts/interfaces/IPaymasterFlow.sol b/l2-contracts/contracts/interfaces/IPaymasterFlow.sol index 75e94a323..207aee24e 100644 --- a/l2-contracts/contracts/interfaces/IPaymasterFlow.sol +++ b/l2-contracts/contracts/interfaces/IPaymasterFlow.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/l2-contracts/contracts/vendor/AddressAliasHelper.sol b/l2-contracts/contracts/vendor/AddressAliasHelper.sol index 0dec0b9ee..6adab1d92 100644 --- a/l2-contracts/contracts/vendor/AddressAliasHelper.sol +++ b/l2-contracts/contracts/vendor/AddressAliasHelper.sol @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; library AddressAliasHelper { diff --git a/system-contracts/README.md b/system-contracts/README.md index 1449c936f..4058a356b 100644 --- a/system-contracts/README.md +++ b/system-contracts/README.md @@ -1,10 +1,10 @@ -# zkSync Era: System Contracts +# ZKsync Era: System Contracts [![Logo](../eraLogo.svg)](https://zksync.io/) -zkSync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or +ZKsync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or decentralization. Since it's EVM compatible (Solidity/Vyper), 99% of Ethereum projects can redeploy without refactoring -or re-auditing a single line of code. zkSync Era also uses an LLVM-based compiler that will eventually let developers +or re-auditing a single line of code. ZKsync Era also uses an LLVM-based compiler that will eventually let developers write smart contracts in C++, Rust and other popular languages. ## system-contracts @@ -17,7 +17,7 @@ the most commonly used contracts: each deployed contract is known. This contract also defines the derivation address. Whenever a contract is deployed, a ContractDeployed event is emitted. -`L1Messenger` This contract is used to send messages from zkSync to Ethereum. For each message sent, the L1MessageSent +`L1Messenger` This contract is used to send messages from ZKsync to Ethereum. For each message sent, the L1MessageSent event is emitted. `NonceHolder` This contract stores account nonces. The account nonces are stored in a single place for efficiency (the @@ -43,7 +43,7 @@ Update the system contracts hashes: `yarn sc calculate-hashes:fix` ### Run tests -The tests of the system contracts utilize the zkSync test node. In order to run the tests, execute the following commands in the root of the repository: +The tests of the system contracts utilize the ZKsync test node. In order to run the tests, execute the following commands in the root of the repository: ``` yarn test-node @@ -150,7 +150,7 @@ changes. ## License -The zkSync Era system-contracts are distributed under the terms of the MIT license. +The ZKsync Era system-contracts are distributed under the terms of the MIT license. See [LICENSE-MIT](LICENSE-MIT) for details. @@ -166,7 +166,7 @@ See [LICENSE-MIT](LICENSE-MIT) for details. ## Disclaimer -zkSync Era has been through lots of testing and audits. Although it is live, it is still in alpha state and will go +ZKsync Era has been through lots of testing and audits. Although it is live, it is still in alpha state and will go through more audits and bug bounties programs. We would love to hear our community's thoughts and suggestions about it! It is important to state that forking it now can potentially lead to missing important security updates, critical features, and performance improvements. diff --git a/system-contracts/SystemContractsHashes.json b/system-contracts/SystemContractsHashes.json index 9d17edc7d..2e885b9f5 100644 --- a/system-contracts/SystemContractsHashes.json +++ b/system-contracts/SystemContractsHashes.json @@ -3,49 +3,49 @@ "contractName": "AccountCodeStorage", "bytecodePath": "artifacts-zk/contracts-preprocessed/AccountCodeStorage.sol/AccountCodeStorage.json", "sourceCodePath": "contracts-preprocessed/AccountCodeStorage.sol", - "bytecodeHash": "0x0100005d39637f175e59ed8b149fb5767eaa1e1668ec9e884a13ad656c625748", - "sourceCodeHash": "0xcf59b8e87c4e6a45172938d0f991c301717556141e03a6c43f30db220b4b8093" + "bytecodeHash": "0x0100005d05a277543946914759aa4a6c403604b828f80d00b900c669c3d224e1", + "sourceCodeHash": "0x2e0e09d57a04bd1e722d8bf8c6423fdf3f8bca44e5e8c4f6684f987794be066e" }, { "contractName": "BootloaderUtilities", "bytecodePath": "artifacts-zk/contracts-preprocessed/BootloaderUtilities.sol/BootloaderUtilities.json", "sourceCodePath": "contracts-preprocessed/BootloaderUtilities.sol", - "bytecodeHash": "0x010007c72a6c3838b90ba1574a7f0b9ead2ccc53b7429e94055eb4e29f9cdd62", - "sourceCodeHash": "0x2605e2d28cf99dbde11aa545e7fa9b6343f988b7173283f7dfd54780e9947ce9" + "bytecodeHash": "0x010007c7bb63f64649098bf75f4baa588db20f445b4d20b7cca972d5d8f973ce", + "sourceCodeHash": "0x0f1213c4b95acb71f4ab5d4082cc1aeb2bd5017e1cccd46afc66e53268609d85" }, { "contractName": "ComplexUpgrader", "bytecodePath": "artifacts-zk/contracts-preprocessed/ComplexUpgrader.sol/ComplexUpgrader.json", "sourceCodePath": "contracts-preprocessed/ComplexUpgrader.sol", - "bytecodeHash": "0x0100004dee09025db93936ca0913936a6ef363256c2427e7c6c646ea5aeb8631", + "bytecodeHash": "0x0100004da9f3aa5e4febcc53522cb7ee6949369fde25dd79e977752b82b9fd5d", "sourceCodeHash": "0x796046a914fb676ba2bbd337b2924311ee2177ce54571c18a2c3945755c83614" }, { "contractName": "Compressor", "bytecodePath": "artifacts-zk/contracts-preprocessed/Compressor.sol/Compressor.json", "sourceCodePath": "contracts-preprocessed/Compressor.sol", - "bytecodeHash": "0x0100014f7c7a4728b9960e1146b1ab129cf4df893f523a45bf2c1a6713ece7be", + "bytecodeHash": "0x0100014fb4f05ae09288cbcf4fa7a09ca456910f6e69be5ac2c2dfc8d71d1576", "sourceCodeHash": "0xc6f7cd8b21aae52ed3dd5083c09b438a7af142a4ecda6067c586770e8be745a5" }, { "contractName": "ContractDeployer", "bytecodePath": "artifacts-zk/contracts-preprocessed/ContractDeployer.sol/ContractDeployer.json", "sourceCodePath": "contracts-preprocessed/ContractDeployer.sol", - "bytecodeHash": "0x010004e54238d31df887052849f439609045c2f21aa4e311e381be824749da74", - "sourceCodeHash": "0x2b52178555e74f3696f9ae08fdce14c6046c3b18e0f02f0187609ca8a3bba471" + "bytecodeHash": "0x010004e5d52d692822d5c54ac87de3297f39be0e4a6f72f2830ae5ac856684ee", + "sourceCodeHash": "0x82f81fbf5fb007a9cac97462d50907ca5d7a1af62d82d2645e093ed8647a5209" }, { "contractName": "Create2Factory", "bytecodePath": "artifacts-zk/contracts-preprocessed/Create2Factory.sol/Create2Factory.json", "sourceCodePath": "contracts-preprocessed/Create2Factory.sol", - "bytecodeHash": "0x0100004931dda7bd294161ad0ef0e228d4b4afc937cab9af4a2d938935fb6ea0", + "bytecodeHash": "0x010000495bd172e90725e6bfafe73e36a288d616d4673f5347eeb819a78bf546", "sourceCodeHash": "0x114d9322a9ca654989f3e0b3b21f1311dbc4db84f443d054cd414f6414d84de3" }, { "contractName": "DefaultAccount", "bytecodePath": "artifacts-zk/contracts-preprocessed/DefaultAccount.sol/DefaultAccount.json", "sourceCodePath": "contracts-preprocessed/DefaultAccount.sol", - "bytecodeHash": "0x0100055da70d970f98ca4677a4b2fcecef5354f345cc5c6d13a78339e5fd87a9", + "bytecodeHash": "0x0100055dba11508480be023137563caec69debc85f826cb3a4b68246a7cabe30", "sourceCodeHash": "0xebffe840ebbd9329edb1ebff8ca50f6935e7dabcc67194a896fcc2e968d46dfb" }, { @@ -59,56 +59,56 @@ "contractName": "ImmutableSimulator", "bytecodePath": "artifacts-zk/contracts-preprocessed/ImmutableSimulator.sol/ImmutableSimulator.json", "sourceCodePath": "contracts-preprocessed/ImmutableSimulator.sol", - "bytecodeHash": "0x01000039575b3cb0a5e96a80d89738a7cafa7e7995e7e4857f83c8982f5ff866", + "bytecodeHash": "0x01000039785a8e0d342a49b6b6c6e156801b816434d93bee85d33f56d56b4f9a", "sourceCodeHash": "0x9659e69f7db09e8f60a8bb95314b1ed26afcc689851665cf27f5408122f60c98" }, { "contractName": "KnownCodesStorage", "bytecodePath": "artifacts-zk/contracts-preprocessed/KnownCodesStorage.sol/KnownCodesStorage.json", "sourceCodePath": "contracts-preprocessed/KnownCodesStorage.sol", - "bytecodeHash": "0x0100006f232f5cf3c8ffde9230c1af56f3129f69d9851a8d29751613a385418f", + "bytecodeHash": "0x0100006f0f209c9e6d06b1327db1257b15fa7a8b9864ee5ccd12cd3f8bc40ac9", "sourceCodeHash": "0xb39b5b81168653e0c5062f7b8e1d6d15a4e186df3317f192f0cb2fc3a74f5448" }, { "contractName": "L1Messenger", "bytecodePath": "artifacts-zk/contracts-preprocessed/L1Messenger.sol/L1Messenger.json", "sourceCodePath": "contracts-preprocessed/L1Messenger.sol", - "bytecodeHash": "0x010002956ca323790f0c8b855ccc115fe48fa127189d80de464eaf956acda5a3", + "bytecodeHash": "0x010002955993e8ff8190e388e94a6bb791fbe9c6388e5011c52cb587a4ebf05e", "sourceCodeHash": "0xa8768fdaac6d8804782f14e2a51bbe2b6be31dee9103b6d02d149ea8dc46eb6a" }, { "contractName": "L2BaseToken", "bytecodePath": "artifacts-zk/contracts-preprocessed/L2BaseToken.sol/L2BaseToken.json", "sourceCodePath": "contracts-preprocessed/L2BaseToken.sol", - "bytecodeHash": "0x0100010348a5ee59718d33426818b6d5a20a50efe68aecf7053304aeff82b7aa", + "bytecodeHash": "0x01000103174a90beadc2cffe3e81bdb7b8a576174e888809c1953175fd3015b4", "sourceCodeHash": "0x8bdd2b4d0b53dba84c9f0af250bbaa2aad10b3de6747bba957f0bd3721090dfa" }, { "contractName": "MsgValueSimulator", "bytecodePath": "artifacts-zk/contracts-preprocessed/MsgValueSimulator.sol/MsgValueSimulator.json", "sourceCodePath": "contracts-preprocessed/MsgValueSimulator.sol", - "bytecodeHash": "0x0100005d426224423feeefe85bc7c7a02f65d01eb7e088c6978e421d78cfea72", + "bytecodeHash": "0x0100005da36075675b98f85fe90df11c1d526f6b12925da3a55a8b9c02aaac5f", "sourceCodeHash": "0x082f3dcbc2fe4d93706c86aae85faa683387097d1b676e7ebd00f71ee0f13b71" }, { "contractName": "NonceHolder", "bytecodePath": "artifacts-zk/contracts-preprocessed/NonceHolder.sol/NonceHolder.json", "sourceCodePath": "contracts-preprocessed/NonceHolder.sol", - "bytecodeHash": "0x010000d91567c5bd154d2350868fb366fbb131e51087799cc5da6a7bc9f40a92", + "bytecodeHash": "0x010000d97de8c14cd36b1ce06cd7f44a09f6093ec8eb4041629c0fc2116d0c73", "sourceCodeHash": "0xcd0c0366effebf2c98c58cf96322cc242a2d1c675620ef5514b7ed1f0a869edc" }, { "contractName": "PubdataChunkPublisher", "bytecodePath": "artifacts-zk/contracts-preprocessed/PubdataChunkPublisher.sol/PubdataChunkPublisher.json", "sourceCodePath": "contracts-preprocessed/PubdataChunkPublisher.sol", - "bytecodeHash": "0x0100004731b1807f406a678ca56a14d29917e2de60fca30cc7fa01169418f3ce", + "bytecodeHash": "0x010000470e396f376539289b7975b6866914a8a0994008a02987edac8be81db7", "sourceCodeHash": "0xd7161e2c8092cf57b43c6220bc605c0e7e540bddcde1af24e2d90f75633b098e" }, { "contractName": "SystemContext", "bytecodePath": "artifacts-zk/contracts-preprocessed/SystemContext.sol/SystemContext.json", "sourceCodePath": "contracts-preprocessed/SystemContext.sol", - "bytecodeHash": "0x010001a5a3730f0455b91c43e1b4cdd96cbffbdb60c161eb16586908a5e740d8", + "bytecodeHash": "0x010001a5eabf9e28288b7ab7e1db316148021347460cfb4314570956867d5af5", "sourceCodeHash": "0xf308743981ef5cea2f7a3332b8e51695a5e47e811a63974437fc1cceee475e7a" }, { @@ -178,35 +178,35 @@ "contractName": "bootloader_test", "bytecodePath": "bootloader/build/artifacts/bootloader_test.yul.zbin", "sourceCodePath": "bootloader/build/bootloader_test.yul", - "bytecodeHash": "0x010003cb94018874dce8c4f3b254625cffc7032c37f85c6b743d30cbac87c934", - "sourceCodeHash": "0x42b9c4235bd0b3de0beff158d7d848381990c55907daeaa3a9c8b6d66b53c0f3" + "bytecodeHash": "0x010003cbe23de2836aebbf2466f6899f7b19ad6dc5ff6e3ce10c83b16cad1b90", + "sourceCodeHash": "0xa7ac131c18e0b890282de1c328802a9c9c454c0c09d0bd015a06abb411556638" }, { "contractName": "fee_estimate", "bytecodePath": "bootloader/build/artifacts/fee_estimate.yul.zbin", "sourceCodePath": "bootloader/build/fee_estimate.yul", - "bytecodeHash": "0x0100092dd79e0d7171d5dfe246e20c2d3f2d8b1ba8104ba1199e0c1a4b8af9ef", - "sourceCodeHash": "0xe538d080f0071f7f31ab1ea013fccec31560450d67e2859257d627100a5fcd07" + "bytecodeHash": "0x0100092d97e147d5fb59598c2d3ab1bb9bcada3fbc538f05fde153731d0e34aa", + "sourceCodeHash": "0x31b38c5e26c4d6acad6cbbb5677648818ab930d146354814666cb855a595f23a" }, { "contractName": "gas_test", "bytecodePath": "bootloader/build/artifacts/gas_test.yul.zbin", "sourceCodePath": "bootloader/build/gas_test.yul", - "bytecodeHash": "0x010008b3ffe296bc8b565f555fa15f8aca08d9b88f5b06c15d72094cf5d779b6", - "sourceCodeHash": "0xcc36539d29f136bccd80fea0c3f9976cfc9e238972930b2aca98e6ad2e38fd1c" + "bytecodeHash": "0x010008b3324dc1065661a15eaefc44278fb555d6a561621c2c73935e7eb6d680", + "sourceCodeHash": "0xc9b10f7ceedf8883248be7d0e265fe076419df02bd59b8cbd701e92bced01472" }, { "contractName": "playground_batch", "bytecodePath": "bootloader/build/artifacts/playground_batch.yul.zbin", "sourceCodePath": "bootloader/build/playground_batch.yul", - "bytecodeHash": "0x010009339296f1ba9bd8b81e7152125a8286c4e7f9c3e194e35fc325a9e5c7d2", - "sourceCodeHash": "0xaac0c38a7b033eec41e2533c04b3541099c0c6ee70eb4acd8eea69edd1ef936a" + "bytecodeHash": "0x010009339beeb192c26f6cb18a67f446a578f10c145c8af344fe67b2772e4311", + "sourceCodeHash": "0xd4b0391e9d227e782934520d98eb66226d79ad1a6cfe422e624d7eee0d1e8bfc" }, { "contractName": "proved_batch", "bytecodePath": "bootloader/build/artifacts/proved_batch.yul.zbin", "sourceCodePath": "bootloader/build/proved_batch.yul", - "bytecodeHash": "0x010008c37ecadea8b003884eb9d81fdfb7161b3b309504e5318f15da19c500d8", - "sourceCodeHash": "0x64618bc0fd4affe7fd2a0fa6a5a16d16be2df194bbe3e0ad6d54f1878a4a6d95" + "bytecodeHash": "0x010008c314c516939d65ffcab410b9dcff5e7be81c4561adf171818984efc39c", + "sourceCodeHash": "0xdd2fb790fb11009d203b7933123cc51bfd00b7e96cc90006c05e2d31a5581477" } ] diff --git a/system-contracts/bootloader/bootloader.yul b/system-contracts/bootloader/bootloader.yul index e5daed9e0..a9a3a1725 100644 --- a/system-contracts/bootloader/bootloader.yul +++ b/system-contracts/bootloader/bootloader.yul @@ -620,10 +620,10 @@ object "Bootloader" { switch isETHCall case 1 { let gasLimitForTx, reservedGas := getGasLimitForTx( - innerTxDataOffset, - transactionIndex, + innerTxDataOffset, + transactionIndex, gasPerPubdata, - L2_TX_INTRINSIC_GAS(), + L2_TX_INTRINSIC_GAS(), L2_TX_INTRINSIC_PUBDATA() ) @@ -1279,7 +1279,7 @@ object "Bootloader" { /// @param gasLimitForTx The L2 gas limit for the transaction validation & execution. /// @param gasPrice The L2 gas price that should be used by the transaction. /// @param basePubdataSpent The amount of pubdata spent at the beginning of the transaction. - /// @param reservedGas The amount of gas reserved for the pubdata. + /// @param reservedGas The amount of gas reserved for the pubdata. /// @param gasPerPubdata The price of each byte of pubdata in L2 gas. /// @return gasLeft The gas left after the validation step. function l2TxValidation( @@ -1343,7 +1343,7 @@ object "Bootloader" { /// @param txDataOffset The offset to the ABI-encoded Transaction struct. /// @param gasLeft The gas left after the validation step. /// @param basePubdataSpent The amount of pubdata spent at the beginning of the transaction. - /// @param reservedGas The amount of gas reserved for the pubdata. + /// @param reservedGas The amount of gas reserved for the pubdata. /// @param gasPerPubdata The price of each byte of pubdata in L2 gas. /// @return success Whether or not the execution step was successful. /// @return gasSpentOnExecute The gas spent on the transaction execution. @@ -1440,7 +1440,7 @@ object "Bootloader" { /// @param abi The nearCall ABI. It is implicitly used as gasLimit for the call of this function. /// @param txDataOffset The offset to the ABI-encoded Transaction struct. /// @param basePubdataSpent The amount of pubdata spent at the beginning of the transaction. - /// @param reservedGas The amount of gas reserved for the pubdata. + /// @param reservedGas The amount of gas reserved for the pubdata. /// @param gasPerPubdata The price of each byte of pubdata in L2 gas. function ZKSYNC_NEAR_CALL_executeL2Tx( abi, @@ -1483,7 +1483,7 @@ object "Bootloader" { /// @param abi The nearCall ABI. It is implicitly used as gasLimit for the call of this function. /// @param txDataOffset The offset to the ABI-encoded Transaction struct. /// @param basePubdataSpent The amount of pubdata spent at the beginning of the transaction. - /// @param reservedGas The amount of gas reserved for the pubdata. + /// @param reservedGas The amount of gas reserved for the pubdata. /// @param gasPerPubdata The price of each byte of pubdata in L2 gas. function ZKSYNC_NEAR_CALL_markFactoryDepsL2( abi, @@ -1835,7 +1835,7 @@ object "Bootloader" { debugLog("from", from) debugLog("gasPrice", gasPrice) - // We assume that addresses of smart contracts on zkSync and Ethereum + // We assume that addresses of smart contracts on ZKsync and Ethereum // never overlap, so no need to check whether `from` is an EOA here. debugLog("setting tx origin", from) @@ -2268,7 +2268,7 @@ object "Bootloader" { /// @param maxRefundedGas The maximum number of gas the bootloader can be refunded. /// @param basePubdataSpent The amount of pubdata spent at the beginning of the transaction. /// @param gasPerPubdata The price of each byte of pubdata in L2 gas. - /// @param reservedGas The amount of gas reserved for the pubdata. + /// @param reservedGas The amount of gas reserved for the pubdata. /// This is the `maximum` number because it does not take into account the number of gas that /// can be spent by the paymaster itself. function ZKSYNC_NEAR_CALL_callPostOp( @@ -2552,7 +2552,7 @@ object "Bootloader" { } /// - /// zkSync-specific utilities: + /// ZKsync-specific utilities: /// /// @dev Returns an ABI that can be used for low-level @@ -2789,7 +2789,7 @@ object "Bootloader" { let spentErgs := getErgsSpentForPubdata(basePubdataSpent, gasPerPubdata) debugLog("spentErgsPubdata", spentErgs) let allowedGasLimit := add(computeGas, reservedGas) - + ret := lt(allowedGasLimit, spentErgs) } @@ -3579,7 +3579,7 @@ object "Bootloader" { } /// @dev Asks operator for the refund for the transaction. The function provides - /// the operator with the proposed refund gas by the bootloader, + /// the operator with the proposed refund gas by the bootloader, /// total spent gas on the pubdata and gas per 1 byte of pubdata. /// This function is called before the refund stage, because at that point /// only the operator knows how close does a transaction diff --git a/system-contracts/contracts/AccountCodeStorage.sol b/system-contracts/contracts/AccountCodeStorage.sol index 03a128ad6..4c55279c4 100644 --- a/system-contracts/contracts/AccountCodeStorage.sol +++ b/system-contracts/contracts/AccountCodeStorage.sol @@ -14,7 +14,7 @@ import {Unauthorized, InvalidCodeHash, CodeHashReason} from "./SystemContractErr * @dev Code hash is not strictly a hash, it's a structure where the first byte denotes the version of the hash, * the second byte denotes whether the contract is constructed, and the next two bytes denote the length in 32-byte words. * And then the next 28 bytes are the truncated hash. - * @dev In this version of zkSync, the first byte of the hash MUST be 1. + * @dev In this version of ZKsync, the first byte of the hash MUST be 1. * @dev The length of each bytecode MUST be odd. It's internal code format requirements, due to padding of SHA256 function. * @dev It is also assumed that all the bytecode hashes are *known*, i.e. the full bytecodes * were published on L1 as calldata. This contract trusts the ContractDeployer and the KnownCodesStorage diff --git a/system-contracts/contracts/BootloaderUtilities.sol b/system-contracts/contracts/BootloaderUtilities.sol index 384f6a121..4fd38da74 100644 --- a/system-contracts/contracts/BootloaderUtilities.sol +++ b/system-contracts/contracts/BootloaderUtilities.sol @@ -177,7 +177,7 @@ contract BootloaderUtilities is IBootloaderUtilities { // Otherwise the length is not encoded at all. } - // On zkSync, access lists are always zero length (at least for now). + // On ZKsync, access lists are always zero length (at least for now). bytes memory encodedAccessListLength = RLPEncoder.encodeListLen(0); bytes memory rEncoded; @@ -276,7 +276,7 @@ contract BootloaderUtilities is IBootloaderUtilities { // Otherwise the length is not encoded at all. } - // On zkSync, access lists are always zero length (at least for now). + // On ZKsync, access lists are always zero length (at least for now). bytes memory encodedAccessListLength = RLPEncoder.encodeListLen(0); bytes memory rEncoded; diff --git a/system-contracts/contracts/Constants.sol b/system-contracts/contracts/Constants.sol index 6be56db16..00145480b 100644 --- a/system-contracts/contracts/Constants.sol +++ b/system-contracts/contracts/Constants.sol @@ -1,6 +1,5 @@ // SPDX-License-Identifier: MIT - -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {IAccountCodeStorage} from "./interfaces/IAccountCodeStorage.sol"; @@ -16,7 +15,7 @@ import {IComplexUpgrader} from "./interfaces/IComplexUpgrader.sol"; import {IBootloaderUtilities} from "./interfaces/IBootloaderUtilities.sol"; import {IPubdataChunkPublisher} from "./interfaces/IPubdataChunkPublisher.sol"; -/// @dev All the system contracts introduced by zkSync have their addresses +/// @dev All the system contracts introduced by ZKsync have their addresses /// started from 2^15 in order to avoid collision with Ethereum precompiles. uint160 constant SYSTEM_CONTRACTS_OFFSET = {{SYSTEM_CONTRACTS_OFFSET}}; // 2^15 diff --git a/system-contracts/contracts/ContractDeployer.sol b/system-contracts/contracts/ContractDeployer.sol index a61eae096..8e9bda169 100644 --- a/system-contracts/contracts/ContractDeployer.sol +++ b/system-contracts/contracts/ContractDeployer.sol @@ -15,7 +15,7 @@ import {Unauthorized, InvalidNonceOrderingChange, ValueMismatch, EmptyBytes32, N /** * @author Matter Labs * @custom:security-contact security@matterlabs.dev - * @notice System smart contract that is responsible for deploying other smart contracts on zkSync. + * @notice System smart contract that is responsible for deploying other smart contracts on ZKsync. * @dev The contract is responsible for generating the address of the deployed smart contract, * incrementing the deployment nonce and making sure that the constructor is never called twice in a contract. * Note, contracts with bytecode that have already been published to L1 once diff --git a/system-contracts/contracts/SystemContractErrors.sol b/system-contracts/contracts/SystemContractErrors.sol index f95879643..b5dfc8276 100644 --- a/system-contracts/contracts/SystemContractErrors.sol +++ b/system-contracts/contracts/SystemContractErrors.sol @@ -1,6 +1,5 @@ // SPDX-License-Identifier: MIT - -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; // 0x86bb51b8 diff --git a/system-contracts/contracts/abstract/SystemContractBase.sol b/system-contracts/contracts/abstract/SystemContractBase.sol index bb461df21..89966a576 100644 --- a/system-contracts/contracts/abstract/SystemContractBase.sol +++ b/system-contracts/contracts/abstract/SystemContractBase.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {SystemContractHelper} from "../libraries/SystemContractHelper.sol"; diff --git a/system-contracts/contracts/interfaces/IAccount.sol b/system-contracts/contracts/interfaces/IAccount.sol index dad81b1b2..cebe91d17 100644 --- a/system-contracts/contracts/interfaces/IAccount.sol +++ b/system-contracts/contracts/interfaces/IAccount.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {Transaction} from "../libraries/TransactionHelper.sol"; diff --git a/system-contracts/contracts/interfaces/IAccountCodeStorage.sol b/system-contracts/contracts/interfaces/IAccountCodeStorage.sol index 0115393a1..5183e77f6 100644 --- a/system-contracts/contracts/interfaces/IAccountCodeStorage.sol +++ b/system-contracts/contracts/interfaces/IAccountCodeStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; interface IAccountCodeStorage { diff --git a/system-contracts/contracts/interfaces/IBaseToken.sol b/system-contracts/contracts/interfaces/IBaseToken.sol index b5a4cf912..fc32c7b83 100644 --- a/system-contracts/contracts/interfaces/IBaseToken.sol +++ b/system-contracts/contracts/interfaces/IBaseToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; interface IBaseToken { diff --git a/system-contracts/contracts/interfaces/IBootloaderUtilities.sol b/system-contracts/contracts/interfaces/IBootloaderUtilities.sol index 4437c9807..e900bfb5e 100644 --- a/system-contracts/contracts/interfaces/IBootloaderUtilities.sol +++ b/system-contracts/contracts/interfaces/IBootloaderUtilities.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {Transaction} from "../libraries/TransactionHelper.sol"; diff --git a/system-contracts/contracts/interfaces/IComplexUpgrader.sol b/system-contracts/contracts/interfaces/IComplexUpgrader.sol index 8ed670a10..3b1468417 100644 --- a/system-contracts/contracts/interfaces/IComplexUpgrader.sol +++ b/system-contracts/contracts/interfaces/IComplexUpgrader.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/interfaces/ICompressor.sol b/system-contracts/contracts/interfaces/ICompressor.sol index 077f30a2b..854aa7904 100644 --- a/system-contracts/contracts/interfaces/ICompressor.sol +++ b/system-contracts/contracts/interfaces/ICompressor.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; // The bitmask by applying which to the compressed state diff metadata we retrieve its operation. diff --git a/system-contracts/contracts/interfaces/IContractDeployer.sol b/system-contracts/contracts/interfaces/IContractDeployer.sol index e8ce701eb..6e0bac3dc 100644 --- a/system-contracts/contracts/interfaces/IContractDeployer.sol +++ b/system-contracts/contracts/interfaces/IContractDeployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; interface IContractDeployer { diff --git a/system-contracts/contracts/interfaces/IImmutableSimulator.sol b/system-contracts/contracts/interfaces/IImmutableSimulator.sol index cb7027fa1..840053849 100644 --- a/system-contracts/contracts/interfaces/IImmutableSimulator.sol +++ b/system-contracts/contracts/interfaces/IImmutableSimulator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; struct ImmutableData { diff --git a/system-contracts/contracts/interfaces/IKnownCodesStorage.sol b/system-contracts/contracts/interfaces/IKnownCodesStorage.sol index 39687ddfc..551cfb0d8 100644 --- a/system-contracts/contracts/interfaces/IKnownCodesStorage.sol +++ b/system-contracts/contracts/interfaces/IKnownCodesStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/interfaces/IL1Messenger.sol b/system-contracts/contracts/interfaces/IL1Messenger.sol index 808b5a082..88e2c81d8 100644 --- a/system-contracts/contracts/interfaces/IL1Messenger.sol +++ b/system-contracts/contracts/interfaces/IL1Messenger.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /// @dev The log passed from L2 diff --git a/system-contracts/contracts/interfaces/IL2StandardToken.sol b/system-contracts/contracts/interfaces/IL2StandardToken.sol index 3439ba3c6..d67a3ea1f 100644 --- a/system-contracts/contracts/interfaces/IL2StandardToken.sol +++ b/system-contracts/contracts/interfaces/IL2StandardToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; interface IL2StandardToken { diff --git a/system-contracts/contracts/interfaces/IMailbox.sol b/system-contracts/contracts/interfaces/IMailbox.sol index 703612039..a9dcdad05 100644 --- a/system-contracts/contracts/interfaces/IMailbox.sol +++ b/system-contracts/contracts/interfaces/IMailbox.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; interface IMailbox { diff --git a/system-contracts/contracts/interfaces/INonceHolder.sol b/system-contracts/contracts/interfaces/INonceHolder.sol index 30af5d100..ce3b0279d 100644 --- a/system-contracts/contracts/interfaces/INonceHolder.sol +++ b/system-contracts/contracts/interfaces/INonceHolder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/interfaces/IPaymaster.sol b/system-contracts/contracts/interfaces/IPaymaster.sol index 68d520eee..1c8af5b28 100644 --- a/system-contracts/contracts/interfaces/IPaymaster.sol +++ b/system-contracts/contracts/interfaces/IPaymaster.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {Transaction} from "../libraries/TransactionHelper.sol"; diff --git a/system-contracts/contracts/interfaces/IPaymasterFlow.sol b/system-contracts/contracts/interfaces/IPaymasterFlow.sol index 0458c3026..4c9683fd4 100644 --- a/system-contracts/contracts/interfaces/IPaymasterFlow.sol +++ b/system-contracts/contracts/interfaces/IPaymasterFlow.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/interfaces/IPubdataChunkPublisher.sol b/system-contracts/contracts/interfaces/IPubdataChunkPublisher.sol index 15faadf66..47893abdb 100644 --- a/system-contracts/contracts/interfaces/IPubdataChunkPublisher.sol +++ b/system-contracts/contracts/interfaces/IPubdataChunkPublisher.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/interfaces/ISystemContext.sol b/system-contracts/contracts/interfaces/ISystemContext.sol index 9926d197d..6b9a37fce 100644 --- a/system-contracts/contracts/interfaces/ISystemContext.sol +++ b/system-contracts/contracts/interfaces/ISystemContext.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/interfaces/ISystemContextDeprecated.sol b/system-contracts/contracts/interfaces/ISystemContextDeprecated.sol index a7f3740be..ac5153270 100644 --- a/system-contracts/contracts/interfaces/ISystemContextDeprecated.sol +++ b/system-contracts/contracts/interfaces/ISystemContextDeprecated.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/libraries/EfficientCall.sol b/system-contracts/contracts/libraries/EfficientCall.sol index 8f203b02a..27fea6396 100644 --- a/system-contracts/contracts/libraries/EfficientCall.sol +++ b/system-contracts/contracts/libraries/EfficientCall.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {SystemContractHelper, ADDRESS_MASK} from "./SystemContractHelper.sol"; diff --git a/system-contracts/contracts/libraries/RLPEncoder.sol b/system-contracts/contracts/libraries/RLPEncoder.sol index b21969731..16eaa4053 100644 --- a/system-contracts/contracts/libraries/RLPEncoder.sol +++ b/system-contracts/contracts/libraries/RLPEncoder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/libraries/SystemContractHelper.sol b/system-contracts/contracts/libraries/SystemContractHelper.sol index 0f832dc79..e8469e308 100644 --- a/system-contracts/contracts/libraries/SystemContractHelper.sol +++ b/system-contracts/contracts/libraries/SystemContractHelper.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {MAX_SYSTEM_CONTRACT_ADDRESS} from "../Constants.sol"; diff --git a/system-contracts/contracts/libraries/SystemContractsCaller.sol b/system-contracts/contracts/libraries/SystemContractsCaller.sol index 14f361c6f..9497b0c52 100644 --- a/system-contracts/contracts/libraries/SystemContractsCaller.sol +++ b/system-contracts/contracts/libraries/SystemContractsCaller.sol @@ -1,12 +1,12 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {MSG_VALUE_SYSTEM_CONTRACT, MSG_VALUE_SIMULATOR_IS_SYSTEM_BIT} from "../Constants.sol"; import {Utils} from "./Utils.sol"; // Addresses used for the compiler to be replaced with the -// zkSync-specific opcodes during the compilation. +// ZKsync-specific opcodes during the compilation. // IMPORTANT: these are just compile-time constants and are used // only if used in-place by Yul optimizer. address constant TO_L1_CALL_ADDRESS = address((1 << 16) - 1); diff --git a/system-contracts/contracts/libraries/TransactionHelper.sol b/system-contracts/contracts/libraries/TransactionHelper.sol index e34599d39..467eb57f9 100644 --- a/system-contracts/contracts/libraries/TransactionHelper.sol +++ b/system-contracts/contracts/libraries/TransactionHelper.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {IERC20} from "../openzeppelin/token/ERC20/IERC20.sol"; @@ -11,7 +11,7 @@ import {RLPEncoder} from "./RLPEncoder.sol"; import {EfficientCall} from "./EfficientCall.sol"; import {UnsupportedTxType, InvalidInput, UnsupportedPaymasterFlow} from "../SystemContractErrors.sol"; -/// @dev The type id of zkSync's EIP-712-signed transaction. +/// @dev The type id of ZKsync's EIP-712-signed transaction. uint8 constant EIP_712_TX_TYPE = 0x71; /// @dev The type id of legacy transactions. @@ -21,7 +21,7 @@ uint8 constant EIP_2930_TX_TYPE = 0x01; /// @dev The type id of EIP1559 transactions. uint8 constant EIP_1559_TX_TYPE = 0x02; -/// @notice Structure used to represent a zkSync transaction. +/// @notice Structure used to represent a ZKsync transaction. struct Transaction { // The type of the transaction. uint256 txType; @@ -114,7 +114,7 @@ library TransactionHelper { } } - /// @notice Encode hash of the zkSync native transaction type. + /// @notice Encode hash of the ZKsync native transaction type. /// @return keccak256 hash of the EIP-712 encoded representation of transaction function _encodeHashEIP712Transaction(Transaction calldata _transaction) private view returns (bytes32) { bytes32 structHash = keccak256( @@ -223,7 +223,7 @@ library TransactionHelper { // Hash of EIP2930 transactions is encoded the following way: // H(0x01 || RLP(chain_id, nonce, gas_price, gas_limit, destination, amount, data, access_list)) // - // Note, that on zkSync access lists are not supported and should always be empty. + // Note, that on ZKsync access lists are not supported and should always be empty. // Encode all fixed-length params to avoid "stack too deep error" bytes memory encodedFixedLengthParams; @@ -261,7 +261,7 @@ library TransactionHelper { // Otherwise the length is not encoded at all. } - // On zkSync, access lists are always zero length (at least for now). + // On ZKsync, access lists are always zero length (at least for now). bytes memory encodedAccessListLength = RLPEncoder.encodeListLen(0); bytes memory encodedListLength; @@ -295,7 +295,7 @@ library TransactionHelper { // Hash of EIP1559 transactions is encoded the following way: // H(0x02 || RLP(chain_id, nonce, max_priority_fee_per_gas, max_fee_per_gas, gas_limit, destination, amount, data, access_list)) // - // Note, that on zkSync access lists are not supported and should always be empty. + // Note, that on ZKsync access lists are not supported and should always be empty. // Encode all fixed-length params to avoid "stack too deep error" bytes memory encodedFixedLengthParams; @@ -335,7 +335,7 @@ library TransactionHelper { // Otherwise the length is not encoded at all. } - // On zkSync, access lists are always zero length (at least for now). + // On ZKsync, access lists are always zero length (at least for now). bytes memory encodedAccessListLength = RLPEncoder.encodeListLen(0); bytes memory encodedListLength; diff --git a/system-contracts/contracts/libraries/UnsafeBytesCalldata.sol b/system-contracts/contracts/libraries/UnsafeBytesCalldata.sol index 4c72d3542..82b4c5c1d 100644 --- a/system-contracts/contracts/libraries/UnsafeBytesCalldata.sol +++ b/system-contracts/contracts/libraries/UnsafeBytesCalldata.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/libraries/Utils.sol b/system-contracts/contracts/libraries/Utils.sol index b4a843d9b..fc23de94b 100644 --- a/system-contracts/contracts/libraries/Utils.sol +++ b/system-contracts/contracts/libraries/Utils.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {EfficientCall} from "./EfficientCall.sol"; @@ -8,7 +8,7 @@ import {MalformedBytecode, BytecodeError, Overflow} from "../SystemContractError /** * @author Matter Labs * @custom:security-contact security@matterlabs.dev - * @dev Common utilities used in zkSync system contracts + * @dev Common utilities used in ZKsync system contracts */ library Utils { /// @dev Bit mask of bytecode hash "isConstructor" marker diff --git a/system-contracts/contracts/openzeppelin/token/ERC20/IERC20.sol b/system-contracts/contracts/openzeppelin/token/ERC20/IERC20.sol index dc3ad760b..18b39a7a9 100644 --- a/system-contracts/contracts/openzeppelin/token/ERC20/IERC20.sol +++ b/system-contracts/contracts/openzeppelin/token/ERC20/IERC20.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts (last updated v4.6.0) (token/ERC20/IERC20.sol) -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.0; /** diff --git a/system-contracts/contracts/openzeppelin/token/ERC20/extensions/IERC20Permit.sol b/system-contracts/contracts/openzeppelin/token/ERC20/extensions/IERC20Permit.sol index d98bfbce9..5e0875438 100644 --- a/system-contracts/contracts/openzeppelin/token/ERC20/extensions/IERC20Permit.sol +++ b/system-contracts/contracts/openzeppelin/token/ERC20/extensions/IERC20Permit.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts v4.4.1 (token/ERC20/extensions/IERC20Permit.sol) -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.0; /** diff --git a/system-contracts/contracts/openzeppelin/token/ERC20/utils/SafeERC20.sol b/system-contracts/contracts/openzeppelin/token/ERC20/utils/SafeERC20.sol index 2c94d1b59..a23e6d1f7 100644 --- a/system-contracts/contracts/openzeppelin/token/ERC20/utils/SafeERC20.sol +++ b/system-contracts/contracts/openzeppelin/token/ERC20/utils/SafeERC20.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts (last updated v4.8.0) (token/ERC20/utils/SafeERC20.sol) -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.0; import {IERC20} from "../IERC20.sol"; diff --git a/system-contracts/contracts/openzeppelin/utils/Address.sol b/system-contracts/contracts/openzeppelin/utils/Address.sol index 9669a9c14..5d6de78c4 100644 --- a/system-contracts/contracts/openzeppelin/utils/Address.sol +++ b/system-contracts/contracts/openzeppelin/utils/Address.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts (last updated v4.8.0) (utils/Address.sol) -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.1; /** diff --git a/system-contracts/scripts/constants.ts b/system-contracts/scripts/constants.ts index 406b4cb6e..b354c36ab 100644 --- a/system-contracts/scripts/constants.ts +++ b/system-contracts/scripts/constants.ts @@ -184,7 +184,7 @@ export const EIP712_DOMAIN = { name: "zkSync", version: "2", chainId: CHAIN_ID, - // zkSync contract doesn't verify EIP712 signatures. + // ZKsync contract doesn't verify EIP712 signatures. }; export interface TransactionData { diff --git a/system-contracts/scripts/deploy-preimages.ts b/system-contracts/scripts/deploy-preimages.ts index 7a4a96880..0029f56a0 100644 --- a/system-contracts/scripts/deploy-preimages.ts +++ b/system-contracts/scripts/deploy-preimages.ts @@ -103,7 +103,7 @@ class ZkSyncDeployer { this.nonce += 1; } - // Returns the current default account bytecode on zkSync + // Returns the current default account bytecode on ZKsync async currentDefaultAccountBytecode(): Promise { const zkSync = await this.deployer.zkWallet.getMainContract(); return await zkSync.getL2DefaultAccountBytecodeHash(); @@ -114,7 +114,7 @@ class ZkSyncDeployer { const bytecodeHash = ethers.utils.hexlify(hashBytecode(defaultAccountBytecode)); const currentDefaultAccountBytecode = ethers.utils.hexlify(await this.currentDefaultAccountBytecode()); - // If the bytecode is not the same as the one deployed on zkSync, we need to add it to the deployment + // If the bytecode is not the same as the one deployed on ZKsync, we need to add it to the deployment if (bytecodeHash.toLowerCase() !== currentDefaultAccountBytecode) { this.defaultAccountToUpgrade = { name: DEFAULT_ACCOUNT_CONTRACT_NAME, @@ -161,7 +161,7 @@ class ZkSyncDeployer { const bytecodeHash = ethers.utils.hexlify(hashBytecode(bootloaderCode)); const currentBootloaderBytecode = ethers.utils.hexlify(await this.currentBootloaderBytecode()); - // If the bytecode is not the same as the one deployed on zkSync, we need to add it to the deployment + // If the bytecode is not the same as the one deployed on ZKsync, we need to add it to the deployment if (bytecodeHash.toLowerCase() !== currentBootloaderBytecode) { this.bootloaderToUpgrade = { name: BOOTLOADER_CONTRACT_NAME, diff --git a/system-contracts/scripts/utils.ts b/system-contracts/scripts/utils.ts index e06c14e50..4c1060ee2 100644 --- a/system-contracts/scripts/utils.ts +++ b/system-contracts/scripts/utils.ts @@ -84,7 +84,7 @@ export async function outputSystemContracts(): Promise { return await Promise.all(upgradeParamsPromises); } -// Script that publishes preimages for all the system contracts on zkSync +// Script that publishes preimages for all the system contracts on ZKsync // and outputs the JSON that can be used for performing the necessary upgrade const DEFAULT_L2_TX_GAS_LIMIT = 2097152; diff --git a/tools/data/verifier_contract_template.txt b/tools/data/verifier_contract_template.txt index 972123961..5ef32b2c5 100644 --- a/tools/data/verifier_contract_template.txt +++ b/tools/data/verifier_contract_template.txt @@ -8,14 +8,14 @@ import {IVerifier} from "./chain-interfaces/IVerifier.sol"; /// @author Matter Labs /// @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 zkSync hyperchain circuits. +/// Modifications have been made to optimize the proof system for ZKsync hyperchain circuits. /// @dev Contract was generated from a verification key with a hash of 0x{{vk_hash}} /// @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: /// * Original Plonk Article: https://eprint.iacr.org/2019/953.pdf /// * Original LookUp Article: https://eprint.iacr.org/2020/315.pdf -/// * Plonk for zkSync v1.1: https://github.com/matter-labs/solidity_plonk_verifier/raw/recursive/bellman_vk_codegen_recursive/RecursivePlonkUnrolledForEthereum.pdf +/// * Plonk for ZKsync v1.1: https://github.com/matter-labs/solidity_plonk_verifier/raw/recursive/bellman_vk_codegen_recursive/RecursivePlonkUnrolledForEthereum.pdf /// The notation used in the code is the same as in the papers. /* solhint-enable max-line-length */ contract Verifier is IVerifier { From dba02125a95096e7b1b13672736c4e759fb78099 Mon Sep 17 00:00:00 2001 From: koloz193 Date: Wed, 28 Aug 2024 17:18:41 -0400 Subject: [PATCH 08/53] chore(contracts): add missing spdx licenses (#732) --- .../IZkSyncHyperchainBase.sol | 4 +- .../l2-deps/ISystemContext.sol | 4 +- l1-contracts/deploy-scripts/AcceptAdmin.s.sol | 2 +- .../deploy-scripts/DeployL2Contracts.sol | 2 + .../deploy-scripts/DeployPaymaster.s.sol | 3 +- .../Bridgehub/experimental_bridge.t.sol | 2 +- system-contracts/SystemContractsHashes.json | 56 +++++++++---------- system-contracts/bootloader/bootloader.yul | 2 + system-contracts/contracts/EventWriter.yul | 2 + .../contracts/precompiles/CodeOracle.yul | 2 + .../contracts/precompiles/EcAdd.yul | 2 + .../contracts/precompiles/EcMul.yul | 2 + .../contracts/precompiles/EcPairing.yul | 2 + .../contracts/precompiles/Ecrecover.yul | 2 + .../contracts/precompiles/Keccak256.yul | 2 + .../contracts/precompiles/P256Verify.yul | 2 + .../contracts/precompiles/SHA256.yul | 2 + .../test-contracts/Keccak256Mock.yul | 2 + .../test-contracts/CodeOracleTest.sol | 2 +- .../contracts/test-contracts/TransferTest.sol | 2 +- 20 files changed, 62 insertions(+), 37 deletions(-) diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchainBase.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchainBase.sol index 24fe3b482..3cd646cc9 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchainBase.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchainBase.sol @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: UNLICENSED -// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. +// SPDX-License-Identifier: MIT +// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @title The interface of the ZKsync contract, responsible for the main ZKsync logic. diff --git a/l1-contracts/contracts/state-transition/l2-deps/ISystemContext.sol b/l1-contracts/contracts/state-transition/l2-deps/ISystemContext.sol index d09e76491..d3244b74b 100644 --- a/l1-contracts/contracts/state-transition/l2-deps/ISystemContext.sol +++ b/l1-contracts/contracts/state-transition/l2-deps/ISystemContext.sol @@ -1,5 +1,5 @@ -// SPDX-License-Identifier: UNLICENSED -// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. +// SPDX-License-Identifier: MIT +// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; interface ISystemContext { diff --git a/l1-contracts/deploy-scripts/AcceptAdmin.s.sol b/l1-contracts/deploy-scripts/AcceptAdmin.s.sol index bb601457b..3a40b4d78 100644 --- a/l1-contracts/deploy-scripts/AcceptAdmin.s.sol +++ b/l1-contracts/deploy-scripts/AcceptAdmin.s.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: UNLICENSED +// SPDX-License-Identifier: MIT pragma solidity ^0.8.21; import {Script} from "forge-std/Script.sol"; diff --git a/l1-contracts/deploy-scripts/DeployL2Contracts.sol b/l1-contracts/deploy-scripts/DeployL2Contracts.sol index 0d7c1e0bb..6e3b5248b 100644 --- a/l1-contracts/deploy-scripts/DeployL2Contracts.sol +++ b/l1-contracts/deploy-scripts/DeployL2Contracts.sol @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + pragma solidity ^0.8.21; import {Script} from "forge-std/Script.sol"; diff --git a/l1-contracts/deploy-scripts/DeployPaymaster.s.sol b/l1-contracts/deploy-scripts/DeployPaymaster.s.sol index 08374e3d1..eec87fbb0 100644 --- a/l1-contracts/deploy-scripts/DeployPaymaster.s.sol +++ b/l1-contracts/deploy-scripts/DeployPaymaster.s.sol @@ -1,4 +1,5 @@ -// SPDX-License-Identifier: UNLICENSED +// SPDX-License-Identifier: MIT + pragma solidity ^0.8.21; import {Script} from "forge-std/Script.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol b/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol index 27174089b..b454a5299 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol @@ -1,4 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED +// SPDX-License-Identifier: MIT pragma solidity 0.8.24; diff --git a/system-contracts/SystemContractsHashes.json b/system-contracts/SystemContractsHashes.json index 2e885b9f5..18da55393 100644 --- a/system-contracts/SystemContractsHashes.json +++ b/system-contracts/SystemContractsHashes.json @@ -115,98 +115,98 @@ "contractName": "EventWriter", "bytecodePath": "contracts-preprocessed/artifacts/EventWriter.yul.zbin", "sourceCodePath": "contracts-preprocessed/EventWriter.yul", - "bytecodeHash": "0x010000159a3a08da3ac57cdefec0e9e30da60456bc5643134cf16d6957bcf1ac", - "sourceCodeHash": "0x55cfee65f174350edfd690c949bc0a29458f25da11f1d5f90b57621567df1fc3" + "bytecodeHash": "0x010000159b30cba9e2096353695b63ca5cbf566416a545a6bcb2ff2e4e672f98", + "sourceCodeHash": "0xfcf4828bcc109dea5f88c38f428d9ac5e18d5a2767fa4909277802c7e38c1f93" }, { "contractName": "CodeOracle", "bytecodePath": "contracts-preprocessed/precompiles/artifacts/CodeOracle.yul.zbin", "sourceCodePath": "contracts-preprocessed/precompiles/CodeOracle.yul", - "bytecodeHash": "0x01000023b02bbb21baf1367835e56ae17b82688527dc8f78caf34b12e670ee65", - "sourceCodeHash": "0x55692fab0ef8b5bab3f6fb77aec84f3d1f1cdf97c0640b327d10594ea61218d2" + "bytecodeHash": "0x01000023d652655672eafbb0adc385bd423a4a59f752a28f3dde16e74fa205e3", + "sourceCodeHash": "0x476063e7907f2b7a532c4da6f606fa07186b5a10d77af8fdd83dbea3d9f23f93" }, { "contractName": "EcAdd", "bytecodePath": "contracts-preprocessed/precompiles/artifacts/EcAdd.yul.zbin", "sourceCodePath": "contracts-preprocessed/precompiles/EcAdd.yul", - "bytecodeHash": "0x010000872dd7e2dc1b34416c174086aa84fd80c78acc7b670214da955bd55728", - "sourceCodeHash": "0xc04879ed27207cd276997a856b6507d6d003801a2ee4c4bb4491f0032370895f" + "bytecodeHash": "0x01000087be6181fcb16bebb0567c58b658eec345822aec1d42d471e84f758b85", + "sourceCodeHash": "0xdfec1c5f8c6a93df1c8821f1ac15058a18a640bcbdeb67dc4a017f2153ff1c86" }, { "contractName": "EcMul", "bytecodePath": "contracts-preprocessed/precompiles/artifacts/EcMul.yul.zbin", "sourceCodePath": "contracts-preprocessed/precompiles/EcMul.yul", - "bytecodeHash": "0x010000bd8bd7ab008f76e359dc296ff5fe0e8a95fedce1d570943e90143acdfd", - "sourceCodeHash": "0xb142465167a02139087fda7640ff859489b33081dcc7c2a8089da5b480bcb58c" + "bytecodeHash": "0x010000bd553a916fcda3726f7b6b3ccfc17887166982915ced63abc78ba43b66", + "sourceCodeHash": "0x0e3f320c8a9532425b85809bf0a2136e707046a01bf20491ec03c77887516c43" }, { "contractName": "EcPairing", "bytecodePath": "contracts-preprocessed/precompiles/artifacts/EcPairing.yul.zbin", "sourceCodePath": "contracts-preprocessed/precompiles/EcPairing.yul", - "bytecodeHash": "0x01000f1b3432a32f9fba2115f5dd3b0ee8127e7bf2c609d57d3e231f19119c43", - "sourceCodeHash": "0x149f025b222369ab65b9995a6d61df8b557b23f8b52a05f21dc2164839befb18" + "bytecodeHash": "0x01000f1b5f8dd50a00b502d2663746a49a81a01857b6ee1e1b38c9959142b299", + "sourceCodeHash": "0x5d008cedc44e0e52c2567fd2b877916b2ec5e7c80294cf99b66485e50a6f2c12" }, { "contractName": "Ecrecover", "bytecodePath": "contracts-preprocessed/precompiles/artifacts/Ecrecover.yul.zbin", "sourceCodePath": "contracts-preprocessed/precompiles/Ecrecover.yul", - "bytecodeHash": "0x0100001112e34172b2bc31574d155893a087a1cf4b608cf9895a2201ea7bd6ee", - "sourceCodeHash": "0xe2334f04fa8003d448c7e6bfb345e644f2c851328aa5b49cb30acf45d6e0bbcf" + "bytecodeHash": "0x010000113d6b03e34605f26aa1fc6fb8953561eb55bb5ea192a5a38f7de3053b", + "sourceCodeHash": "0x21e03ab7a5f518a21258669c82506b1d4d1141f8fd4f30bb385f9730580ddd3c" }, { "contractName": "Keccak256", "bytecodePath": "contracts-preprocessed/precompiles/artifacts/Keccak256.yul.zbin", "sourceCodePath": "contracts-preprocessed/precompiles/Keccak256.yul", - "bytecodeHash": "0x0100000f248e111a1b587fef850dc4585c39af2dd505bc8a0d5cc6d3fcc7ed3c", - "sourceCodeHash": "0x3e6b02b36eb6d8cebe19ae258c2aed531f9be6c261ae02d301ba31b2cd388776" + "bytecodeHash": "0x0100000ff991d5847f1e9c10c5969d0f03b34a25411ad86d5cb3e0d9c3931e0b", + "sourceCodeHash": "0xb454e7760732ce1fffc75174c8cf54dca422206cf1e52a29d274b310b574f26d" }, { "contractName": "P256Verify", "bytecodePath": "contracts-preprocessed/precompiles/artifacts/P256Verify.yul.zbin", "sourceCodePath": "contracts-preprocessed/precompiles/P256Verify.yul", - "bytecodeHash": "0x0100001169cd6aa311c1bc9bbe2e7dd085720c96bb197e3223be7e9c66e46ef9", - "sourceCodeHash": "0x4fa14862937a646a2440a8ef5c4358b59e3e53dff5f11a65a1167cd31894b94c" + "bytecodeHash": "0x010000116595cfcc96291f95d47ede2ce630f25ccbd7428f00dc7f8135fb565a", + "sourceCodeHash": "0x976b68d0362307313fd1aaea309eaa2d849187f37da451618c70dd3a6ac3cf3c" }, { "contractName": "SHA256", "bytecodePath": "contracts-preprocessed/precompiles/artifacts/SHA256.yul.zbin", "sourceCodePath": "contracts-preprocessed/precompiles/SHA256.yul", - "bytecodeHash": "0x0100001752dc8a1a374a6346781205017b7b594d97c28812265865f3a45fcb45", - "sourceCodeHash": "0x6de4b57a9cca1cfda7a8edbf6f3e06aafa32c70458a3cc09972b548714ec51d3" + "bytecodeHash": "0x010000171e4e61b14feacd43cb555bffa5f194d38117132957708dcef83ac15a", + "sourceCodeHash": "0xfd4290467e26e992f39db9ca132e78ce99ce042b0254a368f1d7832dc94ddefb" }, { "contractName": "bootloader_test", "bytecodePath": "bootloader/build/artifacts/bootloader_test.yul.zbin", "sourceCodePath": "bootloader/build/bootloader_test.yul", - "bytecodeHash": "0x010003cbe23de2836aebbf2466f6899f7b19ad6dc5ff6e3ce10c83b16cad1b90", - "sourceCodeHash": "0xa7ac131c18e0b890282de1c328802a9c9c454c0c09d0bd015a06abb411556638" + "bytecodeHash": "0x010003cbe67434b2848054322cbc311385851bbfbf70d17f92cd5f1f9836b25e", + "sourceCodeHash": "0x006fdf461899dec5fdb34301c23e6819eb93e275907cbfc67d73fccfb47cae68" }, { "contractName": "fee_estimate", "bytecodePath": "bootloader/build/artifacts/fee_estimate.yul.zbin", "sourceCodePath": "bootloader/build/fee_estimate.yul", - "bytecodeHash": "0x0100092d97e147d5fb59598c2d3ab1bb9bcada3fbc538f05fde153731d0e34aa", - "sourceCodeHash": "0x31b38c5e26c4d6acad6cbbb5677648818ab930d146354814666cb855a595f23a" + "bytecodeHash": "0x0100092d9b8ae575bca569f68fe60fbef1dc7d4aad6aa02cc4836f56afcf0a38", + "sourceCodeHash": "0x8a858319bac2924a3dee778218a7fe5e23898db0d87b02d7b783f94c5a02d257" }, { "contractName": "gas_test", "bytecodePath": "bootloader/build/artifacts/gas_test.yul.zbin", "sourceCodePath": "bootloader/build/gas_test.yul", - "bytecodeHash": "0x010008b3324dc1065661a15eaefc44278fb555d6a561621c2c73935e7eb6d680", - "sourceCodeHash": "0xc9b10f7ceedf8883248be7d0e265fe076419df02bd59b8cbd701e92bced01472" + "bytecodeHash": "0x010008b3e1b8bdd393f2f8d6f5c994c8b9c287df7310dee75d0c52a245fc7cb1", + "sourceCodeHash": "0x89f5ad470f10e755fa57b82507518e571c24409a328bc33aeba26e9518ad1c3e" }, { "contractName": "playground_batch", "bytecodePath": "bootloader/build/artifacts/playground_batch.yul.zbin", "sourceCodePath": "bootloader/build/playground_batch.yul", - "bytecodeHash": "0x010009339beeb192c26f6cb18a67f446a578f10c145c8af344fe67b2772e4311", - "sourceCodeHash": "0xd4b0391e9d227e782934520d98eb66226d79ad1a6cfe422e624d7eee0d1e8bfc" + "bytecodeHash": "0x01000933061c23d700f3f647c45068e22f5506ff33bb516ac13f11069b163986", + "sourceCodeHash": "0x769448c4fd2b65c43d758ca5f34dd29d9b9dd3000fd0ec89cffcaf8d365a64fd" }, { "contractName": "proved_batch", "bytecodePath": "bootloader/build/artifacts/proved_batch.yul.zbin", "sourceCodePath": "bootloader/build/proved_batch.yul", - "bytecodeHash": "0x010008c314c516939d65ffcab410b9dcff5e7be81c4561adf171818984efc39c", - "sourceCodeHash": "0xdd2fb790fb11009d203b7933123cc51bfd00b7e96cc90006c05e2d31a5581477" + "bytecodeHash": "0x010008c3be57ae5800e077b6c2056d9d75ad1a7b4f0ce583407961cc6fe0b678", + "sourceCodeHash": "0x908bc6ddb34ef89b125e9637239a1149deacacd91255781d82a65a542a39036e" } ] diff --git a/system-contracts/bootloader/bootloader.yul b/system-contracts/bootloader/bootloader.yul index a9a3a1725..e995e7151 100644 --- a/system-contracts/bootloader/bootloader.yul +++ b/system-contracts/bootloader/bootloader.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + object "Bootloader" { code { } diff --git a/system-contracts/contracts/EventWriter.yul b/system-contracts/contracts/EventWriter.yul index 4cd4a3814..c85151b90 100644 --- a/system-contracts/contracts/EventWriter.yul +++ b/system-contracts/contracts/EventWriter.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + /** * @author Matter Labs * @custom:security-contact security@matterlabs.dev diff --git a/system-contracts/contracts/precompiles/CodeOracle.yul b/system-contracts/contracts/precompiles/CodeOracle.yul index 820b8df70..63b386788 100644 --- a/system-contracts/contracts/precompiles/CodeOracle.yul +++ b/system-contracts/contracts/precompiles/CodeOracle.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + /** * @author Matter Labs * @custom:security-contact security@matterlabs.dev diff --git a/system-contracts/contracts/precompiles/EcAdd.yul b/system-contracts/contracts/precompiles/EcAdd.yul index 5771df8f9..8b7f25618 100644 --- a/system-contracts/contracts/precompiles/EcAdd.yul +++ b/system-contracts/contracts/precompiles/EcAdd.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + object "EcAdd" { code { return(0, 0) diff --git a/system-contracts/contracts/precompiles/EcMul.yul b/system-contracts/contracts/precompiles/EcMul.yul index 84838ec2a..63fd0bc42 100644 --- a/system-contracts/contracts/precompiles/EcMul.yul +++ b/system-contracts/contracts/precompiles/EcMul.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + object "EcMul" { code { return(0, 0) diff --git a/system-contracts/contracts/precompiles/EcPairing.yul b/system-contracts/contracts/precompiles/EcPairing.yul index 6ea6e92de..5e8011bcc 100644 --- a/system-contracts/contracts/precompiles/EcPairing.yul +++ b/system-contracts/contracts/precompiles/EcPairing.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + object "EcPairing" { code { return(0, 0) diff --git a/system-contracts/contracts/precompiles/Ecrecover.yul b/system-contracts/contracts/precompiles/Ecrecover.yul index cbb8fcc0f..9c64d509f 100644 --- a/system-contracts/contracts/precompiles/Ecrecover.yul +++ b/system-contracts/contracts/precompiles/Ecrecover.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + /** * @author Matter Labs * @custom:security-contact security@matterlabs.dev diff --git a/system-contracts/contracts/precompiles/Keccak256.yul b/system-contracts/contracts/precompiles/Keccak256.yul index 8eaa53671..397ee89bb 100644 --- a/system-contracts/contracts/precompiles/Keccak256.yul +++ b/system-contracts/contracts/precompiles/Keccak256.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + /** * @author Matter Labs * @custom:security-contact security@matterlabs.dev diff --git a/system-contracts/contracts/precompiles/P256Verify.yul b/system-contracts/contracts/precompiles/P256Verify.yul index 8cd14beb2..80b782209 100644 --- a/system-contracts/contracts/precompiles/P256Verify.yul +++ b/system-contracts/contracts/precompiles/P256Verify.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + /** * @author Matter Labs * @custom:security-contact security@matterlabs.dev diff --git a/system-contracts/contracts/precompiles/SHA256.yul b/system-contracts/contracts/precompiles/SHA256.yul index ff52632cd..8173502ef 100644 --- a/system-contracts/contracts/precompiles/SHA256.yul +++ b/system-contracts/contracts/precompiles/SHA256.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + /** * @author Matter Labs * @custom:security-contact security@matterlabs.dev diff --git a/system-contracts/contracts/precompiles/test-contracts/Keccak256Mock.yul b/system-contracts/contracts/precompiles/test-contracts/Keccak256Mock.yul index b37eb69ca..e3cb9ac1e 100644 --- a/system-contracts/contracts/precompiles/test-contracts/Keccak256Mock.yul +++ b/system-contracts/contracts/precompiles/test-contracts/Keccak256Mock.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + /** * @author Matter Labs * @notice The contract used to emulate EVM's keccak256 opcode. diff --git a/system-contracts/contracts/test-contracts/CodeOracleTest.sol b/system-contracts/contracts/test-contracts/CodeOracleTest.sol index f022fb77b..31de9d366 100644 --- a/system-contracts/contracts/test-contracts/CodeOracleTest.sol +++ b/system-contracts/contracts/test-contracts/CodeOracleTest.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: UNLICENSED +// SPDX-License-Identifier: MIT pragma solidity ^0.8.20; diff --git a/system-contracts/contracts/test-contracts/TransferTest.sol b/system-contracts/contracts/test-contracts/TransferTest.sol index 1b9e9bd75..ca76a9932 100644 --- a/system-contracts/contracts/test-contracts/TransferTest.sol +++ b/system-contracts/contracts/test-contracts/TransferTest.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: UNLICENSED +// SPDX-License-Identifier: MIT pragma solidity ^0.8.20; From 874bc6ba940de9d37b474d1e3dda2fe4e869dfbe Mon Sep 17 00:00:00 2001 From: koloz193 Date: Thu, 29 Aug 2024 10:06:51 -0400 Subject: [PATCH 09/53] fix(scrips): read bytecode from foundry not hardhat (#750) --- .../PrepareZKChainRegistrationCalldata.s.sol | 3 +-- l1-contracts/deploy-scripts/Utils.sol | 13 ++++++++++++- l2-contracts/foundry.toml | 4 ++-- l2-contracts/lib/openzeppelin-contracts | 1 - l2-contracts/lib/openzeppelin-contracts-upgradeable | 1 - .../lib/openzeppelin-contracts-upgradeable-v4 | 1 + l2-contracts/lib/openzeppelin-contracts-v4 | 1 + 7 files changed, 17 insertions(+), 7 deletions(-) delete mode 120000 l2-contracts/lib/openzeppelin-contracts delete mode 120000 l2-contracts/lib/openzeppelin-contracts-upgradeable create mode 120000 l2-contracts/lib/openzeppelin-contracts-upgradeable-v4 create mode 120000 l2-contracts/lib/openzeppelin-contracts-v4 diff --git a/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol index 3810805c8..0a7e20a53 100644 --- a/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol +++ b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -// solhint-disable no-console +// solhint-disable no-console, gas-struct-packing, gas-custom-errors import {Script, console2 as console} from "forge-std/Script.sol"; import {stdToml} from "forge-std/StdToml.sol"; @@ -13,7 +13,6 @@ import {AddressAliasHelper} from "contracts/vendor/AddressAliasHelper.sol"; import {L1SharedBridge} from "contracts/bridge/L1SharedBridge.sol"; import {IStateTransitionManager} from "contracts/state-transition/IStateTransitionManager.sol"; import {IGovernance} from "contracts/governance/IGovernance.sol"; -import {IERC20} from "forge-std/interfaces/IERC20.sol"; import {Utils} from "./Utils.sol"; /** diff --git a/l1-contracts/deploy-scripts/Utils.sol b/l1-contracts/deploy-scripts/Utils.sol index 24011951b..17449da7e 100644 --- a/l1-contracts/deploy-scripts/Utils.sol +++ b/l1-contracts/deploy-scripts/Utils.sol @@ -285,7 +285,7 @@ library Utils { } /** - * @dev Read hardhat bytecodes + * @dev Read foundry bytecodes */ function readFoundryBytecode(string memory artifactPath) internal view returns (bytes memory) { string memory root = vm.projectRoot(); @@ -295,6 +295,17 @@ library Utils { return bytecode; } + /** + * @dev Read hardhat bytecodes + */ + function readHardhatBytecode(string memory artifactPath) internal view returns (bytes memory) { + string memory root = vm.projectRoot(); + string memory path = string.concat(root, artifactPath); + string memory json = vm.readFile(path); + bytes memory bytecode = vm.parseJsonBytes(json, ".bytecode"); + return bytecode; + } + function executeUpgrade( address _governor, bytes32 _salt, diff --git a/l2-contracts/foundry.toml b/l2-contracts/foundry.toml index d34805bfe..deb178a12 100644 --- a/l2-contracts/foundry.toml +++ b/l2-contracts/foundry.toml @@ -5,8 +5,8 @@ libs = ["lib"] cache_path = "cache-forge" evm_version = "paris" remappings = [ - "@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/", - "@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/", + "@openzeppelin/contracts-v4/=lib/openzeppelin-contracts-v4/contracts/", + "@openzeppelin/contracts-upgradeable-v4/=lib/openzeppelin-contracts-upgradeable-v4/contracts/", ] [profile.default.zksync] diff --git a/l2-contracts/lib/openzeppelin-contracts b/l2-contracts/lib/openzeppelin-contracts deleted file mode 120000 index 99aa45507..000000000 --- a/l2-contracts/lib/openzeppelin-contracts +++ /dev/null @@ -1 +0,0 @@ -../../lib/openzeppelin-contracts \ No newline at end of file diff --git a/l2-contracts/lib/openzeppelin-contracts-upgradeable b/l2-contracts/lib/openzeppelin-contracts-upgradeable deleted file mode 120000 index f1fc7a76a..000000000 --- a/l2-contracts/lib/openzeppelin-contracts-upgradeable +++ /dev/null @@ -1 +0,0 @@ -../../lib/openzeppelin-contracts-upgradeable \ No newline at end of file diff --git a/l2-contracts/lib/openzeppelin-contracts-upgradeable-v4 b/l2-contracts/lib/openzeppelin-contracts-upgradeable-v4 new file mode 120000 index 000000000..0551b6016 --- /dev/null +++ b/l2-contracts/lib/openzeppelin-contracts-upgradeable-v4 @@ -0,0 +1 @@ +../../lib/openzeppelin-contracts-upgradeable-v4 \ No newline at end of file diff --git a/l2-contracts/lib/openzeppelin-contracts-v4 b/l2-contracts/lib/openzeppelin-contracts-v4 new file mode 120000 index 000000000..693e94537 --- /dev/null +++ b/l2-contracts/lib/openzeppelin-contracts-v4 @@ -0,0 +1 @@ +../../lib/openzeppelin-contracts-v4 \ No newline at end of file From d3687694f71d83fa286b9c186b4c3ea173028f83 Mon Sep 17 00:00:00 2001 From: Akosh Farkash Date: Mon, 2 Sep 2024 14:53:58 +0100 Subject: [PATCH 10/53] feat: Deploy ConsensusRegistry through L1 to L2 transaction (BFT-504) (#735) --- .../config-deploy-l2-config.toml | 1 + .../deploy-scripts/DeployL2Contracts.sol | 79 ++++++++++++++++++- 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/l1-contracts/deploy-script-config-template/config-deploy-l2-config.toml b/l1-contracts/deploy-script-config-template/config-deploy-l2-config.toml index 67e46ae38..fae9cc907 100644 --- a/l1-contracts/deploy-script-config-template/config-deploy-l2-config.toml +++ b/l1-contracts/deploy-script-config-template/config-deploy-l2-config.toml @@ -4,3 +4,4 @@ l1_shared_bridge = "0x2ae37d8130b82c7e79b3863a39027178e073eedb" bridgehub = "0xea785a9c91a07ed69b83eb165f4ce2c30ecb4c0b" governance = "0x6a08d69675af7755569a1a25ef37e795493473a1" erc20_bridge = "0x84fbda16bd5f2d66d7fbaec5e8d816e7b7014595" +consensus_registry_owner = "0xD64e136566a9E04eb05B30184fF577F52682D182" diff --git a/l1-contracts/deploy-scripts/DeployL2Contracts.sol b/l1-contracts/deploy-scripts/DeployL2Contracts.sol index 906ae831c..b22c091ae 100644 --- a/l1-contracts/deploy-scripts/DeployL2Contracts.sol +++ b/l1-contracts/deploy-scripts/DeployL2Contracts.sol @@ -19,10 +19,15 @@ contract DeployL2Script is Script { address l1SharedBridgeProxy; address governance; address erc20BridgeProxy; + // The owner of the contract sets the validator/attester weights. + // Can be the developer multisig wallet on mainnet. + address consensusRegistryOwner; uint256 chainId; uint256 eraChainId; address l2SharedBridgeImplementation; address l2SharedBridgeProxy; + address consensusRegistryImplementation; + address consensusRegistryProxy; address forceDeployUpgraderAddress; } @@ -32,6 +37,8 @@ contract DeployL2Script is Script { bytes l2StandardErc20Bytecode; bytes l2SharedBridgeBytecode; bytes l2SharedBridgeProxyBytecode; + bytes consensusRegistryBytecode; + bytes consensusRegistryProxyBytecode; bytes forceDeployUpgrader; } @@ -44,6 +51,8 @@ contract DeployL2Script is Script { deploySharedBridgeProxy(); initializeChain(); deployForceDeployer(); + deployConsensusRegistry(); + deployConsensusRegistryProxy(); saveOutput(); } @@ -69,6 +78,16 @@ contract DeployL2Script is Script { saveOutput(); } + function runDeployConsensusRegistry() public { + initializeConfig(); + loadContracts(); + + deployConsensusRegistry(); + deployConsensusRegistryProxy(); + + saveOutput(); + } + function loadContracts() internal { //HACK: Meanwhile we are not integrated foundry zksync we use contracts that has been built using hardhat contracts.l2StandardErc20FactoryBytecode = Utils.readHardhatBytecode( @@ -84,10 +103,17 @@ contract DeployL2Script is Script { contracts.l2SharedBridgeBytecode = Utils.readHardhatBytecode( "/../l2-contracts/artifacts-zk/contracts/bridge/L2SharedBridge.sol/L2SharedBridge.json" ); - contracts.l2SharedBridgeProxyBytecode = Utils.readHardhatBytecode( "/../l2-contracts/artifacts-zk/@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json" ); + + contracts.consensusRegistryBytecode = Utils.readHardhatBytecode( + "/../l2-contracts/artifacts-zk/contracts/ConsensusRegistry.sol/ConsensusRegistry.json" + ); + contracts.consensusRegistryProxyBytecode = Utils.readHardhatBytecode( + "/../l2-contracts/artifacts-zk/@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json" + ); + contracts.forceDeployUpgrader = Utils.readHardhatBytecode( "/../l2-contracts/artifacts-zk/contracts/ForceDeployUpgrader.sol/ForceDeployUpgrader.json" ); @@ -101,6 +127,7 @@ contract DeployL2Script is Script { config.governance = toml.readAddress("$.governance"); config.l1SharedBridgeProxy = toml.readAddress("$.l1_shared_bridge"); config.erc20BridgeProxy = toml.readAddress("$.erc20_bridge"); + config.consensusRegistryOwner = toml.readAddress("$.consensus_registry_owner"); config.chainId = toml.readUint("$.chain_id"); config.eraChainId = toml.readUint("$.era_chain_id"); } @@ -108,6 +135,8 @@ contract DeployL2Script is Script { function saveOutput() internal { vm.serializeAddress("root", "l2_shared_bridge_implementation", config.l2SharedBridgeImplementation); vm.serializeAddress("root", "l2_shared_bridge_proxy", config.l2SharedBridgeProxy); + vm.serializeAddress("root", "consensus_registry_implementation", config.consensusRegistryImplementation); + vm.serializeAddress("root", "consensus_registry_proxy", config.consensusRegistryProxy); string memory toml = vm.serializeAddress("root", "l2_default_upgrader", config.forceDeployUpgraderAddress); string memory root = vm.projectRoot(); string memory path = string.concat(root, "/script-out/output-deploy-l2-contracts.toml"); @@ -185,6 +214,54 @@ contract DeployL2Script is Script { }); } + // Deploy the ConsensusRegistry implementation and save its address into the config. + function deployConsensusRegistry() internal { + // ConsensusRegistry.sol doesn't have a constructor, just an initializer. + bytes memory constructorData = ""; + + config.consensusRegistryImplementation = Utils.deployThroughL1({ + bytecode: contracts.consensusRegistryBytecode, + constructorargs: constructorData, + create2salt: "", + l2GasLimit: Utils.MAX_PRIORITY_TX_GAS, + factoryDeps: new bytes[](0), + chainId: config.chainId, + bridgehubAddress: config.bridgehubAddress, + l1SharedBridgeProxy: config.l1SharedBridgeProxy + }); + } + + // Deploy a transparent upgradable proxy for the already deployed consensus registry + // implementation and save its address into the config. + function deployConsensusRegistryProxy() internal { + // Admin for the proxy + address l2GovernorAddress = AddressAliasHelper.applyL1ToL2Alias(config.governance); + + // Call ConsensusRegistry::initialize with the initial owner. + // solhint-disable-next-line func-named-parameters + bytes memory proxyInitializationParams = abi.encodeWithSignature( + "initialize(address)", + config.consensusRegistryOwner + ); + + bytes memory consensusRegistryProxyConstructorData = abi.encode( + config.consensusRegistryImplementation, // _logic + l2GovernorAddress, // admin_ + proxyInitializationParams // _data + ); + + config.consensusRegistryProxy = Utils.deployThroughL1({ + bytecode: contracts.consensusRegistryProxyBytecode, + constructorargs: consensusRegistryProxyConstructorData, + create2salt: "", + l2GasLimit: Utils.MAX_PRIORITY_TX_GAS, + factoryDeps: new bytes[](0), + chainId: config.chainId, + bridgehubAddress: config.bridgehubAddress, + l1SharedBridgeProxy: config.l1SharedBridgeProxy + }); + } + function initializeChain() internal { L1SharedBridge bridge = L1SharedBridge(config.l1SharedBridgeProxy); From 3a1aecc6d85f456f21887208fc5caa26a7fe9673 Mon Sep 17 00:00:00 2001 From: Stanislav Bezkorovainyi Date: Mon, 2 Sep 2024 17:14:47 +0200 Subject: [PATCH 11/53] Fix token info upon migration (#760) --- .../contracts/bridgehub/Bridgehub.sol | 47 ++++++++++------- .../contracts/bridgehub/IBridgehub.sol | 5 +- .../contracts/common/L1ContractErrors.sol | 2 + .../StateTransitionManager.sol | 2 +- .../chain-deps/ZkSyncHyperchainStorage.sol | 3 ++ .../chain-interfaces/IGetters.sol | 3 ++ .../contracts/upgrades/IL1GenesisUpgrade.sol | 2 +- .../contracts/upgrades/L1GenesisUpgrade.sol | 4 +- .../foundry/integration/GatewayTests.t.sol | 8 ++- .../script-out/output-deploy-l1.toml | 52 +++++++++---------- 10 files changed, 75 insertions(+), 53 deletions(-) diff --git a/l1-contracts/contracts/bridgehub/Bridgehub.sol b/l1-contracts/contracts/bridgehub/Bridgehub.sol index 8eaa029ec..330370e82 100644 --- a/l1-contracts/contracts/bridgehub/Bridgehub.sol +++ b/l1-contracts/contracts/bridgehub/Bridgehub.sol @@ -23,7 +23,7 @@ import {AddressAliasHelper} from "../vendor/AddressAliasHelper.sol"; import {IMessageRoot} from "./IMessageRoot.sol"; import {ISTMDeploymentTracker} from "./ISTMDeploymentTracker.sol"; import {L2CanonicalTransaction} from "../common/Messaging.sol"; -import {HyperchainLimitReached, Unauthorized, STMAlreadyRegistered, STMNotRegistered, ZeroChainId, ChainIdTooBig, SharedBridgeNotSet, BridgeHubAlreadyRegistered, AddressTooLow, MsgValueMismatch, WrongMagicValue, ZeroAddress} from "../common/L1ContractErrors.sol"; +import {AssetHandlerNotRegistered, HyperchainLimitReached, Unauthorized, STMAlreadyRegistered, STMNotRegistered, ZeroChainId, ChainIdTooBig, SharedBridgeNotSet, BridgeHubAlreadyRegistered, AddressTooLow, MsgValueMismatch, WrongMagicValue, ZeroAddress} from "../common/L1ContractErrors.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev @@ -80,7 +80,8 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus mapping(uint256 chainId => bytes32) public baseTokenAssetId; /// @notice The deployment tracker for the state transition managers. - ISTMDeploymentTracker public stmDeployer; + /// @dev The L1 address of the stm deployer is provided. + ISTMDeploymentTracker public l1StmDeployer; /// @dev asset info used to identify chains in the Shared Bridge mapping(bytes32 stmAssetId => address stmAddress) public stmAssetIdToAddress; @@ -140,7 +141,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus // Note that this assumes that the bridgehub only accepts transactions on chains with ETH base token only. // This is indeed true, since the only methods where this immutable is used are the ones with `onlyL1` modifier. - ETH_TOKEN_ASSET_ID = DataEncoding.encodeNTVAssetId(block.chainid, ETH_TOKEN_ADDRESS); + ETH_TOKEN_ASSET_ID = DataEncoding.encodeNTVAssetId(L1_CHAIN_ID, ETH_TOKEN_ADDRESS); _transferOwnership(_owner); whitelistedSettlementLayers[_l1ChainId] = true; } @@ -189,15 +190,15 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @notice To set the addresses of some of the ecosystem contracts, only Owner. Not done in initialize, as /// the order of deployment is Bridgehub, other contracts, and then we call this. /// @param _sharedBridge the shared bridge address - /// @param _stmDeployer the stm deployment tracker address + /// @param _l1StmDeployer the stm deployment tracker address. Note, that the address of the L1 STM deployer is provided. /// @param _messageRoot the message root address function setAddresses( address _sharedBridge, - ISTMDeploymentTracker _stmDeployer, + ISTMDeploymentTracker _l1StmDeployer, IMessageRoot _messageRoot ) external onlyOwner { sharedBridge = IL1AssetRouter(_sharedBridge); - stmDeployer = _stmDeployer; + l1StmDeployer = _l1StmDeployer; messageRoot = _messageRoot; } @@ -280,19 +281,19 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @param _assetAddress the asset handler address function setAssetHandlerAddress(bytes32 _additionalData, address _assetAddress) external { // It is a simplified version of the logic used by the AssetRouter to manage asset handlers. - // STM's assetId is `keccak256(abi.encode(L1_CHAIN_ID, stmDeployer, stmAddress))`. - // And the STMDeployer is considered the deployment tracker for the STM asset. + // STM's assetId is `keccak256(abi.encode(L1_CHAIN_ID, l1StmDeployer, stmAddress))`. + // And the l1StmDeployer is considered the deployment tracker for the STM asset. // - // The STMDeployer will call this method to set the asset handler address for the assetId. + // The l1StmDeployer will call this method to set the asset handler address for the assetId. // If the chain is not the same as L1, we assume that it is done via L1->L2 communication and so we unalias the sender. // // For simpler handling we allow anyone to call this method. It is okay, since during bridging operations - // it is double checked that `assetId` is indeed derived from the `stmDeployer`. + // it is double checked that `assetId` is indeed derived from the `l1StmDeployer`. // TODO(EVM-703): This logic should be revised once interchain communication is implemented. address sender = L1_CHAIN_ID == block.chainid ? msg.sender : AddressAliasHelper.undoL1ToL2Alias(msg.sender); - // This method can be accessed by STMDeployer only - require(sender == address(stmDeployer), "BH: not stm deployer"); + // This method can be accessed by l1StmDeployer only + require(sender == address(l1StmDeployer), "BH: not stm deployer"); require(stateTransitionManagerIsRegistered[_assetAddress], "STM not registered"); bytes32 assetInfo = keccak256(abi.encode(L1_CHAIN_ID, sender, _additionalData)); @@ -341,9 +342,6 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus revert STMNotRegistered(); } - // if (!tokenIsRegistered[_baseToken]) { - // revert TokenNotRegistered(_baseToken); - // } require(assetIdIsRegistered[_baseTokenAssetId], "BH: asset id not registered"); if (address(sharedBridge) == address(0)) { @@ -389,10 +387,14 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @notice baseToken function, which takes chainId as input, reads assetHandler from AR, and tokenAddress from AH function baseToken(uint256 _chainId) public view returns (address) { bytes32 baseTokenAssetId = baseTokenAssetId[_chainId]; - IL1BaseTokenAssetHandler assetHandlerAddress = IL1BaseTokenAssetHandler( - sharedBridge.assetHandlerAddress(baseTokenAssetId) - ); - return assetHandlerAddress.tokenAddress(baseTokenAssetId); + address assetHandlerAddress = sharedBridge.assetHandlerAddress(baseTokenAssetId); + + // It is possible that the asset handler is not deployed for a chain on the current layer. + // In this case we throw an error. + if (assetHandlerAddress == address(0)) { + revert AssetHandlerNotRegistered(baseTokenAssetId); + } + return IL1BaseTokenAssetHandler(assetHandlerAddress).tokenAddress(baseTokenAssetId); } /// @notice Returns all the registered hyperchain addresses @@ -425,7 +427,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus } function stmAssetId(address _stmAddress) public view override returns (bytes32) { - return keccak256(abi.encode(L1_CHAIN_ID, address(stmDeployer), bytes32(uint256(uint160(_stmAddress))))); + return keccak256(abi.encode(L1_CHAIN_ID, address(l1StmDeployer), bytes32(uint256(uint160(_stmAddress))))); } /*////////////////////////////////////////////////////////////// @@ -702,6 +704,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus ); BridgehubMintSTMAssetData memory bridgeMintStruct = BridgehubMintSTMAssetData({ chainId: bridgeData.chainId, + baseTokenAssetId: baseTokenAssetId[bridgeData.chainId], stmData: stmMintData, chainData: chainMintData }); @@ -723,6 +726,10 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus settlementLayer[bridgeData.chainId] = block.chainid; stateTransitionManager[bridgeData.chainId] = stm; + baseTokenAssetId[bridgeData.chainId] = bridgeData.baseTokenAssetId; + // To keep `assetIdIsRegistered` consistent, we'll also automatically register the base token. + // It is assumed that if the bridging happened, the token was approved on L1 already. + assetIdIsRegistered[bridgeData.baseTokenAssetId] = true; address hyperchain = getHyperchain(bridgeData.chainId); bool contractAlreadyDeployed = hyperchain != address(0); diff --git a/l1-contracts/contracts/bridgehub/IBridgehub.sol b/l1-contracts/contracts/bridgehub/IBridgehub.sol index 13f2cdb25..6b88ebb70 100644 --- a/l1-contracts/contracts/bridgehub/IBridgehub.sol +++ b/l1-contracts/contracts/bridgehub/IBridgehub.sol @@ -42,6 +42,7 @@ struct L2TransactionRequestTwoBridgesInner { struct BridgehubMintSTMAssetData { uint256 chainId; + bytes32 baseTokenAssetId; bytes stmData; bytes chainData; } @@ -178,7 +179,7 @@ interface IBridgehub is IL1AssetHandler { function setAddresses( address _sharedBridge, - ISTMDeploymentTracker _stmDeployer, + ISTMDeploymentTracker _l1StmDeployer, IMessageRoot _messageRoot ) external; @@ -216,7 +217,7 @@ interface IBridgehub is IL1AssetHandler { function stmAssetId(address _stmAddress) external view returns (bytes32); - function stmDeployer() external view returns (ISTMDeploymentTracker); + function l1StmDeployer() external view returns (ISTMDeploymentTracker); function stmAssetIdToAddress(bytes32 _assetInfo) external view returns (address); diff --git a/l1-contracts/contracts/common/L1ContractErrors.sol b/l1-contracts/contracts/common/L1ContractErrors.sol index 100151632..ec70e06e8 100644 --- a/l1-contracts/contracts/common/L1ContractErrors.sol +++ b/l1-contracts/contracts/common/L1ContractErrors.sol @@ -308,6 +308,8 @@ error ZeroChainId(); error AssetIdNotSupported(bytes32 assetId); +error AssetHandlerNotRegistered(bytes32 assetId); + enum SharedBridgeKey { PostUpgradeFirstBatch, LegacyBridgeFirstBatch, diff --git a/l1-contracts/contracts/state-transition/StateTransitionManager.sol b/l1-contracts/contracts/state-transition/StateTransitionManager.sol index b916b2618..bff9d7d92 100644 --- a/l1-contracts/contracts/state-transition/StateTransitionManager.sol +++ b/l1-contracts/contracts/state-transition/StateTransitionManager.sol @@ -428,7 +428,7 @@ contract StateTransitionManager is IStateTransitionManager, ReentrancyGuard, Own // genesis upgrade, deploys some contracts, sets chainId IAdmin(hyperchainAddress).genesisUpgrade( l1GenesisUpgrade, - address(IBridgehub(BRIDGE_HUB).stmDeployer()), + address(IBridgehub(BRIDGE_HUB).l1StmDeployer()), _forceDeploymentData, _factoryDeps ); diff --git a/l1-contracts/contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol b/l1-contracts/contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol index cac4a63fa..93c348c3f 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol @@ -134,8 +134,11 @@ struct ZkSyncHyperchainStorage { address pendingAdmin; /// @dev Fee params used to derive gasPrice for the L1->L2 transactions. For L2 transactions, /// the bootloader gives enough freedom to the operator. + /// @dev The value is only for the L1 deployment of the ZK Chain, since payment for all the priority transactions is + /// charged at that level. FeeParams feeParams; /// @dev Address of the blob versioned hash getter smart contract used for EIP-4844 versioned hashes. + /// @dev Used only for testing. address blobVersionedHashRetriever; /// @dev The chainId of the chain uint256 chainId; diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol index 2d128d2bf..2b0ce8bc1 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol @@ -9,6 +9,9 @@ import {IZkSyncHyperchainBase} from "./IZkSyncHyperchainBase.sol"; /// @title The interface of the Getters Contract that implements functions for getting contract state from outside the blockchain. /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev +/// @dev Most of the methods simply return the values that correspond to the current diamond proxy and possibly +/// not to the ZK Chain as a whole. For example, if the chain is migrated to another settlement layer, the values returned +/// by this facet will correspond to the values stored on this chain and possilbly not the canonical state of the chain. interface IGetters is IZkSyncHyperchainBase { /*////////////////////////////////////////////////////////////// CUSTOM GETTERS diff --git a/l1-contracts/contracts/upgrades/IL1GenesisUpgrade.sol b/l1-contracts/contracts/upgrades/IL1GenesisUpgrade.sol index 19b228194..cb1fc7bf8 100644 --- a/l1-contracts/contracts/upgrades/IL1GenesisUpgrade.sol +++ b/l1-contracts/contracts/upgrades/IL1GenesisUpgrade.sol @@ -17,7 +17,7 @@ interface IL1GenesisUpgrade { address _l1GenesisUpgrade, uint256 _chainId, uint256 _protocolVersion, - address _stmDeployerAddress, + address _l1StmDeployerAddress, bytes calldata _forceDeployments, bytes[] calldata _factoryDeps ) external returns (bytes32); diff --git a/l1-contracts/contracts/upgrades/L1GenesisUpgrade.sol b/l1-contracts/contracts/upgrades/L1GenesisUpgrade.sol index 3313b1d25..455f762ba 100644 --- a/l1-contracts/contracts/upgrades/L1GenesisUpgrade.sol +++ b/l1-contracts/contracts/upgrades/L1GenesisUpgrade.sol @@ -26,7 +26,7 @@ contract L1GenesisUpgrade is IL1GenesisUpgrade, BaseZkSyncUpgradeGenesis { address _l1GenesisUpgrade, uint256 _chainId, uint256 _protocolVersion, - address _stmDeployerAddress, + address _l1StmDeployerAddress, bytes calldata _forceDeploymentsData, bytes[] calldata _factoryDeps ) public override returns (bytes32) { @@ -37,7 +37,7 @@ contract L1GenesisUpgrade is IL1GenesisUpgrade, BaseZkSyncUpgradeGenesis { { bytes memory l2GenesisUpgradeCalldata = abi.encodeCall( IL2GenesisUpgrade.genesisUpgrade, - (_chainId, _stmDeployerAddress, _forceDeploymentsData) + (_chainId, _l1StmDeployerAddress, _forceDeploymentsData) ); complexUpgraderCalldata = abi.encodeCall( IComplexUpgrader.upgrade, diff --git a/l1-contracts/test/foundry/integration/GatewayTests.t.sol b/l1-contracts/test/foundry/integration/GatewayTests.t.sol index 496b81ad1..bb54ad5b5 100644 --- a/l1-contracts/test/foundry/integration/GatewayTests.t.sol +++ b/l1-contracts/test/foundry/integration/GatewayTests.t.sol @@ -248,11 +248,13 @@ contract GatewayTests is L1ContractDeployer, HyperchainDeployer, TokenDeployer, bridgehub.registerSettlementLayer(gatewayChainId, true); vm.stopBroadcast(); + bytes32 baseTokenAssetId = keccak256("baseTokenAssetId"); bytes memory initialDiamondCut = l1Script.getInitialDiamondCutData(); bytes memory chainData = abi.encode(AdminFacet(address(migratingChain)).prepareChainCommitment()); - bytes memory stmData = abi.encode(address(1), msg.sender, stm.protocolVersion(), initialDiamondCut); + bytes memory stmData = abi.encode(baseTokenAssetId, msg.sender, stm.protocolVersion(), initialDiamondCut); BridgehubMintSTMAssetData memory data = BridgehubMintSTMAssetData({ chainId: mintChainId, + baseTokenAssetId: baseTokenAssetId, stmData: stmData, chainData: chainData }); @@ -263,6 +265,10 @@ contract GatewayTests is L1ContractDeployer, HyperchainDeployer, TokenDeployer, bridgehub.bridgeMint(gatewayChainId, assetId, bridgehubMintData); vm.stopBroadcast(); vm.chainId(currentChainId); + + assertEq(bridgehub.baseTokenAssetId(mintChainId), baseTokenAssetId); + IZkSyncHyperchain mintedHyperchain = IZkSyncHyperchain(bridgehub.getHyperchain(mintChainId)); + assertEq(mintedHyperchain.getBaseTokenAssetId(), baseTokenAssetId); } // add this to be excluded from coverage report diff --git a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml index dba974302..cbb67dc28 100644 --- a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml +++ b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml @@ -2,13 +2,13 @@ create2_factory_addr = "0x4e59b44847b379578588920cA78FbF26c0B4956C" create2_factory_salt = "0x00000000000000000000000000000000000000000000000000000000000000ff" deployer_addr = "0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496" era_chain_id = 9 -force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000002a006c0107302b929bfaa26e37f1f16425630f553e88f5d300b535ae7a1a8235f8d00000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad979ed796c3d846e1b70fae457404e519165deaa186a5f2357eeb1aef830c86b9600000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001629ac8f4a74ebd8df4688cdedcfe5120809a334ecdc277c65e30475a8ed6616100000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9349c400bc5cef9910dcd7cd1328960b14d2c095f0e5d26c14f4f8a467160578500000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000000" +force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000002a093831bf373db45086a901f45805c61f07944b1b7f596761f084f8dfc3e0bea2200000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad979ed796c3d846e1b70fae457404e519165deaa186a5f2357eeb1aef830c86b9600000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001629ac8f4a74ebd8df4688cdedcfe5120809a334ecdc277c65e30475a8ed6616100000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9349c400bc5cef9910dcd7cd1328960b14d2c095f0e5d26c14f4f8a467160578500000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000000" l1_chain_id = 31337 -multicall3_addr = "0x75ACdD102012453c342E06b01365a58d1108BbDB" +multicall3_addr = "0xb4CA672635D5E33C2725B4F250Dc5D3BFC489469" owner_address = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" [contracts_config] -diamond_cut_data = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000b98c82863a46c019895d8a241b177b47080be2d20000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc0000000000000000000000000ee3aa46ce7a642b7bf9b72ea773cfde0163dec1500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db8650000000000000000000000000000000000000000000000000000000000000000000000000000000088645d63e8477437a1506784acbfa8bc1f77c1b8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005518c73b000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000000000000000000000000000d5bd18e281e0093b2dc67f4e9296b6a29f9a09b8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab700000000000000000000000000000000000000000000000000000000000000000000000000000000b873183bf3f7af16138a74816b26a14a6ef2c2b8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000a3a0db4be1c102227fc9037a82af66f8dc8fb41f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" +diamond_cut_data = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000ae70b8622851519e3af6215b0d2bf8bb7e94ee5e0000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc000000000000000000000000062476c57821675af1a33b39eb1655540fdf9a17c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db865000000000000000000000000000000000000000000000000000000000000000000000000000000004e4cf6187167b8e081cb736a75d3554cb7090dfc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005518c73b000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000000000000000000000000000009c68efaa09262647f5bbb9afb4c7fb2dd7c6c642000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab700000000000000000000000000000000000000000000000000000000000000000000000000000000b6aac5d171cfc9c0a4069d825873ffac5ce96b83000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c000000000000000000000000064fd27c7082f2f3e4f8629977eab095b82ddc422000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" diamond_init_batch_overhead_l1_gas = 1000000 diamond_init_max_l2_gas_per_batch = 80000000 diamond_init_max_pubdata_per_batch = 120000 @@ -23,34 +23,34 @@ recursion_node_level_vk_hash = "0x0000000000000000000000000000000000000000000000 [deployed_addresses] blob_versioned_hash_retriever_addr = "0xA4cB26d6933D2c3E76718D30de8547bCDF8dD241" -governance_addr = "0xd5Fb39C4d0167d6C6D384d7e8962423a8A9BC9F4" -native_token_vault_addr = "0x84449FFBC89C6BF0Ba5B71E3AC6A6C3dFD0A33F3" +governance_addr = "0x61918895E9eB44Caf1B8B9b7e625C65b9AFda41E" +native_token_vault_addr = "0xe5e7Bd646699F63A72AF6A11983DB4e8127A154A" transparent_proxy_admin_addr = "0xD718d5A27a29FF1cD22403426084bA0d479869a0" -validator_timelock_addr = "0xb90B836643Def03F00727D7e8Fd331EEC8Ec0adf" +validator_timelock_addr = "0x3C3D72cec2cecC40672b9e144b32ADB3b7Fd084F" [deployed_addresses.bridgehub] -bridgehub_implementation_addr = "0x8D94C2Af67a96B40572b132ac3C3d8D869247204" -bridgehub_proxy_addr = "0x7D94E8030A23ED1cAEa46Dd6642Acdfe03a7F893" -message_root_implementation_addr = "0x00D6289936efaC8764eF18DEab970a2CaF4DA69d" -message_root_proxy_addr = "0xC76A3ee1eC86E3C3776aAe3BFeF69be37B4DAc4C" -stm_deployment_tracker_implementation_addr = "0x4F3f1278301A2FE7A29636C03653F63Fbc22123a" -stm_deployment_tracker_proxy_addr = "0x09742A20490b2d9D1df9E94bFbd8026fcD349CBb" +bridgehub_implementation_addr = "0x66CAF057C87e15eF8108502BD90cB52E2E90Cf5e" +bridgehub_proxy_addr = "0x15b26f421C552Ce0EF27EDDa4f646Ae347Fe0B11" +message_root_implementation_addr = "0xD84b2C4928190dC10Bbb7D87de213509D9F59394" +message_root_proxy_addr = "0x9348A4Dfd3bB679b42eFb06bb77F1B98eE5CF465" +stm_deployment_tracker_implementation_addr = "0x72a154C815aF6505cec588885950Fa1Ae784D2C2" +stm_deployment_tracker_proxy_addr = "0x9fA6Bcfd5A27252299d718557Ae6556d14419D34" [deployed_addresses.bridges] -erc20_bridge_implementation_addr = "0xdA583c78dDA194421aA45779026A097A2e6d963c" -erc20_bridge_proxy_addr = "0x8944BCDc7A23550C9bc290B197a3FF67BE18D31e" -shared_bridge_implementation_addr = "0x4E4020D1ea4B4c7EAe0267a9a00c81f2168ceA09" -shared_bridge_proxy_addr = "0x384DBe7285f29beb705E51B19f350EC6d718967E" +erc20_bridge_implementation_addr = "0xc68a437d6146d097Bf7fEa4135B65D97FC2a6D89" +erc20_bridge_proxy_addr = "0x1be63449BF1Ab0fDFE9D53A73A2a484b61368d94" +shared_bridge_implementation_addr = "0x162D9044486A4bA9A8e3AC0E9171D13e6A9eCf1b" +shared_bridge_proxy_addr = "0x4D8C730646430d6BF2B7a965Ad39c12CBDc7eEcD" [deployed_addresses.state_transition] -admin_facet_addr = "0xeE3aa46ce7A642B7bF9B72eA773cFDe0163DEc15" -default_upgrade_addr = "0xDa3532D626dEAa25420fa61EA84f328622da5E62" -diamond_init_addr = "0xB98c82863A46c019895D8A241B177b47080Be2D2" +admin_facet_addr = "0x62476C57821675Af1a33B39EB1655540fDF9a17C" +default_upgrade_addr = "0xf16Fda6af9D791828C86B96d2BEd3055f73AFb13" +diamond_init_addr = "0xAe70b8622851519e3Af6215b0d2bf8Bb7e94EE5E" diamond_proxy_addr = "0x0000000000000000000000000000000000000000" -executor_facet_addr = "0xB873183BF3f7AF16138A74816B26a14a6Ef2C2B8" -genesis_upgrade_addr = "0x43Dc0bb98dFF37Db24808531838d73a0bc75dbEA" -getters_facet_addr = "0x88645D63e8477437a1506784aCbfa8bC1F77C1B8" -mailbox_facet_addr = "0xd5BD18e281e0093B2Dc67f4e9296B6a29F9a09b8" -state_transition_implementation_addr = "0x3cB743a54C47A7fCD41ade062207dC4503C4b8aB" -state_transition_proxy_addr = "0x71dC224e61EC6f1293Ff990dc0D31235a25EEC60" -verifier_addr = "0xa3a0Db4Be1c102227Fc9037A82aF66F8Dc8fb41F" +executor_facet_addr = "0xB6aaC5d171Cfc9c0a4069d825873FFaC5ce96b83" +genesis_upgrade_addr = "0x71750BC31260B2802107505b6914C2c1de87fe53" +getters_facet_addr = "0x4E4Cf6187167B8E081cB736A75D3554cB7090dFc" +mailbox_facet_addr = "0x9C68eFaA09262647f5BBb9AFb4C7fb2DD7C6C642" +state_transition_implementation_addr = "0x71464D3Af9c91EbDdEc6e0EAb60e226FAe580d75" +state_transition_proxy_addr = "0xe4f8f48b99d537067f45b46205E9c36a6A4c984a" +verifier_addr = "0x64Fd27c7082F2f3E4F8629977eaB095b82ddC422" From 7f2c27afa0af89105e69071f2513112c2bcaac72 Mon Sep 17 00:00:00 2001 From: Raid5594 <52794079+Raid5594@users.noreply.github.com> Date: Tue, 3 Sep 2024 19:43:12 +0400 Subject: [PATCH 12/53] Small PR to Fix "Ethers" and "ETH" encoding (#762) Co-authored-by: Raid Ateir --- l1-contracts/contracts/bridge/L1SharedBridge.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/l1-contracts/contracts/bridge/L1SharedBridge.sol b/l1-contracts/contracts/bridge/L1SharedBridge.sol index eec3c2e69..56b621c18 100644 --- a/l1-contracts/contracts/bridge/L1SharedBridge.sol +++ b/l1-contracts/contracts/bridge/L1SharedBridge.sol @@ -413,8 +413,8 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Ownable2StepUpgrade /// @dev Receives and parses (name, symbol, decimals) from the token contract function _getERC20Getters(address _token) internal view returns (bytes memory) { if (_token == ETH_TOKEN_ADDRESS) { - bytes memory name = bytes("Ether"); - bytes memory symbol = bytes("ETH"); + bytes memory name = abi.encode("Ether"); + bytes memory symbol = abi.encode("ETH"); bytes memory decimals = abi.encode(uint8(18)); return abi.encode(name, symbol, decimals); // when depositing eth to a non-eth based chain it is an ERC20 } From 78b0ce816499cf12c0024f3abf535bfc78421cae Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Wed, 4 Sep 2024 15:22:10 +0200 Subject: [PATCH 13/53] STM -> CTM --- .../contracts/bridgehub/Bridgehub.sol | 150 ++++++------ ...ntTracker.sol => CTMDeploymentTracker.sol} | 52 ++--- .../contracts/bridgehub/IBridgehub.sol | 42 ++-- ...tTracker.sol => ICTMDeploymentTracker.sol} | 6 +- .../contracts/common/L1ContractErrors.sol | 4 +- .../dev-contracts/test/AdminFacetTest.sol | 2 +- .../test/DummyBridgehubSetter.sol | 4 +- ...nManager.sol => DummyChainTypeManager.sol} | 6 +- ...yChainTypeManagerForValidatorTimelock.sol} | 4 +- ...yChainTypeManagerWithBridgeHubAddress.sol} | 6 +- ...sitionManager.sol => ChainTypeManager.sol} | 38 ++-- ...itionManager.sol => IChainTypeManager.sol} | 12 +- .../state-transition/ValidatorTimelock.sol | 16 +- .../chain-deps/DiamondInit.sol | 4 +- .../chain-deps/ZkSyncHyperchainStorage.sol | 8 +- .../chain-deps/facets/Admin.sol | 38 ++-- .../chain-deps/facets/Executor.sol | 4 +- .../chain-deps/facets/Getters.sol | 4 +- .../chain-deps/facets/Mailbox.sol | 6 +- .../facets/ZkSyncHyperchainBase.sol | 12 +- .../chain-interfaces/IAdmin.sol | 4 +- .../chain-interfaces/IDiamondInit.sol | 4 +- .../chain-interfaces/IGetters.sol | 2 +- .../l2-deps/IL2GenesisUpgrade.sol | 2 +- .../contracts/upgrades/IL1GenesisUpgrade.sol | 2 +- .../contracts/upgrades/L1GenesisUpgrade.sol | 4 +- .../DecentralizeGovernanceUpgradeScript.s.sol | 14 +- l1-contracts/deploy-scripts/DeployL1.s.sol | 114 +++++----- l1-contracts/deploy-scripts/Gateway.s.sol | 32 +-- .../foundry/integration/DeploymentTest.t.sol | 6 +- .../foundry/integration/GatewayTests.t.sol | 24 +- .../Bridgehub/experimental_bridge.t.sol | 214 +++++++++--------- .../concrete/DiamondCut/UpgradeLogic.t.sol | 18 +- .../concrete/Executor/_Executor_Shared.t.sol | 14 +- .../foundry/unit/concrete/Utils/Utils.sol | 6 +- .../unit/concrete/Utils/UtilsFacet.sol | 8 +- .../ValidatorTimelock/ValidatorTimelock.t.sol | 24 +- .../StateTransitionManager/Admin.t.sol | 12 +- .../CreateNewChain.t.sol | 4 +- .../StateTransitionManager/FreezeChain.t.sol | 4 +- .../RevertBatches.t.sol | 6 +- .../SetChainCreationParams.t.sol | 6 +- .../SetNewVersionUpgrade.t.sol | 4 +- .../SetUpgradeDiamondCut.t.sol | 4 +- .../SetValidatorTimelock.t.sol | 4 +- .../StateTransitionOwnerZero.t.sol | 16 +- .../_StateTransitionManager_Shared.t.sol | 26 +-- .../chain-deps/DiamondInit/Initialize.t.sol | 2 +- .../facets/Admin/ChangeFeeParams.t.sol | 16 +- .../facets/Admin/ExecuteUpgrade.t.sol | 12 +- .../facets/Admin/FreezeDiamond.t.sol | 8 +- .../facets/Admin/SetPorterAvailability.t.sol | 16 +- .../Admin/SetPriorityTxMaxGasLimit.t.sol | 16 +- .../facets/Admin/SetValidator.t.sol | 16 +- .../facets/Admin/UnfreezeDiamond.t.sol | 10 +- .../Admin/UpgradeChainFromVersion.t.sol | 34 +-- ...OnlyGovernorOrStateTransitionManager.t.sol | 24 +- .../Base/OnlyStateTransitionManager.t.sol | 18 +- .../chain-deps/facets/Base/_Base_Shared.t.sol | 14 +- .../Getters/GetStateTransitionManager.t.sol | 10 +- .../facets/Getters/_Getters_Shared.t.sol | 4 +- .../contracts/L2GenesisUpgrade.sol | 4 +- .../contracts/interfaces/IBridgehub.sol | 2 +- .../interfaces/IL2GenesisUpgrade.sol | 2 +- 64 files changed, 602 insertions(+), 602 deletions(-) rename l1-contracts/contracts/bridgehub/{STMDeploymentTracker.sol => CTMDeploymentTracker.sol} (79%) rename l1-contracts/contracts/bridgehub/{ISTMDeploymentTracker.sol => ICTMDeploymentTracker.sol} (79%) rename l1-contracts/contracts/dev-contracts/test/{DummyStateTransitionManager.sol => DummyChainTypeManager.sol} (74%) rename l1-contracts/contracts/dev-contracts/test/{DummyStateTransitionManagerForValidatorTimelock.sol => DummyChainTypeManagerForValidatorTimelock.sol} (87%) rename l1-contracts/contracts/dev-contracts/test/{DummyStateTransitionManagerWithBridgeHubAddress.sol => DummyChainTypeManagerWithBridgeHubAddress.sol} (72%) rename l1-contracts/contracts/state-transition/{StateTransitionManager.sol => ChainTypeManager.sol} (95%) rename l1-contracts/contracts/state-transition/{IStateTransitionManager.sol => IChainTypeManager.sol} (95%) diff --git a/l1-contracts/contracts/bridgehub/Bridgehub.sol b/l1-contracts/contracts/bridgehub/Bridgehub.sol index 330370e82..cdd4ae357 100644 --- a/l1-contracts/contracts/bridgehub/Bridgehub.sol +++ b/l1-contracts/contracts/bridgehub/Bridgehub.sol @@ -9,10 +9,10 @@ import {EnumerableMap} from "@openzeppelin/contracts-v4/utils/structs/Enumerable import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/access/Ownable2StepUpgradeable.sol"; import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/security/PausableUpgradeable.sol"; -import {IBridgehub, L2TransactionRequestDirect, L2TransactionRequestTwoBridgesOuter, L2TransactionRequestTwoBridgesInner, BridgehubMintSTMAssetData, BridgehubBurnSTMAssetData} from "./IBridgehub.sol"; +import {IBridgehub, L2TransactionRequestDirect, L2TransactionRequestTwoBridgesOuter, L2TransactionRequestTwoBridgesInner, BridgehubMintCTMAssetData, BridgehubBurnCTMAssetData} from "./IBridgehub.sol"; import {IL1AssetRouter} from "../bridge/interfaces/IL1AssetRouter.sol"; import {IL1BaseTokenAssetHandler} from "../bridge/interfaces/IL1BaseTokenAssetHandler.sol"; -import {IStateTransitionManager} from "../state-transition/IStateTransitionManager.sol"; +import {IChainTypeManager} from "../state-transition/IChainTypeManager.sol"; import {ReentrancyGuard} from "../common/ReentrancyGuard.sol"; import {DataEncoding} from "../common/libraries/DataEncoding.sol"; import {IZkSyncHyperchain} from "../state-transition/chain-interfaces/IZkSyncHyperchain.sol"; @@ -21,9 +21,9 @@ import {ETH_TOKEN_ADDRESS, TWO_BRIDGES_MAGIC_VALUE, BRIDGEHUB_MIN_SECOND_BRIDGE_ import {BridgehubL2TransactionRequest, L2Message, L2Log, TxStatus} from "../common/Messaging.sol"; import {AddressAliasHelper} from "../vendor/AddressAliasHelper.sol"; import {IMessageRoot} from "./IMessageRoot.sol"; -import {ISTMDeploymentTracker} from "./ISTMDeploymentTracker.sol"; +import {ICTMDeploymentTracker} from "./ICTMDeploymentTracker.sol"; import {L2CanonicalTransaction} from "../common/Messaging.sol"; -import {AssetHandlerNotRegistered, HyperchainLimitReached, Unauthorized, STMAlreadyRegistered, STMNotRegistered, ZeroChainId, ChainIdTooBig, SharedBridgeNotSet, BridgeHubAlreadyRegistered, AddressTooLow, MsgValueMismatch, WrongMagicValue, ZeroAddress} from "../common/L1ContractErrors.sol"; +import {AssetHandlerNotRegistered, HyperchainLimitReached, Unauthorized, CTMAlreadyRegistered, CTMNotRegistered, ZeroChainId, ChainIdTooBig, SharedBridgeNotSet, BridgeHubAlreadyRegistered, AddressTooLow, MsgValueMismatch, WrongMagicValue, ZeroAddress} from "../common/L1ContractErrors.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev @@ -42,21 +42,21 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// L1 that is at the most base layer. uint256 public immutable L1_CHAIN_ID; - /// @notice The total number of hyperchains can be created/connected to this STM. + /// @notice The total number of hyperchains can be created/connected to this CTM. /// This is the temporary security measure. uint256 public immutable MAX_NUMBER_OF_HYPERCHAINS; /// @notice all the ether and ERC20 tokens are held by NativeVaultToken managed by this shared Bridge. IL1AssetRouter public sharedBridge; - /// @notice StateTransitionManagers that are registered, and ZKchains that use these STMs can use this bridgehub as settlement layer. - mapping(address stateTransitionManager => bool) public stateTransitionManagerIsRegistered; + /// @notice ChainTypeManagers that are registered, and ZKchains that use these CTMs can use this bridgehub as settlement layer. + mapping(address chainTypeManager => bool) public chainTypeManagerIsRegistered; /// @notice we store registered tokens (for arbitrary base token) mapping(address baseToken => bool) public __DEPRECATED_tokenIsRegistered; - /// @notice chainID => StateTransitionManager contract address, STM that is managing rules for a given ZKchain. - mapping(uint256 chainId => address) public stateTransitionManager; + /// @notice chainID => ChainTypeManager contract address, CTM that is managing rules for a given ZKchain. + mapping(uint256 chainId => address) public chainTypeManager; /// @notice chainID => baseToken contract address, token that is used as 'base token' by a given child chain. // slither-disable-next-line uninitialized-state @@ -80,11 +80,11 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus mapping(uint256 chainId => bytes32) public baseTokenAssetId; /// @notice The deployment tracker for the state transition managers. - /// @dev The L1 address of the stm deployer is provided. - ISTMDeploymentTracker public l1StmDeployer; + /// @dev The L1 address of the ctm deployer is provided. + ICTMDeploymentTracker public l1CtmDeployer; /// @dev asset info used to identify chains in the Shared Bridge - mapping(bytes32 stmAssetId => address stmAddress) public stmAssetIdToAddress; + mapping(bytes32 ctmAssetId => address ctmAddress) public ctmAssetIdToAddress; /// @dev used to indicate the currently active settlement layer for a given chainId mapping(uint256 chainId => uint256 activeSettlementLayerChainId) public settlementLayer; @@ -107,8 +107,8 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus _; } - modifier onlyChainSTM(uint256 _chainId) { - require(msg.sender == stateTransitionManager[_chainId], "BH: not chain STM"); + modifier onlyChainCTM(uint256 _chainId) { + require(msg.sender == chainTypeManager[_chainId], "BH: not chain CTM"); _; } @@ -190,15 +190,15 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @notice To set the addresses of some of the ecosystem contracts, only Owner. Not done in initialize, as /// the order of deployment is Bridgehub, other contracts, and then we call this. /// @param _sharedBridge the shared bridge address - /// @param _l1StmDeployer the stm deployment tracker address. Note, that the address of the L1 STM deployer is provided. + /// @param _l1CtmDeployer the ctm deployment tracker address. Note, that the address of the L1 CTM deployer is provided. /// @param _messageRoot the message root address function setAddresses( address _sharedBridge, - ISTMDeploymentTracker _l1StmDeployer, + ICTMDeploymentTracker _l1CtmDeployer, IMessageRoot _messageRoot ) external onlyOwner { sharedBridge = IL1AssetRouter(_sharedBridge); - l1StmDeployer = _l1StmDeployer; + l1CtmDeployer = _l1CtmDeployer; messageRoot = _messageRoot; } @@ -216,11 +216,11 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @notice Used to set the legacy chain address for the upgrade. /// @param _chainId The chainId of the legacy chain we are migrating. function setLegacyChainAddress(uint256 _chainId) external { - address stm = stateTransitionManager[_chainId]; - require(stm != address(0), "BH: chain not legacy"); + address ctm = chainTypeManager[_chainId]; + require(ctm != address(0), "BH: chain not legacy"); require(!hyperchainMap.contains(_chainId), "BH: chain already migrated"); - /// Note we have to do this before STM is upgraded. - address chainAddress = IStateTransitionManager(stm).getHyperchainLegacy(_chainId); + /// Note we have to do this before CTM is upgraded. + address chainAddress = IChainTypeManager(ctm).getHyperchainLegacy(_chainId); require(chainAddress != address(0), "BH: chain not legacy 2"); _registerNewHyperchain(_chainId, chainAddress); } @@ -228,32 +228,32 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus //// Registry /// @notice State Transition can be any contract with the appropriate interface/functionality - /// @param _stateTransitionManager the state transition manager address to be added - function addStateTransitionManager(address _stateTransitionManager) external onlyOwner { - if (_stateTransitionManager == address(0)) { + /// @param _chainTypeManager the state transition manager address to be added + function addChainTypeManager(address _chainTypeManager) external onlyOwner { + if (_chainTypeManager == address(0)) { revert ZeroAddress(); } - if (stateTransitionManagerIsRegistered[_stateTransitionManager]) { - revert STMAlreadyRegistered(); + if (chainTypeManagerIsRegistered[_chainTypeManager]) { + revert CTMAlreadyRegistered(); } - stateTransitionManagerIsRegistered[_stateTransitionManager] = true; + chainTypeManagerIsRegistered[_chainTypeManager] = true; - emit StateTransitionManagerAdded(_stateTransitionManager); + emit ChainTypeManagerAdded(_chainTypeManager); } /// @notice State Transition can be any contract with the appropriate interface/functionality /// @notice this stops new Chains from using the STF, old chains are not affected - /// @param _stateTransitionManager the state transition manager address to be removed - function removeStateTransitionManager(address _stateTransitionManager) external onlyOwner { - if (_stateTransitionManager == address(0)) { + /// @param _chainTypeManager the state transition manager address to be removed + function removeChainTypeManager(address _chainTypeManager) external onlyOwner { + if (_chainTypeManager == address(0)) { revert ZeroAddress(); } - if (!stateTransitionManagerIsRegistered[_stateTransitionManager]) { - revert STMNotRegistered(); + if (!chainTypeManagerIsRegistered[_chainTypeManager]) { + revert CTMNotRegistered(); } - stateTransitionManagerIsRegistered[_stateTransitionManager] = false; + chainTypeManagerIsRegistered[_chainTypeManager] = false; - emit StateTransitionManagerRemoved(_stateTransitionManager); + emit ChainTypeManagerRemoved(_chainTypeManager); } /// @notice asset id can represent any token contract with the appropriate interface/functionality @@ -281,23 +281,23 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @param _assetAddress the asset handler address function setAssetHandlerAddress(bytes32 _additionalData, address _assetAddress) external { // It is a simplified version of the logic used by the AssetRouter to manage asset handlers. - // STM's assetId is `keccak256(abi.encode(L1_CHAIN_ID, l1StmDeployer, stmAddress))`. - // And the l1StmDeployer is considered the deployment tracker for the STM asset. + // CTM's assetId is `keccak256(abi.encode(L1_CHAIN_ID, l1CtmDeployer, ctmAddress))`. + // And the l1CtmDeployer is considered the deployment tracker for the CTM asset. // - // The l1StmDeployer will call this method to set the asset handler address for the assetId. + // The l1CtmDeployer will call this method to set the asset handler address for the assetId. // If the chain is not the same as L1, we assume that it is done via L1->L2 communication and so we unalias the sender. // // For simpler handling we allow anyone to call this method. It is okay, since during bridging operations - // it is double checked that `assetId` is indeed derived from the `l1StmDeployer`. + // it is double checked that `assetId` is indeed derived from the `l1CtmDeployer`. // TODO(EVM-703): This logic should be revised once interchain communication is implemented. address sender = L1_CHAIN_ID == block.chainid ? msg.sender : AddressAliasHelper.undoL1ToL2Alias(msg.sender); - // This method can be accessed by l1StmDeployer only - require(sender == address(l1StmDeployer), "BH: not stm deployer"); - require(stateTransitionManagerIsRegistered[_assetAddress], "STM not registered"); + // This method can be accessed by l1CtmDeployer only + require(sender == address(l1CtmDeployer), "BH: not ctm deployer"); + require(chainTypeManagerIsRegistered[_assetAddress], "CTM not registered"); bytes32 assetInfo = keccak256(abi.encode(L1_CHAIN_ID, sender, _additionalData)); - stmAssetIdToAddress[assetInfo] = _assetAddress; + ctmAssetIdToAddress[assetInfo] = _assetAddress; emit AssetRegistered(assetInfo, _assetAddress, _additionalData, msg.sender); } @@ -308,7 +308,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @notice register new chain. New chains can be only registered on Bridgehub deployed on L1. Later they can be moved to any other layer. /// @notice for Eth the baseToken address is 1 /// @param _chainId the chainId of the chain - /// @param _stateTransitionManager the state transition manager address + /// @param _chainTypeManager the state transition manager address /// @param _baseTokenAssetId the base token asset id of the chain /// @param _salt the salt for the chainId, currently not used /// @param _admin the admin of the chain @@ -316,7 +316,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @param _factoryDeps the factory dependencies for the chain's deployment function createNewChain( uint256 _chainId, - address _stateTransitionManager, + address _chainTypeManager, bytes32 _baseTokenAssetId, // solhint-disable-next-line no-unused-vars uint256 _salt, @@ -331,15 +331,15 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus revert ChainIdTooBig(); } require(_chainId != block.chainid, "BH: chain id must not match current chainid"); - if (_stateTransitionManager == address(0)) { + if (_chainTypeManager == address(0)) { revert ZeroAddress(); } if (_baseTokenAssetId == bytes32(0)) { revert ZeroAddress(); } - if (!stateTransitionManagerIsRegistered[_stateTransitionManager]) { - revert STMNotRegistered(); + if (!chainTypeManagerIsRegistered[_chainTypeManager]) { + revert CTMNotRegistered(); } require(assetIdIsRegistered[_baseTokenAssetId], "BH: asset id not registered"); @@ -347,16 +347,16 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus if (address(sharedBridge) == address(0)) { revert SharedBridgeNotSet(); } - if (stateTransitionManager[_chainId] != address(0)) { + if (chainTypeManager[_chainId] != address(0)) { revert BridgeHubAlreadyRegistered(); } - stateTransitionManager[_chainId] = _stateTransitionManager; + chainTypeManager[_chainId] = _chainTypeManager; baseTokenAssetId[_chainId] = _baseTokenAssetId; settlementLayer[_chainId] = block.chainid; - address chainAddress = IStateTransitionManager(_stateTransitionManager).createNewChain({ + address chainAddress = IChainTypeManager(_chainTypeManager).createNewChain({ _chainId: _chainId, _baseTokenAssetId: _baseTokenAssetId, _sharedBridge: address(sharedBridge), @@ -367,7 +367,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus _registerNewHyperchain(_chainId, chainAddress); messageRoot.addNewChain(_chainId); - emit NewChain(_chainId, _stateTransitionManager, _admin); + emit NewChain(_chainId, _chainTypeManager, _admin); return _chainId; } @@ -420,14 +420,14 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus (, chainAddress) = hyperchainMap.tryGet(_chainId); } - function stmAssetIdFromChainId(uint256 _chainId) public view override returns (bytes32) { - address stmAddress = stateTransitionManager[_chainId]; - require(stmAddress != address(0), "chain id not registered"); - return stmAssetId(stateTransitionManager[_chainId]); + function ctmAssetIdFromChainId(uint256 _chainId) public view override returns (bytes32) { + address ctmAddress = chainTypeManager[_chainId]; + require(ctmAddress != address(0), "chain id not registered"); + return ctmAssetId(chainTypeManager[_chainId]); } - function stmAssetId(address _stmAddress) public view override returns (bytes32) { - return keccak256(abi.encode(L1_CHAIN_ID, address(l1StmDeployer), bytes32(uint256(uint160(_stmAddress))))); + function ctmAssetId(address _ctmAddress) public view override returns (bytes32) { + return keccak256(abi.encode(L1_CHAIN_ID, address(l1CtmDeployer), bytes32(uint256(uint160(_ctmAddress))))); } /*////////////////////////////////////////////////////////////// @@ -674,7 +674,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @notice IL1AssetHandler interface, used to migrate (transfer) a chain to the settlement layer. /// @param _settlementChainId the chainId of the settlement chain, i.e. where the message and the migrating chain is sent. - /// @param _assetId the assetId of the migrating chain's STM + /// @param _assetId the assetId of the migrating chain's CTM /// @param _prevMsgSender the previous message sender /// @param _data the data for the migration function bridgeBurn( @@ -686,8 +686,8 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus ) external payable override onlyAssetRouter whenMigrationsNotPaused returns (bytes memory bridgehubMintData) { require(whitelistedSettlementLayers[_settlementChainId], "BH: SL not whitelisted"); - BridgehubBurnSTMAssetData memory bridgeData = abi.decode(_data, (BridgehubBurnSTMAssetData)); - require(_assetId == stmAssetIdFromChainId(bridgeData.chainId), "BH: assetInfo 1"); + BridgehubBurnCTMAssetData memory bridgeData = abi.decode(_data, (BridgehubBurnCTMAssetData)); + require(_assetId == ctmAssetIdFromChainId(bridgeData.chainId), "BH: assetInfo 1"); require(settlementLayer[bridgeData.chainId] == block.chainid, "BH: not current SL"); settlementLayer[bridgeData.chainId] = _settlementChainId; @@ -695,17 +695,17 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus require(hyperchain != address(0), "BH: hyperchain not registered"); require(_prevMsgSender == IZkSyncHyperchain(hyperchain).getAdmin(), "BH: incorrect sender"); - bytes memory stmMintData = IStateTransitionManager(stateTransitionManager[bridgeData.chainId]) - .forwardedBridgeBurn(bridgeData.chainId, bridgeData.stmData); + bytes memory ctmMintData = IChainTypeManager(chainTypeManager[bridgeData.chainId]) + .forwardedBridgeBurn(bridgeData.chainId, bridgeData.ctmData); bytes memory chainMintData = IZkSyncHyperchain(hyperchain).forwardedBridgeBurn( hyperchainMap.get(_settlementChainId), _prevMsgSender, bridgeData.chainData ); - BridgehubMintSTMAssetData memory bridgeMintStruct = BridgehubMintSTMAssetData({ + BridgehubMintCTMAssetData memory bridgeMintStruct = BridgehubMintCTMAssetData({ chainId: bridgeData.chainId, baseTokenAssetId: baseTokenAssetId[bridgeData.chainId], - stmData: stmMintData, + ctmData: ctmMintData, chainData: chainMintData }); bridgehubMintData = abi.encode(bridgeMintStruct); @@ -718,14 +718,14 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus bytes32 _assetId, bytes calldata _bridgehubMintData ) external payable override onlyAssetRouter whenMigrationsNotPaused { - BridgehubMintSTMAssetData memory bridgeData = abi.decode(_bridgehubMintData, (BridgehubMintSTMAssetData)); + BridgehubMintCTMAssetData memory bridgeData = abi.decode(_bridgehubMintData, (BridgehubMintCTMAssetData)); - address stm = stmAssetIdToAddress[_assetId]; - require(stm != address(0), "BH: assetInfo 2"); + address ctm = ctmAssetIdToAddress[_assetId]; + require(ctm != address(0), "BH: assetInfo 2"); require(settlementLayer[bridgeData.chainId] != block.chainid, "BH: already current SL"); settlementLayer[bridgeData.chainId] = block.chainid; - stateTransitionManager[bridgeData.chainId] = stm; + chainTypeManager[bridgeData.chainId] = ctm; baseTokenAssetId[bridgeData.chainId] = bridgeData.baseTokenAssetId; // To keep `assetIdIsRegistered` consistent, we'll also automatically register the base token. // It is assumed that if the bridging happened, the token was approved on L1 already. @@ -734,7 +734,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus address hyperchain = getHyperchain(bridgeData.chainId); bool contractAlreadyDeployed = hyperchain != address(0); if (!contractAlreadyDeployed) { - hyperchain = IStateTransitionManager(stm).forwardedBridgeMint(bridgeData.chainId, bridgeData.stmData); + hyperchain = IChainTypeManager(ctm).forwardedBridgeMint(bridgeData.chainId, bridgeData.ctmData); require(hyperchain != address(0), "BH: chain not registered"); _registerNewHyperchain(bridgeData.chainId, hyperchain); messageRoot.addNewChain(bridgeData.chainId); @@ -747,7 +747,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @dev IL1AssetHandler interface, used to undo a failed migration of a chain. /// @param _chainId the chainId of the chain - /// @param _assetId the assetId of the chain's STM + /// @param _assetId the assetId of the chain's CTM /// @param _data the data for the recovery. function bridgeRecoverFailedTransfer( uint256 _chainId, @@ -755,22 +755,22 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus address _depositSender, bytes calldata _data ) external payable override onlyAssetRouter onlyL1 { - BridgehubBurnSTMAssetData memory stmAssetData = abi.decode(_data, (BridgehubBurnSTMAssetData)); + BridgehubBurnCTMAssetData memory ctmAssetData = abi.decode(_data, (BridgehubBurnCTMAssetData)); delete settlementLayer[_chainId]; - IStateTransitionManager(stateTransitionManager[_chainId]).forwardedBridgeRecoverFailedTransfer({ + IChainTypeManager(chainTypeManager[_chainId]).forwardedBridgeRecoverFailedTransfer({ _chainId: _chainId, _assetInfo: _assetId, _depositSender: _depositSender, - _stmData: stmAssetData.stmData + _ctmData: ctmAssetData.ctmData }); IZkSyncHyperchain(getHyperchain(_chainId)).forwardedBridgeRecoverFailedTransfer({ _chainId: _chainId, _assetInfo: _assetId, _prevMsgSender: _depositSender, - _chainData: stmAssetData.chainData + _chainData: ctmAssetData.chainData }); } diff --git a/l1-contracts/contracts/bridgehub/STMDeploymentTracker.sol b/l1-contracts/contracts/bridgehub/CTMDeploymentTracker.sol similarity index 79% rename from l1-contracts/contracts/bridgehub/STMDeploymentTracker.sol rename to l1-contracts/contracts/bridgehub/CTMDeploymentTracker.sol index 42c1e1922..29cc14aaf 100644 --- a/l1-contracts/contracts/bridgehub/STMDeploymentTracker.sol +++ b/l1-contracts/contracts/bridgehub/CTMDeploymentTracker.sol @@ -8,7 +8,7 @@ import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/ac import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/security/PausableUpgradeable.sol"; import {L2TransactionRequestTwoBridgesInner} from "./IBridgehub.sol"; -import {ISTMDeploymentTracker} from "./ISTMDeploymentTracker.sol"; +import {ICTMDeploymentTracker} from "./ICTMDeploymentTracker.sol"; import {IBridgehub, IL1AssetRouter} from "../bridge/interfaces/IL1AssetRouter.sol"; import {ReentrancyGuard} from "../common/ReentrancyGuard.sol"; @@ -18,7 +18,7 @@ import {L2_BRIDGEHUB_ADDR} from "../common/L2ContractAddresses.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev /// @dev Contract to be deployed on L1, can link together other contracts based on AssetInfo. -contract STMDeploymentTracker is ISTMDeploymentTracker, ReentrancyGuard, Ownable2StepUpgradeable, PausableUpgradeable { +contract CTMDeploymentTracker is ICTMDeploymentTracker, ReentrancyGuard, Ownable2StepUpgradeable, PausableUpgradeable { /// @dev Bridgehub smart contract that is used to operate with L2 via asynchronous L2 <-> L1 communication. IBridgehub public immutable override BRIDGE_HUB; @@ -31,14 +31,14 @@ contract STMDeploymentTracker is ISTMDeploymentTracker, ReentrancyGuard, Ownable /// @notice Checks that the message sender is the bridgehub. modifier onlyBridgehub() { // solhint-disable-next-line gas-custom-errors - require(msg.sender == address(BRIDGE_HUB), "STM DT: not BH"); + require(msg.sender == address(BRIDGE_HUB), "CTM DT: not BH"); _; } /// @notice Checks that the message sender is the bridgehub. modifier onlyOwnerViaRouter(address _prevMsgSender) { // solhint-disable-next-line gas-custom-errors - require(msg.sender == address(L1_ASSET_ROUTER) && _prevMsgSender == owner(), "STM DT: not owner via router"); + require(msg.sender == address(L1_ASSET_ROUTER) && _prevMsgSender == owner(), "CTM DT: not owner via router"); _; } @@ -56,21 +56,21 @@ contract STMDeploymentTracker is ISTMDeploymentTracker, ReentrancyGuard, Ownable _transferOwnership(_owner); } - /// @notice Used to register the stm asset in L1 contracts, AssetRouter and Bridgehub. - /// @param _stmAddress the address of the stm asset - function registerSTMAssetOnL1(address _stmAddress) external onlyOwner { + /// @notice Used to register the ctm asset in L1 contracts, AssetRouter and Bridgehub. + /// @param _ctmAddress the address of the ctm asset + function registerCTMAssetOnL1(address _ctmAddress) external onlyOwner { // solhint-disable-next-line gas-custom-errors - require(BRIDGE_HUB.stateTransitionManagerIsRegistered(_stmAddress), "STMDT: stm not registered"); - L1_ASSET_ROUTER.setAssetHandlerAddressThisChain(bytes32(uint256(uint160(_stmAddress))), address(BRIDGE_HUB)); - BRIDGE_HUB.setAssetHandlerAddress(bytes32(uint256(uint160(_stmAddress))), _stmAddress); + require(BRIDGE_HUB.chainTypeManagerIsRegistered(_ctmAddress), "CTMDT: ctm not registered"); + L1_ASSET_ROUTER.setAssetHandlerAddressThisChain(bytes32(uint256(uint160(_ctmAddress))), address(BRIDGE_HUB)); + BRIDGE_HUB.setAssetHandlerAddress(bytes32(uint256(uint160(_ctmAddress))), _ctmAddress); } - /// @notice The function responsible for registering the L2 counterpart of an STM asset on the L2 Bridgehub. + /// @notice The function responsible for registering the L2 counterpart of an CTM asset on the L2 Bridgehub. /// @dev The function is called by the Bridgehub contract during the `Bridgehub.requestL2TransactionTwoBridges`. /// @dev Since the L2 settlement layers `_chainId` might potentially have ERC20 tokens as native assets, /// there are two ways to perform the L1->L2 transaction: - /// - via the `Bridgehub.requestL2TransactionDirect`. However, this would require the STMDeploymentTracker to + /// - via the `Bridgehub.requestL2TransactionDirect`. However, this would require the CTMDeploymentTracker to /// handle the ERC20 balances to be used in the transaction. /// - via the `Bridgehub.requestL2TransactionTwoBridges`. This way it will be the sender that provides the funds /// for the L2 transaction. @@ -88,22 +88,22 @@ contract STMDeploymentTracker is ISTMDeploymentTracker, ReentrancyGuard, Ownable ) external payable onlyBridgehub returns (L2TransactionRequestTwoBridgesInner memory request) { // solhint-disable-next-line gas-custom-errors - require(msg.value == 0, "STMDT: no eth allowed"); + require(msg.value == 0, "CTMDT: no eth allowed"); // solhint-disable-next-line gas-custom-errors - require(_prevMsgSender == owner(), "STMDT: not owner"); + require(_prevMsgSender == owner(), "CTMDT: not owner"); bytes1 encodingVersion = _data[0]; - require(encodingVersion == ENCODING_VERSION, "STMDT: wrong encoding version"); - (address _stmL1Address, address _stmL2Address) = abi.decode(_data[1:], (address, address)); + require(encodingVersion == ENCODING_VERSION, "CTMDT: wrong encoding version"); + (address _ctmL1Address, address _ctmL2Address) = abi.decode(_data[1:], (address, address)); - request = _registerSTMAssetOnL2Bridgehub(_chainId, _stmL1Address, _stmL2Address); + request = _registerCTMAssetOnL2Bridgehub(_chainId, _ctmL1Address, _ctmL2Address); } /// @notice The function called by the Bridgehub after the L2 transaction has been initiated. /// @dev Not used in this contract. In case the transaction fails, we can just re-try it. function bridgehubConfirmL2Transaction(uint256 _chainId, bytes32 _txDataHash, bytes32 _txHash) external {} - /// @notice Used to register the stm asset in L2 AssetRouter. + /// @notice Used to register the ctm asset in L2 AssetRouter. /// @param _prevMsgSender the address that called the Router /// @param _assetHandlerAddressOnCounterpart the address of the asset handler on the counterpart chain. function bridgeCheckCounterpartAddress( @@ -112,24 +112,24 @@ contract STMDeploymentTracker is ISTMDeploymentTracker, ReentrancyGuard, Ownable address _prevMsgSender, address _assetHandlerAddressOnCounterpart ) external view override onlyOwnerViaRouter(_prevMsgSender) { - require(_assetHandlerAddressOnCounterpart == L2_BRIDGEHUB_ADDR, "STMDT: wrong counter part"); + require(_assetHandlerAddressOnCounterpart == L2_BRIDGEHUB_ADDR, "CTMDT: wrong counter part"); } - function getAssetId(address _l1STM) public view override returns (bytes32) { - return keccak256(abi.encode(block.chainid, address(this), bytes32(uint256(uint160(_l1STM))))); + function getAssetId(address _l1CTM) public view override returns (bytes32) { + return keccak256(abi.encode(block.chainid, address(this), bytes32(uint256(uint160(_l1CTM))))); } - /// @notice Used to register the stm asset in L2 Bridgehub. + /// @notice Used to register the ctm asset in L2 Bridgehub. /// @param _chainId the chainId of the chain - function _registerSTMAssetOnL2Bridgehub( + function _registerCTMAssetOnL2Bridgehub( // solhint-disable-next-line no-unused-vars uint256 _chainId, - address _stmL1Address, - address _stmL2Address + address _ctmL1Address, + address _ctmL2Address ) internal pure returns (L2TransactionRequestTwoBridgesInner memory request) { bytes memory l2TxCalldata = abi.encodeCall( IBridgehub.setAssetHandlerAddress, - (bytes32(uint256(uint160(_stmL1Address))), _stmL2Address) + (bytes32(uint256(uint160(_ctmL1Address))), _ctmL2Address) ); request = L2TransactionRequestTwoBridgesInner({ diff --git a/l1-contracts/contracts/bridgehub/IBridgehub.sol b/l1-contracts/contracts/bridgehub/IBridgehub.sol index 6b88ebb70..721fa0835 100644 --- a/l1-contracts/contracts/bridgehub/IBridgehub.sol +++ b/l1-contracts/contracts/bridgehub/IBridgehub.sol @@ -5,7 +5,7 @@ pragma solidity ^0.8.21; import {IL1AssetRouter} from "../bridge/interfaces/IL1AssetRouter.sol"; import {L2CanonicalTransaction, L2Message, L2Log, TxStatus} from "../common/Messaging.sol"; import {IL1AssetHandler} from "../bridge/interfaces/IL1AssetHandler.sol"; -import {ISTMDeploymentTracker} from "./ISTMDeploymentTracker.sol"; +import {ICTMDeploymentTracker} from "./ICTMDeploymentTracker.sol"; import {IMessageRoot} from "./IMessageRoot.sol"; struct L2TransactionRequestDirect { @@ -40,16 +40,16 @@ struct L2TransactionRequestTwoBridgesInner { bytes32 txDataHash; } -struct BridgehubMintSTMAssetData { +struct BridgehubMintCTMAssetData { uint256 chainId; bytes32 baseTokenAssetId; - bytes stmData; + bytes ctmData; bytes chainData; } -struct BridgehubBurnSTMAssetData { +struct BridgehubBurnCTMAssetData { uint256 chainId; - bytes stmData; + bytes ctmData; bytes chainData; } @@ -63,7 +63,7 @@ interface IBridgehub is IL1AssetHandler { /// @notice Admin changed event NewAdmin(address indexed oldAdmin, address indexed newAdmin); - /// @notice STM asset registered + /// @notice CTM asset registered event AssetRegistered( bytes32 indexed assetInfo, address indexed _assetAddress, @@ -75,13 +75,13 @@ interface IBridgehub is IL1AssetHandler { /// @notice Emitted when the bridging to the chain is started. /// @param chainId Chain ID of the hyperchain - /// @param assetId Asset ID of the token for the hyperchain's STM + /// @param assetId Asset ID of the token for the hyperchain's CTM /// @param settlementLayerChainId The chain id of the settlement layer the chain migrates to. event MigrationStarted(uint256 indexed chainId, bytes32 indexed assetId, uint256 indexed settlementLayerChainId); /// @notice Emitted when the bridging to the chain is complete. /// @param chainId Chain ID of the hyperchain - /// @param assetId Asset ID of the token for the hyperchain's STM + /// @param assetId Asset ID of the token for the hyperchain's CTM /// @param hyperchain The address of the hyperchain on the chain where it is migrated to. event MigrationFinalized(uint256 indexed chainId, bytes32 indexed assetId, address indexed hyperchain); @@ -94,9 +94,9 @@ interface IBridgehub is IL1AssetHandler { function acceptAdmin() external; /// Getters - function stateTransitionManagerIsRegistered(address _stateTransitionManager) external view returns (bool); + function chainTypeManagerIsRegistered(address _chainTypeManager) external view returns (bool); - function stateTransitionManager(uint256 _chainId) external view returns (address); + function chainTypeManager(uint256 _chainId) external view returns (address); function assetIdIsRegistered(bytes32 _baseTokenAssetId) external view returns (bool); @@ -163,7 +163,7 @@ interface IBridgehub is IL1AssetHandler { function createNewChain( uint256 _chainId, - address _stateTransitionManager, + address _chainTypeManager, bytes32 _baseTokenAssetId, uint256 _salt, address _admin, @@ -171,23 +171,23 @@ interface IBridgehub is IL1AssetHandler { bytes[] calldata _factoryDeps ) external returns (uint256 chainId); - function addStateTransitionManager(address _stateTransitionManager) external; + function addChainTypeManager(address _chainTypeManager) external; - function removeStateTransitionManager(address _stateTransitionManager) external; + function removeChainTypeManager(address _chainTypeManager) external; function addTokenAssetId(bytes32 _baseTokenAssetId) external; function setAddresses( address _sharedBridge, - ISTMDeploymentTracker _l1StmDeployer, + ICTMDeploymentTracker _l1CtmDeployer, IMessageRoot _messageRoot ) external; - event NewChain(uint256 indexed chainId, address stateTransitionManager, address indexed chainGovernance); + event NewChain(uint256 indexed chainId, address chainTypeManager, address indexed chainGovernance); - event StateTransitionManagerAdded(address indexed stateTransitionManager); + event ChainTypeManagerAdded(address indexed chainTypeManager); - event StateTransitionManagerRemoved(address indexed stateTransitionManager); + event ChainTypeManagerRemoved(address indexed chainTypeManager); event BaseTokenAssetIdRegistered(bytes32 indexed assetId); @@ -213,13 +213,13 @@ interface IBridgehub is IL1AssetHandler { uint64 _expirationTimestamp ) external; - function stmAssetIdFromChainId(uint256 _chainId) external view returns (bytes32); + function ctmAssetIdFromChainId(uint256 _chainId) external view returns (bytes32); - function stmAssetId(address _stmAddress) external view returns (bytes32); + function ctmAssetId(address _ctmAddress) external view returns (bytes32); - function l1StmDeployer() external view returns (ISTMDeploymentTracker); + function l1CtmDeployer() external view returns (ICTMDeploymentTracker); - function stmAssetIdToAddress(bytes32 _assetInfo) external view returns (address); + function ctmAssetIdToAddress(bytes32 _assetInfo) external view returns (address); function setAssetHandlerAddress(bytes32 _additionalData, address _assetAddress) external; diff --git a/l1-contracts/contracts/bridgehub/ISTMDeploymentTracker.sol b/l1-contracts/contracts/bridgehub/ICTMDeploymentTracker.sol similarity index 79% rename from l1-contracts/contracts/bridgehub/ISTMDeploymentTracker.sol rename to l1-contracts/contracts/bridgehub/ICTMDeploymentTracker.sol index e55da57ee..6e2b74dd3 100644 --- a/l1-contracts/contracts/bridgehub/ISTMDeploymentTracker.sol +++ b/l1-contracts/contracts/bridgehub/ICTMDeploymentTracker.sol @@ -8,7 +8,7 @@ import {IL1AssetDeploymentTracker} from "../bridge/interfaces/IL1AssetDeployment /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev -interface ISTMDeploymentTracker is IL1AssetDeploymentTracker { +interface ICTMDeploymentTracker is IL1AssetDeploymentTracker { function bridgehubDeposit( uint256 _chainId, address _prevMsgSender, @@ -20,7 +20,7 @@ interface ISTMDeploymentTracker is IL1AssetDeploymentTracker { function L1_ASSET_ROUTER() external view returns (IL1AssetRouter); - function registerSTMAssetOnL1(address _stmAddress) external; + function registerCTMAssetOnL1(address _ctmAddress) external; - function getAssetId(address _l1STM) external view returns (bytes32); + function getAssetId(address _l1CTM) external view returns (bytes32); } diff --git a/l1-contracts/contracts/common/L1ContractErrors.sol b/l1-contracts/contracts/common/L1ContractErrors.sol index ec70e06e8..a12f812c4 100644 --- a/l1-contracts/contracts/common/L1ContractErrors.sol +++ b/l1-contracts/contracts/common/L1ContractErrors.sol @@ -244,9 +244,9 @@ error SharedBridgeValueAlreadySet(SharedBridgeKey); // 0xdf3a8fdd error SlotOccupied(); // 0xd0bc70cf -error STMAlreadyRegistered(); +error CTMAlreadyRegistered(); // 0x09865e10 -error STMNotRegistered(); +error CTMNotRegistered(); // 0xae43b424 error SystemLogsSizeTooBig(); // 0x08753982 diff --git a/l1-contracts/contracts/dev-contracts/test/AdminFacetTest.sol b/l1-contracts/contracts/dev-contracts/test/AdminFacetTest.sol index 3c4ec6bb8..bf5ef724f 100644 --- a/l1-contracts/contracts/dev-contracts/test/AdminFacetTest.sol +++ b/l1-contracts/contracts/dev-contracts/test/AdminFacetTest.sol @@ -10,7 +10,7 @@ contract AdminFacetTest is AdminFacet { constructor(uint256 _l1ChainId) AdminFacet(_l1ChainId) { s.admin = msg.sender; - s.stateTransitionManager = msg.sender; + s.chainTypeManager = msg.sender; } function getPorterAvailability() external view returns (bool) { diff --git a/l1-contracts/contracts/dev-contracts/test/DummyBridgehubSetter.sol b/l1-contracts/contracts/dev-contracts/test/DummyBridgehubSetter.sol index 0f053956c..5293fc26d 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummyBridgehubSetter.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummyBridgehubSetter.sol @@ -19,7 +19,7 @@ contract DummyBridgehubSetter is Bridgehub { _registerNewHyperchain(_chainId, _hyperchain); } - function setSTM(uint256 _chainId, address _stm) external { - stateTransitionManager[_chainId] = _stm; + function setCTM(uint256 _chainId, address _ctm) external { + chainTypeManager[_chainId] = _ctm; } } diff --git a/l1-contracts/contracts/dev-contracts/test/DummyStateTransitionManager.sol b/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManager.sol similarity index 74% rename from l1-contracts/contracts/dev-contracts/test/DummyStateTransitionManager.sol rename to l1-contracts/contracts/dev-contracts/test/DummyChainTypeManager.sol index 35598befc..f2c168910 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummyStateTransitionManager.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManager.sol @@ -4,11 +4,11 @@ pragma solidity 0.8.24; import {EnumerableMap} from "@openzeppelin/contracts-v4/utils/structs/EnumerableMap.sol"; -import {StateTransitionManager} from "../../state-transition/StateTransitionManager.sol"; +import {ChainTypeManager} from "../../state-transition/ChainTypeManager.sol"; /// @title DummyExecutor /// @notice A test smart contract implementing the IExecutor interface to simulate Executor behavior for testing purposes. -contract DummyStateTransitionManager is StateTransitionManager { +contract DummyChainTypeManager is ChainTypeManager { using EnumerableMap for EnumerableMap.UintToAddressMap; // add this to be excluded from coverage report @@ -17,7 +17,7 @@ contract DummyStateTransitionManager is StateTransitionManager { address hyperchain; /// @notice Constructor - constructor() StateTransitionManager(address(0)) {} + constructor() ChainTypeManager(address(0)) {} function setHyperchain(uint256 _chainId, address _hyperchain) external { hyperchain = _hyperchain; diff --git a/l1-contracts/contracts/dev-contracts/test/DummyStateTransitionManagerForValidatorTimelock.sol b/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManagerForValidatorTimelock.sol similarity index 87% rename from l1-contracts/contracts/dev-contracts/test/DummyStateTransitionManagerForValidatorTimelock.sol rename to l1-contracts/contracts/dev-contracts/test/DummyChainTypeManagerForValidatorTimelock.sol index 1543fd66e..fa38984cb 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummyStateTransitionManagerForValidatorTimelock.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManagerForValidatorTimelock.sol @@ -2,9 +2,9 @@ pragma solidity 0.8.24; -/// @title DummyStateTransitionManagerForValidatorTimelock +/// @title DummyChainTypeManagerForValidatorTimelock /// @notice A test smart contract implementing the IExecutor interface to simulate Executor behavior for testing purposes. -contract DummyStateTransitionManagerForValidatorTimelock { +contract DummyChainTypeManagerForValidatorTimelock { // add this to be excluded from coverage report function test() internal virtual {} diff --git a/l1-contracts/contracts/dev-contracts/test/DummyStateTransitionManagerWithBridgeHubAddress.sol b/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManagerWithBridgeHubAddress.sol similarity index 72% rename from l1-contracts/contracts/dev-contracts/test/DummyStateTransitionManagerWithBridgeHubAddress.sol rename to l1-contracts/contracts/dev-contracts/test/DummyChainTypeManagerWithBridgeHubAddress.sol index 4af440816..55a4c2594 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummyStateTransitionManagerWithBridgeHubAddress.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManagerWithBridgeHubAddress.sol @@ -4,16 +4,16 @@ pragma solidity 0.8.24; import {EnumerableMap} from "@openzeppelin/contracts-v4/utils/structs/EnumerableMap.sol"; -import {StateTransitionManager} from "../../state-transition/StateTransitionManager.sol"; +import {ChainTypeManager} from "../../state-transition/ChainTypeManager.sol"; /// @title DummyExecutor /// @notice A test smart contract implementing the IExecutor interface to simulate Executor behavior for testing purposes. -contract DummyStateTransitionManagerWBH is StateTransitionManager { +contract DummyChainTypeManagerWBH is ChainTypeManager { using EnumerableMap for EnumerableMap.UintToAddressMap; address hyperchain; /// @notice Constructor - constructor(address bridgeHub) StateTransitionManager(bridgeHub) {} + constructor(address bridgeHub) ChainTypeManager(bridgeHub) {} function setHyperchain(uint256 _chainId, address _hyperchain) external { hyperchain = _hyperchain; diff --git a/l1-contracts/contracts/state-transition/StateTransitionManager.sol b/l1-contracts/contracts/state-transition/ChainTypeManager.sol similarity index 95% rename from l1-contracts/contracts/state-transition/StateTransitionManager.sol rename to l1-contracts/contracts/state-transition/ChainTypeManager.sol index bff9d7d92..4bd4f02ec 100644 --- a/l1-contracts/contracts/state-transition/StateTransitionManager.sol +++ b/l1-contracts/contracts/state-transition/ChainTypeManager.sol @@ -12,7 +12,7 @@ import {DiamondProxy} from "./chain-deps/DiamondProxy.sol"; import {IAdmin} from "./chain-interfaces/IAdmin.sol"; import {IDiamondInit} from "./chain-interfaces/IDiamondInit.sol"; import {IExecutor} from "./chain-interfaces/IExecutor.sol"; -import {IStateTransitionManager, StateTransitionManagerInitializeData, ChainCreationParams} from "./IStateTransitionManager.sol"; +import {IChainTypeManager, ChainTypeManagerInitializeData, ChainCreationParams} from "./IChainTypeManager.sol"; import {IZkSyncHyperchain} from "./chain-interfaces/IZkSyncHyperchain.sol"; import {FeeParams} from "./chain-deps/ZkSyncHyperchainStorage.sol"; import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/access/Ownable2StepUpgradeable.sol"; @@ -25,7 +25,7 @@ import {IBridgehub} from "../bridgehub/IBridgehub.sol"; /// @title State Transition Manager contract /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev -contract StateTransitionManager is IStateTransitionManager, ReentrancyGuard, Ownable2StepUpgradeable { +contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpgradeable { using EnumerableMap for EnumerableMap.UintToAddressMap; /// @notice Address of the bridgehub @@ -109,7 +109,7 @@ contract StateTransitionManager is IStateTransitionManager, ReentrancyGuard, Own } /// @notice Returns the address of the hyperchain admin with the corresponding chainID. - /// @notice Not related to the STM, but it is here for legacy reasons. + /// @notice Not related to the CTM, but it is here for legacy reasons. /// @param _chainId the chainId of the chain function getChainAdmin(uint256 _chainId) external view override returns (address) { return IZkSyncHyperchain(getHyperchain(_chainId)).getAdmin(); @@ -117,7 +117,7 @@ contract StateTransitionManager is IStateTransitionManager, ReentrancyGuard, Own /// @dev initialize function initialize( - StateTransitionManagerInitializeData calldata _initializeData + ChainTypeManagerInitializeData calldata _initializeData ) external reentrancyGuardInitializer { if (_initializeData.owner == address(0)) { revert ZeroAddress(); @@ -211,7 +211,7 @@ contract StateTransitionManager is IStateTransitionManager, ReentrancyGuard, Own emit NewAdmin(previousAdmin, currentPendingAdmin); } - /// @dev set validatorTimelock. Cannot do it during initialization, as validatorTimelock is deployed after STM + /// @dev set validatorTimelock. Cannot do it during initialization, as validatorTimelock is deployed after CTM /// @param _validatorTimelock the new validatorTimelock address function setValidatorTimelock(address _validatorTimelock) external onlyOwnerOrAdmin { address oldValidatorTimelock = validatorTimelock; @@ -423,12 +423,12 @@ contract StateTransitionManager is IStateTransitionManager, ReentrancyGuard, Own { // check input bytes32 forceDeploymentHash = keccak256(abi.encode(_forceDeploymentData)); - require(forceDeploymentHash == initialForceDeploymentHash, "STM: initial force deployment mismatch"); + require(forceDeploymentHash == initialForceDeploymentHash, "CTM: initial force deployment mismatch"); } // genesis upgrade, deploys some contracts, sets chainId IAdmin(hyperchainAddress).genesisUpgrade( l1GenesisUpgrade, - address(IBridgehub(BRIDGE_HUB).l1StmDeployer()), + address(IBridgehub(BRIDGE_HUB).l1CtmDeployer()), _forceDeploymentData, _factoryDeps ); @@ -444,8 +444,8 @@ contract StateTransitionManager is IStateTransitionManager, ReentrancyGuard, Own function registerSettlementLayer(uint256 _newSettlementLayerChainId, bool _isWhitelisted) external onlyOwner { require(_newSettlementLayerChainId != 0, "Bad chain id"); - // Currently, we require that the sync layer is deployed by the same STM. - require(getHyperchain(_newSettlementLayerChainId) != address(0), "STM: sync layer not registered"); + // Currently, we require that the sync layer is deployed by the same CTM. + require(getHyperchain(_newSettlementLayerChainId) != address(0), "CTM: sync layer not registered"); IBridgehub(BRIDGE_HUB).registerSettlementLayer(_newSettlementLayerChainId, _isWhitelisted); } @@ -456,16 +456,16 @@ contract StateTransitionManager is IStateTransitionManager, ReentrancyGuard, Own function forwardedBridgeBurn( uint256 _chainId, bytes calldata _data - ) external view override onlyBridgehub returns (bytes memory stmForwardedBridgeMintData) { + ) external view override onlyBridgehub returns (bytes memory ctmForwardedBridgeMintData) { // Note that the `_diamondCut` here is not for the current chain, for the chain where the migration - // happens. The correctness of it will be checked on the STM on the new settlement layer. + // happens. The correctness of it will be checked on the CTM on the new settlement layer. (address _newSettlementLayerAdmin, bytes memory _diamondCut) = abi.decode(_data, (address, bytes)); - require(_newSettlementLayerAdmin != address(0), "STM: admin zero"); + require(_newSettlementLayerAdmin != address(0), "CTM: admin zero"); // We ensure that the chain has the latest protocol version to avoid edge cases // related to different protocol version support. address hyperchain = getHyperchain(_chainId); - require(IZkSyncHyperchain(hyperchain).getProtocolVersion() == protocolVersion, "STM: outdated pv"); + require(IZkSyncHyperchain(hyperchain).getProtocolVersion() == protocolVersion, "CTM: outdated pv"); return abi.encode( @@ -478,19 +478,19 @@ contract StateTransitionManager is IStateTransitionManager, ReentrancyGuard, Own /// @notice Called by the bridgehub during the migration of a chain to the current settlement layer. /// @param _chainId The chain id of the chain to be migrated. - /// @param _stmData The data returned from `forwardedBridgeBurn` for the chain. + /// @param _ctmData The data returned from `forwardedBridgeBurn` for the chain. function forwardedBridgeMint( uint256 _chainId, - bytes calldata _stmData + bytes calldata _ctmData ) external override onlyBridgehub returns (address chainAddress) { (bytes32 _baseTokenAssetId, address _admin, uint256 _protocolVersion, bytes memory _diamondCut) = abi.decode( - _stmData, + _ctmData, (bytes32, address, uint256, bytes) ); // We ensure that the chain has the latest protocol version to avoid edge cases // related to different protocol version support. - require(_protocolVersion == protocolVersion, "STM, outdated pv"); + require(_protocolVersion == protocolVersion, "CTM, outdated pv"); chainAddress = _deployNewChain({ _chainId: _chainId, _baseTokenAssetId: _baseTokenAssetId, @@ -504,12 +504,12 @@ contract StateTransitionManager is IStateTransitionManager, ReentrancyGuard, Own /// param _chainId the chainId of the chain /// param _assetInfo the assetInfo of the chain /// param _depositSender the address of that sent the deposit - /// param _stmData the data of the migration + /// param _ctmData the data of the migration function forwardedBridgeRecoverFailedTransfer( uint256 /* _chainId */, bytes32 /* _assetInfo */, address /* _depositSender */, - bytes calldata /* _stmData */ + bytes calldata /* _ctmData */ ) external { // Function is empty due to the fact that when calling `forwardedBridgeBurn` there are no // state updates that occur. diff --git a/l1-contracts/contracts/state-transition/IStateTransitionManager.sol b/l1-contracts/contracts/state-transition/IChainTypeManager.sol similarity index 95% rename from l1-contracts/contracts/state-transition/IStateTransitionManager.sol rename to l1-contracts/contracts/state-transition/IChainTypeManager.sol index 9c2785259..2e8fadcb5 100644 --- a/l1-contracts/contracts/state-transition/IStateTransitionManager.sol +++ b/l1-contracts/contracts/state-transition/IChainTypeManager.sol @@ -8,13 +8,13 @@ import {FeeParams} from "./chain-deps/ZkSyncHyperchainStorage.sol"; // import {IBridgehub} from "../bridgehub/IBridgehub.sol"; -/// @notice Struct that holds all data needed for initializing STM Proxy. +/// @notice Struct that holds all data needed for initializing CTM Proxy. /// @dev We use struct instead of raw parameters in `initialize` function to prevent "Stack too deep" error /// @param owner The address who can manage non-critical updates in the contract /// @param validatorTimelock The address that serves as consensus, i.e. can submit blocks to be processed /// @param chainCreationParams The struct that contains the fields that define how a new chain should be created /// @param protocolVersion The initial protocol version on the newly deployed chain -struct StateTransitionManagerInitializeData { +struct ChainTypeManagerInitializeData { address owner; address validatorTimelock; ChainCreationParams chainCreationParams; @@ -22,7 +22,7 @@ struct StateTransitionManagerInitializeData { } /// @notice The struct that contains the fields that define how a new chain should be created -/// within this STM. +/// within this CTM. /// @param genesisUpgrade The address that is used in the diamond cut initialize address on chain creation /// @param genesisBatchHash Batch hash of the genesis (initial) batch /// @param genesisIndexRepeatedStorageChanges The serial number of the shortcut storage key for the genesis batch @@ -38,7 +38,7 @@ struct ChainCreationParams { bytes forceDeploymentsData; } -interface IStateTransitionManager { +interface IChainTypeManager { /// @dev Emitted when a new Hyperchain is added event NewHyperchain(uint256 indexed _chainId, address indexed _hyperchainContract); @@ -104,7 +104,7 @@ interface IStateTransitionManager { function getProtocolVersion(uint256 _chainId) external view returns (uint256); - function initialize(StateTransitionManagerInitializeData calldata _initializeData) external; + function initialize(ChainTypeManagerInitializeData calldata _initializeData) external; function setValidatorTimelock(address _validatorTimelock) external; @@ -169,6 +169,6 @@ interface IStateTransitionManager { uint256 _chainId, bytes32 _assetInfo, address _depositSender, - bytes calldata _stmData + bytes calldata _ctmData ) external; } diff --git a/l1-contracts/contracts/state-transition/ValidatorTimelock.sol b/l1-contracts/contracts/state-transition/ValidatorTimelock.sol index ecf0d6dcc..5146952c6 100644 --- a/l1-contracts/contracts/state-transition/ValidatorTimelock.sol +++ b/l1-contracts/contracts/state-transition/ValidatorTimelock.sol @@ -5,7 +5,7 @@ pragma solidity 0.8.24; import {Ownable2Step} from "@openzeppelin/contracts-v4/access/Ownable2Step.sol"; import {LibMap} from "./libraries/LibMap.sol"; import {IExecutor} from "./chain-interfaces/IExecutor.sol"; -import {IStateTransitionManager} from "./IStateTransitionManager.sol"; +import {IChainTypeManager} from "./IChainTypeManager.sol"; import {PriorityOpsBatchInfo} from "./libraries/PriorityTree.sol"; import {Unauthorized, TimeNotReached, ZeroAddress} from "../common/L1ContractErrors.sol"; @@ -41,8 +41,8 @@ contract ValidatorTimelock is IExecutor, Ownable2Step { /// @notice Error for when an address is not a validator. error ValidatorDoesNotExist(uint256 _chainId); - /// @dev The stateTransitionManager smart contract. - IStateTransitionManager public stateTransitionManager; + /// @dev The chainTypeManager smart contract. + IChainTypeManager public chainTypeManager; /// @dev The mapping of L2 chainId => batch number => timestamp when it was committed. mapping(uint256 chainId => LibMap.Uint32Map batchNumberToTimestampMapping) internal committedBatchTimestamp; @@ -64,7 +64,7 @@ contract ValidatorTimelock is IExecutor, Ownable2Step { /// @notice Checks if the caller is the admin of the chain. modifier onlyChainAdmin(uint256 _chainId) { - if (msg.sender != stateTransitionManager.getChainAdmin(_chainId)) { + if (msg.sender != chainTypeManager.getChainAdmin(_chainId)) { revert Unauthorized(msg.sender); } _; @@ -79,11 +79,11 @@ contract ValidatorTimelock is IExecutor, Ownable2Step { } /// @dev Sets a new state transition manager. - function setStateTransitionManager(IStateTransitionManager _stateTransitionManager) external onlyOwner { - if (address(_stateTransitionManager) == address(0)) { + function setChainTypeManager(IChainTypeManager _chainTypeManager) external onlyOwner { + if (address(_chainTypeManager) == address(0)) { revert ZeroAddress(); } - stateTransitionManager = _stateTransitionManager; + chainTypeManager = _chainTypeManager; } /// @dev Sets an address as a validator. @@ -193,7 +193,7 @@ contract ValidatorTimelock is IExecutor, Ownable2Step { /// @dev Call the hyperchain diamond contract with the same calldata as this contract was called. /// Note: it is called the hyperchain diamond contract, not delegatecalled! function _propagateToZkSyncHyperchain(uint256 _chainId) internal { - address contractAddress = stateTransitionManager.getHyperchain(_chainId); + address contractAddress = chainTypeManager.getHyperchain(_chainId); assembly { // Copy function signature and arguments from calldata at zero position into memory at pointer position calldatacopy(0, 0, calldatasize()) diff --git a/l1-contracts/contracts/state-transition/chain-deps/DiamondInit.sol b/l1-contracts/contracts/state-transition/chain-deps/DiamondInit.sol index 10707950e..453d67f56 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/DiamondInit.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/DiamondInit.sol @@ -39,7 +39,7 @@ contract DiamondInit is ZkSyncHyperchainBase, IDiamondInit { if (_initializeData.bridgehub == address(0)) { revert ZeroAddress(); } - if (_initializeData.stateTransitionManager == address(0)) { + if (_initializeData.chainTypeManager == address(0)) { revert ZeroAddress(); } if (_initializeData.baseTokenAssetId == bytes32(0)) { @@ -54,7 +54,7 @@ contract DiamondInit is ZkSyncHyperchainBase, IDiamondInit { s.chainId = _initializeData.chainId; s.bridgehub = _initializeData.bridgehub; - s.stateTransitionManager = _initializeData.stateTransitionManager; + s.chainTypeManager = _initializeData.chainTypeManager; s.baseTokenAssetId = _initializeData.baseTokenAssetId; s.baseTokenBridge = _initializeData.baseTokenBridge; s.protocolVersion = _initializeData.protocolVersion; diff --git a/l1-contracts/contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol b/l1-contracts/contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol index 93c348c3f..5611ffbe2 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.24; import {IVerifier, VerifierParams} from "../chain-interfaces/IVerifier.sol"; -// import {IStateTransitionManager} from "../IStateTransitionManager.sol"; +// import {IChainTypeManager} from "../IChainTypeManager.sol"; import {PriorityQueue} from "../../state-transition/libraries/PriorityQueue.sol"; import {PriorityTree} from "../../state-transition/libraries/PriorityTree.sol"; @@ -69,7 +69,7 @@ struct FeeParams { struct ZkSyncHyperchainStorage { /// @dev Storage of variables needed for deprecated diamond cut facet uint256[7] __DEPRECATED_diamondCutStorage; - /// @notice Address which will exercise critical changes to the Diamond Proxy (upgrades, freezing & unfreezing). Replaced by STM + /// @notice Address which will exercise critical changes to the Diamond Proxy (upgrades, freezing & unfreezing). Replaced by CTM address __DEPRECATED_governor; /// @notice Address that the governor proposed as one that will replace it address __DEPRECATED_pendingGovernor; @@ -144,8 +144,8 @@ struct ZkSyncHyperchainStorage { uint256 chainId; /// @dev The address of the bridgehub address bridgehub; - /// @dev The address of the StateTransitionManager - address stateTransitionManager; + /// @dev The address of the ChainTypeManager + address chainTypeManager; /// @dev The address of the baseToken contract. Eth is address(1) address __DEPRECATED_baseToken; /// @dev The address of the baseTokenbridge. Eth also uses the shared bridge diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol index e09f3b6a3..d3859cbc4 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol @@ -11,7 +11,7 @@ import {FeeParams, PubdataPricingMode} from "../ZkSyncHyperchainStorage.sol"; import {PriorityTree} from "../../../state-transition/libraries/PriorityTree.sol"; import {PriorityQueue} from "../../../state-transition/libraries/PriorityQueue.sol"; import {ZkSyncHyperchainBase} from "./ZkSyncHyperchainBase.sol"; -import {IStateTransitionManager} from "../../IStateTransitionManager.sol"; +import {IChainTypeManager} from "../../IChainTypeManager.sol"; import {IL1GenesisUpgrade} from "../../../upgrades/IL1GenesisUpgrade.sol"; import {Unauthorized, TooMuchGas, PriorityTxPubdataExceedsMaxPubDataPerBatch, InvalidPubdataPricingMode, ProtocolIdMismatch, ChainAlreadyLive, HashMismatch, ProtocolIdNotGreater, DenominatorIsZero, DiamondAlreadyFrozen, DiamondNotFrozen} from "../../../common/L1ContractErrors.sol"; @@ -67,20 +67,20 @@ contract AdminFacet is ZkSyncHyperchainBase, IAdmin { } /// @inheritdoc IAdmin - function setValidator(address _validator, bool _active) external onlyStateTransitionManager { + function setValidator(address _validator, bool _active) external onlyChainTypeManager { s.validators[_validator] = _active; emit ValidatorStatusUpdate(_validator, _active); } /// @inheritdoc IAdmin - function setPorterAvailability(bool _zkPorterIsAvailable) external onlyStateTransitionManager { + function setPorterAvailability(bool _zkPorterIsAvailable) external onlyChainTypeManager { // Change the porter availability s.zkPorterIsAvailable = _zkPorterIsAvailable; emit IsPorterAvailableStatusUpdate(_zkPorterIsAvailable); } /// @inheritdoc IAdmin - function setPriorityTxMaxGasLimit(uint256 _newPriorityTxMaxGasLimit) external onlyStateTransitionManager { + function setPriorityTxMaxGasLimit(uint256 _newPriorityTxMaxGasLimit) external onlyChainTypeManager { if (_newPriorityTxMaxGasLimit > MAX_GAS_PER_TRANSACTION) { revert TooMuchGas(); } @@ -91,7 +91,7 @@ contract AdminFacet is ZkSyncHyperchainBase, IAdmin { } /// @inheritdoc IAdmin - function changeFeeParams(FeeParams calldata _newFeeParams) external onlyAdminOrStateTransitionManager onlyL1 { + function changeFeeParams(FeeParams calldata _newFeeParams) external onlyAdminOrChainTypeManager onlyL1 { // Double checking that the new fee params are valid, i.e. // the maximal pubdata per batch is not less than the maximal pubdata per priority transaction. if (_newFeeParams.maxPubdataPerBatch < _newFeeParams.priorityTxMaxPubdata) { @@ -111,7 +111,7 @@ contract AdminFacet is ZkSyncHyperchainBase, IAdmin { } /// @inheritdoc IAdmin - function setTokenMultiplier(uint128 _nominator, uint128 _denominator) external onlyAdminOrStateTransitionManager { + function setTokenMultiplier(uint128 _nominator, uint128 _denominator) external onlyAdminOrChainTypeManager { if (_denominator == 0) { revert DenominatorIsZero(); } @@ -168,9 +168,9 @@ contract AdminFacet is ZkSyncHyperchainBase, IAdmin { function upgradeChainFromVersion( uint256 _oldProtocolVersion, Diamond.DiamondCutData calldata _diamondCut - ) external onlyAdminOrStateTransitionManager { + ) external onlyAdminOrChainTypeManager { bytes32 cutHashInput = keccak256(abi.encode(_diamondCut)); - bytes32 upgradeCutHash = IStateTransitionManager(s.stateTransitionManager).upgradeCutHash(_oldProtocolVersion); + bytes32 upgradeCutHash = IChainTypeManager(s.chainTypeManager).upgradeCutHash(_oldProtocolVersion); if (cutHashInput != upgradeCutHash) { revert HashMismatch(upgradeCutHash, cutHashInput); } @@ -186,7 +186,7 @@ contract AdminFacet is ZkSyncHyperchainBase, IAdmin { } /// @inheritdoc IAdmin - function executeUpgrade(Diamond.DiamondCutData calldata _diamondCut) external onlyStateTransitionManager { + function executeUpgrade(Diamond.DiamondCutData calldata _diamondCut) external onlyChainTypeManager { Diamond.diamondCut(_diamondCut); emit ExecuteUpgrade(_diamondCut); } @@ -194,17 +194,17 @@ contract AdminFacet is ZkSyncHyperchainBase, IAdmin { /// @dev we have to set the chainId at genesis, as blockhashzero is the same for all chains with the same chainId function genesisUpgrade( address _l1GenesisUpgrade, - address _stmDeployer, + address _ctmDeployer, bytes calldata _forceDeploymentData, bytes[] calldata _factoryDeps - ) external onlyStateTransitionManager { + ) external onlyChainTypeManager { Diamond.FacetCut[] memory emptyArray; Diamond.DiamondCutData memory cutData = Diamond.DiamondCutData({ facetCuts: emptyArray, initAddress: _l1GenesisUpgrade, initCalldata: abi.encodeCall( IL1GenesisUpgrade.genesisUpgrade, - (_l1GenesisUpgrade, s.chainId, s.protocolVersion, _stmDeployer, _forceDeploymentData, _factoryDeps) + (_l1GenesisUpgrade, s.chainId, s.protocolVersion, _ctmDeployer, _forceDeploymentData, _factoryDeps) ) }); @@ -216,7 +216,7 @@ contract AdminFacet is ZkSyncHyperchainBase, IAdmin { //////////////////////////////////////////////////////////////*/ /// @inheritdoc IAdmin - function freezeDiamond() external onlyStateTransitionManager { + function freezeDiamond() external onlyChainTypeManager { Diamond.DiamondStorage storage diamondStorage = Diamond.getDiamondStorage(); // diamond proxy is frozen already @@ -229,7 +229,7 @@ contract AdminFacet is ZkSyncHyperchainBase, IAdmin { } /// @inheritdoc IAdmin - function unfreezeDiamond() external onlyStateTransitionManager { + function unfreezeDiamond() external onlyChainTypeManager { Diamond.DiamondStorage storage diamondStorage = Diamond.getDiamondStorage(); // diamond proxy is not frozen @@ -258,7 +258,7 @@ contract AdminFacet is ZkSyncHyperchainBase, IAdmin { uint256 currentProtocolVersion = s.protocolVersion; - require(currentProtocolVersion == protocolVersion, "STM: protocolVersion not up to date"); + require(currentProtocolVersion == protocolVersion, "CTM: protocolVersion not up to date"); s.settlementLayer = _settlementLayer; chainBridgeMintData = abi.encode(prepareChainCommitment()); @@ -271,11 +271,11 @@ contract AdminFacet is ZkSyncHyperchainBase, IAdmin { ) external payable override onlyBridgehub { HyperchainCommitment memory _commitment = abi.decode(_data, (HyperchainCommitment)); - IStateTransitionManager stm = IStateTransitionManager(s.stateTransitionManager); + IChainTypeManager ctm = IChainTypeManager(s.chainTypeManager); uint256 currentProtocolVersion = s.protocolVersion; - uint256 protocolVersion = stm.protocolVersion(); - require(currentProtocolVersion == protocolVersion, "STM: protocolVersion not up to date"); + uint256 protocolVersion = ctm.protocolVersion(); + require(currentProtocolVersion == protocolVersion, "CTM: protocolVersion not up to date"); uint256 batchesExecuted = _commitment.totalBatchesExecuted; uint256 batchesVerified = _commitment.totalBatchesVerified; @@ -351,7 +351,7 @@ contract AdminFacet is ZkSyncHyperchainBase, IAdmin { uint256 currentProtocolVersion = s.protocolVersion; - require(currentProtocolVersion == protocolVersion, "STM: protocolVersion not up to date"); + require(currentProtocolVersion == protocolVersion, "CTM: protocolVersion not up to date"); s.settlementLayer = address(0); } diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol index ea459a6d0..61822df3e 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol @@ -13,7 +13,7 @@ import {PriorityQueue, PriorityOperation} from "../../libraries/PriorityQueue.so import {UncheckedMath} from "../../../common/libraries/UncheckedMath.sol"; import {UnsafeBytes} from "../../../common/libraries/UnsafeBytes.sol"; import {L2_BOOTLOADER_ADDRESS, L2_TO_L1_MESSENGER_SYSTEM_CONTRACT_ADDR, L2_SYSTEM_CONTEXT_SYSTEM_CONTRACT_ADDR} from "../../../common/L2ContractAddresses.sol"; -import {IStateTransitionManager} from "../../IStateTransitionManager.sol"; +import {IChainTypeManager} from "../../IChainTypeManager.sol"; import {PriorityTree, PriorityOpsBatchInfo} from "../../libraries/PriorityTree.sol"; import {IL1DAValidator, L1DAValidatorOutput} from "../../chain-interfaces/IL1DAValidator.sol"; import {BatchNumberMismatch, TimeNotReached, ValueMismatch, HashMismatch, NonIncreasingTimestamp, TimestampError, InvalidLogSender, TxHashMismatch, UnexpectedSystemLog, LogAlreadyProcessed, InvalidProtocolVersion, CanOnlyProcessOneBatch, BatchHashMismatch, UpgradeBatchNumberIsNotZero, NonSequentialBatch, CantExecuteUnprovenBatches, SystemLogsSizeTooBig, InvalidNumberOfBlobs, VerifiedBatchesExceedsCommittedBatches, InvalidProof, RevertedBatchNotAfterNewLastBatch, CantRevertExecutedBatch, L2TimestampTooBig, PriorityOperationsRollingHashMismatch} from "../../../common/L1ContractErrors.sol"; @@ -249,7 +249,7 @@ contract ExecutorFacet is ZkSyncHyperchainBase, IExecutor { // 2. A chain might become out of sync if it launches while we are in the middle of a protocol upgrade. This would mean they cannot process their genesis upgrade // as their protocolversion would be outdated, and they also cannot process the protocol upgrade tx as they have a pending upgrade. // 3. The protocol upgrade is increased in the BaseZkSyncUpgrade, in the executor only the systemContractsUpgradeTxHash is checked - if (!IStateTransitionManager(s.stateTransitionManager).protocolVersionIsActive(s.protocolVersion)) { + if (!IChainTypeManager(s.chainTypeManager).protocolVersionIsActive(s.protocolVersion)) { revert InvalidProtocolVersion(); } // With the new changes for EIP-4844, namely the restriction on number of blobs per block, we only allow for a single batch to be committed at a time. diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol index 7542c63fe..0c1569617 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol @@ -56,8 +56,8 @@ contract GettersFacet is ZkSyncHyperchainBase, IGetters, ILegacyGetters { } /// @inheritdoc IGetters - function getStateTransitionManager() external view returns (address) { - return s.stateTransitionManager; + function getChainTypeManager() external view returns (address) { + return s.chainTypeManager; } /// @inheritdoc IGetters diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol index 516b686a0..5ce1758a6 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol @@ -7,7 +7,7 @@ pragma solidity 0.8.24; import {Math} from "@openzeppelin/contracts-v4/utils/math/Math.sol"; import {IMailbox} from "../../chain-interfaces/IMailbox.sol"; -import {IStateTransitionManager} from "../../IStateTransitionManager.sol"; +import {IChainTypeManager} from "../../IChainTypeManager.sol"; import {IBridgehub} from "../../../bridgehub/IBridgehub.sol"; import {ITransactionFilterer} from "../../chain-interfaces/ITransactionFilterer.sol"; @@ -271,7 +271,7 @@ contract MailboxFacet is ZkSyncHyperchainBase, IMailbox { // to a chain's message root only if the chain has indeed executed its batch on top of it. // // We trust all chains whitelisted by the Bridgehub governance. - require(IBridgehub(s.bridgehub).whitelistedSettlementLayers(settlementLayerChainId), "Mailbox: wrong STM"); + require(IBridgehub(s.bridgehub).whitelistedSettlementLayers(settlementLayerChainId), "Mailbox: wrong CTM"); settlementLayerAddress = IBridgehub(s.bridgehub).getHyperchain(settlementLayerChainId); } @@ -373,7 +373,7 @@ contract MailboxFacet is ZkSyncHyperchainBase, IMailbox { ) external override onlyL1 returns (bytes32 canonicalTxHash) { require(IBridgehub(s.bridgehub).whitelistedSettlementLayers(s.chainId), "Mailbox SL: not SL"); require( - IStateTransitionManager(s.stateTransitionManager).getHyperchain(_chainId) == msg.sender, + IChainTypeManager(s.chainTypeManager).getHyperchain(_chainId) == msg.sender, "Mailbox SL: not hyperchain" ); diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/ZkSyncHyperchainBase.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/ZkSyncHyperchainBase.sol index 0910fcab3..cc30341e8 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/ZkSyncHyperchainBase.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/ZkSyncHyperchainBase.sol @@ -30,8 +30,8 @@ contract ZkSyncHyperchainBase is ReentrancyGuard { _; } - modifier onlyStateTransitionManager() { - if (msg.sender != s.stateTransitionManager) { + modifier onlyChainTypeManager() { + if (msg.sender != s.chainTypeManager) { revert Unauthorized(msg.sender); } _; @@ -44,15 +44,15 @@ contract ZkSyncHyperchainBase is ReentrancyGuard { _; } - modifier onlyAdminOrStateTransitionManager() { - if (msg.sender != s.admin && msg.sender != s.stateTransitionManager) { + modifier onlyAdminOrChainTypeManager() { + if (msg.sender != s.admin && msg.sender != s.chainTypeManager) { revert Unauthorized(msg.sender); } _; } - modifier onlyValidatorOrStateTransitionManager() { - if (!s.validators[msg.sender] && msg.sender != s.stateTransitionManager) { + modifier onlyValidatorOrChainTypeManager() { + if (!s.validators[msg.sender] && msg.sender != s.chainTypeManager) { revert Unauthorized(msg.sender); } _; diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol index 216aa138a..4d6dc8c54 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol @@ -61,12 +61,12 @@ interface IAdmin is IZkSyncHyperchainBase { function freezeDiamond() external; /// @notice Unpause the functionality of all freezable facets & their selectors - /// @dev Both the admin and the STM can unfreeze Diamond Proxy + /// @dev Both the admin and the CTM can unfreeze Diamond Proxy function unfreezeDiamond() external; function genesisUpgrade( address _l1GenesisUpgrade, - address _stmDeployer, + address _ctmDeployer, bytes calldata _forceDeploymentData, bytes[] calldata _factoryDeps ) external; diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol index 81c09f759..3d78a25ce 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol @@ -7,7 +7,7 @@ import {FeeParams} from "../chain-deps/ZkSyncHyperchainStorage.sol"; /// @param chainId the id of the chain /// @param bridgehub the address of the bridgehub contract -/// @param stateTransitionManager contract's address +/// @param chainTypeManager contract's address /// @param protocolVersion initial protocol version /// @param validatorTimelock address of the validator timelock that delays execution /// @param admin address who can manage the contract @@ -25,7 +25,7 @@ import {FeeParams} from "../chain-deps/ZkSyncHyperchainStorage.sol"; struct InitializeData { uint256 chainId; address bridgehub; - address stateTransitionManager; + address chainTypeManager; uint256 protocolVersion; address admin; address validatorTimelock; diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol index 2b0ce8bc1..4d61e8030 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol @@ -30,7 +30,7 @@ interface IGetters is IZkSyncHyperchainBase { function getBridgehub() external view returns (address); /// @return The address of the state transition - function getStateTransitionManager() external view returns (address); + function getChainTypeManager() external view returns (address); /// @return The chain ID function getChainId() external view returns (uint256); diff --git a/l1-contracts/contracts/state-transition/l2-deps/IL2GenesisUpgrade.sol b/l1-contracts/contracts/state-transition/l2-deps/IL2GenesisUpgrade.sol index cce858e3e..daddd142a 100644 --- a/l1-contracts/contracts/state-transition/l2-deps/IL2GenesisUpgrade.sol +++ b/l1-contracts/contracts/state-transition/l2-deps/IL2GenesisUpgrade.sol @@ -22,7 +22,7 @@ interface IL2GenesisUpgrade { function genesisUpgrade( uint256 _chainId, - address _stmDeployer, + address _ctmDeployer, bytes calldata _forceDeploymentsData ) external payable; } diff --git a/l1-contracts/contracts/upgrades/IL1GenesisUpgrade.sol b/l1-contracts/contracts/upgrades/IL1GenesisUpgrade.sol index cb1fc7bf8..0c6f8fd41 100644 --- a/l1-contracts/contracts/upgrades/IL1GenesisUpgrade.sol +++ b/l1-contracts/contracts/upgrades/IL1GenesisUpgrade.sol @@ -17,7 +17,7 @@ interface IL1GenesisUpgrade { address _l1GenesisUpgrade, uint256 _chainId, uint256 _protocolVersion, - address _l1StmDeployerAddress, + address _l1CtmDeployerAddress, bytes calldata _forceDeployments, bytes[] calldata _factoryDeps ) external returns (bytes32); diff --git a/l1-contracts/contracts/upgrades/L1GenesisUpgrade.sol b/l1-contracts/contracts/upgrades/L1GenesisUpgrade.sol index 455f762ba..4637c535d 100644 --- a/l1-contracts/contracts/upgrades/L1GenesisUpgrade.sol +++ b/l1-contracts/contracts/upgrades/L1GenesisUpgrade.sol @@ -26,7 +26,7 @@ contract L1GenesisUpgrade is IL1GenesisUpgrade, BaseZkSyncUpgradeGenesis { address _l1GenesisUpgrade, uint256 _chainId, uint256 _protocolVersion, - address _l1StmDeployerAddress, + address _l1CtmDeployerAddress, bytes calldata _forceDeploymentsData, bytes[] calldata _factoryDeps ) public override returns (bytes32) { @@ -37,7 +37,7 @@ contract L1GenesisUpgrade is IL1GenesisUpgrade, BaseZkSyncUpgradeGenesis { { bytes memory l2GenesisUpgradeCalldata = abi.encodeCall( IL2GenesisUpgrade.genesisUpgrade, - (_chainId, _l1StmDeployerAddress, _forceDeploymentsData) + (_chainId, _l1CtmDeployerAddress, _forceDeploymentsData) ); complexUpgraderCalldata = abi.encodeCall( IComplexUpgrader.upgrade, diff --git a/l1-contracts/deploy-scripts/DecentralizeGovernanceUpgradeScript.s.sol b/l1-contracts/deploy-scripts/DecentralizeGovernanceUpgradeScript.s.sol index 953bfe296..39ecc4efd 100644 --- a/l1-contracts/deploy-scripts/DecentralizeGovernanceUpgradeScript.s.sol +++ b/l1-contracts/deploy-scripts/DecentralizeGovernanceUpgradeScript.s.sol @@ -8,22 +8,22 @@ import {ProxyAdmin} from "@openzeppelin/contracts-v4/proxy/transparent/ProxyAdmi import {ITransparentUpgradeableProxy} from "@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol"; import {Governance} from "contracts/governance/Governance.sol"; -import {IStateTransitionManager} from "contracts/state-transition/IStateTransitionManager.sol"; +import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol"; import {Utils} from "./Utils.sol"; contract DecentralizeGovernanceUpgradeScript is Script { - function upgradeSTM( + function upgradeCTM( ProxyAdmin _proxyAdmin, - ITransparentUpgradeableProxy _stmProxy, + ITransparentUpgradeableProxy _ctmProxy, Governance _governance, - address _newStmImpl + address _newCtmImpl ) public { // solhint-disable-next-line gas-custom-errors - require(_proxyAdmin.getProxyAdmin(_stmProxy) == address(_proxyAdmin), "Proxy admin incorrect"); + require(_proxyAdmin.getProxyAdmin(_ctmProxy) == address(_proxyAdmin), "Proxy admin incorrect"); // solhint-disable-next-line gas-custom-errors require(_proxyAdmin.owner() == address(_governance), "Proxy admin owner incorrect"); - bytes memory proxyAdminUpgradeData = abi.encodeCall(ProxyAdmin.upgrade, (_stmProxy, _newStmImpl)); + bytes memory proxyAdminUpgradeData = abi.encodeCall(ProxyAdmin.upgrade, (_ctmProxy, _newCtmImpl)); Utils.executeUpgrade({ _governor: address(_governance), @@ -36,7 +36,7 @@ contract DecentralizeGovernanceUpgradeScript is Script { } function setPendingAdmin(address _target, Governance _governance, address _pendingAdmin) public { - bytes memory upgradeData = abi.encodeCall(IStateTransitionManager.setPendingAdmin, (_pendingAdmin)); + bytes memory upgradeData = abi.encodeCall(IChainTypeManager.setPendingAdmin, (_pendingAdmin)); Utils.executeUpgrade({ _governor: address(_governance), _salt: bytes32(0), diff --git a/l1-contracts/deploy-scripts/DeployL1.s.sol b/l1-contracts/deploy-scripts/DeployL1.s.sol index ca9d96357..19421a5ac 100644 --- a/l1-contracts/deploy-scripts/DeployL1.s.sol +++ b/l1-contracts/deploy-scripts/DeployL1.s.sol @@ -19,16 +19,16 @@ import {ChainAdmin} from "contracts/governance/ChainAdmin.sol"; import {ValidatorTimelock} from "contracts/state-transition/ValidatorTimelock.sol"; import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; import {MessageRoot} from "contracts/bridgehub/MessageRoot.sol"; -import {STMDeploymentTracker} from "contracts/bridgehub/STMDeploymentTracker.sol"; +import {CTMDeploymentTracker} from "contracts/bridgehub/CTMDeploymentTracker.sol"; import {L1NativeTokenVault} from "contracts/bridge/L1NativeTokenVault.sol"; import {ExecutorFacet} from "contracts/state-transition/chain-deps/facets/Executor.sol"; import {AdminFacet} from "contracts/state-transition/chain-deps/facets/Admin.sol"; import {MailboxFacet} from "contracts/state-transition/chain-deps/facets/Mailbox.sol"; import {GettersFacet} from "contracts/state-transition/chain-deps/facets/Getters.sol"; import {DiamondInit} from "contracts/state-transition/chain-deps/DiamondInit.sol"; -import {StateTransitionManager} from "contracts/state-transition/StateTransitionManager.sol"; -import {StateTransitionManagerInitializeData, ChainCreationParams} from "contracts/state-transition/IStateTransitionManager.sol"; -import {IStateTransitionManager} from "contracts/state-transition/IStateTransitionManager.sol"; +import {ChainTypeManager} from "contracts/state-transition/ChainTypeManager.sol"; +import {ChainTypeManagerInitializeData, ChainCreationParams} from "contracts/state-transition/IChainTypeManager.sol"; +import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; import {InitializeDataNewChain as DiamondInitializeDataNewChain} from "contracts/state-transition/chain-interfaces/IDiamondInit.sol"; import {FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; @@ -39,7 +39,7 @@ import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; import {IL1NativeTokenVault} from "contracts/bridge/interfaces/IL1NativeTokenVault.sol"; import {AddressHasNoCode} from "./ZkSyncScriptErrors.sol"; -import {ISTMDeploymentTracker} from "contracts/bridgehub/ISTMDeploymentTracker.sol"; +import {ICTMDeploymentTracker} from "contracts/bridgehub/ICTMDeploymentTracker.sol"; import {IMessageRoot} from "contracts/bridgehub/IMessageRoot.sol"; contract DeployL1Script is Script { @@ -72,8 +72,8 @@ contract DeployL1Script is Script { struct BridgehubDeployedAddresses { address bridgehubImplementation; address bridgehubProxy; - address stmDeploymentTrackerImplementation; - address stmDeploymentTrackerProxy; + address ctmDeploymentTrackerImplementation; + address ctmDeploymentTrackerProxy; address messageRootImplementation; address messageRootProxy; } @@ -174,12 +174,12 @@ contract DeployL1Script is Script { deployErc20BridgeImplementation(); deployErc20BridgeProxy(); updateSharedBridge(); - deploySTMDeploymentTracker(); + deployCTMDeploymentTracker(); registerSharedBridge(); deployBlobVersionedHashRetriever(); - deployStateTransitionManagerContract(); - setStateTransitionManagerInValidatorTimelock(); + deployChainTypeManagerContract(); + setChainTypeManagerInValidatorTimelock(); // deployDiamondProxy(); @@ -200,7 +200,7 @@ contract DeployL1Script is Script { return config.ownerAddress; } - function getSTM() public view returns (address) { + function getCTM() public view returns (address) { return addresses.stateTransition.stateTransitionProxy; } @@ -411,26 +411,26 @@ contract DeployL1Script is Script { addresses.bridgehub.messageRootProxy = messageRootProxy; } - function deploySTMDeploymentTracker() internal { - bytes memory stmDTBytecode = abi.encodePacked( - type(STMDeploymentTracker).creationCode, + function deployCTMDeploymentTracker() internal { + bytes memory ctmDTBytecode = abi.encodePacked( + type(CTMDeploymentTracker).creationCode, abi.encode(addresses.bridgehub.bridgehubProxy, addresses.bridges.sharedBridgeProxy) ); - address stmDTImplementation = deployViaCreate2(stmDTBytecode); - console.log("STM Deployment Tracker Implementation deployed at:", stmDTImplementation); - addresses.bridgehub.stmDeploymentTrackerImplementation = stmDTImplementation; + address ctmDTImplementation = deployViaCreate2(ctmDTBytecode); + console.log("CTM Deployment Tracker Implementation deployed at:", ctmDTImplementation); + addresses.bridgehub.ctmDeploymentTrackerImplementation = ctmDTImplementation; bytes memory bytecode = abi.encodePacked( type(TransparentUpgradeableProxy).creationCode, abi.encode( - stmDTImplementation, + ctmDTImplementation, addresses.transparentProxyAdmin, - abi.encodeCall(STMDeploymentTracker.initialize, (config.deployerAddress)) + abi.encodeCall(CTMDeploymentTracker.initialize, (config.deployerAddress)) ) ); - address stmDTProxy = deployViaCreate2(bytecode); - console.log("STM Deployment Tracker Proxy deployed at:", stmDTProxy); - addresses.bridgehub.stmDeploymentTrackerProxy = stmDTProxy; + address ctmDTProxy = deployViaCreate2(bytecode); + console.log("CTM Deployment Tracker Proxy deployed at:", ctmDTProxy); + addresses.bridgehub.ctmDeploymentTrackerProxy = ctmDTProxy; } function deployBlobVersionedHashRetriever() internal { @@ -441,11 +441,11 @@ contract DeployL1Script is Script { addresses.blobVersionedHashRetriever = contractAddress; } - function deployStateTransitionManagerContract() internal { + function deployChainTypeManagerContract() internal { deployStateTransitionDiamondFacets(); - deployStateTransitionManagerImplementation(); - deployStateTransitionManagerProxy(); - registerStateTransitionManager(); + deployChainTypeManagerImplementation(); + deployChainTypeManagerProxy(); + registerChainTypeManager(); } function deployStateTransitionDiamondFacets() internal { @@ -474,17 +474,17 @@ contract DeployL1Script is Script { addresses.stateTransition.diamondInit = diamondInit; } - function deployStateTransitionManagerImplementation() internal { + function deployChainTypeManagerImplementation() internal { bytes memory bytecode = abi.encodePacked( - type(StateTransitionManager).creationCode, + type(ChainTypeManager).creationCode, abi.encode(addresses.bridgehub.bridgehubProxy) ); address contractAddress = deployViaCreate2(bytecode); - console.log("StateTransitionManagerImplementation deployed at:", contractAddress); + console.log("ChainTypeManagerImplementation deployed at:", contractAddress); addresses.stateTransition.stateTransitionImplementation = contractAddress; } - function deployStateTransitionManagerProxy() internal { + function deployChainTypeManagerProxy() internal { Diamond.FacetCut[] memory facetCuts = new Diamond.FacetCut[](4); facetCuts[0] = Diamond.FacetCut({ facet: addresses.stateTransition.adminFacet, @@ -553,7 +553,7 @@ contract DeployL1Script is Script { forceDeploymentsData: config.contracts.forceDeploymentsData }); - StateTransitionManagerInitializeData memory diamondInitData = StateTransitionManagerInitializeData({ + ChainTypeManagerInitializeData memory diamondInitData = ChainTypeManagerInitializeData({ owner: msg.sender, validatorTimelock: addresses.validatorTimelock, chainCreationParams: chainCreationParams, @@ -566,49 +566,49 @@ contract DeployL1Script is Script { abi.encode( addresses.stateTransition.stateTransitionImplementation, addresses.transparentProxyAdmin, - abi.encodeCall(StateTransitionManager.initialize, (diamondInitData)) + abi.encodeCall(ChainTypeManager.initialize, (diamondInitData)) ) ) ); - console.log("StateTransitionManagerProxy deployed at:", contractAddress); + console.log("ChainTypeManagerProxy deployed at:", contractAddress); addresses.stateTransition.stateTransitionProxy = contractAddress; } - function registerStateTransitionManager() internal { + function registerChainTypeManager() internal { Bridgehub bridgehub = Bridgehub(addresses.bridgehub.bridgehubProxy); vm.startBroadcast(msg.sender); - bridgehub.addStateTransitionManager(addresses.stateTransition.stateTransitionProxy); - console.log("StateTransitionManager registered"); - STMDeploymentTracker stmDT = STMDeploymentTracker(addresses.bridgehub.stmDeploymentTrackerProxy); + bridgehub.addChainTypeManager(addresses.stateTransition.stateTransitionProxy); + console.log("ChainTypeManager registered"); + CTMDeploymentTracker ctmDT = CTMDeploymentTracker(addresses.bridgehub.ctmDeploymentTrackerProxy); // vm.startBroadcast(msg.sender); L1AssetRouter sharedBridge = L1AssetRouter(addresses.bridges.sharedBridgeProxy); sharedBridge.setAssetDeploymentTracker( bytes32(uint256(uint160(addresses.stateTransition.stateTransitionProxy))), - address(stmDT) + address(ctmDT) ); - console.log("STM DT whitelisted"); + console.log("CTM DT whitelisted"); - stmDT.registerSTMAssetOnL1(addresses.stateTransition.stateTransitionProxy); + ctmDT.registerCTMAssetOnL1(addresses.stateTransition.stateTransitionProxy); vm.stopBroadcast(); - console.log("STM registered in STMDeploymentTracker"); + console.log("CTM registered in CTMDeploymentTracker"); - bytes32 assetId = bridgehub.stmAssetId(addresses.stateTransition.stateTransitionProxy); - // console.log(address(bridgehub.stmDeployer()), addresses.bridgehub.stmDeploymentTrackerProxy); - // console.log(address(bridgehub.stmDeployer().BRIDGE_HUB()), addresses.bridgehub.bridgehubProxy); + bytes32 assetId = bridgehub.ctmAssetId(addresses.stateTransition.stateTransitionProxy); + // console.log(address(bridgehub.ctmDeployer()), addresses.bridgehub.ctmDeploymentTrackerProxy); + // console.log(address(bridgehub.ctmDeployer().BRIDGE_HUB()), addresses.bridgehub.bridgehubProxy); console.log( - "STM in router 1", + "CTM in router 1", sharedBridge.assetHandlerAddress(assetId), - bridgehub.stmAssetIdToAddress(assetId) + bridgehub.ctmAssetIdToAddress(assetId) ); } - function setStateTransitionManagerInValidatorTimelock() internal { + function setChainTypeManagerInValidatorTimelock() internal { ValidatorTimelock validatorTimelock = ValidatorTimelock(addresses.validatorTimelock); vm.broadcast(msg.sender); - validatorTimelock.setStateTransitionManager( - IStateTransitionManager(addresses.stateTransition.stateTransitionProxy) + validatorTimelock.setChainTypeManager( + IChainTypeManager(addresses.stateTransition.stateTransitionProxy) ); - console.log("StateTransitionManager set in ValidatorTimelock"); + console.log("ChainTypeManager set in ValidatorTimelock"); } function deployDiamondProxy() internal { @@ -672,7 +672,7 @@ contract DeployL1Script is Script { // bridgehub.setSharedBridge(addresses.bridges.sharedBridgeProxy); bridgehub.setAddresses( addresses.bridges.sharedBridgeProxy, - ISTMDeploymentTracker(addresses.bridgehub.stmDeploymentTrackerProxy), + ICTMDeploymentTracker(addresses.bridgehub.ctmDeploymentTrackerProxy), IMessageRoot(addresses.bridgehub.messageRootProxy) ); vm.stopBroadcast(); @@ -755,8 +755,8 @@ contract DeployL1Script is Script { L1AssetRouter sharedBridge = L1AssetRouter(addresses.bridges.sharedBridgeProxy); sharedBridge.transferOwnership(addresses.governance); - StateTransitionManager stm = StateTransitionManager(addresses.stateTransition.stateTransitionProxy); - stm.transferOwnership(addresses.governance); + ChainTypeManager ctm = ChainTypeManager(addresses.stateTransition.stateTransitionProxy); + ctm.transferOwnership(addresses.governance); vm.stopBroadcast(); console.log("Owners updated"); @@ -766,13 +766,13 @@ contract DeployL1Script is Script { vm.serializeAddress("bridgehub", "bridgehub_proxy_addr", addresses.bridgehub.bridgehubProxy); vm.serializeAddress( "bridgehub", - "stm_deployment_tracker_proxy_addr", - addresses.bridgehub.stmDeploymentTrackerProxy + "ctm_deployment_tracker_proxy_addr", + addresses.bridgehub.ctmDeploymentTrackerProxy ); vm.serializeAddress( "bridgehub", - "stm_deployment_tracker_implementation_addr", - addresses.bridgehub.stmDeploymentTrackerImplementation + "ctm_deployment_tracker_implementation_addr", + addresses.bridgehub.ctmDeploymentTrackerImplementation ); vm.serializeAddress("bridgehub", "message_root_proxy_addr", addresses.bridgehub.messageRootProxy); vm.serializeAddress( diff --git a/l1-contracts/deploy-scripts/Gateway.s.sol b/l1-contracts/deploy-scripts/Gateway.s.sol index 3ed77be36..210db8a70 100644 --- a/l1-contracts/deploy-scripts/Gateway.s.sol +++ b/l1-contracts/deploy-scripts/Gateway.s.sol @@ -8,7 +8,7 @@ import {Script, console2 as console} from "forge-std/Script.sol"; import {stdToml} from "forge-std/StdToml.sol"; import {Ownable} from "@openzeppelin/contracts-v4/access/Ownable.sol"; -import {IBridgehub, BridgehubBurnSTMAssetData} from "contracts/bridgehub/IBridgehub.sol"; +import {IBridgehub, BridgehubBurnCTMAssetData} from "contracts/bridgehub/IBridgehub.sol"; import {IZkSyncHyperchain} from "contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol"; // import {ValidatorTimelock} from "contracts/state-transition/ValidatorTimelock.sol"; // import {Governance} from "contracts/governance/Governance.sol"; @@ -42,7 +42,7 @@ contract GatewayScript is Script { uint128 baseTokenGasPriceMultiplierNominator; uint128 baseTokenGasPriceMultiplierDenominator; address bridgehub; - address stmDeploymentTracker; + address ctmDeploymentTracker; address nativeTokenVault; address stateTransitionProxy; address sharedBridgeProxy; @@ -86,8 +86,8 @@ contract GatewayScript is Script { config.nativeTokenVault = toml.readAddress("$.deployed_addresses.native_token_vault_addr"); config.diamondCutData = toml.readBytes("$.contracts_config.diamond_cut_data"); config.forceDeployments = toml.readBytes("$.contracts_config.force_deployments_data"); - config.stmDeploymentTracker = toml.readAddress( - "$.deployed_addresses.bridgehub.stm_deployment_tracker_proxy_addr" + config.ctmDeploymentTracker = toml.readAddress( + "$.deployed_addresses.bridgehub.ctm_deployment_tracker_proxy_addr" ); path = string.concat(root, vm.envString("HYPERCHAIN_CONFIG")); toml = vm.readFile(path); @@ -120,7 +120,7 @@ contract GatewayScript is Script { Ownable ownable = Ownable(config.bridgehub); vm.prank(ownable.owner()); bridgehub.registerSettlementLayer(config.gatewayChainId, true); - // bytes memory data = abi.encodeCall(stm.registerSettlementLayer, (config.chainChainId, true)); + // bytes memory data = abi.encodeCall(ctm.registerSettlementLayer, (config.chainChainId, true)); // Utils.executeUpgrade({ // _governor: ownable.owner(), // _salt: bytes32(config.bridgehubCreateNewChainSalt), @@ -129,7 +129,7 @@ contract GatewayScript is Script { // _value: 0, // _delay: 0 // }); - console.log("Gateway registered on STM"); + console.log("Gateway registered on CTM"); } function moveChainToGateway() public { @@ -151,17 +151,17 @@ contract GatewayScript is Script { console.log("newAdmin", newAdmin); IZkSyncHyperchain chain = IZkSyncHyperchain(bridgehub.getHyperchain(config.chainChainId)); console.log("chainAdmin", bridgehub.getHyperchain(config.chainChainId), chain.getAdmin()); - bytes32 stmAssetId = bridgehub.stmAssetIdFromChainId(config.chainChainId); + bytes32 ctmAssetId = bridgehub.ctmAssetIdFromChainId(config.chainChainId); bytes memory diamondCutData = config.diamondCutData; // todo replace with config.zkDiamondCutData; - bytes memory stmData = abi.encode(newAdmin, diamondCutData); + bytes memory ctmData = abi.encode(newAdmin, diamondCutData); bytes memory chainData = abi.encode(chain.getProtocolVersion()); - BridgehubBurnSTMAssetData memory stmAssetData = BridgehubBurnSTMAssetData({ + BridgehubBurnCTMAssetData memory ctmAssetData = BridgehubBurnCTMAssetData({ chainId: config.chainChainId, - stmData: stmData, + ctmData: ctmData, chainData: chainData }); - bytes memory bridgehubData = abi.encode(stmAssetData); - bytes memory routerData = bytes.concat(bytes1(0x01), abi.encode(stmAssetId, bridgehubData)); + bytes memory bridgehubData = abi.encode(ctmAssetData); + bytes memory routerData = bytes.concat(bytes1(0x01), abi.encode(ctmAssetId, bridgehubData)); vm.startBroadcast(chain.getAdmin()); L2TransactionRequestTwoBridgesOuter memory request = L2TransactionRequestTwoBridgesOuter({ @@ -182,8 +182,8 @@ contract GatewayScript is Script { function registerL2Contracts() public { IBridgehub bridgehub = IBridgehub(config.bridgehub); - Ownable ownable = Ownable(config.stmDeploymentTracker); - // IStateTransitionManager stm = IStateTransitionManager(config.stateTransitionProxy); + Ownable ownable = Ownable(config.ctmDeploymentTracker); + // IChainTypeManager ctm = IChainTypeManager(config.stateTransitionProxy); uint256 gasPrice = 10; uint256 l2GasLimit = 72000000; @@ -194,7 +194,7 @@ contract GatewayScript is Script { l2GasLimit, REQUIRED_L2_GAS_PRICE_PER_PUBDATA ) * 2; - bytes32 assetId = bridgehub.stmAssetIdFromChainId(config.chainChainId); + bytes32 assetId = bridgehub.ctmAssetIdFromChainId(config.chainChainId); bytes memory routerData = bytes.concat(bytes1(0x02), abi.encode(assetId, L2_BRIDGEHUB_ADDR)); L2TransactionRequestTwoBridgesOuter memory assetRouterRegistrationRequest = L2TransactionRequestTwoBridgesOuter({ @@ -216,7 +216,7 @@ contract GatewayScript is Script { l2GasLimit: l2GasLimit, l2GasPerPubdataByteLimit: REQUIRED_L2_GAS_PRICE_PER_PUBDATA, refundRecipient: ownable.owner(), - secondBridgeAddress: config.stmDeploymentTracker, + secondBridgeAddress: config.ctmDeploymentTracker, secondBridgeValue: 0, secondBridgeCalldata: bytes.concat( bytes1(0x01), diff --git a/l1-contracts/test/foundry/integration/DeploymentTest.t.sol b/l1-contracts/test/foundry/integration/DeploymentTest.t.sol index ef28640fe..3b0c1638c 100644 --- a/l1-contracts/test/foundry/integration/DeploymentTest.t.sol +++ b/l1-contracts/test/foundry/integration/DeploymentTest.t.sol @@ -21,7 +21,7 @@ import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; import {L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR} from "contracts/common/L2ContractAddresses.sol"; import {IL1ERC20Bridge} from "contracts/bridge/interfaces/IL1ERC20Bridge.sol"; import {IZkSyncHyperchain} from "contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol"; -import {IStateTransitionManager} from "contracts/state-transition/IStateTransitionManager.sol"; +import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol"; contract DeploymentTests is L1ContractDeployer, HyperchainDeployer, TokenDeployer, L2TxMocker { uint256 constant TEST_USERS_COUNT = 10; @@ -72,7 +72,7 @@ contract DeploymentTests is L1ContractDeployer, HyperchainDeployer, TokenDeploye IBridgehub bridgehub = IBridgehub(l1Script.getBridgehubProxyAddress()); address newChainAddress = bridgehub.getHyperchain(chainId); address admin = IZkSyncHyperchain(bridgehub.getHyperchain(chainId)).getAdmin(); - IStateTransitionManager stm = IStateTransitionManager(bridgehub.stateTransitionManager(chainId)); + IChainTypeManager ctm = IChainTypeManager(bridgehub.chainTypeManager(chainId)); assertNotEq(admin, address(0)); assertNotEq(newChainAddress, address(0)); @@ -85,7 +85,7 @@ contract DeploymentTests is L1ContractDeployer, HyperchainDeployer, TokenDeploye assertEq(chainIds.length, 1); assertEq(chainIds[0], chainId); - uint256 protocolVersion = stm.getProtocolVersion(chainId); + uint256 protocolVersion = ctm.getProtocolVersion(chainId); assertEq(protocolVersion, 0); } diff --git a/l1-contracts/test/foundry/integration/GatewayTests.t.sol b/l1-contracts/test/foundry/integration/GatewayTests.t.sol index bb54ad5b5..86d3d65ff 100644 --- a/l1-contracts/test/foundry/integration/GatewayTests.t.sol +++ b/l1-contracts/test/foundry/integration/GatewayTests.t.sol @@ -5,7 +5,7 @@ import {Test} from "forge-std/Test.sol"; import {Vm} from "forge-std/Vm.sol"; import "forge-std/console.sol"; -import {L2TransactionRequestDirect, L2TransactionRequestTwoBridgesOuter, BridgehubMintSTMAssetData, BridgehubBurnSTMAssetData} from "contracts/bridgehub/IBridgehub.sol"; +import {L2TransactionRequestDirect, L2TransactionRequestTwoBridgesOuter, BridgehubMintCTMAssetData, BridgehubBurnCTMAssetData} from "contracts/bridgehub/IBridgehub.sol"; import {TestnetERC20Token} from "contracts/dev-contracts/TestnetERC20Token.sol"; import {MailboxFacet} from "contracts/state-transition/chain-deps/facets/Mailbox.sol"; import {GettersFacet} from "contracts/state-transition/chain-deps/facets/Getters.sol"; @@ -27,7 +27,7 @@ import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; import {Ownable} from "@openzeppelin/contracts-v4/access/Ownable.sol"; import {IZkSyncHyperchain} from "contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol"; -import {IStateTransitionManager} from "contracts/state-transition/IStateTransitionManager.sol"; +import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol"; import {AdminFacet} from "contracts/state-transition/chain-deps/facets/Admin.sol"; import {AddressAliasHelper} from "contracts/vendor/AddressAliasHelper.sol"; import {TxStatus} from "contracts/common/Messaging.sol"; @@ -172,18 +172,18 @@ contract GatewayTests is L1ContractDeployer, HyperchainDeployer, TokenDeployer, // Setup IBridgehub bridgehub = IBridgehub(l1Script.getBridgehubProxyAddress()); - IStateTransitionManager stm = IStateTransitionManager(l1Script.getSTM()); - bytes32 assetId = bridgehub.stmAssetIdFromChainId(migratingChainId); + IChainTypeManager ctm = IChainTypeManager(l1Script.getCTM()); + bytes32 assetId = bridgehub.ctmAssetIdFromChainId(migratingChainId); bytes memory transferData; { IZkSyncHyperchain chain = IZkSyncHyperchain(bridgehub.getHyperchain(migratingChainId)); bytes memory initialDiamondCut = l1Script.getInitialDiamondCutData(); bytes memory chainData = abi.encode(chain.getProtocolVersion()); - bytes memory stmData = abi.encode(address(1), msg.sender, stm.protocolVersion(), initialDiamondCut); - BridgehubBurnSTMAssetData memory data = BridgehubBurnSTMAssetData({ + bytes memory ctmData = abi.encode(address(1), msg.sender, ctm.protocolVersion(), initialDiamondCut); + BridgehubBurnCTMAssetData memory data = BridgehubBurnCTMAssetData({ chainId: migratingChainId, - stmData: stmData, + ctmData: ctmData, chainData: chainData }); transferData = abi.encode(data); @@ -240,9 +240,9 @@ contract GatewayTests is L1ContractDeployer, HyperchainDeployer, TokenDeployer, function finishMoveChain() public { IBridgehub bridgehub = IBridgehub(l1Script.getBridgehubProxyAddress()); - IStateTransitionManager stm = IStateTransitionManager(l1Script.getSTM()); + IChainTypeManager ctm = IChainTypeManager(l1Script.getCTM()); IZkSyncHyperchain migratingChain = IZkSyncHyperchain(bridgehub.getHyperchain(migratingChainId)); - bytes32 assetId = bridgehub.stmAssetIdFromChainId(migratingChainId); + bytes32 assetId = bridgehub.ctmAssetIdFromChainId(migratingChainId); vm.startBroadcast(Ownable(address(bridgehub)).owner()); bridgehub.registerSettlementLayer(gatewayChainId, true); @@ -251,11 +251,11 @@ contract GatewayTests is L1ContractDeployer, HyperchainDeployer, TokenDeployer, bytes32 baseTokenAssetId = keccak256("baseTokenAssetId"); bytes memory initialDiamondCut = l1Script.getInitialDiamondCutData(); bytes memory chainData = abi.encode(AdminFacet(address(migratingChain)).prepareChainCommitment()); - bytes memory stmData = abi.encode(baseTokenAssetId, msg.sender, stm.protocolVersion(), initialDiamondCut); - BridgehubMintSTMAssetData memory data = BridgehubMintSTMAssetData({ + bytes memory ctmData = abi.encode(baseTokenAssetId, msg.sender, ctm.protocolVersion(), initialDiamondCut); + BridgehubMintCTMAssetData memory data = BridgehubMintCTMAssetData({ chainId: mintChainId, baseTokenAssetId: baseTokenAssetId, - stmData: stmData, + ctmData: ctmData, chainData: chainData }); bytes memory bridgehubMintData = abi.encode(data); diff --git a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol b/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol index 703d0d81b..78b530e67 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol @@ -8,9 +8,9 @@ import "forge-std/console.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; import {TestnetERC20Token} from "contracts/dev-contracts/TestnetERC20Token.sol"; import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; -import {ChainCreationParams} from "contracts/state-transition/IStateTransitionManager.sol"; +import {ChainCreationParams} from "contracts/state-transition/IChainTypeManager.sol"; import {L2TransactionRequestDirect, L2TransactionRequestTwoBridgesOuter} from "contracts/bridgehub/IBridgehub.sol"; -import {DummyStateTransitionManagerWBH} from "contracts/dev-contracts/test/DummyStateTransitionManagerWithBridgeHubAddress.sol"; +import {DummyChainTypeManagerWBH} from "contracts/dev-contracts/test/DummyChainTypeManagerWithBridgeHubAddress.sol"; import {DummyHyperchain} from "contracts/dev-contracts/test/DummyHyperchain.sol"; import {DummySharedBridge} from "contracts/dev-contracts/test/DummySharedBridge.sol"; import {DummyBridgehubSetter} from "contracts/dev-contracts/test/DummyBridgehubSetter.sol"; @@ -22,12 +22,12 @@ import {L2Message, L2Log, TxStatus, BridgehubL2TransactionRequest} from "contrac import {L2_NATIVE_TOKEN_VAULT_ADDR} from "contracts/common/L2ContractAddresses.sol"; import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; -import {ISTMDeploymentTracker} from "contracts/bridgehub/ISTMDeploymentTracker.sol"; +import {ICTMDeploymentTracker} from "contracts/bridgehub/ICTMDeploymentTracker.sol"; import {IMessageRoot} from "contracts/bridgehub/IMessageRoot.sol"; import {L2TransactionRequestTwoBridgesInner} from "contracts/bridgehub/IBridgehub.sol"; import {ETH_TOKEN_ADDRESS, REQUIRED_L2_GAS_PRICE_PER_PUBDATA, MAX_NEW_FACTORY_DEPS, TWO_BRIDGES_MAGIC_VALUE} from "contracts/common/Config.sol"; import {L1ERC20Bridge} from "contracts/bridge/L1ERC20Bridge.sol"; -import {ZeroChainId, AddressTooLow, ChainIdTooBig, WrongMagicValue, SharedBridgeNotSet, TokenNotRegistered, BridgeHubAlreadyRegistered, MsgValueMismatch, SlotOccupied, STMAlreadyRegistered, TokenAlreadyRegistered, Unauthorized, NonEmptyMsgValue, STMNotRegistered, InvalidChainId} from "contracts/common/L1ContractErrors.sol"; +import {ZeroChainId, AddressTooLow, ChainIdTooBig, WrongMagicValue, SharedBridgeNotSet, TokenNotRegistered, BridgeHubAlreadyRegistered, MsgValueMismatch, SlotOccupied, CTMAlreadyRegistered, TokenAlreadyRegistered, Unauthorized, NonEmptyMsgValue, CTMNotRegistered, InvalidChainId} from "contracts/common/L1ContractErrors.sol"; contract ExperimentalBridgeTest is Test { using stdStorage for StdStorage; @@ -36,7 +36,7 @@ contract ExperimentalBridgeTest is Test { DummyBridgehubSetter dummyBridgehub; address public bridgeOwner; address public testTokenAddress; - DummyStateTransitionManagerWBH mockSTM; + DummyChainTypeManagerWBH mockCTM; DummyHyperchain mockChainContract; DummySharedBridge mockSharedBridge; DummySharedBridge mockSecondSharedBridge; @@ -62,7 +62,7 @@ contract ExperimentalBridgeTest is Test { uint256 eraChainId; - event NewChain(uint256 indexed chainId, address stateTransitionManager, address indexed chainGovernance); + event NewChain(uint256 indexed chainId, address chainTypeManager, address indexed chainGovernance); modifier useRandomToken(uint256 randomValue) { _setRandomToken(randomValue); @@ -89,7 +89,7 @@ contract ExperimentalBridgeTest is Test { dummyBridgehub = new DummyBridgehubSetter(l1ChainId, bridgeOwner, type(uint256).max); bridgeHub = Bridgehub(address(dummyBridgehub)); address weth = makeAddr("WETH"); - mockSTM = new DummyStateTransitionManagerWBH(address(bridgeHub)); + mockCTM = new DummyChainTypeManagerWBH(address(bridgeHub)); mockChainContract = new DummyHyperchain(address(bridgeHub), eraChainId, block.chainid); mockL2Contract = makeAddr("mockL2Contract"); @@ -214,143 +214,143 @@ contract ExperimentalBridgeTest is Test { } } - function test_addStateTransitionManager(address randomAddressWithoutTheCorrectInterface) public { + function test_addChainTypeManager(address randomAddressWithoutTheCorrectInterface) public { vm.assume(randomAddressWithoutTheCorrectInterface != address(0)); - bool isSTMRegistered = bridgeHub.stateTransitionManagerIsRegistered(randomAddressWithoutTheCorrectInterface); - assertTrue(!isSTMRegistered); + bool isCTMRegistered = bridgeHub.chainTypeManagerIsRegistered(randomAddressWithoutTheCorrectInterface); + assertTrue(!isCTMRegistered); vm.prank(bridgeOwner); - bridgeHub.addStateTransitionManager(randomAddressWithoutTheCorrectInterface); + bridgeHub.addChainTypeManager(randomAddressWithoutTheCorrectInterface); - isSTMRegistered = bridgeHub.stateTransitionManagerIsRegistered(randomAddressWithoutTheCorrectInterface); - assertTrue(isSTMRegistered); + isCTMRegistered = bridgeHub.chainTypeManagerIsRegistered(randomAddressWithoutTheCorrectInterface); + assertTrue(isCTMRegistered); - // An address that has already been registered, cannot be registered again (at least not before calling `removeStateTransitionManager`). + // An address that has already been registered, cannot be registered again (at least not before calling `removeChainTypeManager`). vm.prank(bridgeOwner); - vm.expectRevert(STMAlreadyRegistered.selector); - bridgeHub.addStateTransitionManager(randomAddressWithoutTheCorrectInterface); + vm.expectRevert(CTMAlreadyRegistered.selector); + bridgeHub.addChainTypeManager(randomAddressWithoutTheCorrectInterface); - isSTMRegistered = bridgeHub.stateTransitionManagerIsRegistered(randomAddressWithoutTheCorrectInterface); - assertTrue(isSTMRegistered); + isCTMRegistered = bridgeHub.chainTypeManagerIsRegistered(randomAddressWithoutTheCorrectInterface); + assertTrue(isCTMRegistered); } - function test_addStateTransitionManager_cannotBeCalledByRandomAddress( + function test_addChainTypeManager_cannotBeCalledByRandomAddress( address randomCaller, address randomAddressWithoutTheCorrectInterface ) public { vm.assume(randomAddressWithoutTheCorrectInterface != address(0)); - bool isSTMRegistered = bridgeHub.stateTransitionManagerIsRegistered(randomAddressWithoutTheCorrectInterface); - assertTrue(!isSTMRegistered); + bool isCTMRegistered = bridgeHub.chainTypeManagerIsRegistered(randomAddressWithoutTheCorrectInterface); + assertTrue(!isCTMRegistered); if (randomCaller != bridgeOwner) { vm.prank(randomCaller); vm.expectRevert(bytes("Ownable: caller is not the owner")); - bridgeHub.addStateTransitionManager(randomAddressWithoutTheCorrectInterface); + bridgeHub.addChainTypeManager(randomAddressWithoutTheCorrectInterface); } vm.prank(bridgeOwner); - bridgeHub.addStateTransitionManager(randomAddressWithoutTheCorrectInterface); + bridgeHub.addChainTypeManager(randomAddressWithoutTheCorrectInterface); - isSTMRegistered = bridgeHub.stateTransitionManagerIsRegistered(randomAddressWithoutTheCorrectInterface); - assertTrue(isSTMRegistered); + isCTMRegistered = bridgeHub.chainTypeManagerIsRegistered(randomAddressWithoutTheCorrectInterface); + assertTrue(isCTMRegistered); - // An address that has already been registered, cannot be registered again (at least not before calling `removeStateTransitionManager`). + // An address that has already been registered, cannot be registered again (at least not before calling `removeChainTypeManager`). vm.prank(bridgeOwner); - vm.expectRevert(STMAlreadyRegistered.selector); - bridgeHub.addStateTransitionManager(randomAddressWithoutTheCorrectInterface); + vm.expectRevert(CTMAlreadyRegistered.selector); + bridgeHub.addChainTypeManager(randomAddressWithoutTheCorrectInterface); // Definitely not by a random caller if (randomCaller != bridgeOwner) { vm.prank(randomCaller); vm.expectRevert("Ownable: caller is not the owner"); - bridgeHub.addStateTransitionManager(randomAddressWithoutTheCorrectInterface); + bridgeHub.addChainTypeManager(randomAddressWithoutTheCorrectInterface); } - isSTMRegistered = bridgeHub.stateTransitionManagerIsRegistered(randomAddressWithoutTheCorrectInterface); - assertTrue(isSTMRegistered); + isCTMRegistered = bridgeHub.chainTypeManagerIsRegistered(randomAddressWithoutTheCorrectInterface); + assertTrue(isCTMRegistered); } - function test_removeStateTransitionManager(address randomAddressWithoutTheCorrectInterface) public { + function test_removeChainTypeManager(address randomAddressWithoutTheCorrectInterface) public { vm.assume(randomAddressWithoutTheCorrectInterface != address(0)); - bool isSTMRegistered = bridgeHub.stateTransitionManagerIsRegistered(randomAddressWithoutTheCorrectInterface); - assertTrue(!isSTMRegistered); + bool isCTMRegistered = bridgeHub.chainTypeManagerIsRegistered(randomAddressWithoutTheCorrectInterface); + assertTrue(!isCTMRegistered); - // A non-existent STM cannot be removed + // A non-existent CTM cannot be removed vm.prank(bridgeOwner); - vm.expectRevert(STMNotRegistered.selector); - bridgeHub.removeStateTransitionManager(randomAddressWithoutTheCorrectInterface); + vm.expectRevert(CTMNotRegistered.selector); + bridgeHub.removeChainTypeManager(randomAddressWithoutTheCorrectInterface); - // Let's first register our particular stateTransitionManager + // Let's first register our particular chainTypeManager vm.prank(bridgeOwner); - bridgeHub.addStateTransitionManager(randomAddressWithoutTheCorrectInterface); + bridgeHub.addChainTypeManager(randomAddressWithoutTheCorrectInterface); - isSTMRegistered = bridgeHub.stateTransitionManagerIsRegistered(randomAddressWithoutTheCorrectInterface); - assertTrue(isSTMRegistered); + isCTMRegistered = bridgeHub.chainTypeManagerIsRegistered(randomAddressWithoutTheCorrectInterface); + assertTrue(isCTMRegistered); // Only an address that has already been registered, can be removed. vm.prank(bridgeOwner); - bridgeHub.removeStateTransitionManager(randomAddressWithoutTheCorrectInterface); + bridgeHub.removeChainTypeManager(randomAddressWithoutTheCorrectInterface); - isSTMRegistered = bridgeHub.stateTransitionManagerIsRegistered(randomAddressWithoutTheCorrectInterface); - assertTrue(!isSTMRegistered); + isCTMRegistered = bridgeHub.chainTypeManagerIsRegistered(randomAddressWithoutTheCorrectInterface); + assertTrue(!isCTMRegistered); - // An already removed STM cannot be removed again + // An already removed CTM cannot be removed again vm.prank(bridgeOwner); - vm.expectRevert(STMNotRegistered.selector); - bridgeHub.removeStateTransitionManager(randomAddressWithoutTheCorrectInterface); + vm.expectRevert(CTMNotRegistered.selector); + bridgeHub.removeChainTypeManager(randomAddressWithoutTheCorrectInterface); } - function test_removeStateTransitionManager_cannotBeCalledByRandomAddress( + function test_removeChainTypeManager_cannotBeCalledByRandomAddress( address randomAddressWithoutTheCorrectInterface, address randomCaller ) public { vm.assume(randomAddressWithoutTheCorrectInterface != address(0)); - bool isSTMRegistered = bridgeHub.stateTransitionManagerIsRegistered(randomAddressWithoutTheCorrectInterface); - assertTrue(!isSTMRegistered); + bool isCTMRegistered = bridgeHub.chainTypeManagerIsRegistered(randomAddressWithoutTheCorrectInterface); + assertTrue(!isCTMRegistered); if (randomCaller != bridgeOwner) { vm.prank(randomCaller); vm.expectRevert(bytes("Ownable: caller is not the owner")); - bridgeHub.removeStateTransitionManager(randomAddressWithoutTheCorrectInterface); + bridgeHub.removeChainTypeManager(randomAddressWithoutTheCorrectInterface); } - // A non-existent STM cannot be removed + // A non-existent CTM cannot be removed vm.prank(bridgeOwner); - vm.expectRevert(STMNotRegistered.selector); - bridgeHub.removeStateTransitionManager(randomAddressWithoutTheCorrectInterface); + vm.expectRevert(CTMNotRegistered.selector); + bridgeHub.removeChainTypeManager(randomAddressWithoutTheCorrectInterface); - // Let's first register our particular stateTransitionManager + // Let's first register our particular chainTypeManager vm.prank(bridgeOwner); - bridgeHub.addStateTransitionManager(randomAddressWithoutTheCorrectInterface); + bridgeHub.addChainTypeManager(randomAddressWithoutTheCorrectInterface); - isSTMRegistered = bridgeHub.stateTransitionManagerIsRegistered(randomAddressWithoutTheCorrectInterface); - assertTrue(isSTMRegistered); + isCTMRegistered = bridgeHub.chainTypeManagerIsRegistered(randomAddressWithoutTheCorrectInterface); + assertTrue(isCTMRegistered); // Only an address that has already been registered, can be removed. vm.prank(bridgeOwner); - bridgeHub.removeStateTransitionManager(randomAddressWithoutTheCorrectInterface); + bridgeHub.removeChainTypeManager(randomAddressWithoutTheCorrectInterface); - isSTMRegistered = bridgeHub.stateTransitionManagerIsRegistered(randomAddressWithoutTheCorrectInterface); - assertTrue(!isSTMRegistered); + isCTMRegistered = bridgeHub.chainTypeManagerIsRegistered(randomAddressWithoutTheCorrectInterface); + assertTrue(!isCTMRegistered); - // An already removed STM cannot be removed again + // An already removed CTM cannot be removed again vm.prank(bridgeOwner); - vm.expectRevert(STMNotRegistered.selector); - bridgeHub.removeStateTransitionManager(randomAddressWithoutTheCorrectInterface); + vm.expectRevert(CTMNotRegistered.selector); + bridgeHub.removeChainTypeManager(randomAddressWithoutTheCorrectInterface); // Not possible by a randomcaller as well if (randomCaller != bridgeOwner) { vm.prank(randomCaller); vm.expectRevert(bytes("Ownable: caller is not the owner")); - bridgeHub.removeStateTransitionManager(randomAddressWithoutTheCorrectInterface); + bridgeHub.removeChainTypeManager(randomAddressWithoutTheCorrectInterface); } } function test_addAssetId(address randomAddress) public { vm.startPrank(bridgeOwner); - bridgeHub.setAddresses(address(mockSharedBridge), ISTMDeploymentTracker(address(0)), IMessageRoot(address(0))); + bridgeHub.setAddresses(address(mockSharedBridge), ICTMDeploymentTracker(address(0)), IMessageRoot(address(0))); vm.stopPrank(); bytes32 assetId = DataEncoding.encodeNTVAssetId(block.chainid, testTokenAddress); @@ -383,7 +383,7 @@ contract ExperimentalBridgeTest is Test { uint256 randomValue ) public useRandomToken(randomValue) { vm.startPrank(bridgeOwner); - bridgeHub.setAddresses(address(mockSharedBridge), ISTMDeploymentTracker(address(0)), IMessageRoot(address(0))); + bridgeHub.setAddresses(address(mockSharedBridge), ICTMDeploymentTracker(address(0)), IMessageRoot(address(0))); vm.stopPrank(); bytes32 assetId = DataEncoding.encodeNTVAssetId(block.chainid, testTokenAddress); @@ -471,7 +471,7 @@ contract ExperimentalBridgeTest is Test { // vm.prank(deployerAddress); // bridgeHub.createNewChain({ // _chainId: chainId, - // _stateTransitionManager: address(mockSTM), + // _chainTypeManager: address(mockCTM), // _baseToken: address(testToken), // _salt: salt, // _admin: admin, @@ -481,11 +481,11 @@ contract ExperimentalBridgeTest is Test { // vm.prank(bridgeOwner); // bridgeHub.unpause(); - // vm.expectRevert(STMNotRegistered.selector); + // vm.expectRevert(CTMNotRegistered.selector); // vm.prank(deployerAddress); // bridgeHub.createNewChain({ // _chainId: 1, - // _stateTransitionManager: address(mockSTM), + // _chainTypeManager: address(mockCTM), // _baseToken: address(testToken), // _salt: uint256(123), // _admin: admin, @@ -493,7 +493,7 @@ contract ExperimentalBridgeTest is Test { // }); // } - // function test_RevertWhen_STMNotRegisteredOnCreate( + // function test_RevertWhen_CTMNotRegisteredOnCreate( // uint256 chainId, // uint256 salt, // uint256 randomValue @@ -508,11 +508,11 @@ contract ExperimentalBridgeTest is Test { // bridgeHub.acceptAdmin(); // chainId = bound(chainId, 1, type(uint48).max); - // vm.expectRevert(STMNotRegistered.selector); + // vm.expectRevert(CTMNotRegistered.selector); // vm.prank(deployerAddress); // bridgeHub.createNewChain({ // _chainId: chainId, - // _stateTransitionManager: address(mockSTM), + // _chainTypeManager: address(mockCTM), // _baseToken: address(testToken), // _salt: salt, // _admin: admin, @@ -539,7 +539,7 @@ contract ExperimentalBridgeTest is Test { // vm.prank(deployerAddress); // bridgeHub.createNewChain({ // _chainId: chainId, - // _stateTransitionManager: address(mockSTM), + // _chainTypeManager: address(mockCTM), // _baseToken: address(testToken), // _salt: salt, // _admin: admin, @@ -551,7 +551,7 @@ contract ExperimentalBridgeTest is Test { // vm.prank(deployerAddress); // bridgeHub.createNewChain({ // _chainId: chainId, - // _stateTransitionManager: address(mockSTM), + // _chainTypeManager: address(mockCTM), // _baseToken: address(testToken), // _salt: salt, // _admin: admin, @@ -574,14 +574,14 @@ contract ExperimentalBridgeTest is Test { // bridgeHub.acceptAdmin(); // vm.startPrank(bridgeOwner); - // bridgeHub.addStateTransitionManager(address(mockSTM)); + // bridgeHub.addChainTypeManager(address(mockCTM)); // vm.stopPrank(); // vm.expectRevert(abi.encodeWithSelector(TokenNotRegistered.selector, address(testToken))); // vm.prank(deployerAddress); // bridgeHub.createNewChain({ // _chainId: chainId, - // _stateTransitionManager: address(mockSTM), + // _chainTypeManager: address(mockCTM), // _baseToken: address(testToken), // _salt: salt, // _admin: admin, @@ -604,7 +604,7 @@ contract ExperimentalBridgeTest is Test { // bridgeHub.acceptAdmin(); // vm.startPrank(bridgeOwner); - // bridgeHub.addStateTransitionManager(address(mockSTM)); + // bridgeHub.addChainTypeManager(address(mockCTM)); // bridgeHub.addToken(address(testToken)); // vm.stopPrank(); @@ -612,7 +612,7 @@ contract ExperimentalBridgeTest is Test { // vm.prank(deployerAddress); // bridgeHub.createNewChain({ // _chainId: chainId, - // _stateTransitionManager: address(mockSTM), + // _chainTypeManager: address(mockCTM), // _baseToken: address(testToken), // _salt: salt, // _admin: admin, @@ -633,21 +633,21 @@ contract ExperimentalBridgeTest is Test { // bridgeHub.acceptAdmin(); // vm.startPrank(bridgeOwner); - // bridgeHub.addStateTransitionManager(address(mockSTM)); + // bridgeHub.addChainTypeManager(address(mockCTM)); // bridgeHub.addToken(address(testToken)); // bridgeHub.setSharedBridge(sharedBridgeAddress); // vm.stopPrank(); // chainId = bound(chainId, 1, type(uint48).max); - // stdstore.target(address(bridgeHub)).sig("stateTransitionManager(uint256)").with_key(chainId).checked_write( - // address(mockSTM) + // stdstore.target(address(bridgeHub)).sig("chainTypeManager(uint256)").with_key(chainId).checked_write( + // address(mockCTM) // ); // vm.expectRevert(BridgeHubAlreadyRegistered.selector); // vm.prank(deployerAddress); // bridgeHub.createNewChain({ // _chainId: chainId, - // _stateTransitionManager: address(mockSTM), + // _chainTypeManager: address(mockCTM), // _baseToken: address(testToken), // _salt: salt, // _admin: admin, @@ -675,7 +675,7 @@ contract ExperimentalBridgeTest is Test { // bridgeHub.acceptAdmin(); // vm.startPrank(bridgeOwner); - // bridgeHub.addStateTransitionManager(address(mockSTM)); + // bridgeHub.addChainTypeManager(address(mockCTM)); // bridgeHub.addToken(address(testToken)); // bridgeHub.setSharedBridge(sharedBridgeAddress); // vm.stopPrank(); @@ -685,7 +685,7 @@ contract ExperimentalBridgeTest is Test { // vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, randomCaller)); // bridgeHub.createNewChain({ // _chainId: chainId, - // _stateTransitionManager: address(mockSTM), + // _chainTypeManager: address(mockCTM), // _baseToken: address(testToken), // _salt: salt, // _admin: admin, @@ -693,7 +693,7 @@ contract ExperimentalBridgeTest is Test { // }); // } - // vm.prank(mockSTM.owner()); + // vm.prank(mockCTM.owner()); // bytes memory _newChainInitData = _createNewChainInitData( // isFreezable, // mockSelectors, @@ -701,17 +701,17 @@ contract ExperimentalBridgeTest is Test { // mockInitCalldata // ); - // // bridgeHub.createNewChain => stateTransitionManager.createNewChain => this function sets the stateTransition mapping - // // of `chainId`, let's emulate that using foundry cheatcodes or let's just use the extra function we introduced in our mockSTM - // mockSTM.setHyperchain(chainId, address(mockChainContract)); - // assertTrue(mockSTM.getHyperchain(chainId) == address(mockChainContract)); + // // bridgeHub.createNewChain => chainTypeManager.createNewChain => this function sets the stateTransition mapping + // // of `chainId`, let's emulate that using foundry cheatcodes or let's just use the extra function we introduced in our mockCTM + // mockCTM.setHyperchain(chainId, address(mockChainContract)); + // assertTrue(mockCTM.getHyperchain(chainId) == address(mockChainContract)); // vm.startPrank(deployerAddress); // vm.mockCall( - // address(mockSTM), + // address(mockCTM), // // solhint-disable-next-line func-named-parameters // abi.encodeWithSelector( - // mockSTM.createNewChain.selector, + // mockCTM.createNewChain.selector, // chainId, // address(testToken), // sharedBridgeAddress, @@ -722,11 +722,11 @@ contract ExperimentalBridgeTest is Test { // ); // vm.expectEmit(true, true, true, true, address(bridgeHub)); - // emit NewChain(chainId, address(mockSTM), admin); + // emit NewChain(chainId, address(mockCTM), admin); // newChainId = bridgeHub.createNewChain({ // _chainId: chainId, - // _stateTransitionManager: address(mockSTM), + // _chainTypeManager: address(mockCTM), // _baseToken: address(testToken), // _salt: uint256(chainId * 2), // _admin: admin, @@ -736,7 +736,7 @@ contract ExperimentalBridgeTest is Test { // vm.stopPrank(); // vm.clearMockedCalls(); - // assertTrue(bridgeHub.stateTransitionManager(newChainId) == address(mockSTM)); + // assertTrue(bridgeHub.chainTypeManager(newChainId) == address(mockCTM)); // assertTrue(bridgeHub.baseToken(newChainId) == testTokenAddress); // } @@ -744,7 +744,7 @@ contract ExperimentalBridgeTest is Test { // mockChainId = _setUpHyperchainForChainId(mockChainId); // // Now the following statements should be true as well: - // assertTrue(bridgeHub.stateTransitionManager(mockChainId) == address(mockSTM)); + // assertTrue(bridgeHub.chainTypeManager(mockChainId) == address(mockCTM)); // address returnedHyperchain = bridgeHub.getHyperchain(mockChainId); // assertEq(returnedHyperchain, address(mockChainContract)); @@ -762,7 +762,7 @@ contract ExperimentalBridgeTest is Test { // mockChainId = _setUpHyperchainForChainId(mockChainId); // // Now the following statements should be true as well: - // assertTrue(bridgeHub.stateTransitionManager(mockChainId) == address(mockSTM)); + // assertTrue(bridgeHub.chainTypeManager(mockChainId) == address(mockCTM)); // assertTrue(bridgeHub.getHyperchain(mockChainId) == address(mockChainContract)); // // Creating a random L2Message::l2Message so that we pass the correct parameters to `proveL2MessageInclusion` @@ -810,7 +810,7 @@ contract ExperimentalBridgeTest is Test { mockChainId = _setUpHyperchainForChainId(mockChainId); // Now the following statements should be true as well: - assertTrue(bridgeHub.stateTransitionManager(mockChainId) == address(mockSTM)); + assertTrue(bridgeHub.chainTypeManager(mockChainId) == address(mockCTM)); assertTrue(bridgeHub.getHyperchain(mockChainId) == address(mockChainContract)); // Creating a random L2Log::l2Log so that we pass the correct parameters to `proveL2LogInclusion` @@ -1501,7 +1501,7 @@ contract ExperimentalBridgeTest is Test { forceDeploymentsData: bytes("") }); - mockSTM.setChainCreationParams(params); + mockCTM.setChainCreationParams(params); return abi.encode(abi.encode(diamondCutData), bytes("")); } @@ -1510,14 +1510,14 @@ contract ExperimentalBridgeTest is Test { mockChainId = bound(mockChainId, 1, type(uint48).max); mockChainIdInRange = mockChainId; vm.prank(bridgeOwner); - bridgeHub.addStateTransitionManager(address(mockSTM)); + bridgeHub.addChainTypeManager(address(mockCTM)); - // We need to set the stateTransitionManager of the mockChainId to mockSTM + // We need to set the chainTypeManager of the mockChainId to mockCTM // There is no function to do that in the bridgeHub - // So, perhaps we will have to manually set the values in the stateTransitionManager mapping via a foundry cheatcode - assertTrue(!(bridgeHub.stateTransitionManager(mockChainId) == address(mockSTM))); + // So, perhaps we will have to manually set the values in the chainTypeManager mapping via a foundry cheatcode + assertTrue(!(bridgeHub.chainTypeManager(mockChainId) == address(mockCTM))); - dummyBridgehub.setSTM(mockChainId, address(mockSTM)); + dummyBridgehub.setCTM(mockChainId, address(mockCTM)); dummyBridgehub.setHyperchain(mockChainId, address(mockChainContract)); } @@ -1615,7 +1615,7 @@ contract ExperimentalBridgeTest is Test { bytes memory randomData ) public { vm.startPrank(bridgeOwner); - bridgeHub.addStateTransitionManager(address(mockSTM)); + bridgeHub.addChainTypeManager(address(mockCTM)); vm.stopPrank(); L2Message memory l2Message = _createMockL2Message(randomTxNumInBatch, randomSender, randomData); @@ -1658,7 +1658,7 @@ contract ExperimentalBridgeTest is Test { bytes32 randomValue ) public { vm.startPrank(bridgeOwner); - bridgeHub.addStateTransitionManager(address(mockSTM)); + bridgeHub.addChainTypeManager(address(mockCTM)); vm.stopPrank(); L2Log memory l2Log = _createMockL2Log({ @@ -1705,7 +1705,7 @@ contract ExperimentalBridgeTest is Test { bool randomResultantBool ) public { vm.startPrank(bridgeOwner); - bridgeHub.addStateTransitionManager(address(mockSTM)); + bridgeHub.addChainTypeManager(address(mockCTM)); vm.stopPrank(); TxStatus txStatus; diff --git a/l1-contracts/test/foundry/unit/concrete/DiamondCut/UpgradeLogic.t.sol b/l1-contracts/test/foundry/unit/concrete/DiamondCut/UpgradeLogic.t.sol index bb696ed94..43e09c130 100644 --- a/l1-contracts/test/foundry/unit/concrete/DiamondCut/UpgradeLogic.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/DiamondCut/UpgradeLogic.t.sol @@ -13,7 +13,7 @@ import {IVerifier} from "contracts/state-transition/chain-interfaces/IVerifier.s import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; import {Utils} from "../Utils/Utils.sol"; import {InitializeData} from "contracts/state-transition/chain-deps/DiamondInit.sol"; -import {DummyStateTransitionManager} from "contracts/dev-contracts/test/DummyStateTransitionManager.sol"; +import {DummyChainTypeManager} from "contracts/dev-contracts/test/DummyChainTypeManager.sol"; import {DummyBridgehub} from "contracts/dev-contracts/test/DummyBridgehub.sol"; import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; import {DiamondAlreadyFrozen, Unauthorized, DiamondFreezeIncorrectState, DiamondNotFrozen} from "contracts/common/L1ContractErrors.sol"; @@ -25,7 +25,7 @@ contract UpgradeLogicTest is DiamondCutTest { AdminFacet private proxyAsAdmin; GettersFacet private proxyAsGetters; address private admin; - address private stateTransitionManager; + address private chainTypeManager; address private randomSigner; function getAdminSelectors() private view returns (bytes4[] memory) { @@ -46,7 +46,7 @@ contract UpgradeLogicTest is DiamondCutTest { function setUp() public { admin = makeAddr("admin"); - stateTransitionManager = address(new DummyStateTransitionManager()); + chainTypeManager = address(new DummyChainTypeManager()); randomSigner = makeAddr("randomSigner"); DummyBridgehub dummyBridgehub = new DummyBridgehub(); @@ -79,7 +79,7 @@ contract UpgradeLogicTest is DiamondCutTest { // TODO REVIEW chainId: 1, bridgehub: address(dummyBridgehub), - stateTransitionManager: stateTransitionManager, + chainTypeManager: chainTypeManager, protocolVersion: 0, admin: admin, validatorTimelock: makeAddr("validatorTimelock"), @@ -126,8 +126,8 @@ contract UpgradeLogicTest is DiamondCutTest { proxyAsAdmin.freezeDiamond(); } - function test_RevertWhen_DoubleFreezingBySTM() public { - vm.startPrank(stateTransitionManager); + function test_RevertWhen_DoubleFreezingByCTM() public { + vm.startPrank(chainTypeManager); proxyAsAdmin.freezeDiamond(); @@ -136,7 +136,7 @@ contract UpgradeLogicTest is DiamondCutTest { } function test_RevertWhen_UnfreezingWhenNotFrozen() public { - vm.startPrank(stateTransitionManager); + vm.startPrank(chainTypeManager); vm.expectRevert(DiamondNotFrozen.selector); proxyAsAdmin.unfreezeDiamond(); @@ -157,7 +157,7 @@ contract UpgradeLogicTest is DiamondCutTest { initCalldata: bytes("") }); - vm.startPrank(stateTransitionManager); + vm.startPrank(chainTypeManager); proxyAsAdmin.executeUpgrade(diamondCutData); @@ -188,7 +188,7 @@ contract UpgradeLogicTest is DiamondCutTest { initCalldata: bytes("") }); - vm.startPrank(stateTransitionManager); + vm.startPrank(chainTypeManager); proxyAsAdmin.executeUpgrade(diamondCutData); proxyAsAdmin.executeUpgrade(diamondCutData); diff --git a/l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol b/l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol index 1aae6364d..42d518acd 100644 --- a/l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol @@ -6,8 +6,8 @@ import {Test} from "forge-std/Test.sol"; import {Utils, DEFAULT_L2_LOGS_TREE_ROOT_HASH, L2_DA_VALIDATOR_ADDRESS} from "../Utils/Utils.sol"; import {COMMIT_TIMESTAMP_NOT_OLDER, ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; import {DummyEraBaseTokenBridge} from "contracts/dev-contracts/test/DummyEraBaseTokenBridge.sol"; -import {DummyStateTransitionManager} from "contracts/dev-contracts/test/DummyStateTransitionManager.sol"; -import {IStateTransitionManager} from "contracts/state-transition/IStateTransitionManager.sol"; +import {DummyChainTypeManager} from "contracts/dev-contracts/test/DummyChainTypeManager.sol"; +import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol"; import {DiamondInit} from "contracts/state-transition/chain-deps/DiamondInit.sol"; import {DiamondProxy} from "contracts/state-transition/chain-deps/DiamondProxy.sol"; import {VerifierParams, FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; @@ -164,10 +164,10 @@ contract ExecutorTest is Test { executor = new TestExecutor(); mailbox = new MailboxFacet(eraChainId, block.chainid); - DummyStateTransitionManager stateTransitionManager = new DummyStateTransitionManager(); + DummyChainTypeManager chainTypeManager = new DummyChainTypeManager(); vm.mockCall( - address(stateTransitionManager), - abi.encodeWithSelector(IStateTransitionManager.protocolVersionIsActive.selector), + address(chainTypeManager), + abi.encodeWithSelector(IChainTypeManager.protocolVersionIsActive.selector), abi.encode(bool(true)) ); DiamondInit diamondInit = new DiamondInit(); @@ -191,7 +191,7 @@ contract ExecutorTest is Test { // TODO REVIEW chainId: eraChainId, bridgehub: address(dummyBridgehub), - stateTransitionManager: address(stateTransitionManager), + chainTypeManager: address(chainTypeManager), protocolVersion: 0, admin: owner, validatorTimelock: validator, @@ -254,7 +254,7 @@ contract ExecutorTest is Test { admin = AdminFacet(address(diamondProxy)); // Initiate the token multiplier to enable L1 -> L2 transactions. - vm.prank(address(stateTransitionManager)); + vm.prank(address(chainTypeManager)); admin.setTokenMultiplier(1, 1); vm.prank(address(owner)); admin.setDAValidatorPair(address(rollupL1DAValidator), L2_DA_VALIDATOR_ADDRESS); diff --git a/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol b/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol index 08291b5b1..865c8408d 100644 --- a/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol +++ b/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol @@ -282,8 +282,8 @@ library Utils { selectors[23] = UtilsFacet.util_getValidator.selector; selectors[24] = UtilsFacet.util_setZkPorterAvailability.selector; selectors[25] = UtilsFacet.util_getZkPorterAvailability.selector; - selectors[26] = UtilsFacet.util_setStateTransitionManager.selector; - selectors[27] = UtilsFacet.util_getStateTransitionManager.selector; + selectors[26] = UtilsFacet.util_setChainTypeManager.selector; + selectors[27] = UtilsFacet.util_getChainTypeManager.selector; selectors[28] = UtilsFacet.util_setPriorityTxMaxGasLimit.selector; selectors[29] = UtilsFacet.util_getPriorityTxMaxGasLimit.selector; selectors[30] = UtilsFacet.util_setFeeParams.selector; @@ -328,7 +328,7 @@ library Utils { InitializeData({ chainId: 1, bridgehub: address(dummyBridgehub), - stateTransitionManager: address(0x1234567890876543567890), + chainTypeManager: address(0x1234567890876543567890), protocolVersion: 0, admin: address(0x32149872498357874258787), validatorTimelock: address(0x85430237648403822345345), diff --git a/l1-contracts/test/foundry/unit/concrete/Utils/UtilsFacet.sol b/l1-contracts/test/foundry/unit/concrete/Utils/UtilsFacet.sol index f7e056122..0d4469071 100644 --- a/l1-contracts/test/foundry/unit/concrete/Utils/UtilsFacet.sol +++ b/l1-contracts/test/foundry/unit/concrete/Utils/UtilsFacet.sol @@ -120,12 +120,12 @@ contract UtilsFacet is ZkSyncHyperchainBase { return s.zkPorterIsAvailable; } - function util_setStateTransitionManager(address _stateTransitionManager) external { - s.stateTransitionManager = _stateTransitionManager; + function util_setChainTypeManager(address _chainTypeManager) external { + s.chainTypeManager = _chainTypeManager; } - function util_getStateTransitionManager() external view returns (address) { - return s.stateTransitionManager; + function util_getChainTypeManager() external view returns (address) { + return s.chainTypeManager; } function util_setPriorityTxMaxGasLimit(uint256 _priorityTxMaxGasLimit) external { diff --git a/l1-contracts/test/foundry/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol b/l1-contracts/test/foundry/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol index 5d52cb155..e215030b5 100644 --- a/l1-contracts/test/foundry/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol @@ -4,8 +4,8 @@ pragma solidity 0.8.24; import {Test} from "forge-std/Test.sol"; import {Utils} from "../Utils/Utils.sol"; import {ValidatorTimelock, IExecutor} from "contracts/state-transition/ValidatorTimelock.sol"; -import {DummyStateTransitionManagerForValidatorTimelock} from "contracts/dev-contracts/test/DummyStateTransitionManagerForValidatorTimelock.sol"; -import {IStateTransitionManager} from "contracts/state-transition/IStateTransitionManager.sol"; +import {DummyChainTypeManagerForValidatorTimelock} from "contracts/dev-contracts/test/DummyChainTypeManagerForValidatorTimelock.sol"; +import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol"; import {Unauthorized, TimeNotReached} from "contracts/common/L1ContractErrors.sol"; contract ValidatorTimelockTest is Test { @@ -22,7 +22,7 @@ contract ValidatorTimelockTest is Test { error ValidatorDoesNotExist(uint256 _chainId); ValidatorTimelock validator; - DummyStateTransitionManagerForValidatorTimelock stateTransitionManager; + DummyChainTypeManagerForValidatorTimelock chainTypeManager; address owner; address zkSync; @@ -45,10 +45,10 @@ contract ValidatorTimelockTest is Test { lastBatchNumber = 123; executionDelay = 10; - stateTransitionManager = new DummyStateTransitionManagerForValidatorTimelock(owner, zkSync); + chainTypeManager = new DummyChainTypeManagerForValidatorTimelock(owner, zkSync); validator = new ValidatorTimelock(owner, executionDelay, eraChainId); vm.prank(owner); - validator.setStateTransitionManager(IStateTransitionManager(address(stateTransitionManager))); + validator.setChainTypeManager(IChainTypeManager(address(chainTypeManager))); vm.prank(owner); validator.addValidator(chainId, alice); vm.prank(owner); @@ -95,17 +95,17 @@ contract ValidatorTimelockTest is Test { validator.commitBatchesSharedBridge(chainId, storedBatch, batchesToCommit); } - function test_setStateTransitionManager() public { - assert(validator.stateTransitionManager() == IStateTransitionManager(address(stateTransitionManager))); + function test_setChainTypeManager() public { + assert(validator.chainTypeManager() == IChainTypeManager(address(chainTypeManager))); - DummyStateTransitionManagerForValidatorTimelock newManager = new DummyStateTransitionManagerForValidatorTimelock( + DummyChainTypeManagerForValidatorTimelock newManager = new DummyChainTypeManagerForValidatorTimelock( bob, zkSync ); vm.prank(owner); - validator.setStateTransitionManager(IStateTransitionManager(address(newManager))); + validator.setChainTypeManager(IChainTypeManager(address(newManager))); - assert(validator.stateTransitionManager() == IStateTransitionManager(address(newManager))); + assert(validator.chainTypeManager() == IChainTypeManager(address(newManager))); } function test_setExecutionDelay() public { @@ -268,9 +268,9 @@ contract ValidatorTimelockTest is Test { validator.commitBatchesSharedBridge(chainId, storedBatch, batchesToCommit); } - function test_RevertWhen_setStateTransitionManagerNotOwner() public { + function test_RevertWhen_setChainTypeManagerNotOwner() public { vm.expectRevert("Ownable: caller is not the owner"); - validator.setStateTransitionManager(IStateTransitionManager(address(stateTransitionManager))); + validator.setChainTypeManager(IChainTypeManager(address(chainTypeManager))); } function test_RevertWhen_revertBatchesNotValidator() public { diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/Admin.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/Admin.t.sol index a214c0374..2bad40139 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/Admin.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/Admin.t.sol @@ -1,15 +1,15 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import {IStateTransitionManager} from "contracts/state-transition/IStateTransitionManager.sol"; -import {StateTransitionManagerTest} from "./_StateTransitionManager_Shared.t.sol"; +import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol +import {ChainTypeManagerTest} from "./_ChainTypeManager_Shared.t.sol"; -contract AdminTest is StateTransitionManagerTest { +contract AdminTest is ChainTypeManagerTest { function test_setPendingAdmin() public { address newAdmin = makeAddr("newAdmin"); vm.expectEmit(true, true, true, false); - emit IStateTransitionManager.NewPendingAdmin(address(0), newAdmin); + emit IChainTypeManager.NewPendingAdmin(address(0), newAdmin); chainContractAddress.setPendingAdmin(newAdmin); } @@ -22,9 +22,9 @@ contract AdminTest is StateTransitionManagerTest { vm.stopPrank(); vm.prank(newAdmin); vm.expectEmit(true, true, true, false); - emit IStateTransitionManager.NewPendingAdmin(newAdmin, address(0)); + emit IChainTypeManager.NewPendingAdmin(newAdmin, address(0)); vm.expectEmit(true, true, true, false); - emit IStateTransitionManager.NewAdmin(address(0), newAdmin); + emit IChainTypeManager.NewAdmin(address(0), newAdmin); chainContractAddress.acceptAdmin(); address currentAdmin = chainContractAddress.admin(); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/CreateNewChain.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/CreateNewChain.t.sol index 4efe05fc5..4a9394c7e 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/CreateNewChain.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/CreateNewChain.t.sol @@ -1,12 +1,12 @@ // // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import {StateTransitionManagerTest} from "./_StateTransitionManager_Shared.t.sol"; +import {ChainTypeManagerTest} from "./_ChainTypeManager_Shared.t.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; import {Unauthorized, HashMismatch} from "contracts/common/L1ContractErrors.sol"; -contract createNewChainTest is StateTransitionManagerTest { +contract createNewChainTest is ChainTypeManagerTest { function test_RevertWhen_InitialDiamondCutHashMismatch() public { Diamond.DiamondCutData memory initialDiamondCutData = getDiamondCutData(sharedBridge); Diamond.DiamondCutData memory correctDiamondCutData = getDiamondCutData(address(diamondInit)); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/FreezeChain.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/FreezeChain.t.sol index 5a759413b..da0c71358 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/FreezeChain.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/FreezeChain.t.sol @@ -1,12 +1,12 @@ // // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import {StateTransitionManagerTest} from "./_StateTransitionManager_Shared.t.sol"; +import {ChainTypeManagerTest} from "./_ChainTypeManager_Shared.t.sol"; import {GettersFacet} from "contracts/state-transition/chain-deps/facets/Getters.sol"; import {IAdmin} from "contracts/state-transition/chain-interfaces/IAdmin.sol"; import {FacetIsFrozen} from "contracts/common/L1ContractErrors.sol"; -contract freezeChainTest is StateTransitionManagerTest { +contract freezeChainTest is ChainTypeManagerTest { // function test_FreezingChain() public { // createNewChain(getDiamondCutData(diamondInit)); // address newChainAddress = chainContractAddress.getHyperchain(chainId); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/RevertBatches.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/RevertBatches.t.sol index ac9b060c5..6f53cec5c 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/RevertBatches.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/RevertBatches.t.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.24; import {Vm} from "forge-std/Test.sol"; import {Utils, L2_SYSTEM_CONTEXT_ADDRESS} from "../../Utils/Utils.sol"; -import {StateTransitionManagerTest} from "./_StateTransitionManager_Shared.t.sol"; +import {ChainTypeManagerTest} from "./_ChainTypeManager_Shared.t.sol"; import {COMMIT_TIMESTAMP_NOT_OLDER, DEFAULT_L2_LOGS_TREE_ROOT_HASH, EMPTY_STRING_KECCAK} from "contracts/common/Config.sol"; import {IExecutor, SystemLogKey} from "contracts/state-transition/chain-interfaces/IExecutor.sol"; @@ -13,7 +13,7 @@ import {AdminFacet} from "contracts/state-transition/chain-deps/facets/Admin.sol import {ExecutorFacet} from "contracts/state-transition/chain-deps/facets/Executor.sol"; import {IExecutor} from "contracts/state-transition/chain-interfaces/IExecutor.sol"; -contract revertBatchesTest is StateTransitionManagerTest { +contract revertBatchesTest is ChainTypeManagerTest { // Items for logs & commits uint256 internal currentTimestamp; IExecutor.CommitBatchInfo internal newCommitBatchInfo; @@ -127,7 +127,7 @@ contract revertBatchesTest is StateTransitionManagerTest { // executorFacet.proveBatches(genesisStoredBatchInfo, storedBatchInfoArray, proofInput); - // // Test batch revert triggered from STM + // // Test batch revert triggered from CTM // vm.stopPrank(); // vm.startPrank(governor); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetChainCreationParams.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetChainCreationParams.t.sol index f4712553c..00c3fe976 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetChainCreationParams.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetChainCreationParams.t.sol @@ -1,13 +1,13 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import {StateTransitionManagerTest} from "./_StateTransitionManager_Shared.t.sol"; +import {ChainTypeManagerTest} from "./_ChainTypeManager_Shared.t.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; -import {ChainCreationParams} from "contracts/state-transition/IStateTransitionManager.sol"; +import {ChainCreationParams} from "contracts/state-transition/IChainTypeManager.sol"; import {IExecutor} from "contracts/state-transition/chain-interfaces/IExecutor.sol"; import {EMPTY_STRING_KECCAK, DEFAULT_L2_LOGS_TREE_ROOT_HASH} from "contracts/common/Config.sol"; -contract SetChainCreationParamsTest is StateTransitionManagerTest { +contract SetChainCreationParamsTest is ChainTypeManagerTest { function test_SettingInitialCutHash() public { bytes32 initialCutHash = keccak256(abi.encode(getDiamondCutData(address(diamondInit)))); address randomDiamondInit = address(0x303030303030303030303); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetNewVersionUpgrade.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetNewVersionUpgrade.t.sol index b1153a495..43d06491d 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetNewVersionUpgrade.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetNewVersionUpgrade.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import {StateTransitionManagerTest} from "./_StateTransitionManager_Shared.t.sol"; +import {ChainTypeManagerTest} from "./_ChainTypeManager_Shared.t.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; -contract setNewVersionUpgradeTest is StateTransitionManagerTest { +contract setNewVersionUpgradeTest is ChainTypeManagerTest { function test_SettingNewVersionUpgrade() public { assertEq(chainContractAddress.protocolVersion(), 0, "Initial protocol version is not correct"); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetUpgradeDiamondCut.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetUpgradeDiamondCut.t.sol index a71f35d2e..a156c5351 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetUpgradeDiamondCut.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetUpgradeDiamondCut.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import {StateTransitionManagerTest} from "./_StateTransitionManager_Shared.t.sol"; +import {ChainTypeManagerTest} from "./_ChainTypeManager_Shared.t.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; -contract setUpgradeDiamondCutTest is StateTransitionManagerTest { +contract setUpgradeDiamondCutTest is ChainTypeManagerTest { function test_SettingUpgradeDiamondCut() public { assertEq(chainContractAddress.protocolVersion(), 0, "Initial protocol version is not correct"); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetValidatorTimelock.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetValidatorTimelock.t.sol index 23d0d3aaf..790064aec 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetValidatorTimelock.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetValidatorTimelock.t.sol @@ -1,11 +1,11 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import {StateTransitionManagerTest} from "./_StateTransitionManager_Shared.t.sol"; +import {ChainTypeManagerTest} from "./_ChainTypeManager_Shared.t.sol"; import {Unauthorized} from "contracts/common/L1ContractErrors.sol"; -contract setValidatorTimelockTest is StateTransitionManagerTest { +contract setValidatorTimelockTest is ChainTypeManagerTest { function test_SettingValidatorTimelock() public { assertEq( chainContractAddress.validatorTimelock(), diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/StateTransitionOwnerZero.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/StateTransitionOwnerZero.t.sol index 1d87e925f..bc10f6278 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/StateTransitionOwnerZero.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/StateTransitionOwnerZero.t.sol @@ -2,13 +2,13 @@ pragma solidity 0.8.24; import {TransparentUpgradeableProxy} from "@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol"; -import {StateTransitionManagerTest} from "./_StateTransitionManager_Shared.t.sol"; -import {StateTransitionManager} from "contracts/state-transition/StateTransitionManager.sol"; -import {StateTransitionManagerInitializeData, ChainCreationParams} from "contracts/state-transition/IStateTransitionManager.sol"; +import {ChainTypeManagerTest} from "./_ChainTypeManager_Shared.t.sol"; +import {ChainTypeManager} from "contracts/state-transition/ChainTypeManager.sol"; +import {ChainTypeManagerInitializeData, ChainCreationParams} from "contracts/state-transition/IChainTypeManager.sol"; import {ZeroAddress} from "contracts/common/L1ContractErrors.sol"; -contract initializingSTMOwnerZeroTest is StateTransitionManagerTest { - function test_InitializingSTMWithGovernorZeroShouldRevert() public { +contract initializingCTMOwnerZeroTest is ChainTypeManagerTest { + function test_InitializingCTMWithGovernorZeroShouldRevert() public { ChainCreationParams memory chainCreationParams = ChainCreationParams({ genesisUpgrade: address(genesisUpgradeContract), genesisBatchHash: bytes32(uint256(0x01)), @@ -18,7 +18,7 @@ contract initializingSTMOwnerZeroTest is StateTransitionManagerTest { forceDeploymentsData: bytes("") }); - StateTransitionManagerInitializeData memory stmInitializeDataNoOwner = StateTransitionManagerInitializeData({ + ChainTypeManagerInitializeData memory ctmInitializeDataNoOwner = ChainTypeManagerInitializeData({ owner: address(0), validatorTimelock: validator, chainCreationParams: chainCreationParams, @@ -27,9 +27,9 @@ contract initializingSTMOwnerZeroTest is StateTransitionManagerTest { vm.expectRevert(ZeroAddress.selector); new TransparentUpgradeableProxy( - address(stateTransitionManager), + address(chainTypeManager), admin, - abi.encodeCall(StateTransitionManager.initialize, stmInitializeDataNoOwner) + abi.encodeCall(ChainTypeManager.initialize, ctmInitializeDataNoOwner) ); } } diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/_StateTransitionManager_Shared.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/_StateTransitionManager_Shared.t.sol index 954df224f..e9900ef92 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/_StateTransitionManager_Shared.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/_StateTransitionManager_Shared.t.sol @@ -16,16 +16,16 @@ import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; import {DiamondInit} from "contracts/state-transition/chain-deps/DiamondInit.sol"; import {L1GenesisUpgrade as GenesisUpgrade} from "contracts/upgrades/L1GenesisUpgrade.sol"; import {InitializeDataNewChain} from "contracts/state-transition/chain-interfaces/IDiamondInit.sol"; -import {StateTransitionManager} from "contracts/state-transition/StateTransitionManager.sol"; -import {StateTransitionManagerInitializeData, ChainCreationParams} from "contracts/state-transition/IStateTransitionManager.sol"; +import {ChainTypeManager} from "contracts/state-transition/ChainTypeManager.sol"; +import {ChainTypeManagerInitializeData, ChainCreationParams} from "contracts/state-transition/IChainTypeManager.sol"; import {TestnetVerifier} from "contracts/state-transition/TestnetVerifier.sol"; import {DummyBridgehub} from "contracts/dev-contracts/test/DummyBridgehub.sol"; import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; import {ZeroAddress} from "contracts/common/L1ContractErrors.sol"; -contract StateTransitionManagerTest is Test { - StateTransitionManager internal stateTransitionManager; - StateTransitionManager internal chainContractAddress; +contract ChainTypeManagerTest is Test { + ChainTypeManager internal chainTypeManager; + ChainTypeManager internal chainContractAddress; GenesisUpgrade internal genesisUpgradeContract; address internal bridgehub; address internal diamondInit; @@ -46,7 +46,7 @@ contract StateTransitionManagerTest is Test { newChainAdmin = makeAddr("chainadmin"); vm.startPrank(bridgehub); - stateTransitionManager = new StateTransitionManager(address(IBridgehub(address(bridgehub)))); + chainTypeManager = new ChainTypeManager(address(IBridgehub(address(bridgehub)))); diamondInit = address(new DiamondInit()); genesisUpgradeContract = new GenesisUpgrade(); @@ -92,7 +92,7 @@ contract StateTransitionManagerTest is Test { forceDeploymentsData: bytes("") }); - StateTransitionManagerInitializeData memory stmInitializeDataNoGovernor = StateTransitionManagerInitializeData({ + ChainTypeManagerInitializeData memory ctmInitializeDataNoGovernor = ChainTypeManagerInitializeData({ owner: address(0), validatorTimelock: validator, chainCreationParams: chainCreationParams, @@ -101,12 +101,12 @@ contract StateTransitionManagerTest is Test { vm.expectRevert(ZeroAddress.selector); new TransparentUpgradeableProxy( - address(stateTransitionManager), + address(chainTypeManager), admin, - abi.encodeCall(StateTransitionManager.initialize, stmInitializeDataNoGovernor) + abi.encodeCall(ChainTypeManager.initialize, ctmInitializeDataNoGovernor) ); - StateTransitionManagerInitializeData memory stmInitializeData = StateTransitionManagerInitializeData({ + ChainTypeManagerInitializeData memory ctmInitializeData = ChainTypeManagerInitializeData({ owner: governor, validatorTimelock: validator, chainCreationParams: chainCreationParams, @@ -114,11 +114,11 @@ contract StateTransitionManagerTest is Test { }); TransparentUpgradeableProxy transparentUpgradeableProxy = new TransparentUpgradeableProxy( - address(stateTransitionManager), + address(chainTypeManager), admin, - abi.encodeCall(StateTransitionManager.initialize, stmInitializeData) + abi.encodeCall(ChainTypeManager.initialize, ctmInitializeData) ); - chainContractAddress = StateTransitionManager(address(transparentUpgradeableProxy)); + chainContractAddress = ChainTypeManager(address(transparentUpgradeableProxy)); vm.stopPrank(); vm.startPrank(governor); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondInit/Initialize.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondInit/Initialize.t.sol index 33d82a2a9..7b17fbce2 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondInit/Initialize.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondInit/Initialize.t.sol @@ -84,7 +84,7 @@ contract InitializeTest is DiamondInitTest { assertEq(utilsFacet.util_getChainId(), initializeData.chainId); assertEq(utilsFacet.util_getBridgehub(), initializeData.bridgehub); - assertEq(utilsFacet.util_getStateTransitionManager(), initializeData.stateTransitionManager); + assertEq(utilsFacet.util_getChainTypeManager(), initializeData.chainTypeManager); assertEq(utilsFacet.util_getBaseTokenAssetId(), initializeData.baseTokenAssetId); assertEq(utilsFacet.util_getBaseTokenBridge(), initializeData.baseTokenBridge); assertEq(utilsFacet.util_getProtocolVersion(), initializeData.protocolVersion); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol index 70324aabf..0d1aebe92 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol @@ -25,8 +25,8 @@ contract ChangeFeeParamsTest is AdminTest { ); } - function test_revertWhen_calledByNonStateTransitionManager() public { - address nonStateTransitionManager = makeAddr("nonStateTransitionManager"); + function test_revertWhen_calledByNonChainTypeManagerlic { + address nonChainTypeManagereAddr("nonChainTChainTypeManager FeeParams memory newFeeParams = FeeParams({ pubdataPricingMode: PubdataPricingMode.Rollup, batchOverheadL1Gas: 1_000_000, @@ -36,14 +36,14 @@ contract ChangeFeeParamsTest is AdminTest { minimalL2GasPrice: 250_000_000 }); - vm.startPrank(nonStateTransitionManager); - vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonStateTransitionManager)); + vm.startPrank(nonChainTypeManager + vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonChainTypeManager adminFacet.changeFeeParams(newFeeParams); } function test_revertWhen_newMaxPubdataPerBatchIsLessThanMaxPubdataPerTransaction() public { - address stateTransitionManager = utilsFacet.util_getStateTransitionManager(); + address chainTypeManager = utilsFacet.util_getChainTypeManager uint32 priorityTxMaxPubdata = 88_000; uint32 maxPubdataPerBatch = priorityTxMaxPubdata - 1; FeeParams memory newFeeParams = FeeParams({ @@ -57,12 +57,12 @@ contract ChangeFeeParamsTest is AdminTest { vm.expectRevert(PriorityTxPubdataExceedsMaxPubDataPerBatch.selector); - vm.startPrank(stateTransitionManager); + vm.startPrank(chainTypeManager); adminFacet.changeFeeParams(newFeeParams); } function test_successfulChange() public { - address stateTransitionManager = utilsFacet.util_getStateTransitionManager(); + address chainTypeManager = utilsFacet.util_getChainTypeManager FeeParams memory oldFeeParams = utilsFacet.util_getFeeParams(); FeeParams memory newFeeParams = FeeParams({ pubdataPricingMode: PubdataPricingMode.Rollup, @@ -77,7 +77,7 @@ contract ChangeFeeParamsTest is AdminTest { vm.expectEmit(true, true, true, true, address(adminFacet)); emit NewFeeParams(oldFeeParams, newFeeParams); - vm.startPrank(stateTransitionManager); + vm.startPrank(chainTypeManager); adminFacet.changeFeeParams(newFeeParams); bytes32 newFeeParamsHash = keccak256(abi.encode(newFeeParams)); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ExecuteUpgrade.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ExecuteUpgrade.t.sol index d09b6f204..de559f27b 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ExecuteUpgrade.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ExecuteUpgrade.t.sol @@ -15,17 +15,17 @@ import {ProposedUpgrade} from "contracts/upgrades/BaseZkSyncUpgrade.sol"; contract ExecuteUpgradeTest is AdminTest { event ExecuteUpgrade(Diamond.DiamondCutData diamondCut); - function test_revertWhen_calledByNonGovernorOrStateTransitionManager() public { - address nonStateTransitionManager = makeAddr("nonStateTransitionManager"); + function test_revertWhen_calledByNonGovernorOrChainTypeManager() public { + address nonChainTypeManager = makeAddr("nonChainTypeManager"); Diamond.DiamondCutData memory diamondCutData = Diamond.DiamondCutData({ facetCuts: new Diamond.FacetCut[](0), initAddress: address(0), initCalldata: new bytes(0) }); - vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonStateTransitionManager)); + vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonChainTypeManager)); - vm.startPrank(nonStateTransitionManager); + vm.startPrank(nonChainTypeManager); adminFacet.executeUpgrade(diamondCutData); } @@ -61,8 +61,8 @@ contract ExecuteUpgradeTest is AdminTest { initCalldata: abi.encodeCall(upgrade.upgrade, (proposedUpgrade)) }); - address stm = utilsFacet.util_getStateTransitionManager(); - vm.startPrank(stm); + address ctm = utilsFacet.util_getChainTypeManager(); + vm.startPrank(ctm); adminFacet.executeUpgrade(diamondCutData); } diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/FreezeDiamond.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/FreezeDiamond.t.sol index 77baed0ef..457611105 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/FreezeDiamond.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/FreezeDiamond.t.sol @@ -8,12 +8,12 @@ import {Unauthorized} from "contracts/common/L1ContractErrors.sol"; contract FreezeDiamondTest is AdminTest { event Freeze(); - function test_revertWhen_calledByNonStateTransitionManager() public { - address nonStateTransitionManager = makeAddr("nonStateTransitionManager"); + function test_revertWhen_calledByNonChainTypeManager() public { + address nonChainTypeManager = makeAddr("nonChainTypeManager"); - vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonStateTransitionManager)); + vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonChainTypeManager)); - vm.startPrank(nonStateTransitionManager); + vm.startPrank(nonChainTypeManager); adminFacet.freezeDiamond(); } } diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetPorterAvailability.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetPorterAvailability.t.sol index ad0708f11..ca594b93a 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetPorterAvailability.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetPorterAvailability.t.sol @@ -8,17 +8,17 @@ import {Unauthorized} from "contracts/common/L1ContractErrors.sol"; contract SetPorterAvailabilityTest is AdminTest { event IsPorterAvailableStatusUpdate(bool isPorterAvailable); - function test_revertWhen_calledByNonStateTransitionManager() public { - address nonStateTransitionManager = makeAddr("nonStateTransitionManager"); + function test_revertWhen_calledByNonChainTypeManager() public { + address nonChainTypeManager = makeAddr("nonChainTypeManager"); bool isPorterAvailable = true; - vm.startPrank(nonStateTransitionManager); - vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonStateTransitionManager)); + vm.startPrank(nonChainTypeManager); + vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonChainTypeManager)); adminFacet.setPorterAvailability(isPorterAvailable); } function test_setPorterAvailabilityToFalse() public { - address stateTransitionManager = utilsFacet.util_getStateTransitionManager(); + address chainTypeManager = utilsFacet.util_getChainTypeManager(); bool isPorterAvailable = false; utilsFacet.util_setZkPorterAvailability(true); @@ -27,14 +27,14 @@ contract SetPorterAvailabilityTest is AdminTest { vm.expectEmit(true, true, true, true, address(adminFacet)); emit IsPorterAvailableStatusUpdate(isPorterAvailable); - vm.startPrank(stateTransitionManager); + vm.startPrank(chainTypeManager); adminFacet.setPorterAvailability(isPorterAvailable); assertEq(utilsFacet.util_getZkPorterAvailability(), isPorterAvailable); } function test_setPorterAvailabilityToTrue() public { - address stateTransitionManager = utilsFacet.util_getStateTransitionManager(); + address chainTypeManager = utilsFacet.util_getChainTypeManager(); bool isPorterAvailable = true; utilsFacet.util_setZkPorterAvailability(false); @@ -43,7 +43,7 @@ contract SetPorterAvailabilityTest is AdminTest { vm.expectEmit(true, true, true, true, address(adminFacet)); emit IsPorterAvailableStatusUpdate(isPorterAvailable); - vm.startPrank(stateTransitionManager); + vm.startPrank(chainTypeManager); adminFacet.setPorterAvailability(isPorterAvailable); assertEq(utilsFacet.util_getZkPorterAvailability(), isPorterAvailable); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetPriorityTxMaxGasLimit.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetPriorityTxMaxGasLimit.t.sol index 5581420fe..e5841bc87 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetPriorityTxMaxGasLimit.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetPriorityTxMaxGasLimit.t.sol @@ -10,26 +10,26 @@ import {Unauthorized, TooMuchGas} from "contracts/common/L1ContractErrors.sol"; contract SetPriorityTxMaxGasLimitTest is AdminTest { event NewPriorityTxMaxGasLimit(uint256 oldPriorityTxMaxGasLimit, uint256 newPriorityTxMaxGasLimit); - function test_revertWhen_calledByNonStateTransitionManager() public { - address nonStateTransitionManager = makeAddr("nonStateTransitionManager"); + function test_revertWhen_calledByNonChainTypeManager() public { + address nonChainTypeManager = makeAddr("nonChainTypeManager"); uint256 newPriorityTxMaxGasLimit = 100; - vm.startPrank(nonStateTransitionManager); - vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonStateTransitionManager)); + vm.startPrank(nonChainTypeManager); + vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonChainTypeManager)); adminFacet.setPriorityTxMaxGasLimit(newPriorityTxMaxGasLimit); } function test_revertWhen_newPriorityTxMaxGasLimitIsGreaterThanMaxGasPerTransaction() public { - address stateTransitionManager = utilsFacet.util_getStateTransitionManager(); + address chainTypeManager = utilsFacet.util_getChainTypeManager(); uint256 newPriorityTxMaxGasLimit = MAX_GAS_PER_TRANSACTION + 1; - vm.startPrank(stateTransitionManager); + vm.startPrank(chainTypeManager); vm.expectRevert(TooMuchGas.selector); adminFacet.setPriorityTxMaxGasLimit(newPriorityTxMaxGasLimit); } function test_successfulSet() public { - address stateTransitionManager = utilsFacet.util_getStateTransitionManager(); + address chainTypeManager = utilsFacet.util_getChainTypeManager(); uint256 oldPriorityTxMaxGasLimit = utilsFacet.util_getPriorityTxMaxGasLimit(); uint256 newPriorityTxMaxGasLimit = 100; @@ -37,7 +37,7 @@ contract SetPriorityTxMaxGasLimitTest is AdminTest { vm.expectEmit(true, true, true, true, address(adminFacet)); emit NewPriorityTxMaxGasLimit(oldPriorityTxMaxGasLimit, newPriorityTxMaxGasLimit); - vm.startPrank(stateTransitionManager); + vm.startPrank(chainTypeManager); adminFacet.setPriorityTxMaxGasLimit(newPriorityTxMaxGasLimit); assertEq(utilsFacet.util_getPriorityTxMaxGasLimit(), newPriorityTxMaxGasLimit); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetValidator.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetValidator.t.sol index 77990a285..5b75a0ac7 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetValidator.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetValidator.t.sol @@ -8,18 +8,18 @@ import {Unauthorized} from "contracts/common/L1ContractErrors.sol"; contract SetValidatorTest is AdminTest { event ValidatorStatusUpdate(address indexed validatorAddress, bool isActive); - function test_revertWhen_calledByNonStateTransitionManager() public { - address nonStateTransitionManager = makeAddr("nonStateTransitionManager"); + function test_revertWhen_calledByNonChainTypeManager() public { + address nonChainTypeManager = makeAddr("nonChainTypeManager"); address validator = makeAddr("validator"); bool isActive = true; - vm.startPrank(nonStateTransitionManager); - vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonStateTransitionManager)); + vm.startPrank(nonChainTypeManager); + vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonChainTypeManager)); adminFacet.setValidator(validator, isActive); } function test_deactivateValidator() public { - address stateTransitionManager = utilsFacet.util_getStateTransitionManager(); + address chainTypeManager = utilsFacet.util_getChainTypeManager(); address validator = makeAddr("validator"); bool isActive = false; @@ -29,14 +29,14 @@ contract SetValidatorTest is AdminTest { vm.expectEmit(true, true, true, true, address(adminFacet)); emit ValidatorStatusUpdate(validator, isActive); - vm.startPrank(stateTransitionManager); + vm.startPrank(chainTypeManager); adminFacet.setValidator(validator, isActive); assertEq(utilsFacet.util_getValidator(validator), isActive); } function test_reactivateValidator() public { - address stateTransitionManager = utilsFacet.util_getStateTransitionManager(); + address chainTypeManager = utilsFacet.util_getChainTypeManager(); address validator = makeAddr("validator"); bool isActive = true; @@ -46,7 +46,7 @@ contract SetValidatorTest is AdminTest { vm.expectEmit(true, true, true, true, address(adminFacet)); emit ValidatorStatusUpdate(validator, isActive); - vm.startPrank(stateTransitionManager); + vm.startPrank(chainTypeManager); adminFacet.setValidator(validator, isActive); assertEq(utilsFacet.util_getValidator(validator), isActive); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/UnfreezeDiamond.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/UnfreezeDiamond.t.sol index e0da9d6dc..88af27533 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/UnfreezeDiamond.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/UnfreezeDiamond.t.sol @@ -8,16 +8,16 @@ import {Unauthorized, DiamondFreezeIncorrectState, DiamondNotFrozen} from "contr contract UnfreezeDiamondTest is AdminTest { event Unfreeze(); - function test_revertWhen_calledByNonStateTransitionManager() public { - address nonStateTransitionManager = makeAddr("nonStateTransitionManager"); + function test_revertWhen_calledByNonChainTypeManager() public { + address nonChainTypeManager = makeAddr("nonChainTypeManager"); - vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonStateTransitionManager)); - vm.startPrank(nonStateTransitionManager); + vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonChainTypeManager)); + vm.startPrank(nonChainTypeManager); adminFacet.unfreezeDiamond(); } function test_revertWhen_diamondIsNotFrozen() public { - address admin = utilsFacet.util_getStateTransitionManager(); + address admin = utilsFacet.util_getChainTypeManager(); utilsFacet.util_setIsFrozen(false); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/UpgradeChainFromVersion.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/UpgradeChainFromVersion.t.sol index 9e6efc1e5..50de804d5 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/UpgradeChainFromVersion.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/UpgradeChainFromVersion.t.sol @@ -5,14 +5,14 @@ pragma solidity 0.8.24; import {AdminTest} from "./_Admin_Shared.t.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; -import {IStateTransitionManager} from "contracts/state-transition/IStateTransitionManager.sol"; +import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol"; import {ProtocolIdMismatch, ProtocolIdNotGreater, InvalidProtocolVersion, ValueMismatch, Unauthorized, HashMismatch} from "contracts/common/L1ContractErrors.sol"; contract UpgradeChainFromVersionTest is AdminTest { event ExecuteUpgrade(Diamond.DiamondCutData diamondCut); - function test_revertWhen_calledByNonAdminOrStateTransitionManager() public { - address nonAdminOrStateTransitionManager = makeAddr("nonAdminOrStateTransitionManager"); + function test_revertWhen_calledByNonAdminOrChainTypeManager() public { + address nonAdminOrChainTypeManager = makeAddr("nonAdminOrChainTypeManager"); uint256 oldProtocolVersion = 1; Diamond.DiamondCutData memory diamondCutData = Diamond.DiamondCutData({ facetCuts: new Diamond.FacetCut[](0), @@ -20,14 +20,14 @@ contract UpgradeChainFromVersionTest is AdminTest { initCalldata: new bytes(0) }); - vm.startPrank(nonAdminOrStateTransitionManager); - vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonAdminOrStateTransitionManager)); + vm.startPrank(nonAdminOrChainTypeManager); + vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonAdminOrChainTypeManager)); adminFacet.upgradeChainFromVersion(oldProtocolVersion, diamondCutData); } function test_revertWhen_cutHashMismatch() public { address admin = utilsFacet.util_getAdmin(); - address stateTransitionManager = makeAddr("stateTransitionManager"); + address chainTypeManager = makeAddr("chainTypeManager"); uint256 oldProtocolVersion = 1; Diamond.DiamondCutData memory diamondCutData = Diamond.DiamondCutData({ @@ -36,12 +36,12 @@ contract UpgradeChainFromVersionTest is AdminTest { initCalldata: new bytes(0) }); - utilsFacet.util_setStateTransitionManager(stateTransitionManager); + utilsFacet.util_setChainTypeManager(chainTypeManager); bytes32 cutHashInput = keccak256("random"); vm.mockCall( - stateTransitionManager, - abi.encodeWithSelector(IStateTransitionManager.upgradeCutHash.selector), + chainTypeManager, + abi.encodeWithSelector(IChainTypeManager.upgradeCutHash.selector), abi.encode(cutHashInput) ); @@ -54,7 +54,7 @@ contract UpgradeChainFromVersionTest is AdminTest { function test_revertWhen_ProtocolVersionMismatchWhenUpgrading() public { address admin = utilsFacet.util_getAdmin(); - address stateTransitionManager = makeAddr("stateTransitionManager"); + address chainTypeManager = makeAddr("chainTypeManager"); uint256 oldProtocolVersion = 1; Diamond.DiamondCutData memory diamondCutData = Diamond.DiamondCutData({ @@ -64,12 +64,12 @@ contract UpgradeChainFromVersionTest is AdminTest { }); utilsFacet.util_setProtocolVersion(oldProtocolVersion + 1); - utilsFacet.util_setStateTransitionManager(stateTransitionManager); + utilsFacet.util_setChainTypeManager(chainTypeManager); bytes32 cutHashInput = keccak256(abi.encode(diamondCutData)); vm.mockCall( - stateTransitionManager, - abi.encodeWithSelector(IStateTransitionManager.upgradeCutHash.selector), + chainTypeManager, + abi.encodeWithSelector(IChainTypeManager.upgradeCutHash.selector), abi.encode(cutHashInput) ); @@ -80,7 +80,7 @@ contract UpgradeChainFromVersionTest is AdminTest { function test_revertWhen_ProtocolVersionMismatchAfterUpgrading() public { address admin = utilsFacet.util_getAdmin(); - address stateTransitionManager = makeAddr("stateTransitionManager"); + address chainTypeManager = makeAddr("chainTypeManager"); uint256 oldProtocolVersion = 1; Diamond.DiamondCutData memory diamondCutData = Diamond.DiamondCutData({ @@ -90,12 +90,12 @@ contract UpgradeChainFromVersionTest is AdminTest { }); utilsFacet.util_setProtocolVersion(oldProtocolVersion); - utilsFacet.util_setStateTransitionManager(stateTransitionManager); + utilsFacet.util_setChainTypeManager(chainTypeManager); bytes32 cutHashInput = keccak256(abi.encode(diamondCutData)); vm.mockCall( - stateTransitionManager, - abi.encodeWithSelector(IStateTransitionManager.upgradeCutHash.selector), + chainTypeManager, + abi.encodeWithSelector(IChainTypeManager.upgradeCutHash.selector), abi.encode(cutHashInput) ); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernorOrStateTransitionManager.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernorOrStateTransitionManager.t.sol index 2c4062d5b..edda66f4d 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernorOrStateTransitionManager.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernorOrStateTransitionManager.t.sol @@ -5,34 +5,34 @@ pragma solidity 0.8.24; import {ZkSyncHyperchainBaseTest} from "./_Base_Shared.t.sol"; import {Unauthorized} from "contracts/common/L1ContractErrors.sol"; -contract OnlyAdminOrStateTransitionManagerTest is ZkSyncHyperchainBaseTest { +contract OnlyAdminOrChainTypeManagerTest is ZkSyncHyperchainBaseTest { function test_revertWhen_calledByNonAdmin() public { address nonAdmin = makeAddr("nonAdmin"); vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonAdmin)); vm.startPrank(nonAdmin); - testBaseFacet.functionWithOnlyAdminOrStateTransitionManagerModifier(); + testBaseFacet.functionWithOnlyAdminOrChainTypeManagerModifier(); } - function test_revertWhen_calledByNonStateTransitionManager() public { - address nonStateTransitionManager = makeAddr("nonStateTransitionManager"); + function test_revertWhen_calledByNonChainTypeManager() public { + address nonChainTypeManager = makeAddr("nonChainTypeManager"); - vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonStateTransitionManager)); - vm.startPrank(nonStateTransitionManager); - testBaseFacet.functionWithOnlyAdminOrStateTransitionManagerModifier(); + vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonChainTypeManager)); + vm.startPrank(nonChainTypeManager); + testBaseFacet.functionWithOnlyAdminOrChainTypeManagerModifier(); } function test_successfulCallWhenCalledByAdmin() public { address admin = utilsFacet.util_getAdmin(); vm.startPrank(admin); - testBaseFacet.functionWithOnlyAdminOrStateTransitionManagerModifier(); + testBaseFacet.functionWithOnlyAdminOrChainTypeManagerModifier(); } - function test_successfulCallWhenCalledByStateTransitionManager() public { - address stateTransitionManager = utilsFacet.util_getStateTransitionManager(); + function test_successfulCallWhenCalledByChainTypeManager() public { + address chainTypeManager = utilsFacet.util_getChainTypeManager(); - vm.startPrank(stateTransitionManager); - testBaseFacet.functionWithOnlyAdminOrStateTransitionManagerModifier(); + vm.startPrank(chainTypeManager); + testBaseFacet.functionWithOnlyAdminOrChainTypeManagerModifier(); } } diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyStateTransitionManager.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyStateTransitionManager.t.sol index a93032c90..e02208201 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyStateTransitionManager.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyStateTransitionManager.t.sol @@ -5,19 +5,19 @@ pragma solidity 0.8.24; import {ZkSyncHyperchainBaseTest} from "./_Base_Shared.t.sol"; import {Unauthorized} from "contracts/common/L1ContractErrors.sol"; -contract OnlyStateTransitionManagerTest is ZkSyncHyperchainBaseTest { - function test_revertWhen_calledByNonStateTransitionManager() public { - address nonStateTransitionManager = makeAddr("nonStateTransitionManager"); +contract OnlyChainTypeManagerTest is ZkSyncHyperchainBaseTest { + function test_revertWhen_calledByNonChainTypeManager() public { + address nonChainTypeManager = makeAddr("nonChainTypeManager"); - vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonStateTransitionManager)); - vm.startPrank(nonStateTransitionManager); - testBaseFacet.functionWithOnlyStateTransitionManagerModifier(); + vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonChainTypeManager)); + vm.startPrank(nonChainTypeManager); + testBaseFacet.functionWithOnlyChainTypeManagerModifier(); } function test_successfulCall() public { - address stateTransitionManager = utilsFacet.util_getStateTransitionManager(); + address chainTypeManager = utilsFacet.util_getChainTypeManager(); - vm.startPrank(stateTransitionManager); - testBaseFacet.functionWithOnlyStateTransitionManagerModifier(); + vm.startPrank(chainTypeManager); + testBaseFacet.functionWithOnlyChainTypeManagerModifier(); } } diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol index 15fa32883..0eff0cba7 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol @@ -15,15 +15,15 @@ contract TestBaseFacet is ZkSyncHyperchainBase { function functionWithOnlyValidatorModifier() external onlyValidator {} - function functionWithOnlyStateTransitionManagerModifier() external onlyStateTransitionManager {} + function functionWithOnlyChainTypeManagerModifier() external onlyChainTypeManager {} function functionWithOnlyBridgehubModifier() external onlyBridgehub {} - function functionWithOnlyAdminOrStateTransitionManagerModifier() external onlyAdminOrStateTransitionManager {} + function functionWithOnlyAdminOrChainTypeManagerModifier() external onlyAdminOrChainTypeManager {} - function functionWithonlyValidatorOrStateTransitionManagerModifier() + function functionWithonlyValidatorOrChainTypeManagerModifier() external - onlyValidatorOrStateTransitionManager + onlyValidatorOrChainTypeManager {} // add this to be excluded from coverage report @@ -46,10 +46,10 @@ contract ZkSyncHyperchainBaseTest is Test { selectors = new bytes4[](6); selectors[0] = TestBaseFacet.functionWithOnlyAdminModifier.selector; selectors[1] = TestBaseFacet.functionWithOnlyValidatorModifier.selector; - selectors[2] = TestBaseFacet.functionWithOnlyStateTransitionManagerModifier.selector; + selectors[2] = TestBaseFacet.functionWithOnlyChainTypeManagerModifier.selector; selectors[3] = TestBaseFacet.functionWithOnlyBridgehubModifier.selector; - selectors[4] = TestBaseFacet.functionWithOnlyAdminOrStateTransitionManagerModifier.selector; - selectors[5] = TestBaseFacet.functionWithonlyValidatorOrStateTransitionManagerModifier.selector; + selectors[4] = TestBaseFacet.functionWithOnlyAdminOrChainTypeManagerModifier.selector; + selectors[5] = TestBaseFacet.functionWithonlyValidatorOrChainTypeManagerModifier.selector; } function setUp() public virtual { diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetStateTransitionManager.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetStateTransitionManager.t.sol index 9b3038f97..cf8b23ef0 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetStateTransitionManager.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetStateTransitionManager.t.sol @@ -4,13 +4,13 @@ pragma solidity 0.8.24; import {GettersFacetTest} from "./_Getters_Shared.t.sol"; -contract GetStateTransitionManagerTest is GettersFacetTest { +contract GetChainTypeManagerTest is GettersFacetTest { function test() public { - address expected = makeAddr("stateTransitionManager"); - gettersFacetWrapper.util_setStateTransitionManager(expected); + address expected = makeAddr("chainTypeManager"); + gettersFacetWrapper.util_setChainTypeManager(expected); - address received = gettersFacet.getStateTransitionManager(); + address received = gettersFacet.getChainTypeManager(); - assertEq(expected, received, "StateTransitionManager address is incorrect"); + assertEq(expected, received, "ChainTypeManager address is incorrect"); } } diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/_Getters_Shared.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/_Getters_Shared.t.sol index 04065ca07..557378c63 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/_Getters_Shared.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/_Getters_Shared.t.sol @@ -28,8 +28,8 @@ contract GettersFacetWrapper is GettersFacet { s.bridgehub = _bridgehub; } - function util_setStateTransitionManager(address _stateTransitionManager) external { - s.stateTransitionManager = _stateTransitionManager; + function util_setChainTypeManager(address _chainTypeManager) external { + s.chainTypeManager = _chainTypeManager; } function util_setBaseToken(bytes32 _baseTokenAssetId) external { diff --git a/system-contracts/contracts/L2GenesisUpgrade.sol b/system-contracts/contracts/L2GenesisUpgrade.sol index 28ca12b2b..aab22ff34 100644 --- a/system-contracts/contracts/L2GenesisUpgrade.sol +++ b/system-contracts/contracts/L2GenesisUpgrade.sol @@ -14,7 +14,7 @@ import {IL2GenesisUpgrade} from "./interfaces/IL2GenesisUpgrade.sol"; contract L2GenesisUpgrade is IL2GenesisUpgrade { function genesisUpgrade( uint256 _chainId, - address _stmDeployer, + address _ctmDeployer, bytes calldata _forceDeploymentsData ) external payable { // solhint-disable-next-line gas-custom-errors @@ -32,7 +32,7 @@ contract L2GenesisUpgrade is IL2GenesisUpgrade { bytes memory data = abi.encodeCall( L2_BRIDDGE_HUB.setAddresses, - (L2_ASSET_ROUTER, _stmDeployer, address(L2_MESSAGE_ROOT)) + (L2_ASSET_ROUTER, _ctmDeployer, address(L2_MESSAGE_ROOT)) ); (bool success, bytes memory returnData) = SystemContractHelper.mimicCall( diff --git a/system-contracts/contracts/interfaces/IBridgehub.sol b/system-contracts/contracts/interfaces/IBridgehub.sol index 523c3ca7f..9fdacbf4a 100644 --- a/system-contracts/contracts/interfaces/IBridgehub.sol +++ b/system-contracts/contracts/interfaces/IBridgehub.sol @@ -5,7 +5,7 @@ pragma solidity ^0.8.20; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev interface IBridgehub { - function setAddresses(address _assetRouter, address _stmDeployer, address _messageRoot) external; + function setAddresses(address _assetRouter, address _ctmDeployer, address _messageRoot) external; function owner() external view returns (address); } diff --git a/system-contracts/contracts/interfaces/IL2GenesisUpgrade.sol b/system-contracts/contracts/interfaces/IL2GenesisUpgrade.sol index e0abb950c..2d50b8978 100644 --- a/system-contracts/contracts/interfaces/IL2GenesisUpgrade.sol +++ b/system-contracts/contracts/interfaces/IL2GenesisUpgrade.sol @@ -7,7 +7,7 @@ interface IL2GenesisUpgrade { function genesisUpgrade( uint256 _chainId, - address _stmDeployer, + address _ctmDeployer, bytes calldata _forceDeploymentsData ) external payable; } From 213f990a1c07a709155d8bf93a21a4892755ba40 Mon Sep 17 00:00:00 2001 From: kelemeno <34402761+kelemeno@users.noreply.github.com> Date: Wed, 4 Sep 2024 15:43:33 +0100 Subject: [PATCH 14/53] chore: Kl/merge-dev-sync-layer-stable (#763) Co-authored-by: Dima Zhornyk <55756184+dimazhornyk@users.noreply.github.com> Co-authored-by: Bence Haromi <56651250+benceharomi@users.noreply.github.com> Co-authored-by: koloz193 --- .../workflows/l1-contracts-foundry-ci.yaml | 2 +- .gitignore | 1 + CONTRIBUTING.md | 2 +- README.md | 12 +- docs/Overview.md | 24 +- gas-bound-caller/README.md | 2 +- l1-contracts/README.md | 6 +- .../contracts/bridge/L1ERC20Bridge.sol | 2 +- .../bridge/interfaces/IL1AssetRouter.sol | 2 +- .../bridge/interfaces/IL1ERC20Bridge.sol | 2 +- .../contracts/bridge/interfaces/IL2Bridge.sol | 2 +- .../contracts/bridge/interfaces/IWETH9.sol | 2 +- .../contracts/bridgehub/IBridgehub.sol | 2 +- l1-contracts/contracts/common/Config.sol | 2 +- .../contracts/common/Dependencies.sol | 2 +- .../contracts/common/L2ContractAddresses.sol | 2 +- l1-contracts/contracts/common/Messaging.sol | 2 +- .../contracts/common/ReentrancyGuard.sol | 2 +- .../common/interfaces/IL2ContractDeployer.sol | 2 +- .../common/libraries/L2ContractHelper.sol | 2 +- .../contracts/common/libraries/Merkle.sol | 4 +- .../contracts/common/libraries/SemVer.sol | 2 +- .../common/libraries/UncheckedMath.sol | 2 +- .../common/libraries/UnsafeBytes.sol | 2 +- .../contracts/governance/IGovernance.sol | 2 +- .../IStateTransitionManager.sol | 2 +- .../chain-deps/facets/Mailbox.sol | 1 + .../chain-interfaces/IAdmin.sol | 2 +- .../chain-interfaces/IDiamondInit.sol | 2 +- .../chain-interfaces/IExecutor.sol | 2 +- .../chain-interfaces/IGetters.sol | 2 +- .../chain-interfaces/ILegacyGetters.sol | 2 +- .../chain-interfaces/IMailbox.sol | 2 +- .../chain-interfaces/ITransactionFilterer.sol | 2 +- .../chain-interfaces/IVerifier.sol | 2 +- .../chain-interfaces/IZkSyncHyperchain.sol | 2 +- .../IZkSyncHyperchainBase.sol | 2 +- .../state-transition/libraries/Diamond.sol | 2 +- .../state-transition/libraries/LibMap.sol | 2 +- .../libraries/PriorityQueue.sol | 2 +- .../libraries/TransactionValidator.sol | 2 +- .../contracts/vendor/AddressAliasHelper.sol | 2 +- .../config-prepare-registration-calldata.toml | 12 + l1-contracts/deploy-scripts/AcceptAdmin.s.sol | 2 +- .../deploy-scripts/DeployL2Contracts.sol | 2 + .../deploy-scripts/DeployPaymaster.s.sol | 3 +- .../PrepareZKChainRegistrationCalldata.s.sol | 365 ++++++++++++++++++ l1-contracts/deploy-scripts/Utils.sol | 24 +- l1-contracts/foundry.toml | 12 +- .../script-config/artifacts/BeaconProxy.json | 81 ++++ .../artifacts/L2SharedBridge.json | 262 +++++++++++++ .../TransparentUpgradeableProxy.json | 86 +++++ .../Bridgehub/experimental_bridge.t.sol | 2 +- l2-contracts/contracts/Dependencies.sol | 2 +- l2-contracts/contracts/L2ContractHelper.sol | 2 +- .../contracts/SystemContractsCaller.sol | 2 +- l2-contracts/contracts/TestnetPaymaster.sol | 2 +- .../bridge/interfaces/IL1AssetRouter.sol | 2 +- .../bridge/interfaces/IL1ERC20Bridge.sol | 2 +- .../bridge/interfaces/IL2SharedBridge.sol | 2 +- .../bridge/interfaces/IL2StandardToken.sol | 2 +- .../bridge/interfaces/IL2WrappedBaseToken.sol | 2 +- .../contracts/errors/L2ContractErrors.sol | 2 +- .../contracts/interfaces/IPaymaster.sol | 2 +- .../contracts/interfaces/IPaymasterFlow.sol | 2 +- .../contracts/vendor/AddressAliasHelper.sol | 2 +- l2-contracts/foundry.toml | 6 +- system-contracts/README.md | 14 +- system-contracts/SystemContractsHashes.json | 88 ++--- system-contracts/bootloader/bootloader.yul | 26 +- system-contracts/contracts/Constants.sol | 3 +- system-contracts/contracts/EventWriter.yul | 2 + .../contracts/SystemContractErrors.sol | 3 +- .../contracts/abstract/SystemContractBase.sol | 2 +- .../contracts/interfaces/IAccount.sol | 2 +- .../interfaces/IAccountCodeStorage.sol | 2 +- .../contracts/interfaces/IBaseToken.sol | 2 +- .../interfaces/IBootloaderUtilities.sol | 2 +- .../contracts/interfaces/IComplexUpgrader.sol | 2 +- .../contracts/interfaces/ICompressor.sol | 2 +- .../interfaces/IContractDeployer.sol | 2 +- .../interfaces/IImmutableSimulator.sol | 2 +- .../interfaces/IKnownCodesStorage.sol | 2 +- .../contracts/interfaces/IL1Messenger.sol | 2 +- .../contracts/interfaces/IL2StandardToken.sol | 2 +- .../contracts/interfaces/IMailbox.sol | 2 +- .../contracts/interfaces/INonceHolder.sol | 2 +- .../contracts/interfaces/IPaymaster.sol | 2 +- .../contracts/interfaces/IPaymasterFlow.sol | 2 +- .../interfaces/IPubdataChunkPublisher.sol | 2 +- .../contracts/interfaces/ISystemContext.sol | 2 +- .../interfaces/ISystemContextDeprecated.sol | 2 +- .../contracts/libraries/EfficientCall.sol | 2 +- .../contracts/libraries/RLPEncoder.sol | 2 +- .../libraries/SystemContractHelper.sol | 2 +- .../libraries/SystemContractsCaller.sol | 2 +- .../contracts/libraries/TransactionHelper.sol | 2 +- .../libraries/UnsafeBytesCalldata.sol | 2 +- .../contracts/libraries/Utils.sol | 2 +- .../openzeppelin/token/ERC20/IERC20.sol | 2 +- .../token/ERC20/extensions/IERC20Permit.sol | 2 +- .../token/ERC20/utils/SafeERC20.sol | 2 +- .../contracts/openzeppelin/utils/Address.sol | 2 +- .../contracts/precompiles/CodeOracle.yul | 2 + .../contracts/precompiles/EcAdd.yul | 2 + .../contracts/precompiles/EcMul.yul | 2 + .../contracts/precompiles/EcPairing.yul | 2 + .../contracts/precompiles/Ecrecover.yul | 2 + .../contracts/precompiles/Keccak256.yul | 2 + .../contracts/precompiles/P256Verify.yul | 2 + .../contracts/precompiles/SHA256.yul | 2 + .../test-contracts/Keccak256Mock.yul | 2 + .../test-contracts/CodeOracleTest.sol | 2 +- .../contracts/test-contracts/TransferTest.sol | 2 +- system-contracts/scripts/constants.ts | 2 +- system-contracts/scripts/deploy-preimages.ts | 6 +- system-contracts/scripts/utils.ts | 2 +- 117 files changed, 1032 insertions(+), 199 deletions(-) create mode 100644 l1-contracts/deploy-script-config-template/config-prepare-registration-calldata.toml create mode 100644 l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol create mode 100644 l1-contracts/script-config/artifacts/BeaconProxy.json create mode 100644 l1-contracts/script-config/artifacts/L2SharedBridge.json create mode 100644 l1-contracts/script-config/artifacts/TransparentUpgradeableProxy.json diff --git a/.github/workflows/l1-contracts-foundry-ci.yaml b/.github/workflows/l1-contracts-foundry-ci.yaml index ca3513151..5e959c124 100644 --- a/.github/workflows/l1-contracts-foundry-ci.yaml +++ b/.github/workflows/l1-contracts-foundry-ci.yaml @@ -88,7 +88,7 @@ jobs: - name: Copy configs from template working-directory: ./l1-contracts - run: cp -r deploy-script-config-template script-config + run: cp -r deploy-script-config-template/. script-config - name: Run anvil run: | diff --git a/.gitignore b/.gitignore index 05b4a6e2e..58c92d50f 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ l1-contracts/coverage/* l1-contracts/out/* l1-contracts/broadcast/* l1-contracts/script-config/* +!l1-contracts/script-config/artifacts l1-contracts/script-out/* l1-contracts/test/foundry/integration/deploy-scripts/script-out/*.toml !l1-contracts/script-out/.gitkeep diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dd3d45842..46bdeebac 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,7 +34,7 @@ We aim to make it as easy as possible to contribute to the mission. This is stil and suggestions here too. Some resources to help: 1. [In-repo docs aimed at developers](docs) -2. [zkSync Era docs!](https://era.zksync.io/docs/) +2. [ZKsync Era docs!](https://era.zksync.io/docs/) 3. Company links can be found in the [repo's readme](README.md) ## Code of Conduct diff --git a/README.md b/README.md index 6e3e06aba..cc1425b5b 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -# zkSync Era: Smart Contracts +# ZKsync Era: Smart Contracts [![Logo](eraLogo.svg)](https://zksync.io/) -zkSync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or +ZKsync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or decentralization. Since it's EVM compatible (Solidity/Vyper), 99% of Ethereum projects can redeploy without refactoring -or re-auditing a single line of code. zkSync Era also uses an LLVM-based compiler that will eventually let developers +or re-auditing a single line of code. ZKsync Era also uses an LLVM-based compiler that will eventually let developers write smart contracts in C++, Rust and other popular languages. -This repository contains both L1 and L2 zkSync smart contracts. For their description see the +This repository contains both L1 and L2 ZKsync smart contracts. For their description see the [system overview](docs/Overview.md). ## Disclaimer @@ -17,7 +17,7 @@ others may not. ## License -zkSync Era contracts are distributed under the terms of the MIT license. +ZKsync Era contracts are distributed under the terms of the MIT license. See [LICENSE-MIT](LICENSE-MIT) for details. @@ -33,7 +33,7 @@ See [LICENSE-MIT](LICENSE-MIT) for details. ## Disclaimer -zkSync Era has been through lots of testing and audits. Although it is live, it is still in alpha state and will go +ZKsync Era has been through lots of testing and audits. Although it is live, it is still in alpha state and will go through more audits and bug bounties programs. We would love to hear our community's thoughts and suggestions about it! It is important to state that forking it now can potentially lead to missing important security updates, critical features, and performance improvements. diff --git a/docs/Overview.md b/docs/Overview.md index aedb11f54..4529a8dda 100644 --- a/docs/Overview.md +++ b/docs/Overview.md @@ -1,6 +1,6 @@ # Overview -zkSync Era is a permissionless general-purpose ZK rollup. Similar to many L1 blockchains and sidechains it enables +ZKsync Era is a permissionless general-purpose ZK rollup. Similar to many L1 blockchains and sidechains it enables deployment and interaction with Turing-complete smart contracts. - L2 smart contracts are executed on a zkEVM. @@ -10,7 +10,7 @@ deployment and interaction with Turing-complete smart contracts. - There is no escape hatch mechanism yet, but there will be one. All data that is needed to restore the L2 state are also pushed on-chain. There are two approaches, publishing inputs of -L2 transactions on-chain and publishing the state transition diff. zkSync follows the second option. +L2 transactions on-chain and publishing the state transition diff. ZKsync follows the second option. See the [documentation](https://era.zksync.io/docs/dev/fundamentals/rollups.html) to read more! @@ -25,13 +25,13 @@ See the [documentation](https://era.zksync.io/docs/dev/fundamentals/rollups.html L2 blocks. - **Facet** - implementation contract. The word comes from the EIP-2535. - **Gas** - a unit that measures the amount of computational effort required to execute specific operations on the - zkSync Era network. + ZKsync Era network. ### L1 Smart contracts #### Diamond -Technically, this L1 smart contract acts as a connector between Ethereum (L1) and zkSync (L2). This contract checks the +Technically, this L1 smart contract acts as a connector between Ethereum (L1) and ZKsync (L2). This contract checks the validity proof and data availability, handles L2 <-> L1 communication, finalizes L2 state transition, and more. There are also important contracts deployed on the L2 that can also execute logic called _system contracts_. Using L2 @@ -73,7 +73,7 @@ execution of upgrades in the diamond proxy. This contract manages operations (calls with preconditions) for governance tasks. The contract allows for operations to be scheduled, executed, and canceled with appropriate permissions and delays. It is used for managing and coordinating -upgrades and changes in all zkSync Era governed contracts. +upgrades and changes in all ZKsync Era governed contracts. Each upgrade consists of two steps: @@ -122,8 +122,8 @@ function applyL1ToL2Alias(address l1Address) internal pure returns (address l2Ad ``` For most of the rollups the address aliasing needs to prevent cross-chain exploits that would otherwise be possible if -we simply reused the same L1 addresses as the L2 sender. In zkSync Era address derivation rule is different from the -Ethereum, so cross-chain exploits are already impossible. However, zkSync Era may add full EVM support in the future, so +we simply reused the same L1 addresses as the L2 sender. In ZKsync Era address derivation rule is different from the +Ethereum, so cross-chain exploits are already impossible. However, ZKsync Era may add full EVM support in the future, so applying address aliasing leave room for future EVM compatibility. The L1 -> L2 communication is also used for bridging ether. The user should include a `msg.value` when initiating a @@ -253,8 +253,8 @@ the L1 recipient. #### ValidatorTimelock -An intermediate smart contract between the validator EOA account and the zkSync smart contract. Its primary purpose is -to provide a trustless means of delaying batch execution without modifying the main zkSync contract. zkSync actively +An intermediate smart contract between the validator EOA account and the ZKsync smart contract. Its primary purpose is +to provide a trustless means of delaying batch execution without modifying the main ZKsync contract. ZKsync actively monitors the chain activity and reacts to any suspicious activity by freezing the chain. This allows time for investigation and mitigation before resuming normal operations. @@ -264,12 +264,12 @@ the Alpha stage. This contract consists of four main functions `commitBatches`, `proveBatches`, `executeBatches`, and `revertBatches`, that can be called only by the validator. -When the validator calls `commitBatches`, the same calldata will be propagated to the zkSync contract (`DiamondProxy` +When the validator calls `commitBatches`, the same calldata will be propagated to the ZKsync contract (`DiamondProxy` through `call` where it invokes the `ExecutorFacet` through `delegatecall`), and also a timestamp is assigned to these batches to track the time these batches are committed by the validator to enforce a delay between committing and execution of batches. Then, the validator can prove the already committed batches regardless of the mentioned timestamp, -and again the same calldata (related to the `proveBatches` function) will be propagated to the zkSync contract. After, -the `delay` is elapsed, the validator is allowed to call `executeBatches` to propagate the same calldata to zkSync +and again the same calldata (related to the `proveBatches` function) will be propagated to the ZKsync contract. After, +the `delay` is elapsed, the validator is allowed to call `executeBatches` to propagate the same calldata to ZKsync contract. ### L2 specifics diff --git a/gas-bound-caller/README.md b/gas-bound-caller/README.md index 00f2868df..17b647539 100644 --- a/gas-bound-caller/README.md +++ b/gas-bound-caller/README.md @@ -46,4 +46,4 @@ Since `GasBoundCaller` would be the contract that calls the `_to` contract, the It should be deployed via a built-in CREATE2 factory on each individual chain. -The current address on both sepolia testnet and mainnet for zkSync Era is `0xc706EC7dfA5D4Dc87f29f859094165E8290530f5`. +The current address on both sepolia testnet and mainnet for ZKsync Era is `0xc706EC7dfA5D4Dc87f29f859094165E8290530f5`. diff --git a/l1-contracts/README.md b/l1-contracts/README.md index 30ffc8399..8fb04bb86 100644 --- a/l1-contracts/README.md +++ b/l1-contracts/README.md @@ -1,10 +1,10 @@ -# zkSync Era: L1 Contracts +# ZKsync Era: L1 Contracts [![Logo](../eraLogo.svg)](https://zksync.io/) -zkSync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or +ZKsync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or decentralization. Since it's EVM compatible (Solidity/Vyper), 99% of Ethereum projects can redeploy without refactoring -or re-auditing a single line of code. zkSync Era also uses an LLVM-based compiler that will eventually let developers +or re-auditing a single line of code. ZKsync Era also uses an LLVM-based compiler that will eventually let developers write smart contracts in C++, Rust and other popular languages. ## L1 Contracts diff --git a/l1-contracts/contracts/bridge/L1ERC20Bridge.sol b/l1-contracts/contracts/bridge/L1ERC20Bridge.sol index 663db2bc9..bfe68882c 100644 --- a/l1-contracts/contracts/bridge/L1ERC20Bridge.sol +++ b/l1-contracts/contracts/bridge/L1ERC20Bridge.sol @@ -42,7 +42,7 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { mapping(address account => mapping(address l1Token => mapping(bytes32 depositL2TxHash => uint256 amount))) public depositAmount; - /// @dev The address that is used as a L2 Shared Bridge in ZKsync Era. + /// @dev The address that is used as a L2 bridge counterpart in ZKsync Era. // slither-disable-next-line uninitialized-state address public l2Bridge; diff --git a/l1-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol b/l1-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol index da13c9e70..3394fb758 100644 --- a/l1-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol +++ b/l1-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {L2TransactionRequestTwoBridgesInner} from "../../bridgehub/IBridgehub.sol"; diff --git a/l1-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol b/l1-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol index 98eab24c8..b9426f3e1 100644 --- a/l1-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol +++ b/l1-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {IL1AssetRouter} from "./IL1AssetRouter.sol"; diff --git a/l1-contracts/contracts/bridge/interfaces/IL2Bridge.sol b/l1-contracts/contracts/bridge/interfaces/IL2Bridge.sol index 55ac45e8d..7fe7b7a97 100644 --- a/l1-contracts/contracts/bridge/interfaces/IL2Bridge.sol +++ b/l1-contracts/contracts/bridge/interfaces/IL2Bridge.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @author Matter Labs diff --git a/l1-contracts/contracts/bridge/interfaces/IWETH9.sol b/l1-contracts/contracts/bridge/interfaces/IWETH9.sol index 2634cc5d5..e1536f4fb 100644 --- a/l1-contracts/contracts/bridge/interfaces/IWETH9.sol +++ b/l1-contracts/contracts/bridge/interfaces/IWETH9.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: Apache-2.0 -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; interface IWETH9 { diff --git a/l1-contracts/contracts/bridgehub/IBridgehub.sol b/l1-contracts/contracts/bridgehub/IBridgehub.sol index 6b88ebb70..5e674b145 100644 --- a/l1-contracts/contracts/bridgehub/IBridgehub.sol +++ b/l1-contracts/contracts/bridgehub/IBridgehub.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {IL1AssetRouter} from "../bridge/interfaces/IL1AssetRouter.sol"; diff --git a/l1-contracts/contracts/common/Config.sol b/l1-contracts/contracts/common/Config.sol index bd28dba5a..dfac8a3bd 100644 --- a/l1-contracts/contracts/common/Config.sol +++ b/l1-contracts/contracts/common/Config.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @dev `keccak256("")` diff --git a/l1-contracts/contracts/common/Dependencies.sol b/l1-contracts/contracts/common/Dependencies.sol index 017b6177e..fceaa77dd 100644 --- a/l1-contracts/contracts/common/Dependencies.sol +++ b/l1-contracts/contracts/common/Dependencies.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /* solhint-disable-next-line no-unused-import */ diff --git a/l1-contracts/contracts/common/L2ContractAddresses.sol b/l1-contracts/contracts/common/L2ContractAddresses.sol index feecf5726..3cef5f560 100644 --- a/l1-contracts/contracts/common/L2ContractAddresses.sol +++ b/l1-contracts/contracts/common/L2ContractAddresses.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @dev The formal address of the initial program of the system: the bootloader diff --git a/l1-contracts/contracts/common/Messaging.sol b/l1-contracts/contracts/common/Messaging.sol index 526d526dd..a7a2db944 100644 --- a/l1-contracts/contracts/common/Messaging.sol +++ b/l1-contracts/contracts/common/Messaging.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @dev The enum that represents the transaction execution status diff --git a/l1-contracts/contracts/common/ReentrancyGuard.sol b/l1-contracts/contracts/common/ReentrancyGuard.sol index 7d3899658..b1f8e556a 100644 --- a/l1-contracts/contracts/common/ReentrancyGuard.sol +++ b/l1-contracts/contracts/common/ReentrancyGuard.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {SlotOccupied, NotInitializedReentrancyGuard, Reentrancy} from "./L1ContractErrors.sol"; diff --git a/l1-contracts/contracts/common/interfaces/IL2ContractDeployer.sol b/l1-contracts/contracts/common/interfaces/IL2ContractDeployer.sol index 5e2a21538..3d5b597df 100644 --- a/l1-contracts/contracts/common/interfaces/IL2ContractDeployer.sol +++ b/l1-contracts/contracts/common/interfaces/IL2ContractDeployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /** diff --git a/l1-contracts/contracts/common/libraries/L2ContractHelper.sol b/l1-contracts/contracts/common/libraries/L2ContractHelper.sol index a890710cc..93d786936 100644 --- a/l1-contracts/contracts/common/libraries/L2ContractHelper.sol +++ b/l1-contracts/contracts/common/libraries/L2ContractHelper.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {BytecodeError, MalformedBytecode, LengthIsNotDivisibleBy32} from "../L1ContractErrors.sol"; diff --git a/l1-contracts/contracts/common/libraries/Merkle.sol b/l1-contracts/contracts/common/libraries/Merkle.sol index 3a70ff5cd..560bfc7bc 100644 --- a/l1-contracts/contracts/common/libraries/Merkle.sol +++ b/l1-contracts/contracts/common/libraries/Merkle.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT - -pragma solidity 0.8.24; +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. +pragma solidity ^0.8.21; // solhint-disable gas-custom-errors diff --git a/l1-contracts/contracts/common/libraries/SemVer.sol b/l1-contracts/contracts/common/libraries/SemVer.sol index 8d9fd10ac..c46051626 100644 --- a/l1-contracts/contracts/common/libraries/SemVer.sol +++ b/l1-contracts/contracts/common/libraries/SemVer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @dev The number of bits dedicated to the "patch" portion of the protocol version. diff --git a/l1-contracts/contracts/common/libraries/UncheckedMath.sol b/l1-contracts/contracts/common/libraries/UncheckedMath.sol index 91c3e652c..a41a9c6ea 100644 --- a/l1-contracts/contracts/common/libraries/UncheckedMath.sol +++ b/l1-contracts/contracts/common/libraries/UncheckedMath.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /** diff --git a/l1-contracts/contracts/common/libraries/UnsafeBytes.sol b/l1-contracts/contracts/common/libraries/UnsafeBytes.sol index ed898b4ba..e2680d9e0 100644 --- a/l1-contracts/contracts/common/libraries/UnsafeBytes.sol +++ b/l1-contracts/contracts/common/libraries/UnsafeBytes.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /** diff --git a/l1-contracts/contracts/governance/IGovernance.sol b/l1-contracts/contracts/governance/IGovernance.sol index e2a600175..2b03ed4c9 100644 --- a/l1-contracts/contracts/governance/IGovernance.sol +++ b/l1-contracts/contracts/governance/IGovernance.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @title Governance contract interface diff --git a/l1-contracts/contracts/state-transition/IStateTransitionManager.sol b/l1-contracts/contracts/state-transition/IStateTransitionManager.sol index 9c2785259..0db3ec3de 100644 --- a/l1-contracts/contracts/state-transition/IStateTransitionManager.sol +++ b/l1-contracts/contracts/state-transition/IStateTransitionManager.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {Diamond} from "./libraries/Diamond.sol"; diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol index 516b686a0..b389684ba 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol @@ -478,6 +478,7 @@ contract MailboxFacet is ZkSyncHyperchainBase, IMailbox { request.refundRecipient = AddressAliasHelper.actualRefundRecipient(request.refundRecipient, request.sender); // Change the sender address if it is a smart contract to prevent address collision between L1 and L2. // Please note, currently ZKsync address derivation is different from Ethereum one, but it may be changed in the future. + // solhint-disable avoid-tx-origin // slither-disable-next-line tx-origin if (request.sender != tx.origin) { request.sender = AddressAliasHelper.applyL1ToL2Alias(request.sender); diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol index 216aa138a..61802b674 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {IZkSyncHyperchainBase} from "../chain-interfaces/IZkSyncHyperchainBase.sol"; diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol index 81c09f759..d7def8255 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {IVerifier, VerifierParams} from "./IVerifier.sol"; diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol index 70e53677f..6f5462f73 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {IZkSyncHyperchainBase} from "./IZkSyncHyperchainBase.sol"; diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol index 2b0ce8bc1..f1eb7f865 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {VerifierParams} from "../chain-interfaces/IVerifier.sol"; diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/ILegacyGetters.sol b/l1-contracts/contracts/state-transition/chain-interfaces/ILegacyGetters.sol index f32f9dcfa..cb62f5087 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/ILegacyGetters.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/ILegacyGetters.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {IZkSyncHyperchainBase} from "./IZkSyncHyperchainBase.sol"; diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IMailbox.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IMailbox.sol index 5b61101fc..f565e8562 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IMailbox.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IMailbox.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {IZkSyncHyperchainBase} from "./IZkSyncHyperchainBase.sol"; diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/ITransactionFilterer.sol b/l1-contracts/contracts/state-transition/chain-interfaces/ITransactionFilterer.sol index 49dee07fd..a3776cacd 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/ITransactionFilterer.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/ITransactionFilterer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @title The interface of the L1 -> L2 transaction filterer. diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IVerifier.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IVerifier.sol index dbca3bf0c..97872c370 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IVerifier.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IVerifier.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @notice Part of the configuration parameters of ZKP circuits diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol index bf9a88a5e..14aa123b0 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {IAdmin} from "./IAdmin.sol"; diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchainBase.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchainBase.sol index 19e894535..3cd646cc9 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchainBase.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchainBase.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: UNLICENSED +// SPDX-License-Identifier: MIT // We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; diff --git a/l1-contracts/contracts/state-transition/libraries/Diamond.sol b/l1-contracts/contracts/state-transition/libraries/Diamond.sol index 6d8416fde..b43a673c5 100644 --- a/l1-contracts/contracts/state-transition/libraries/Diamond.sol +++ b/l1-contracts/contracts/state-transition/libraries/Diamond.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {SafeCast} from "@openzeppelin/contracts-v4/utils/math/SafeCast.sol"; diff --git a/l1-contracts/contracts/state-transition/libraries/LibMap.sol b/l1-contracts/contracts/state-transition/libraries/LibMap.sol index 9bedb1cce..2cbad0b78 100644 --- a/l1-contracts/contracts/state-transition/libraries/LibMap.sol +++ b/l1-contracts/contracts/state-transition/libraries/LibMap.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @notice Library for storage of packed unsigned integers. diff --git a/l1-contracts/contracts/state-transition/libraries/PriorityQueue.sol b/l1-contracts/contracts/state-transition/libraries/PriorityQueue.sol index 762350039..141cd40c0 100644 --- a/l1-contracts/contracts/state-transition/libraries/PriorityQueue.sol +++ b/l1-contracts/contracts/state-transition/libraries/PriorityQueue.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {QueueIsEmpty} from "../../common/L1ContractErrors.sol"; diff --git a/l1-contracts/contracts/state-transition/libraries/TransactionValidator.sol b/l1-contracts/contracts/state-transition/libraries/TransactionValidator.sol index cab01b069..f196053f4 100644 --- a/l1-contracts/contracts/state-transition/libraries/TransactionValidator.sol +++ b/l1-contracts/contracts/state-transition/libraries/TransactionValidator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; import {Math} from "@openzeppelin/contracts-v4/utils/math/Math.sol"; diff --git a/l1-contracts/contracts/vendor/AddressAliasHelper.sol b/l1-contracts/contracts/vendor/AddressAliasHelper.sol index e5bc1da07..ad80f3483 100644 --- a/l1-contracts/contracts/vendor/AddressAliasHelper.sol +++ b/l1-contracts/contracts/vendor/AddressAliasHelper.sol @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; library AddressAliasHelper { diff --git a/l1-contracts/deploy-script-config-template/config-prepare-registration-calldata.toml b/l1-contracts/deploy-script-config-template/config-prepare-registration-calldata.toml new file mode 100644 index 000000000..99ff2e7ce --- /dev/null +++ b/l1-contracts/deploy-script-config-template/config-prepare-registration-calldata.toml @@ -0,0 +1,12 @@ +[deployed_addresses] +state_transition_proxy_addr = "0x635853efd1d388f597feb9fe06e666efda397911" +erc20_bridge_proxy_addr = "0x147CDc5DD347bA141545Ad08fce748484Ed7fDbA" + + +[chain] +chain_id = 123 +era_chain_id = 9 +admin = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" +diamond_cut_data = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000cf3cd7fa8948f7748d20f7f33e85a0320b6c5d4d0000000000000000000000000000000000000000000000000000000000000c400000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000a200000000000000000000000003fe9b8f276c1a2e26d2190f2d9fd1897a04eb90a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf50000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db865000000000000000000000000000000000000000000000000000000000000000000000000000000000e70df06c0938e724ce23e49b3c4f01abed6bbfc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002906d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005518c73b0000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da0000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000000000000000000000000000006e2e077311fb218b80404298c9a227c42b792b610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008042901c70000000000000000000000000000000000000000000000000000000012f43dab00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000c924de3500000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000000000000000000000000000a226529de193f2153b25d7d9ad774689b78c301e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000080f23da4300000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006edd4f12000000000000000000000000000000000000000000000000000000006f497ac600000000000000000000000000000000000000000000000000000000701f58c5000000000000000000000000000000000000000000000000000000007f61885c0000000000000000000000000000000000000000000000000000000097c09d3400000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c00000000000000000000000007bd175a72991f0a30ed333eaf1cb215c42e7492c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e3200000000000000000000000000000000000000000000000000000000044aa200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000baa109e4e90cc08a3c5069a0173aace4e934d57e" +bridgehub_create_new_chain_salt = 0 +base_token_addr = "0x0000000000000000000000000000000000000001" diff --git a/l1-contracts/deploy-scripts/AcceptAdmin.s.sol b/l1-contracts/deploy-scripts/AcceptAdmin.s.sol index bb601457b..3a40b4d78 100644 --- a/l1-contracts/deploy-scripts/AcceptAdmin.s.sol +++ b/l1-contracts/deploy-scripts/AcceptAdmin.s.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: UNLICENSED +// SPDX-License-Identifier: MIT pragma solidity ^0.8.21; import {Script} from "forge-std/Script.sol"; diff --git a/l1-contracts/deploy-scripts/DeployL2Contracts.sol b/l1-contracts/deploy-scripts/DeployL2Contracts.sol index e094193b3..550357739 100644 --- a/l1-contracts/deploy-scripts/DeployL2Contracts.sol +++ b/l1-contracts/deploy-scripts/DeployL2Contracts.sol @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + pragma solidity ^0.8.21; import {Script} from "forge-std/Script.sol"; diff --git a/l1-contracts/deploy-scripts/DeployPaymaster.s.sol b/l1-contracts/deploy-scripts/DeployPaymaster.s.sol index 08374e3d1..eec87fbb0 100644 --- a/l1-contracts/deploy-scripts/DeployPaymaster.s.sol +++ b/l1-contracts/deploy-scripts/DeployPaymaster.s.sol @@ -1,4 +1,5 @@ -// SPDX-License-Identifier: UNLICENSED +// SPDX-License-Identifier: MIT + pragma solidity ^0.8.21; import {Script} from "forge-std/Script.sol"; diff --git a/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol new file mode 100644 index 000000000..0a7e20a53 --- /dev/null +++ b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol @@ -0,0 +1,365 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.8.24; + +// solhint-disable no-console, gas-struct-packing, gas-custom-errors + +import {Script, console2 as console} from "forge-std/Script.sol"; +import {stdToml} from "forge-std/StdToml.sol"; + +import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; +import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; +import {L2ContractHelper} from "contracts/common/libraries/L2ContractHelper.sol"; +import {AddressAliasHelper} from "contracts/vendor/AddressAliasHelper.sol"; +import {L1SharedBridge} from "contracts/bridge/L1SharedBridge.sol"; +import {IStateTransitionManager} from "contracts/state-transition/IStateTransitionManager.sol"; +import {IGovernance} from "contracts/governance/IGovernance.sol"; +import {Utils} from "./Utils.sol"; + +/** + * @title Prepare ZKChain Registration Calldata + * @dev Script to prepare calldata for registering a new ZKChain on the bridgehub + * + * This script prepares calldata for registering a new ZKChain on the bridgehub + * That includes 3 steps: + * 1. Register base token on the bridgehub + * 2. Register the new ZKChain on the bridgehub + * 3. Initialize the L2 bridge on the L1 shared bridge + * + * The script precomputes the address of the L2 bridge to generate the calldata for the third step. + * It assumes that L1 governance is the owner of the L2 bridge and the L2 bridge is deployed by the msg.sender of the script. + * + * The script reads the configuration from a TOML file `script-config/prepare-registration-calldata.toml` + * and writes the output to a TOML file `script-out/output-prepare-registration-calldata.toml`. + * + * The output contains 4 fields: + * - scheduleCalldataStageOne: calldata for scheduling the first stage + * - executeCalldataStageOne: calldata for executing the first stage + * - scheduleCalldataStageTwo: calldata for scheduling the second stage + * - executeCalldataStageTwo: calldata for executing the second stage + * (stage 2 of the execution is the registration of the L2 bridge on the L1 shared bridge) + * + * The separation is required to ensure that there is no period of time where the L2 bridge is registered, so users + * can send their funds there, but they will be burned in case L2 bridge is not initialized by the chain operator. + * It is meant to be executed only after the L2 bridge is deployed. + * + * How to use: + * 1. Create a TOML file `script-config/prepare-registration-calldata.toml`, reference config at `deploy-script-config-template/config-prepare-registration-calldata.toml`. + * 2. Run the script impersonating the address that will deploy the L2 bridge, `forge script --rpc-url $RPC --sender $DEPLOYER PrepareZKChainRegistrationCalldata.s.sol` + * 3. Run the `scheduleCalldataStageOne` and `executeCalldataStageOne` on the L1 chain using governance. + * 4. Deploy the L2 bridge using the address from step 2. This address doesn't need any special permissions, just has to be consistent across all the stages. + * 5. Run the `scheduleCalldataStageTwo` and `executeCalldataStageTwo` on the L1 chain using governance. + * + */ +contract PrepareZKChainRegistrationCalldataScript is Script { + using stdToml for string; + + address internal constant ADDRESS_ONE = 0x0000000000000000000000000000000000000001; + + struct Config { + // Admin of the yet-to-be-registered chain (L1-based address) + address chainAdmin; + // STM proxy address + address stateTransitionProxy; + // Chain ID of the new chain + uint256 chainId; + // Chain ID of the era (required for the L2 bridge deployment) + uint256 eraChainId; + // Salt for createNewChain call, also used as a governance operation salt + uint256 bridgehubCreateNewChainSalt; + // Address of the new chain's base token + address baseToken; + // Diamond cut data is a "configuration" for the Diamond proxy that will be created for a new chain. + // It can only be the one that's allowed by the STM. It can be generated by the other scripts or taken from the + // `etc/env/ecosystems/ENV.yaml` file in `zksync-era` repository + bytes diamondCutData; + // Address of the L1 ERC20 bridge proxy (required for the L2 bridge deployment) + address erc20BridgeProxy; + } + + // Addresses of the contracts in the L1 ecosystem that are fetched from the chain + struct EcosystemContracts { + // Address of the L1 shared bridge proxy + address l1SharedBridgeProxy; + // Bridgehub proxy address + address bridgehub; + // Address of the governance contract for the L1 ecosystem + address governance; + } + + struct ContractsBytecodes { + // Default bytecode of the ERC-20 on L2 (BeaconProxy) + bytes beaconProxy; + // Bytecode of the L2 shared bridge + bytes l2SharedBridgeBytecode; + // Bytecode of the L2 shared bridge proxy (TransparentUpgradeableProxy) + bytes l2SharedBridgeProxyBytecode; + } + + Config internal config; + EcosystemContracts internal ecosystem; + ContractsBytecodes internal bytecodes; + + function run() public { + console.log("Preparing ZK chain registration calldata"); + + initializeConfig(); + + checkBaseTokenAddress(); + + IGovernance.Call[] memory calls; + uint256 cnt = 0; + if (!IBridgehub(ecosystem.bridgehub).tokenIsRegistered(config.baseToken)) { + calls = new IGovernance.Call[](2); + console.log("Adding a call to register base token on the bridgehub"); + IGovernance.Call memory baseTokenRegistrationCall = prepareRegisterBaseTokenCall(); + calls[cnt] = baseTokenRegistrationCall; + ++cnt; + } else { + calls = new IGovernance.Call[](1); + } + + IGovernance.Call memory registerChainCall = prepareRegisterHyperchainCall(); + calls[cnt] = registerChainCall; + ++cnt; + + address l2SharedBridgeProxy = computeL2BridgeAddress(); + IGovernance.Call memory initChainCall = prepareInitializeChainGovernanceCall(l2SharedBridgeProxy); + + scheduleTransparentCalldata(calls, initChainCall); + } + + function initializeConfig() internal { + // Grab config from output of l1 deployment + string memory root = vm.projectRoot(); + string memory path = string.concat(root, "/script-config/prepare-registration-calldata.toml"); + console.log("Reading a config from", path); + string memory toml = vm.readFile(path); + + // Config file must be parsed key by key, otherwise values returned + // are parsed alphabetically and not by key. + // https://book.getfoundry.sh/cheatcodes/parse-toml + config.stateTransitionProxy = toml.readAddress("$.deployed_addresses.state_transition_proxy_addr"); + config.erc20BridgeProxy = toml.readAddress("$.deployed_addresses.erc20_bridge_proxy_addr"); + + ecosystem.bridgehub = IStateTransitionManager(config.stateTransitionProxy).BRIDGE_HUB(); + ecosystem.l1SharedBridgeProxy = address(Bridgehub(ecosystem.bridgehub).sharedBridge()); + ecosystem.governance = Bridgehub(ecosystem.bridgehub).owner(); + + config.chainId = toml.readUint("$.chain.chain_id"); + config.eraChainId = toml.readUint("$.chain.era_chain_id"); + config.chainAdmin = toml.readAddress("$.chain.admin"); + config.diamondCutData = toml.readBytes("$.chain.diamond_cut_data"); + config.bridgehubCreateNewChainSalt = toml.readUint("$.chain.bridgehub_create_new_chain_salt"); + config.baseToken = toml.readAddress("$.chain.base_token_addr"); + + bytecodes.l2SharedBridgeBytecode = Utils.readHardhatBytecode("/script-config/artifacts/L2SharedBridge.json"); + bytecodes.beaconProxy = Utils.readHardhatBytecode("/script-config/artifacts/BeaconProxy.json"); + bytecodes.l2SharedBridgeProxyBytecode = Utils.readHardhatBytecode( + "/script-config/artifacts/TransparentUpgradeableProxy.json" + ); + } + + function checkBaseTokenAddress() internal view { + if (config.baseToken == address(0)) { + revert("Base token address is not set"); + } + + // Check if it's ethereum address + if (config.baseToken == ADDRESS_ONE) { + return; + } + + // Does not prevent registering a non-ERC-20 contract as a token + // But calling the ERC-20 methods here on non-ERC-20 will fail without a readable revert message + if (config.baseToken.code.length == 0) { + revert("Token address is an EOA"); + } + + console.log("Using base token address:", config.baseToken); + } + + function prepareRegisterBaseTokenCall() internal view returns (IGovernance.Call memory) { + Bridgehub bridgehub = Bridgehub(ecosystem.bridgehub); + + bytes memory data = abi.encodeCall(bridgehub.addToken, (config.baseToken)); + + return IGovernance.Call({target: ecosystem.bridgehub, value: 0, data: data}); + } + + // @dev Computes the address of the L2 bridge and the L2 bridge proxy + // The variables that are used to compute the address are: + // - Salt + // - L2 bridge impl bytecode hash + // - Era chain ID + // - Beacon proxy bytecode hash + // - L1 governance address(owner of the L2 bridge) + // - L1 ERC20 bridge proxy address + // - Default ERC20 proxy address + // - Deployer's address + function computeL2BridgeAddress() internal view returns (address) { + bytes32 salt = ""; + bytes32 bridgeBytecodeHash = L2ContractHelper.hashL2Bytecode(bytecodes.l2SharedBridgeBytecode); + bytes memory bridgeConstructorData = abi.encode(config.eraChainId); + + address deployer; + address l2GovernanceAddress; + + // ZKsync's protocol design assumes that the addresses of all the smart contracts that are sending L1->L2 + // messages are aliased. We have to check if the sender is an EOA and apply the alias if it is not. + if (isEOA(msg.sender)) { + deployer = msg.sender; + } else { + deployer = AddressAliasHelper.applyL1ToL2Alias(msg.sender); + } + + // If the governance address is an EOA, we use it directly, otherwise we apply the alias. On the Mainnet/Testnet + // the governance address is a smart contract, but in case someone uses the script with different envs, we have + // to check if the address is an EOA. + if (isEOA(ecosystem.governance)) { + l2GovernanceAddress = ecosystem.governance; + } else { + l2GovernanceAddress = AddressAliasHelper.applyL1ToL2Alias(ecosystem.governance); + } + + address implContractAddress = L2ContractHelper.computeCreate2Address( + deployer, + salt, + bridgeBytecodeHash, + keccak256(bridgeConstructorData) + ); + + console.log("Computed L2 bridge impl address:", implContractAddress); + console.log("Bridge bytecode hash:"); + console.logBytes32(bridgeBytecodeHash); + console.log("Bridge constructor data:"); + console.logBytes(bridgeConstructorData); + console.log("Deployer:", deployer); + + bytes32 l2StandardErc20BytecodeHash = L2ContractHelper.hashL2Bytecode(bytecodes.beaconProxy); + + // solhint-disable-next-line func-named-parameters + bytes memory proxyInitializationParams = abi.encodeWithSignature( + "initialize(address,address,bytes32,address)", + ecosystem.l1SharedBridgeProxy, + config.erc20BridgeProxy, + l2StandardErc20BytecodeHash, + l2GovernanceAddress + ); + + bytes memory l2SharedBridgeProxyConstructorData = abi.encode( + implContractAddress, + l2GovernanceAddress, + proxyInitializationParams + ); + + address proxyContractAddress = L2ContractHelper.computeCreate2Address( + deployer, + salt, + L2ContractHelper.hashL2Bytecode(bytecodes.l2SharedBridgeProxyBytecode), + keccak256(l2SharedBridgeProxyConstructorData) + ); + + console.log("Computed L2 bridge proxy address:", proxyContractAddress); + console.log("L1 shared bridge proxy:", ecosystem.l1SharedBridgeProxy); + console.log("L1 ERC20 bridge proxy:", config.erc20BridgeProxy); + console.log("L2 governor addr:", l2GovernanceAddress); + + return proxyContractAddress; + } + + function prepareRegisterHyperchainCall() internal view returns (IGovernance.Call memory) { + Bridgehub bridgehub = Bridgehub(ecosystem.bridgehub); + + bytes memory data = abi.encodeCall( + bridgehub.createNewChain, + ( + config.chainId, + config.stateTransitionProxy, + config.baseToken, + config.bridgehubCreateNewChainSalt, + config.chainAdmin, + config.diamondCutData + ) + ); + + return IGovernance.Call({target: ecosystem.bridgehub, value: 0, data: data}); + } + + function prepareInitializeChainGovernanceCall( + address l2SharedBridgeProxy + ) internal view returns (IGovernance.Call memory) { + L1SharedBridge bridge = L1SharedBridge(ecosystem.l1SharedBridgeProxy); + + bytes memory data = abi.encodeCall(bridge.initializeChainGovernance, (config.chainId, l2SharedBridgeProxy)); + + return IGovernance.Call({target: ecosystem.l1SharedBridgeProxy, value: 0, data: data}); + } + + // @dev Prepares a call to schedule a transparent operation on the governance contract + // `calls` is an array of calls that will be executed in the first stage (add a token to BH, create a new chain) + // `initChainGovCall` is a call that will be executed in the second stage (register the L2 bridge on the L1 shared bridge) + function scheduleTransparentCalldata( + IGovernance.Call[] memory calls, + IGovernance.Call memory initChainGovCall + ) internal { + IGovernance governance = IGovernance(ecosystem.governance); + + IGovernance.Operation memory operation = IGovernance.Operation({ + calls: calls, + predecessor: bytes32(0), + salt: bytes32(config.bridgehubCreateNewChainSalt) + }); + + bytes memory scheduleCalldata = abi.encodeCall(governance.scheduleTransparent, (operation, 0)); + bytes memory executeCalldata = abi.encodeCall(governance.execute, (operation)); + + IGovernance.Call[] memory initChainGovArray = new IGovernance.Call[](1); + initChainGovArray[0] = initChainGovCall; + + IGovernance.Operation memory operation2 = IGovernance.Operation({ + calls: initChainGovArray, + predecessor: bytes32(0), + salt: bytes32(config.bridgehubCreateNewChainSalt) + }); + + bytes memory scheduleCalldata2 = abi.encodeCall(governance.scheduleTransparent, (operation2, 0)); + bytes memory executeCalldata2 = abi.encodeCall(governance.execute, (operation2)); + + saveOutput(scheduleCalldata, executeCalldata, scheduleCalldata2, executeCalldata2); + } + + // Writes the output to a TOML file `script-out/output-prepare-registration-calldata.toml + // For the detailed explanation of the output - look into the contract description + function saveOutput( + bytes memory schedule, + bytes memory execute, + bytes memory schedule2, + bytes memory execute2 + ) internal { + vm.serializeBytes("root", "scheduleCalldataStageOne", schedule); + vm.serializeBytes("root", "executeCalldataStageOne", execute); + vm.serializeBytes("root", "scheduleCalldataStageTwo", schedule2); + string memory toml = vm.serializeBytes("root", "executeCalldataStageTwo", execute2); + + string memory root = vm.projectRoot(); + string memory path = string.concat(root, "/script-out/output-prepare-registration-calldata.toml"); + + console.log("Writing the output to", path); + vm.writeToml(toml, path); + } + + function isEOA(address _addr) private view returns (bool) { + uint32 size; + assembly { + size := extcodesize(_addr) + } + + return (size == 0); + } +} + +// Done by the chain admin separately from this script: +// - add validators +// - deploy L2 contracts +// - set pubdata sending mode +// - set base token gas price multiplier diff --git a/l1-contracts/deploy-scripts/Utils.sol b/l1-contracts/deploy-scripts/Utils.sol index a0748825c..c3ab22594 100644 --- a/l1-contracts/deploy-scripts/Utils.sol +++ b/l1-contracts/deploy-scripts/Utils.sol @@ -112,17 +112,6 @@ library Utils { return vm.readFileBinary("../system-contracts/bootloader/build/artifacts/proved_batch.yul.zbin"); } - /** - * @dev Read hardhat bytecodes - */ - function readHardhatBytecode(string memory artifactPath) internal view returns (bytes memory) { - string memory root = vm.projectRoot(); - string memory path = string.concat(root, artifactPath); - string memory json = vm.readFile(path); - bytes memory bytecode = vm.parseJsonBytes(json, ".bytecode"); - return bytecode; - } - /** * @dev Returns the bytecode of a given system contract. */ @@ -297,7 +286,7 @@ library Utils { } /** - * @dev Read hardhat bytecodes + * @dev Read foundry bytecodes */ function readFoundryBytecode(string memory artifactPath) internal view returns (bytes memory) { string memory root = vm.projectRoot(); @@ -307,6 +296,17 @@ library Utils { return bytecode; } + /** + * @dev Read hardhat bytecodes + */ + function readHardhatBytecode(string memory artifactPath) internal view returns (bytes memory) { + string memory root = vm.projectRoot(); + string memory path = string.concat(root, artifactPath); + string memory json = vm.readFile(path); + bytes memory bytecode = vm.parseJsonBytes(json, ".bytecode"); + return bytecode; + } + function executeUpgrade( address _governor, bytes32 _salt, diff --git a/l1-contracts/foundry.toml b/l1-contracts/foundry.toml index 8077a4875..2820332c9 100644 --- a/l1-contracts/foundry.toml +++ b/l1-contracts/foundry.toml @@ -1,6 +1,8 @@ [profile.default] -libs = ["node_modules", "../lib", "../da-contracts/"] allow_paths = ["../l2-contracts/contracts"] +src = "contracts" +out = "out" +libs = ["node_modules", "../lib", "../da-contracts/"] cache_path = "cache-forge" test = "test/foundry" solc_version = "0.8.24" @@ -21,11 +23,11 @@ fs_permissions = [ ignored_error_codes = ["missing-receive-ether", "code-size"] ignored_warnings_from = ["test", "contracts/dev-contracts"] remappings = [ - "forge-std/=./lib/forge-std/src/", - "murky/=./lib/murky/src/", + "forge-std/=lib/forge-std/src/", + "murky/=lib/murky/src/", "foundry-test/=test/foundry/", "l2-contracts/=../l2-contracts/contracts/", "da-contracts/=../da-contracts/contracts/", - "@openzeppelin/contracts-v4/=./lib/openzeppelin-contracts-v4/contracts/", - "@openzeppelin/contracts-upgradeable-v4/=./lib/openzeppelin-contracts-upgradeable-v4/contracts/", + "@openzeppelin/contracts-v4/=lib/openzeppelin-contracts-v4/contracts/", + "@openzeppelin/contracts-upgradeable-v4/=lib/openzeppelin-contracts-upgradeable-v4/contracts/", ] diff --git a/l1-contracts/script-config/artifacts/BeaconProxy.json b/l1-contracts/script-config/artifacts/BeaconProxy.json new file mode 100644 index 000000000..258780377 --- /dev/null +++ b/l1-contracts/script-config/artifacts/BeaconProxy.json @@ -0,0 +1,81 @@ +{ + "_format": "hh-zksolc-artifact-1", + "contractName": "BeaconProxy", + "sourceName": "@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol", + "abi": [ + { + "inputs": [ + { + "internalType": "address", + "name": "beacon", + "type": "address" + }, + { + "internalType": "bytes", + "name": "data", + "type": "bytes" + } + ], + "stateMutability": "payable", + "type": "constructor" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "previousAdmin", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "newAdmin", + "type": "address" + } + ], + "name": "AdminChanged", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "beacon", + "type": "address" + } + ], + "name": "BeaconUpgraded", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "implementation", + "type": "address" + } + ], + "name": "Upgraded", + "type": "event" + }, + { + "stateMutability": "payable", + "type": "fallback" + }, + { + "stateMutability": "payable", + "type": "receive" + } + ], + "bytecode": "0x0004000000000002000700000000000200000000030100190000006003300270000001020030019d0000010203300197000300000031035500020000000103550000008008000039000000400080043f00000001022001900000001c0000c13d000000000131034f0000010d02000041000000000202041a0000010b04000041000000800040043f00000106022001970000000004000414000000000303004b000000250000c13d000000040320008c000000ab0000c13d0000000103000031000000200230008c00000000040300190000002004008039000000d60000013d0000010302300041000001040220009c0000002c0000213d0000011d0100004100000000001004350000004101000039000000040010043f0000011e010000410000040400010430000000040320008c000001160000c13d0000000103000031000000200230008c00000000040300190000002004008039000001410000013d0000009f023000390000010502200197000000400020043f0000001f0230018f00000005043002720000003b0000613d00000000050000190000000506500210000000000761034f000000000707043b000000800660003900000000007604350000000105500039000000000645004b000000330000413d000000000502004b0000004a0000613d0000000504400210000000000141034f00000003022002100000008004400039000000000504043300000000052501cf000000000525022f000000000101043b0000010002200089000000000121022f00000000012101cf000000000151019f00000000001404350000003f0130008c0000014a0000a13d000000800a00043d0000010601a0009c0000014a0000213d000000a00200043d000001070120009c0000014a0000213d0000001f012000390000010804000041000000000531004b000000000500001900000000050480190000010801100197000000000601004b0000000004008019000001080110009c000000000405c019000000000104004b0000014a0000c13d00000080012000390000000001010433000001070410009c0000001f0000213d0000003f04100039000000200700008a000000000474016f000000400900043d0000000004490019000000000594004b00000000050000190000000105004039000001070640009c0000001f0000213d00000001055001900000001f0000c13d0000008003300039000000400040043f0000000006190436000000a0022000390000000004210019000000000334004b0000014a0000213d000600000009001d000500000007001d000400000008001d000000000301004b000000820000613d000000000300001900000000046300190000000005230019000000000505043300000000005404350000002003300039000000000413004b0000007b0000413d000300000006001d000000000116001900000000000104350000010901000041000000000010043900070000000a001d0000000400a0044300000102010000410000000002000414000001020320009c0000000002018019000000c0012002100000010a011001c70000800202000039040203f80000040f0000000102200190000003db0000613d000000400a00043d000000000101043b000000000101004b000002200000c13d0000006401a000390000011b0200004100000000002104350000004401a000390000011c0200004100000000002104350000002401a0003900000025020000390000000000210435000001150100004100000000001a04350000000401a000390000002002000039000000000021043500000102010000410000010202a0009c000000000a0180190000004001a002100000011a011001c700000404000104300000010201000041000001020340009c0000000004018019000000c0014002100000011f011001c7040203f80000040f000000000301001900000060033002700000010203300197000000200430008c000000000403001900000020040080390000001f0540018f0000000506400272000000c30000613d00000000070000190000000508700210000000000981034f000000000909043b000000800880003900000000009804350000000107700039000000000867004b000000bb0000413d000000000705004b000000d20000613d0000000506600210000000000761034f00000003055002100000008006600039000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f000300000001035500000001022001900000014c0000613d0000009f02400039000000e00220018f000000400020043f000000200230008c0000014a0000413d000000800200043d000001060420009c0000014a0000213d000000020500036700000000040000310000001f0740018f0000000506400272000000eb0000613d00000000080000190000000509800210000000000a95034f000000000a0a043b0000000000a904350000000108800039000000000968004b000000e40000413d000000000807004b000000f90000613d00000003077002100000000506600210000000000806043300000000087801cf000000000878022f000000000565034f000000000505043b0000010007700089000000000575022f00000000057501cf000000000585019f00000000005604350000000005000414000000040620008c000001c40000c13d0000001f0430018f0000000502300272000001070000613d00000000050000190000000506500210000000000761034f000000000707043b00000000007604350000000105500039000000000625004b000001000000413d000000000504004b000001ed0000613d00000003044002100000000502200210000000000502043300000000054501cf000000000545022f000000000121034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000151019f0000000000120435000001ed0000013d0000010201000041000001020340009c0000000004018019000000c0014002100000011f011001c7040203f80000040f000000000301001900000060033002700000010203300197000000200430008c000000000403001900000020040080390000001f0540018f00000005064002720000012e0000613d00000000070000190000000508700210000000000981034f000000000909043b000000800880003900000000009804350000000107700039000000000867004b000001260000413d000000000705004b0000013d0000613d0000000506600210000000000761034f00000003055002100000008006600039000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f00030000000103550000000102200190000001690000613d0000001f02400039000000600220018f00000080022001bf000000400020043f000000200230008c0000014a0000413d000000800200043d000001060420009c0000018c0000a13d00000000010000190000040400010430000000400200043d0000001f0430018f0000000505300272000001590000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000001510000413d000000000604004b000001680000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001850000013d000000400200043d0000001f0430018f0000000505300272000001760000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b0000016e0000413d000000000604004b000001850000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f00000000001504350000010201000041000001020420009c000000000201801900000040012002100000006002300210000000000121019f0000040400010430000000020500036700000000040000310000001f0740018f0000000506400272000001990000613d00000000080000190000000509800210000000000a95034f000000000a0a043b0000000000a904350000000108800039000000000968004b000001920000413d000000000807004b000001a70000613d00000003077002100000000506600210000000000806043300000000087801cf000000000878022f000000000565034f000000000505043b0000010007700089000000000575022f00000000057501cf000000000585019f00000000005604350000000005000414000000040620008c000001ee0000c13d0000001f0430018f0000000502300272000001b50000613d00000000050000190000000506500210000000000761034f000000000707043b00000000007604350000000105500039000000000625004b000001ae0000413d000000000504004b000002170000613d00000003044002100000000502200210000000000502043300000000054501cf000000000545022f000000000121034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000151019f0000000000120435000002170000013d0000010201000041000001020350009c0000000005018019000001020340009c00000000040180190000006001400210000000c003500210000000000113019f040203fd0000040f0003000000010355000000000301001900000060033002700000001f0430018f000101020030019d00000102033001970000000505300272000001dd0000613d00000000060000190000000507600210000000000871034f000000000808043b00000000008704350000000106600039000000000756004b000001d60000413d000000000604004b000001eb0000613d00000003044002100000000505500210000000000605043300000000064601cf000000000646022f000000000151034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f000000000015043500000001012001900000021c0000613d000002170000013d0000010201000041000001020350009c0000000005018019000001020340009c00000000040180190000006001400210000000c003500210000000000113019f040203fd0000040f0003000000010355000000000301001900000060033002700000001f0430018f000101020030019d00000102033001970000000505300272000002070000613d00000000060000190000000507600210000000000871034f000000000808043b00000000008704350000000106600039000000000756004b000002000000413d000000000604004b000002150000613d00000003044002100000000505500210000000000605043300000000064601cf000000000646022f000000000151034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f000000000015043500000001012001900000021e0000613d0000010201000041000001020230009c00000000030180190000006001300210000004030001042e00000060013002100000040400010430000000600130021000000404000104300000010b0100004100000000001a0435000000000100041400000007020000290000010602200197000000040320008c000700000002001d0000022d0000c13d0000000103000031000000200130008c000000000403001900000020040080390000025e0000013d0000010204000041000001020310009c00000000010480190000010203a0009c00000000040a40190000004003400210000000c001100210000000000131019f0000010c011001c700020000000a001d040203f80000040f000000020a000029000000000301001900000060033002700000010203300197000000200430008c000000000403001900000020040080390000001f0540018f00000005064002720000024b0000613d0000000007000019000000050870021000000000098a0019000000000881034f000000000808043b00000000008904350000000107700039000000000867004b000002430000413d000000000705004b0000025a0000613d0000000506600210000000000761034f00000000066a00190000000305500210000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f00030000000103550000000102200190000002950000613d0000001f01400039000000600210018f0000000001a20019000000000221004b00000000020000190000000102004039000001070410009c0000001f0000213d00000001022001900000001f0000c13d000000400010043f000000200130008c0000014a0000413d00000000010a0433000001060210009c0000014a0000213d00000109020000410000000000200439000000040010044300000102010000410000000002000414000001020320009c0000000002018019000000c0012002100000010a011001c70000800202000039040203f80000040f0000000102200190000003db0000613d000000400200043d000200000002001d000000000101043b000000000101004b000002b20000c13d0000000203000029000000640130003900000118020000410000000000210435000000440130003900000119020000410000000000210435000000240130003900000030020000390000000000210435000001150100004100000000001304350000000401300039000000200200003900000000002104350000010201000041000001020230009c000000000301801900000040013002100000011a011001c70000040400010430000000400200043d0000001f0430018f0000000505300272000002a20000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b0000029a0000413d000000000604004b000001850000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001850000013d0000010d01000041000000000201041a0000010e022001970000000705000029000000000252019f000000000021041b00000102010000410000000002000414000001020320009c0000000002018019000000c0012002100000010f011001c70000800d0200003900000002030000390000011004000041040203f30000040f000000010120019000000006010000290000014a0000613d0000000001010433000000000101004b000002cd0000c13d0000002001000039000001000010044300000120000004430000011701000041000004030001042e0000010b010000410000000202000029000000000012043500000000010004140000000702000029000000040220008c000002d90000c13d0000000103000031000000200130008c000000000403001900000020040080390000030b0000013d0000010202000041000001020310009c00000000010280190000000204000029000001020340009c00000000020440190000004002200210000000c001100210000000000121019f0000010c011001c70000000702000029040203f80000040f000000020a000029000000000301001900000060033002700000010203300197000000200430008c000000000403001900000020040080390000001f0540018f0000000506400272000002f80000613d0000000007000019000000050870021000000000098a0019000000000881034f000000000808043b00000000008904350000000107700039000000000867004b000002f00000413d000000000705004b000003070000613d0000000506600210000000000761034f00000002066000290000000305500210000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f00030000000103550000000102200190000003380000613d0000001f01400039000000600110018f0000000202100029000000000112004b00000000010000190000000101004039000700000002001d000001070220009c00000006040000290000001f0000213d00000001011001900000001f0000c13d0000000701000029000000400010043f000000200130008c0000014a0000413d00000002010000290000000001010433000200000001001d000001060110009c0000014a0000213d0000000701000029000001110110009c0000001f0000213d00000007050000290000006001500039000000400010043f000000400150003900000112020000410000000000210435000000270100003900000000021504360000011301000041000100000002001d0000000000120435000000000204043300000000010004140000000204000029000000040440008c000003550000c13d0000000102000039000001070130009c00000005050000290000001f0000213d0000036d0000013d000000400200043d0000001f0430018f0000000505300272000003450000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b0000033d0000413d000000000604004b000003540000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001850000013d00000102030000410000000305000029000001020450009c00000000050380190000004004500210000001020520009c00000000020380190000006002200210000000000242019f000001020410009c0000000001038019000000c001100210000000000121019f0000000202000029040203fd0000040f0000006004000039000000010220018f00030000000103550000006001100270000101020010019d000001020310019800000004090000290000000505000029000003960000613d0000003f01300039000000000151016f000000400400043d0000000001140019000000000541004b00000000050000190000000105004039000001070610009c0000001f0000213d00000001055001900000001f0000c13d000000400010043f0000001f0130018f000000000934043600000003050003670000000503300272000003870000613d000000000600001900000005076002100000000008790019000000000775034f000000000707043b00000000007804350000000106600039000000000736004b0000037f0000413d000000000601004b000003960000613d0000000503300210000000000535034f00000000033900190000000301100210000000000603043300000000061601cf000000000616022f000000000505043b0000010001100089000000000515022f00000000011501cf000000000161019f00000000001304350000000001040433000000000202004b000003b60000c13d000000000201004b000003dc0000c13d000000400400043d000600000004001d0000011501000041000000000014043500000004014000390000002002000039000000000021043500000007010000290000000003010433000700000003001d0000002401400039000000000031043500000044024000390000000101000029040203e50000040f00000007010000290000001f01100039000000050110017f00000044011000390000010202000041000001020310009c00000000010280190000000604000029000001020340009c00000000040280190000004002400210000003e20000013d000000000101004b000002c80000c13d000001090100004100000000001004390000000201000029000000040010044300000102010000410000000002000414000001020320009c0000000002018019000000c0012002100000010a011001c70000800202000039040203f80000040f0000000102200190000003db0000613d000000000101043b000000000101004b000002c80000c13d000000400100043d00000044021000390000011403000041000000000032043500000024021000390000001d030000390000000000320435000001150200004100000000002104350000000402100039000000200300003900000000003204350000010202000041000001020310009c0000000001028019000000400110021000000116011001c70000040400010430000000000001042f0000010202000041000001020310009c0000000001028019000001020390009c000000000902801900000040029002100000006001100210000000000121019f0000040400010430000000000403004b000003ef0000613d000000000400001900000000052400190000000006140019000000000606043300000000006504350000002004400039000000000534004b000003e80000413d00000000012300190000000000010435000000000001042d000000000001042f000003f6002104210000000102000039000000000001042d0000000002000019000000000001042d000003fb002104230000000102000039000000000001042d0000000002000019000000000001042d00000400002104250000000102000039000000000001042d0000000002000019000000000001042d0000040200000432000004030001042e000004040001043000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000009fffffffffffffffffffffffffffffffffffffffffffffffff000000000000007f00000000000000000000000000000000000000000000000000000001ffffffe0000000000000000000000000ffffffffffffffffffffffffffffffffffffffff000000000000000000000000000000000000000000000000ffffffffffffffff80000000000000000000000000000000000000000000000000000000000000001806aa1896bbf26568e884a7374b41e002500962caba6a15023a8d90e8508b8302000002000000000000000000000000000000240000000000000000000000005c60da1b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000a3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50ffffffffffffffffffffffff000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001cf3b03a6cf19fa2baba4df148e9dcabedea7f8a5c07840e207e5c089be95d3e000000000000000000000000000000000000000000000000ffffffffffffff9f206661696c656400000000000000000000000000000000000000000000000000416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000008c379a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064000000000000000000000000000000020000000000000000000000000000004000000100000000000000000073206e6f74206120636f6e747261637400000000000000000000000000000000455243313936373a20626561636f6e20696d706c656d656e746174696f6e206900000000000000000000000000000000000000840000000000000000000000007472616374000000000000000000000000000000000000000000000000000000455243313936373a206e657720626561636f6e206973206e6f74206120636f6e4e487b710000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000004000000800000000000000000d32177e88b033622e0bc848f24ab73d0795ed87730981120fcdf94fbc134fa5d", + "deployedBytecode": "0x0004000000000002000700000000000200000000030100190000006003300270000001020030019d0000010203300197000300000031035500020000000103550000008008000039000000400080043f00000001022001900000001c0000c13d000000000131034f0000010d02000041000000000202041a0000010b04000041000000800040043f00000106022001970000000004000414000000000303004b000000250000c13d000000040320008c000000ab0000c13d0000000103000031000000200230008c00000000040300190000002004008039000000d60000013d0000010302300041000001040220009c0000002c0000213d0000011d0100004100000000001004350000004101000039000000040010043f0000011e010000410000040400010430000000040320008c000001160000c13d0000000103000031000000200230008c00000000040300190000002004008039000001410000013d0000009f023000390000010502200197000000400020043f0000001f0230018f00000005043002720000003b0000613d00000000050000190000000506500210000000000761034f000000000707043b000000800660003900000000007604350000000105500039000000000645004b000000330000413d000000000502004b0000004a0000613d0000000504400210000000000141034f00000003022002100000008004400039000000000504043300000000052501cf000000000525022f000000000101043b0000010002200089000000000121022f00000000012101cf000000000151019f00000000001404350000003f0130008c0000014a0000a13d000000800a00043d0000010601a0009c0000014a0000213d000000a00200043d000001070120009c0000014a0000213d0000001f012000390000010804000041000000000531004b000000000500001900000000050480190000010801100197000000000601004b0000000004008019000001080110009c000000000405c019000000000104004b0000014a0000c13d00000080012000390000000001010433000001070410009c0000001f0000213d0000003f04100039000000200700008a000000000474016f000000400900043d0000000004490019000000000594004b00000000050000190000000105004039000001070640009c0000001f0000213d00000001055001900000001f0000c13d0000008003300039000000400040043f0000000006190436000000a0022000390000000004210019000000000334004b0000014a0000213d000600000009001d000500000007001d000400000008001d000000000301004b000000820000613d000000000300001900000000046300190000000005230019000000000505043300000000005404350000002003300039000000000413004b0000007b0000413d000300000006001d000000000116001900000000000104350000010901000041000000000010043900070000000a001d0000000400a0044300000102010000410000000002000414000001020320009c0000000002018019000000c0012002100000010a011001c70000800202000039040203f80000040f0000000102200190000003db0000613d000000400a00043d000000000101043b000000000101004b000002200000c13d0000006401a000390000011b0200004100000000002104350000004401a000390000011c0200004100000000002104350000002401a0003900000025020000390000000000210435000001150100004100000000001a04350000000401a000390000002002000039000000000021043500000102010000410000010202a0009c000000000a0180190000004001a002100000011a011001c700000404000104300000010201000041000001020340009c0000000004018019000000c0014002100000011f011001c7040203f80000040f000000000301001900000060033002700000010203300197000000200430008c000000000403001900000020040080390000001f0540018f0000000506400272000000c30000613d00000000070000190000000508700210000000000981034f000000000909043b000000800880003900000000009804350000000107700039000000000867004b000000bb0000413d000000000705004b000000d20000613d0000000506600210000000000761034f00000003055002100000008006600039000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f000300000001035500000001022001900000014c0000613d0000009f02400039000000e00220018f000000400020043f000000200230008c0000014a0000413d000000800200043d000001060420009c0000014a0000213d000000020500036700000000040000310000001f0740018f0000000506400272000000eb0000613d00000000080000190000000509800210000000000a95034f000000000a0a043b0000000000a904350000000108800039000000000968004b000000e40000413d000000000807004b000000f90000613d00000003077002100000000506600210000000000806043300000000087801cf000000000878022f000000000565034f000000000505043b0000010007700089000000000575022f00000000057501cf000000000585019f00000000005604350000000005000414000000040620008c000001c40000c13d0000001f0430018f0000000502300272000001070000613d00000000050000190000000506500210000000000761034f000000000707043b00000000007604350000000105500039000000000625004b000001000000413d000000000504004b000001ed0000613d00000003044002100000000502200210000000000502043300000000054501cf000000000545022f000000000121034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000151019f0000000000120435000001ed0000013d0000010201000041000001020340009c0000000004018019000000c0014002100000011f011001c7040203f80000040f000000000301001900000060033002700000010203300197000000200430008c000000000403001900000020040080390000001f0540018f00000005064002720000012e0000613d00000000070000190000000508700210000000000981034f000000000909043b000000800880003900000000009804350000000107700039000000000867004b000001260000413d000000000705004b0000013d0000613d0000000506600210000000000761034f00000003055002100000008006600039000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f00030000000103550000000102200190000001690000613d0000001f02400039000000600220018f00000080022001bf000000400020043f000000200230008c0000014a0000413d000000800200043d000001060420009c0000018c0000a13d00000000010000190000040400010430000000400200043d0000001f0430018f0000000505300272000001590000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000001510000413d000000000604004b000001680000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001850000013d000000400200043d0000001f0430018f0000000505300272000001760000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b0000016e0000413d000000000604004b000001850000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f00000000001504350000010201000041000001020420009c000000000201801900000040012002100000006002300210000000000121019f0000040400010430000000020500036700000000040000310000001f0740018f0000000506400272000001990000613d00000000080000190000000509800210000000000a95034f000000000a0a043b0000000000a904350000000108800039000000000968004b000001920000413d000000000807004b000001a70000613d00000003077002100000000506600210000000000806043300000000087801cf000000000878022f000000000565034f000000000505043b0000010007700089000000000575022f00000000057501cf000000000585019f00000000005604350000000005000414000000040620008c000001ee0000c13d0000001f0430018f0000000502300272000001b50000613d00000000050000190000000506500210000000000761034f000000000707043b00000000007604350000000105500039000000000625004b000001ae0000413d000000000504004b000002170000613d00000003044002100000000502200210000000000502043300000000054501cf000000000545022f000000000121034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000151019f0000000000120435000002170000013d0000010201000041000001020350009c0000000005018019000001020340009c00000000040180190000006001400210000000c003500210000000000113019f040203fd0000040f0003000000010355000000000301001900000060033002700000001f0430018f000101020030019d00000102033001970000000505300272000001dd0000613d00000000060000190000000507600210000000000871034f000000000808043b00000000008704350000000106600039000000000756004b000001d60000413d000000000604004b000001eb0000613d00000003044002100000000505500210000000000605043300000000064601cf000000000646022f000000000151034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f000000000015043500000001012001900000021c0000613d000002170000013d0000010201000041000001020350009c0000000005018019000001020340009c00000000040180190000006001400210000000c003500210000000000113019f040203fd0000040f0003000000010355000000000301001900000060033002700000001f0430018f000101020030019d00000102033001970000000505300272000002070000613d00000000060000190000000507600210000000000871034f000000000808043b00000000008704350000000106600039000000000756004b000002000000413d000000000604004b000002150000613d00000003044002100000000505500210000000000605043300000000064601cf000000000646022f000000000151034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f000000000015043500000001012001900000021e0000613d0000010201000041000001020230009c00000000030180190000006001300210000004030001042e00000060013002100000040400010430000000600130021000000404000104300000010b0100004100000000001a0435000000000100041400000007020000290000010602200197000000040320008c000700000002001d0000022d0000c13d0000000103000031000000200130008c000000000403001900000020040080390000025e0000013d0000010204000041000001020310009c00000000010480190000010203a0009c00000000040a40190000004003400210000000c001100210000000000131019f0000010c011001c700020000000a001d040203f80000040f000000020a000029000000000301001900000060033002700000010203300197000000200430008c000000000403001900000020040080390000001f0540018f00000005064002720000024b0000613d0000000007000019000000050870021000000000098a0019000000000881034f000000000808043b00000000008904350000000107700039000000000867004b000002430000413d000000000705004b0000025a0000613d0000000506600210000000000761034f00000000066a00190000000305500210000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f00030000000103550000000102200190000002950000613d0000001f01400039000000600210018f0000000001a20019000000000221004b00000000020000190000000102004039000001070410009c0000001f0000213d00000001022001900000001f0000c13d000000400010043f000000200130008c0000014a0000413d00000000010a0433000001060210009c0000014a0000213d00000109020000410000000000200439000000040010044300000102010000410000000002000414000001020320009c0000000002018019000000c0012002100000010a011001c70000800202000039040203f80000040f0000000102200190000003db0000613d000000400200043d000200000002001d000000000101043b000000000101004b000002b20000c13d0000000203000029000000640130003900000118020000410000000000210435000000440130003900000119020000410000000000210435000000240130003900000030020000390000000000210435000001150100004100000000001304350000000401300039000000200200003900000000002104350000010201000041000001020230009c000000000301801900000040013002100000011a011001c70000040400010430000000400200043d0000001f0430018f0000000505300272000002a20000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b0000029a0000413d000000000604004b000001850000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001850000013d0000010d01000041000000000201041a0000010e022001970000000705000029000000000252019f000000000021041b00000102010000410000000002000414000001020320009c0000000002018019000000c0012002100000010f011001c70000800d0200003900000002030000390000011004000041040203f30000040f000000010120019000000006010000290000014a0000613d0000000001010433000000000101004b000002cd0000c13d0000002001000039000001000010044300000120000004430000011701000041000004030001042e0000010b010000410000000202000029000000000012043500000000010004140000000702000029000000040220008c000002d90000c13d0000000103000031000000200130008c000000000403001900000020040080390000030b0000013d0000010202000041000001020310009c00000000010280190000000204000029000001020340009c00000000020440190000004002200210000000c001100210000000000121019f0000010c011001c70000000702000029040203f80000040f000000020a000029000000000301001900000060033002700000010203300197000000200430008c000000000403001900000020040080390000001f0540018f0000000506400272000002f80000613d0000000007000019000000050870021000000000098a0019000000000881034f000000000808043b00000000008904350000000107700039000000000867004b000002f00000413d000000000705004b000003070000613d0000000506600210000000000761034f00000002066000290000000305500210000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f00030000000103550000000102200190000003380000613d0000001f01400039000000600110018f0000000202100029000000000112004b00000000010000190000000101004039000700000002001d000001070220009c00000006040000290000001f0000213d00000001011001900000001f0000c13d0000000701000029000000400010043f000000200130008c0000014a0000413d00000002010000290000000001010433000200000001001d000001060110009c0000014a0000213d0000000701000029000001110110009c0000001f0000213d00000007050000290000006001500039000000400010043f000000400150003900000112020000410000000000210435000000270100003900000000021504360000011301000041000100000002001d0000000000120435000000000204043300000000010004140000000204000029000000040440008c000003550000c13d0000000102000039000001070130009c00000005050000290000001f0000213d0000036d0000013d000000400200043d0000001f0430018f0000000505300272000003450000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b0000033d0000413d000000000604004b000003540000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001850000013d00000102030000410000000305000029000001020450009c00000000050380190000004004500210000001020520009c00000000020380190000006002200210000000000242019f000001020410009c0000000001038019000000c001100210000000000121019f0000000202000029040203fd0000040f0000006004000039000000010220018f00030000000103550000006001100270000101020010019d000001020310019800000004090000290000000505000029000003960000613d0000003f01300039000000000151016f000000400400043d0000000001140019000000000541004b00000000050000190000000105004039000001070610009c0000001f0000213d00000001055001900000001f0000c13d000000400010043f0000001f0130018f000000000934043600000003050003670000000503300272000003870000613d000000000600001900000005076002100000000008790019000000000775034f000000000707043b00000000007804350000000106600039000000000736004b0000037f0000413d000000000601004b000003960000613d0000000503300210000000000535034f00000000033900190000000301100210000000000603043300000000061601cf000000000616022f000000000505043b0000010001100089000000000515022f00000000011501cf000000000161019f00000000001304350000000001040433000000000202004b000003b60000c13d000000000201004b000003dc0000c13d000000400400043d000600000004001d0000011501000041000000000014043500000004014000390000002002000039000000000021043500000007010000290000000003010433000700000003001d0000002401400039000000000031043500000044024000390000000101000029040203e50000040f00000007010000290000001f01100039000000050110017f00000044011000390000010202000041000001020310009c00000000010280190000000604000029000001020340009c00000000040280190000004002400210000003e20000013d000000000101004b000002c80000c13d000001090100004100000000001004390000000201000029000000040010044300000102010000410000000002000414000001020320009c0000000002018019000000c0012002100000010a011001c70000800202000039040203f80000040f0000000102200190000003db0000613d000000000101043b000000000101004b000002c80000c13d000000400100043d00000044021000390000011403000041000000000032043500000024021000390000001d030000390000000000320435000001150200004100000000002104350000000402100039000000200300003900000000003204350000010202000041000001020310009c0000000001028019000000400110021000000116011001c70000040400010430000000000001042f0000010202000041000001020310009c0000000001028019000001020390009c000000000902801900000040029002100000006001100210000000000121019f0000040400010430000000000403004b000003ef0000613d000000000400001900000000052400190000000006140019000000000606043300000000006504350000002004400039000000000534004b000003e80000413d00000000012300190000000000010435000000000001042d000000000001042f000003f6002104210000000102000039000000000001042d0000000002000019000000000001042d000003fb002104230000000102000039000000000001042d0000000002000019000000000001042d00000400002104250000000102000039000000000001042d0000000002000019000000000001042d0000040200000432000004030001042e000004040001043000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000009fffffffffffffffffffffffffffffffffffffffffffffffff000000000000007f00000000000000000000000000000000000000000000000000000001ffffffe0000000000000000000000000ffffffffffffffffffffffffffffffffffffffff000000000000000000000000000000000000000000000000ffffffffffffffff80000000000000000000000000000000000000000000000000000000000000001806aa1896bbf26568e884a7374b41e002500962caba6a15023a8d90e8508b8302000002000000000000000000000000000000240000000000000000000000005c60da1b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000a3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50ffffffffffffffffffffffff000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001cf3b03a6cf19fa2baba4df148e9dcabedea7f8a5c07840e207e5c089be95d3e000000000000000000000000000000000000000000000000ffffffffffffff9f206661696c656400000000000000000000000000000000000000000000000000416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000008c379a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064000000000000000000000000000000020000000000000000000000000000004000000100000000000000000073206e6f74206120636f6e747261637400000000000000000000000000000000455243313936373a20626561636f6e20696d706c656d656e746174696f6e206900000000000000000000000000000000000000840000000000000000000000007472616374000000000000000000000000000000000000000000000000000000455243313936373a206e657720626561636f6e206973206e6f74206120636f6e4e487b710000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000240000000000000000000000000000000000000000000000000000000000000004000000800000000000000000d32177e88b033622e0bc848f24ab73d0795ed87730981120fcdf94fbc134fa5d", + "linkReferences": {}, + "deployedLinkReferences": {}, + "factoryDeps": {} +} diff --git a/l1-contracts/script-config/artifacts/L2SharedBridge.json b/l1-contracts/script-config/artifacts/L2SharedBridge.json new file mode 100644 index 000000000..a74e5c9ad --- /dev/null +++ b/l1-contracts/script-config/artifacts/L2SharedBridge.json @@ -0,0 +1,262 @@ +{ + "_format": "hh-zksolc-artifact-1", + "contractName": "L2SharedBridge", + "sourceName": "contracts/bridge/L2SharedBridge.sol", + "abi": [ + { + "inputs": [ + { + "internalType": "uint256", + "name": "_eraChainId", + "type": "uint256" + } + ], + "stateMutability": "nonpayable", + "type": "constructor" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "l1Sender", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "l2Receiver", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "l2Token", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "FinalizeDeposit", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "uint8", + "name": "version", + "type": "uint8" + } + ], + "name": "Initialized", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "l2Sender", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "l1Receiver", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "l2Token", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "WithdrawalInitiated", + "type": "event" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "_l1Sender", + "type": "address" + }, + { + "internalType": "address", + "name": "_l2Receiver", + "type": "address" + }, + { + "internalType": "address", + "name": "_l1Token", + "type": "address" + }, + { + "internalType": "uint256", + "name": "_amount", + "type": "uint256" + }, + { + "internalType": "bytes", + "name": "_data", + "type": "bytes" + } + ], + "name": "finalizeDeposit", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "_l1SharedBridge", + "type": "address" + }, + { + "internalType": "address", + "name": "_l1Bridge", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "_l2TokenProxyBytecodeHash", + "type": "bytes32" + }, + { + "internalType": "address", + "name": "_aliasedOwner", + "type": "address" + } + ], + "name": "initialize", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "l1Bridge", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "l1SharedBridge", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "l2TokenAddress", + "type": "address" + } + ], + "name": "l1TokenAddress", + "outputs": [ + { + "internalType": "address", + "name": "l1TokenAddress", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "_l1Token", + "type": "address" + } + ], + "name": "l2TokenAddress", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "l2TokenBeacon", + "outputs": [ + { + "internalType": "contract UpgradeableBeacon", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "_l1Receiver", + "type": "address" + }, + { + "internalType": "address", + "name": "_l2Token", + "type": "address" + }, + { + "internalType": "uint256", + "name": "_amount", + "type": "uint256" + } + ], + "name": "withdraw", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + } + ], + "bytecode": "0x0004000000000002001000000000000200000000030100190000006004300270000001a20340019700030000003103550002000000010355000001a20040019d00000001022001900000001d0000c13d0000008002000039000000400020043f000000040230008c000000400000413d000000000201043b000000e002200270000001ab0420009c000000420000213d000001b10420009c0000008a0000213d000001b40120009c000000c10000613d000001b50120009c000000400000c13d0000000001000416000000000101004b000000400000c13d0000000401000039000001d90000013d0000000002000416000000000202004b000000400000c13d000000bf02300039000001a302200197000000400020043f0000001f0230018f00000005043002720000002f0000613d00000000050000190000000506500210000000000761034f000000000707043b000000a00660003900000000007604350000000105500039000000000645004b000000270000413d000000000502004b0000003e0000613d0000000504400210000000000141034f0000000302200210000000a004400039000000000504043300000000052501cf000000000525022f000000000101043b0000010002200089000000000121022f00000000012101cf000000000151019f0000000000140435000000200130008c000000640000813d00000000010000190000068300010430000001ac0420009c000000940000213d000001af0420009c000000c60000613d000001b00220009c000000400000c13d0000000002000416000000000202004b000000400000c13d000000040230008a000000600220008c000000400000413d0000000402100370000000000402043b000001b60240009c000000400000213d0000002402100370000000000302043b000001b60230009c000000400000213d0000004401100370000000000201043b000000000102004b000001de0000c13d000001a601000041000000800010043f0000002001000039000000840010043f0000001501000039000000a40010043f000001c501000041000000c40010043f000001c6010000410000068300010430000000a00100043d000000800010043f000000000200041a0000ff0003200190000000ac0000c13d000000ff0320018f000000ff0330008c000000820000613d000000ff012001bf000000000010041b000000ff01000039000000400200043d0000000000120435000001a2010000410000000003000414000001a20430009c0000000003018019000001a20420009c00000000020180190000004001200210000000c002300210000000000112019f000001a8011001c70000800d020000390000000103000039000001a904000041068106770000040f0000000101200190000000400000613d000000800100043d000001400000044300000160001004430000002001000039000001000010044300000001010000390000012000100443000001aa01000041000006820001042e000001b20420009c000001a50000613d000001b30120009c000000400000c13d0000000001000416000000000101004b000000400000c13d000000000100041a0000001001100270000001da0000013d000001ad0420009c000001c90000613d000001ae0220009c000000400000c13d0000000002000416000000000202004b000000400000c13d000000040230008a000000200220008c000000400000413d0000000401100370000000000101043b000001b60210009c000000400000213d068106050000040f000001b601100197000000400200043d0000000000120435000001a201000041000001a20320009c00000000020180190000004001200210000001b7011001c7000006820001042e000000400100043d0000006402100039000001a40300004100000000003204350000004402100039000001a5030000410000000000320435000000240210003900000027030000390000000000320435000001a6020000410000000000210435000000040210003900000020030000390000000000320435000001a202000041000001a20310009c00000000010280190000004001100210000001a7011001c700000683000104300000000001000416000000000101004b000000400000c13d0000000101000039000001d90000013d0000000002000416000000000202004b000000400000c13d000000040230008a000000a00220008c000000400000413d0000000402100370000000000802043b000001b60280009c000000400000213d0000002402100370000000000902043b000001b60290009c000000400000213d0000004402100370000000000a02043b000001b602a0009c000000400000213d0000008402100370000000000202043b000001bd0420009c000000400000213d0000002304200039000001c705000041000000000634004b00000000060000190000000006058019000001c704400197000000000704004b0000000005008019000001c70440009c000000000506c019000000000405004b000000400000c13d0000000404200039000000000441034f000000000504043b000001bd0450009c000000400000213d001000240020003d0000001002500029000000000232004b000000400000213d000b00000005001d000f0000000a001d000e00000009001d000c00000008001d0000006401100370000000000101043b000d00000001001d0000000001000411000001c801100041000001b6011001970000000402000039000000000202041a000001b602200197000000000221004b000001050000613d000000000200041a0000001002200270000001b602200197000000000121004b000002c10000c13d0000000101000039000800000001001d000000000101041a000001b601100197000000a00010043f0000004001000039000900000001001d000000c00010043f000000e00000043f0000006001000039000a00000001001d000000800010043f0000010001000039000000400010043f000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ca011001c700008010020000390681067c0000040f00000001022001900000000f05000029000000400000613d0000000202000039000700000002001d000000000202041a000000000301043b000000400100043d000000a004100039000000000034043500000080031000390000000000230435000000600210003900000000005204350000004002100039000000000300041000000000003204350000002002100039000001cb030000410000000000320435000000a0030000390000000000310435000001cc0310009c000002170000213d000000c003100039000000400030043f000001a204000041000001a20320009c000000000204801900000040022002100000000001010433000001a20310009c00000000010480190000006001100210000000000121019f0000000002000414000001a20320009c0000000002048019000000c002200210000000000112019f000001cd011001c700008010020000390681067c0000040f0000000102200190000000400000613d000000000101043b000500000001001d000001b601100197000600000001001d00000000001004350000000301000039000400000001001d000000200010043f0000000001000414000001a20210009c000001a201008041000000c001100210000001be011001c700008010020000390681067c0000040f0000000102200190000000400000613d000000000101043b000000000101041a000001b601100198000003ad0000c13d00000000010004140000000702000029000000000402041a0000000802000029000000000202041a000000400300043d000000400530003900000009060000290000000000650435000001b602200197000000200530003900000000002504350000000a02000029000000000023043500000060023000390000000000020435000001c00230009c000002170000213d0000008002300039000000400020043f000000a005300039000001cf060000410000000000650435000000e4053000390000000a060000290000000000650435000000c4053000390000000000450435000000a4043000390000000f0500002900000000005404350000010405300039000000000403043300000000004504350000012405300039000000000604004b0000018a0000613d000000000600001900000000075600190000002006600039000000000836001900000000080804330000000000870435000000000746004b000001830000413d000000000354001900000000000304350000001f03400039000a0020000000920000000a0330017f00000084043000390000000000420435000000c3033000390000000a0430017f0000000003240019000000000443004b00000000040000190000000104004039000001bd0530009c000002170000213d0000000104400190000002170000c13d000000400030043f0000000004020433000001d00540009c0000045f0000413d0000004401300039000001dc02000041000000000021043500000024013000390000000802000039000002b50000013d0000000002000416000000000202004b000000400000c13d000000040230008a000000800220008c000000400000413d0000000402100370000000000202043b000001b60320009c000000400000213d0000002403100370000000000603043b000001b60360009c000000400000213d0000006403100370000000000503043b000001b60350009c000000400000213d000000000300041a0000fffe043001900000021d0000c13d000001e00330019700000102033001bf000000000030041b0000004401100370000000000401043b000000000102004b000002290000c13d000001a601000041000000800010043f0000002001000039000000840010043f0000000201000039000000a40010043f000001f501000041000000610000013d0000000002000416000000000202004b000000400000c13d000000040230008a000000200220008c000000400000413d0000000401100370000000000101043b000001b60210009c000000400000213d00000000001004350000000301000039000000200010043f00000040020000390000000001000019068106610000040f000000000101041a000001b601100197000000800010043f000001b801000041000006820001042e000f00000002001d000e00000004001d000001b9010000410000000000100439001000000003001d0000000400300443000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ba011001c700008002020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000000000101004b0000001004000029000000400000613d000000400500043d00000024015000390000000f020000290000000000210435000001bb0100004100000000001504350000000001000411000d00000001001d000001b601100197000000040250003900000000001204350000000001000414000000040240008c000002150000613d000001a202000041000001a20310009c0000000001028019000001a20350009c00000000020540190000004002200210000000c001100210000000000121019f000001bc011001c70000000002040019000c00000005001d068106770000040f0000000c05000029000000100400002900000000030100190000006003300270000101a20030019d000001a20330019700030000000103550000000102200190000002640000613d000001bd0150009c000002400000a13d000001f00100004100000000001004350000004101000039000000040010043f000001ef010000410000068300010430000001a601000041000000800010043f0000002001000039000000840010043f0000002e01000039000000a40010043f000001dd01000041000000c40010043f000001de01000041000000e40010043f000001df010000410000068300010430000000000104004b000002330000c13d000001a601000041000000800010043f0000002001000039000000840010043f0000000201000039000000a40010043f000001f401000041000000610000013d001000000006001d000f00000004001d000e00000005001d000000000105004b000002870000c13d000001a601000041000000800010043f0000002001000039000000840010043f0000000201000039000000a40010043f000001f301000041000000610000013d000000400050043f00000000004004350000000301000039000000200010043f000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001be011001c700008010020000390681067c0000040f0000000102200190000000400000613d000000400200043d0000002403200039000000000101043b000000000101041a000001b601100198000002c90000c13d000001a6010000410000000000120435000000040120003900000020040000390000000000410435000000020100003900000000001304350000004401200039000001c3030000410000000000310435000001a201000041000001a20320009c00000000020180190000004001200210000001c4011001c70000068300010430000000400200043d0000001f0430018f0000000505300272000002710000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000002690000413d000000000604004b000002800000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001a201000041000001a20420009c000000000201801900000040012002100000006002300210000000000121019f0000068300010430000001e1013001970000001002200210000001e202200197000000000121019f000000000010041b000001e3010000410000000000100439000000000100041200000004001004430000002400000443000001a2030000410000000001000414000001a20210009c0000000001038019000000c001100210000001e4011001c700008005020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000d00000001001d000001e50100004100000000001004390000000001000414000001a20210009c000001a201008041000000c001100210000001e6011001c70000800b020000390681067c0000040f00000001022001900000059c0000613d000000400200043d000c00000002001d000000000101043b0000000d0110006c0000034d0000c13d000000100100006b0000038f0000c13d0000000c030000290000004401300039000001f2020000410000000000210435000000240130003900000003020000390000000000210435000001a6010000410000000000130435000000040130003900000020020000390000000000210435000001a201000041000001a20230009c00000000030180190000004001300210000001c4011001c70000068300010430000001a601000041000000800010043f0000002001000039000000840010043f0000000201000039000000a40010043f000001c901000041000000610000013d0000002004200039000001bf0500004100000000005404350000000e04000029000000600440021000000000004304350000006001100210000000380320003900000000001304350000004c012000390000000f0300002900000000003104350000004c010000390000000000120435000001c00120009c000002170000213d0000008003200039000000400030043f000001c101000041000c00000003001d0000000000130435000000840120003900000020030000390000000000310435000000a40320003900000000010204330000000000130435000000c403200039000000000401004b000002ef0000613d000000000400001900000000053400190000002004400039000000000624001900000000060604330000000000650435000000000514004b000002e80000413d000000000231001900000000000204350000001f01100039000000200200008a000000000121016f000001a2020000410000000c04000029000001a20340009c0000000003020019000000000304401900000040033002100000004401100039000001a20410009c00000000010280190000006001100210000000000131019f0000000003000414000001a20430009c0000000003028019000000c002300210000000000112019f0000800802000039068106770000040f0000000c0a00002900000000030100190000006003300270000001a203300197000000200430008c000000000403001900000020040080390000001f0540018f0000000506400272000003190000613d0000000007000019000000050870021000000000098a0019000000000881034f000000000808043b00000000008904350000000107700039000000000867004b000003110000413d000000000705004b000003280000613d0000000506600210000000000761034f0000000c066000290000000305500210000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f00030000000103550000000102200190000003720000613d0000001f01400039000000600210018f0000000c01200029000000000221004b00000000020000190000000102004039000001bd0410009c00000010070000290000000e05000029000002170000213d0000000102200190000002170000c13d000000400010043f000000200230008c000000400000413d0000000f020000290000000000210435000001a2020000410000000003000414000001a20430009c0000000003028019000001a20410009c00000000010280190000004001100210000000c002300210000000000112019f000001a8011001c7000001b6065001970000800d020000390000000403000039000001c2040000410000000d05000029000003a80000013d0000000c01000029000001e70110009c000002170000813d0000000c040000290000002401400039000001e8020000410000000000210435000000440140003900000000020004140000006003000039001000000003001d0000000000310435000001e90100004100000000001404350000006401400039000000000001043500000004014000390000000000010435000001a201000041000001a20320009c0000000002018019000001a20340009c00000000040180190000004001400210000000c002200210000000000121019f000001ea011001c70000800602000039068106770000040f0000000102200190000003fc0000613d000000000201043b000000000102004b000004380000c13d00000003010003670000000102000031000004010000013d000000400200043d0000001f0430018f00000005053002720000037f0000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000003770000413d000000000604004b0000038e0000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000002800000013d0000000401000039000000000201041a000001d90220019700000010022001af000000000021041b000001f101000041000000000200041a000000000112016f000000000010041b00000002010000390000000c040000290000000000140435000001a2010000410000000002000414000001a20320009c0000000002018019000001a20340009c00000000040180190000004001400210000000c002200210000000000112019f000001a8011001c70000800d020000390000000103000039000001a904000041068106770000040f0000000101200190000000400000613d0000000001000019000006820001042e0000000f0110006c000004260000c13d000001b901000041000000000010043900000006010000290000000400100443000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ba011001c700008002020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000000000101004b0000000e02000029000000400000613d000000400400043d00000024014000390000000d030000290000000000310435000001da010000410000000000140435000001b602200197001000000004001d0000000401400039000f00000002001d000000000021043500000000010004140000000602000029000000040220008c000003e30000613d000001a202000041000001a20310009c00000000010280190000001004000029000001a20340009c00000000020440190000004002200210000000c001100210000000000121019f000001bc011001c70000000602000029068106770000040f00000000030100190000006003300270000101a20030019d000001a203300197000300000001035500000001022001900000059d0000613d0000001001000029000001bd0110009c000002170000213d0000001004000029000000400040043f0000000d010000290000000000140435000001a2010000410000000002000414000001a20320009c0000000002018019000001a20340009c00000000040180190000004001400210000000c002200210000000000112019f000001a8011001c70000000c02000029000001b6052001970000800d020000390000000403000039000001db040000410000000f060000290000000607000029000003a80000013d000300000001035500000000020100190000006002200270000101a20020019d000001a202200197000000400300043d0000001f0420018f00000005052002720000040e0000613d000000000600001900000005076002100000000008730019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000004060000413d000000000604004b0000041d0000613d0000000505500210000000000151034f00000000055300190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001a201000041000001a20430009c0000000003018019000001a20420009c000000000201801900000060012002100000004002300210000000000112019f0000068300010430000000400100043d0000004402100039000001ce030000410000000000320435000000240210003900000007030000290000000000320435000001a6020000410000000000210435000000040210003900000020030000390000000000320435000001a202000041000001a20310009c00000000010280190000004001100210000001c4011001c70000068300010430000000400100043d000001eb0310009c000002170000213d000001b602200197000000840310003900000000002304350000002402100039000001ec0300004100000000003204350000006402100039000000000300041400000020040000390000000000420435000000440210003900000010040000290000000000420435000001e902000041000000000021043500000004021000390000000000020435000001a202000041000001a20430009c0000000003028019000001a20410009c00000000010280190000004001100210000000c002300210000000000121019f000001ed011001c70000800602000039068106770000040f00000001022001900000053c0000613d000000000101043b000000000201004b0000055e0000c13d00000003010003670000000102000031000005410000013d000000c001100210000001d1011001970000004002200210000001d202200041000001d302200197000000000121019f0000006002400210000001d402200197000000000121019f000001d5011001c700008006020000390000000003000019000000000400001900000000050000190000000006000019068106770000040f000300000001035500000000030100190000006003300270000101a20030019d000001a2053001970000003f03500039000001a306300197000000400400043d0000000003460019000000000663004b00000000060000190000000106004039000001bd0730009c000002170000213d0000000106600190000002170000c13d000000400030043f00000000035404360000001f0650003900000005066002720000048f0000613d0000000007000031000000020770036700000000080000190000000509800210000000000a930019000000000997034f000000000909043b00000000009a04350000000108800039000000000968004b000004870000413d000000000600004b000004910000613d0000001f0650018f00000005055002720000049d0000613d000000000700001900000005087002100000000009830019000000000881034f000000000808043b00000000008904350000000107700039000000000857004b000004950000413d000000000706004b000004ac0000613d0000000505500210000000000151034f00000000055300190000000306600210000000000705043300000000076701cf000000000767022f000000000101043b0000010006600089000000000161022f00000000016101cf000000000171019f00000000001504350000000101200190000005ba0000613d0000000001040433000001c702000041000000200410008c00000000040000190000000004024019000001c701100197000000000501004b000000000200a019000001c70110009c000000000204c019000000000102004b000000400000c13d0000000001030433000800000001001d000001b60110009c000000400000213d000001b901000041000000000010043900000008010000290000000400100443000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ba011001c700008002020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000000000101004b0000000f020000290000000b04000029000000400000613d000000400300043d000001d701000041000000000013043500000024053000390000000901000029000300000005001d00000000001504350000000401300039000200000001001d00000000002104350000001f0240018f0000006401300039000900000003001d0000004403300039000100000003001d0000000000430435000000100300002900000002033003670000000504400272000004ee0000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000004e60000413d000000000502004b000004fd0000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f00000000002404350000000b01100029000000000001043500000000010004140000000802000029000000040220008c0000051e0000613d0000000b020000290000001f022000390000000a0220017f000001a2030000410000000905000029000001a20450009c0000000004030019000000000405401900000040044002100000006402200039000001a20520009c00000000020380190000006002200210000000000224019f000001a20410009c0000000001038019000000c001100210000000000121019f0000000802000029068106770000040f00000000030100190000006003300270000101a20030019d000001a20330019700030000000103550000000102200190000005db0000613d0000000901000029000001bd0110009c000002170000213d0000000901000029000000400010043f0000000802000029000000050120014f000001b601100198000005f80000c13d000000060100002900000000001004350000000401000029000000200010043f000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001be011001c700008010020000390681067c0000040f00000001022001900000000f03000029000000400000613d000000000101043b000000000201041a000001d902200197000000000232019f000000000021041b000003af0000013d000300000001035500000000020100190000006002200270000101a20020019d000001a202200197000000400300043d0000001f0420018f00000005052002720000054e0000613d000000000600001900000005076002100000000008730019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000005460000413d000000000604004b0000055d0000613d0000000505500210000000000151034f00000000055300190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f00000000001504350000041d0000013d000001b6031001970000000101000039000000000201041a000001d902200197000000000232019f000000000021041b00000002010000390000000f02000029000000000021041b000001b9010000410000000000100439001000000003001d0000000400300443000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ba011001c700008002020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000000000101004b0000000e02000029000000400000613d000000400300043d000001ee010000410000000000130435000c00000003001d0000000401300039000000000021043500000000010004140000001002000029000000040220008c000005960000613d000001a202000041000001a20310009c00000000010280190000000c04000029000001a20340009c00000000020440190000004002200210000000c001100210000000000121019f000001ef011001c70000001002000029068106770000040f00000000030100190000006003300270000101a20030019d000001a20330019700030000000103550000000102200190000005be0000613d0000000c01000029000001bd0110009c000002170000213d0000000c01000029000000400010043f000003940000013d000000000001042f000000400200043d0000001f0430018f0000000505300272000005aa0000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000005a20000413d000000000604004b000005b90000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000002800000013d000000400100043d0000004402100039000001d603000041000004290000013d000000400200043d0000001f0430018f0000000505300272000005cb0000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000005c30000413d000000000604004b000002800000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000002800000013d000000400200043d0000001f0430018f0000000505300272000005e80000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000005e00000413d000000000604004b000005f70000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000002800000013d000001a60100004100000009030000290000000000130435000000200100003900000002020000290000000000120435000000070100002900000003020000290000000000120435000001d80100004100000001020000290000000000120435000002bb0000013d0001000000000002000100000001001d0000000101000039000000000301041a000000400100043d00000040021000390000004004000039000000000042043500000060020000390000000002210436000001b603300197000000000032043500000060031000390000000000030435000001f60310009c000006580000813d0000008003100039000000400030043f000001a203000041000001a20420009c000000000203801900000040022002100000000001010433000001a20410009c00000000010380190000006001100210000000000121019f0000000002000414000001a20420009c0000000002038019000000c002200210000000000112019f000001cd011001c700008010020000390681067c0000040f00000001022001900000065e0000613d0000000202000039000000000202041a000000000301043b000000400100043d000000a0041000390000000000340435000000800310003900000000002304350000000102000029000001b602200197000000600310003900000000002304350000004002100039000000000300041000000000003204350000002002100039000001cb030000410000000000320435000000a0030000390000000000310435000001cc0310009c000006580000213d000000c003100039000000400030043f000001a203000041000001a20420009c000000000203801900000040022002100000000001010433000001a20410009c00000000010380190000006001100210000000000121019f0000000002000414000001a20420009c0000000002038019000000c002200210000000000112019f000001cd011001c700008010020000390681067c0000040f00000001022001900000065e0000613d000000000101043b000001b601100197000000000001042d000001f00100004100000000001004350000004101000039000000040010043f000001ef01000041000006830001043000000000010000190000068300010430000000000001042f000001a203000041000001a20410009c00000000010380190000004001100210000001a20420009c00000000020380190000006002200210000000000112019f0000000002000414000001a20420009c0000000002038019000000c002200210000000000112019f000001cd011001c700008010020000390681067c0000040f0000000102200190000006750000613d000000000101043b000000000001042d000000000100001900000683000104300000067a002104210000000102000039000000000001042d0000000002000019000000000001042d0000067f002104230000000102000039000000000001042d0000000002000019000000000001042d0000068100000432000006820001042e0000068300010430000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000000000001ffffffe0616c697a696e6700000000000000000000000000000000000000000000000000496e697469616c697a61626c653a20636f6e747261637420697320696e69746908c379a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008400000000000000000000000002000000000000000000000000000000000000200000000000000000000000007f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498000000020000000000000000000000000000008000000100000000000000000000000000000000000000000000000000000000000000000000000000cfe7af7b00000000000000000000000000000000000000000000000000000000f54266a100000000000000000000000000000000000000000000000000000000f54266a200000000000000000000000000000000000000000000000000000000f5f1516800000000000000000000000000000000000000000000000000000000cfe7af7c00000000000000000000000000000000000000000000000000000000d9caed1200000000000000000000000000000000000000000000000000000000a31ee5af00000000000000000000000000000000000000000000000000000000a31ee5b000000000000000000000000000000000000000000000000000000000b852ad36000000000000000000000000000000000000000000000000000000006dde720900000000000000000000000000000000000000000000000000000000969b53da000000000000000000000000ffffffffffffffffffffffffffffffffffffffff000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000008000000000000000001806aa1896bbf26568e884a7374b41e002500962caba6a15023a8d90e8508b83020000020000000000000000000000000000002400000000000000000000000074f4f547000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000044000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff020000000000000000000000000000000000004000000000000000000000000011a2ccc100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff7f62f84b24000000000000000000000000000000000000000000000000000000002fc3848834aac8e883a2d2a17a7514dc4f2d3dd268089df9b9f5d918259ef3b079680000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064000000000000000000000000416d6f756e742063616e6e6f74206265207a65726f000000000000000000000000000000000000000000000000000000000000640000008000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000eeeeffffffffffffffffffffffffffffffffeeef6d710000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000060000000a000000000000000002020dba91b30cc0006188af794c2fb30dd8520db7e2c088b7fc7c103c00ca494000000000000000000000000000000000000000000000000ffffffffffffff3f020000000000000000000000000000000000000000000000000000000000000067670000000000000000000000000000000000000000000000000000000000003cda335100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000ffffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000ffffffff00000000000000000000000001000000000000000000000000000000000000000000000000000000000000006d6b00000000000000000000000000000000000000000000000000000000000095f11a40000000000000000000000000000000000000000000000000000000006d74000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000008c2a993e00000000000000000000000000000000000000000000000000000000b84fba9af218da60d299dc177abd5805e7ac541d2673cbee7808c10017874f634f766572666c6f77000000000000000000000000000000000000000000000000496e697469616c697a61626c653a20636f6e747261637420697320616c726561647920696e697469616c697a65640000000000000000000000000000000000000000000000000000000000000000000000000084000000800000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000ffffffffffffffffffff0000000000000000000000000000000000000000010200000000000000000000ffffffffffffffffffffffffffffffffffffffff0000310ab089e4439a4c15d089f94afb7896ff553aecb10793d0ab882de59d99a32e02000002000000000000000000000000000000440000000000000000000000009a8a0592ac89c5ad3bc6df8224c17b485976f597df104ee20d0df415241f670b0200000200000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff7c010004751688ab9322961547058fd0f36d3edf69880b64cbb2857041d33f4a133cda33511d41a8a5431b1770c5bc0ddd62e1cd30555d16659b89c0d60f4f9f570200000000000000000000000000000000000084000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff7b010000691fa4f751f8312bc555242f18ed78cdc9aabc0ea77d7d5a675ee8ac6f02000000000000000000000000000000000000a4000000000000000000000000f2fde38b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000240000000000000000000000004e487b7100000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff6266320000000000000000000000000000000000000000000000000000000000736600000000000000000000000000000000000000000000000000000000000064660000000000000000000000000000000000000000000000000000000000006266000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff800000000000000000000000000000000000000000000000000000000000000000f5cf0be6820df44d868e986d4d5cafabd5702ac45d181a5ac4eb5ed59a001b03", + "deployedBytecode": "0x0004000000000002001000000000000200000000030100190000006004300270000001a20340019700030000003103550002000000010355000001a20040019d00000001022001900000001d0000c13d0000008002000039000000400020043f000000040230008c000000400000413d000000000201043b000000e002200270000001ab0420009c000000420000213d000001b10420009c0000008a0000213d000001b40120009c000000c10000613d000001b50120009c000000400000c13d0000000001000416000000000101004b000000400000c13d0000000401000039000001d90000013d0000000002000416000000000202004b000000400000c13d000000bf02300039000001a302200197000000400020043f0000001f0230018f00000005043002720000002f0000613d00000000050000190000000506500210000000000761034f000000000707043b000000a00660003900000000007604350000000105500039000000000645004b000000270000413d000000000502004b0000003e0000613d0000000504400210000000000141034f0000000302200210000000a004400039000000000504043300000000052501cf000000000525022f000000000101043b0000010002200089000000000121022f00000000012101cf000000000151019f0000000000140435000000200130008c000000640000813d00000000010000190000068300010430000001ac0420009c000000940000213d000001af0420009c000000c60000613d000001b00220009c000000400000c13d0000000002000416000000000202004b000000400000c13d000000040230008a000000600220008c000000400000413d0000000402100370000000000402043b000001b60240009c000000400000213d0000002402100370000000000302043b000001b60230009c000000400000213d0000004401100370000000000201043b000000000102004b000001de0000c13d000001a601000041000000800010043f0000002001000039000000840010043f0000001501000039000000a40010043f000001c501000041000000c40010043f000001c6010000410000068300010430000000a00100043d000000800010043f000000000200041a0000ff0003200190000000ac0000c13d000000ff0320018f000000ff0330008c000000820000613d000000ff012001bf000000000010041b000000ff01000039000000400200043d0000000000120435000001a2010000410000000003000414000001a20430009c0000000003018019000001a20420009c00000000020180190000004001200210000000c002300210000000000112019f000001a8011001c70000800d020000390000000103000039000001a904000041068106770000040f0000000101200190000000400000613d000000800100043d000001400000044300000160001004430000002001000039000001000010044300000001010000390000012000100443000001aa01000041000006820001042e000001b20420009c000001a50000613d000001b30120009c000000400000c13d0000000001000416000000000101004b000000400000c13d000000000100041a0000001001100270000001da0000013d000001ad0420009c000001c90000613d000001ae0220009c000000400000c13d0000000002000416000000000202004b000000400000c13d000000040230008a000000200220008c000000400000413d0000000401100370000000000101043b000001b60210009c000000400000213d068106050000040f000001b601100197000000400200043d0000000000120435000001a201000041000001a20320009c00000000020180190000004001200210000001b7011001c7000006820001042e000000400100043d0000006402100039000001a40300004100000000003204350000004402100039000001a5030000410000000000320435000000240210003900000027030000390000000000320435000001a6020000410000000000210435000000040210003900000020030000390000000000320435000001a202000041000001a20310009c00000000010280190000004001100210000001a7011001c700000683000104300000000001000416000000000101004b000000400000c13d0000000101000039000001d90000013d0000000002000416000000000202004b000000400000c13d000000040230008a000000a00220008c000000400000413d0000000402100370000000000802043b000001b60280009c000000400000213d0000002402100370000000000902043b000001b60290009c000000400000213d0000004402100370000000000a02043b000001b602a0009c000000400000213d0000008402100370000000000202043b000001bd0420009c000000400000213d0000002304200039000001c705000041000000000634004b00000000060000190000000006058019000001c704400197000000000704004b0000000005008019000001c70440009c000000000506c019000000000405004b000000400000c13d0000000404200039000000000441034f000000000504043b000001bd0450009c000000400000213d001000240020003d0000001002500029000000000232004b000000400000213d000b00000005001d000f0000000a001d000e00000009001d000c00000008001d0000006401100370000000000101043b000d00000001001d0000000001000411000001c801100041000001b6011001970000000402000039000000000202041a000001b602200197000000000221004b000001050000613d000000000200041a0000001002200270000001b602200197000000000121004b000002c10000c13d0000000101000039000800000001001d000000000101041a000001b601100197000000a00010043f0000004001000039000900000001001d000000c00010043f000000e00000043f0000006001000039000a00000001001d000000800010043f0000010001000039000000400010043f000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ca011001c700008010020000390681067c0000040f00000001022001900000000f05000029000000400000613d0000000202000039000700000002001d000000000202041a000000000301043b000000400100043d000000a004100039000000000034043500000080031000390000000000230435000000600210003900000000005204350000004002100039000000000300041000000000003204350000002002100039000001cb030000410000000000320435000000a0030000390000000000310435000001cc0310009c000002170000213d000000c003100039000000400030043f000001a204000041000001a20320009c000000000204801900000040022002100000000001010433000001a20310009c00000000010480190000006001100210000000000121019f0000000002000414000001a20320009c0000000002048019000000c002200210000000000112019f000001cd011001c700008010020000390681067c0000040f0000000102200190000000400000613d000000000101043b000500000001001d000001b601100197000600000001001d00000000001004350000000301000039000400000001001d000000200010043f0000000001000414000001a20210009c000001a201008041000000c001100210000001be011001c700008010020000390681067c0000040f0000000102200190000000400000613d000000000101043b000000000101041a000001b601100198000003ad0000c13d00000000010004140000000702000029000000000402041a0000000802000029000000000202041a000000400300043d000000400530003900000009060000290000000000650435000001b602200197000000200530003900000000002504350000000a02000029000000000023043500000060023000390000000000020435000001c00230009c000002170000213d0000008002300039000000400020043f000000a005300039000001cf060000410000000000650435000000e4053000390000000a060000290000000000650435000000c4053000390000000000450435000000a4043000390000000f0500002900000000005404350000010405300039000000000403043300000000004504350000012405300039000000000604004b0000018a0000613d000000000600001900000000075600190000002006600039000000000836001900000000080804330000000000870435000000000746004b000001830000413d000000000354001900000000000304350000001f03400039000a0020000000920000000a0330017f00000084043000390000000000420435000000c3033000390000000a0430017f0000000003240019000000000443004b00000000040000190000000104004039000001bd0530009c000002170000213d0000000104400190000002170000c13d000000400030043f0000000004020433000001d00540009c0000045f0000413d0000004401300039000001dc02000041000000000021043500000024013000390000000802000039000002b50000013d0000000002000416000000000202004b000000400000c13d000000040230008a000000800220008c000000400000413d0000000402100370000000000202043b000001b60320009c000000400000213d0000002403100370000000000603043b000001b60360009c000000400000213d0000006403100370000000000503043b000001b60350009c000000400000213d000000000300041a0000fffe043001900000021d0000c13d000001e00330019700000102033001bf000000000030041b0000004401100370000000000401043b000000000102004b000002290000c13d000001a601000041000000800010043f0000002001000039000000840010043f0000000201000039000000a40010043f000001f501000041000000610000013d0000000002000416000000000202004b000000400000c13d000000040230008a000000200220008c000000400000413d0000000401100370000000000101043b000001b60210009c000000400000213d00000000001004350000000301000039000000200010043f00000040020000390000000001000019068106610000040f000000000101041a000001b601100197000000800010043f000001b801000041000006820001042e000f00000002001d000e00000004001d000001b9010000410000000000100439001000000003001d0000000400300443000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ba011001c700008002020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000000000101004b0000001004000029000000400000613d000000400500043d00000024015000390000000f020000290000000000210435000001bb0100004100000000001504350000000001000411000d00000001001d000001b601100197000000040250003900000000001204350000000001000414000000040240008c000002150000613d000001a202000041000001a20310009c0000000001028019000001a20350009c00000000020540190000004002200210000000c001100210000000000121019f000001bc011001c70000000002040019000c00000005001d068106770000040f0000000c05000029000000100400002900000000030100190000006003300270000101a20030019d000001a20330019700030000000103550000000102200190000002640000613d000001bd0150009c000002400000a13d000001f00100004100000000001004350000004101000039000000040010043f000001ef010000410000068300010430000001a601000041000000800010043f0000002001000039000000840010043f0000002e01000039000000a40010043f000001dd01000041000000c40010043f000001de01000041000000e40010043f000001df010000410000068300010430000000000104004b000002330000c13d000001a601000041000000800010043f0000002001000039000000840010043f0000000201000039000000a40010043f000001f401000041000000610000013d001000000006001d000f00000004001d000e00000005001d000000000105004b000002870000c13d000001a601000041000000800010043f0000002001000039000000840010043f0000000201000039000000a40010043f000001f301000041000000610000013d000000400050043f00000000004004350000000301000039000000200010043f000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001be011001c700008010020000390681067c0000040f0000000102200190000000400000613d000000400200043d0000002403200039000000000101043b000000000101041a000001b601100198000002c90000c13d000001a6010000410000000000120435000000040120003900000020040000390000000000410435000000020100003900000000001304350000004401200039000001c3030000410000000000310435000001a201000041000001a20320009c00000000020180190000004001200210000001c4011001c70000068300010430000000400200043d0000001f0430018f0000000505300272000002710000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000002690000413d000000000604004b000002800000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001a201000041000001a20420009c000000000201801900000040012002100000006002300210000000000121019f0000068300010430000001e1013001970000001002200210000001e202200197000000000121019f000000000010041b000001e3010000410000000000100439000000000100041200000004001004430000002400000443000001a2030000410000000001000414000001a20210009c0000000001038019000000c001100210000001e4011001c700008005020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000d00000001001d000001e50100004100000000001004390000000001000414000001a20210009c000001a201008041000000c001100210000001e6011001c70000800b020000390681067c0000040f00000001022001900000059c0000613d000000400200043d000c00000002001d000000000101043b0000000d0110006c0000034d0000c13d000000100100006b0000038f0000c13d0000000c030000290000004401300039000001f2020000410000000000210435000000240130003900000003020000390000000000210435000001a6010000410000000000130435000000040130003900000020020000390000000000210435000001a201000041000001a20230009c00000000030180190000004001300210000001c4011001c70000068300010430000001a601000041000000800010043f0000002001000039000000840010043f0000000201000039000000a40010043f000001c901000041000000610000013d0000002004200039000001bf0500004100000000005404350000000e04000029000000600440021000000000004304350000006001100210000000380320003900000000001304350000004c012000390000000f0300002900000000003104350000004c010000390000000000120435000001c00120009c000002170000213d0000008003200039000000400030043f000001c101000041000c00000003001d0000000000130435000000840120003900000020030000390000000000310435000000a40320003900000000010204330000000000130435000000c403200039000000000401004b000002ef0000613d000000000400001900000000053400190000002004400039000000000624001900000000060604330000000000650435000000000514004b000002e80000413d000000000231001900000000000204350000001f01100039000000200200008a000000000121016f000001a2020000410000000c04000029000001a20340009c0000000003020019000000000304401900000040033002100000004401100039000001a20410009c00000000010280190000006001100210000000000131019f0000000003000414000001a20430009c0000000003028019000000c002300210000000000112019f0000800802000039068106770000040f0000000c0a00002900000000030100190000006003300270000001a203300197000000200430008c000000000403001900000020040080390000001f0540018f0000000506400272000003190000613d0000000007000019000000050870021000000000098a0019000000000881034f000000000808043b00000000008904350000000107700039000000000867004b000003110000413d000000000705004b000003280000613d0000000506600210000000000761034f0000000c066000290000000305500210000000000806043300000000085801cf000000000858022f000000000707043b0000010005500089000000000757022f00000000055701cf000000000585019f0000000000560435000100000003001f00030000000103550000000102200190000003720000613d0000001f01400039000000600210018f0000000c01200029000000000221004b00000000020000190000000102004039000001bd0410009c00000010070000290000000e05000029000002170000213d0000000102200190000002170000c13d000000400010043f000000200230008c000000400000413d0000000f020000290000000000210435000001a2020000410000000003000414000001a20430009c0000000003028019000001a20410009c00000000010280190000004001100210000000c002300210000000000112019f000001a8011001c7000001b6065001970000800d020000390000000403000039000001c2040000410000000d05000029000003a80000013d0000000c01000029000001e70110009c000002170000813d0000000c040000290000002401400039000001e8020000410000000000210435000000440140003900000000020004140000006003000039001000000003001d0000000000310435000001e90100004100000000001404350000006401400039000000000001043500000004014000390000000000010435000001a201000041000001a20320009c0000000002018019000001a20340009c00000000040180190000004001400210000000c002200210000000000121019f000001ea011001c70000800602000039068106770000040f0000000102200190000003fc0000613d000000000201043b000000000102004b000004380000c13d00000003010003670000000102000031000004010000013d000000400200043d0000001f0430018f00000005053002720000037f0000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000003770000413d000000000604004b0000038e0000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000002800000013d0000000401000039000000000201041a000001d90220019700000010022001af000000000021041b000001f101000041000000000200041a000000000112016f000000000010041b00000002010000390000000c040000290000000000140435000001a2010000410000000002000414000001a20320009c0000000002018019000001a20340009c00000000040180190000004001400210000000c002200210000000000112019f000001a8011001c70000800d020000390000000103000039000001a904000041068106770000040f0000000101200190000000400000613d0000000001000019000006820001042e0000000f0110006c000004260000c13d000001b901000041000000000010043900000006010000290000000400100443000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ba011001c700008002020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000000000101004b0000000e02000029000000400000613d000000400400043d00000024014000390000000d030000290000000000310435000001da010000410000000000140435000001b602200197001000000004001d0000000401400039000f00000002001d000000000021043500000000010004140000000602000029000000040220008c000003e30000613d000001a202000041000001a20310009c00000000010280190000001004000029000001a20340009c00000000020440190000004002200210000000c001100210000000000121019f000001bc011001c70000000602000029068106770000040f00000000030100190000006003300270000101a20030019d000001a203300197000300000001035500000001022001900000059d0000613d0000001001000029000001bd0110009c000002170000213d0000001004000029000000400040043f0000000d010000290000000000140435000001a2010000410000000002000414000001a20320009c0000000002018019000001a20340009c00000000040180190000004001400210000000c002200210000000000112019f000001a8011001c70000000c02000029000001b6052001970000800d020000390000000403000039000001db040000410000000f060000290000000607000029000003a80000013d000300000001035500000000020100190000006002200270000101a20020019d000001a202200197000000400300043d0000001f0420018f00000005052002720000040e0000613d000000000600001900000005076002100000000008730019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000004060000413d000000000604004b0000041d0000613d0000000505500210000000000151034f00000000055300190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000001a201000041000001a20430009c0000000003018019000001a20420009c000000000201801900000060012002100000004002300210000000000112019f0000068300010430000000400100043d0000004402100039000001ce030000410000000000320435000000240210003900000007030000290000000000320435000001a6020000410000000000210435000000040210003900000020030000390000000000320435000001a202000041000001a20310009c00000000010280190000004001100210000001c4011001c70000068300010430000000400100043d000001eb0310009c000002170000213d000001b602200197000000840310003900000000002304350000002402100039000001ec0300004100000000003204350000006402100039000000000300041400000020040000390000000000420435000000440210003900000010040000290000000000420435000001e902000041000000000021043500000004021000390000000000020435000001a202000041000001a20430009c0000000003028019000001a20410009c00000000010280190000004001100210000000c002300210000000000121019f000001ed011001c70000800602000039068106770000040f00000001022001900000053c0000613d000000000101043b000000000201004b0000055e0000c13d00000003010003670000000102000031000005410000013d000000c001100210000001d1011001970000004002200210000001d202200041000001d302200197000000000121019f0000006002400210000001d402200197000000000121019f000001d5011001c700008006020000390000000003000019000000000400001900000000050000190000000006000019068106770000040f000300000001035500000000030100190000006003300270000101a20030019d000001a2053001970000003f03500039000001a306300197000000400400043d0000000003460019000000000663004b00000000060000190000000106004039000001bd0730009c000002170000213d0000000106600190000002170000c13d000000400030043f00000000035404360000001f0650003900000005066002720000048f0000613d0000000007000031000000020770036700000000080000190000000509800210000000000a930019000000000997034f000000000909043b00000000009a04350000000108800039000000000968004b000004870000413d000000000600004b000004910000613d0000001f0650018f00000005055002720000049d0000613d000000000700001900000005087002100000000009830019000000000881034f000000000808043b00000000008904350000000107700039000000000857004b000004950000413d000000000706004b000004ac0000613d0000000505500210000000000151034f00000000055300190000000306600210000000000705043300000000076701cf000000000767022f000000000101043b0000010006600089000000000161022f00000000016101cf000000000171019f00000000001504350000000101200190000005ba0000613d0000000001040433000001c702000041000000200410008c00000000040000190000000004024019000001c701100197000000000501004b000000000200a019000001c70110009c000000000204c019000000000102004b000000400000c13d0000000001030433000800000001001d000001b60110009c000000400000213d000001b901000041000000000010043900000008010000290000000400100443000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ba011001c700008002020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000000000101004b0000000f020000290000000b04000029000000400000613d000000400300043d000001d701000041000000000013043500000024053000390000000901000029000300000005001d00000000001504350000000401300039000200000001001d00000000002104350000001f0240018f0000006401300039000900000003001d0000004403300039000100000003001d0000000000430435000000100300002900000002033003670000000504400272000004ee0000613d000000000500001900000005065002100000000007610019000000000663034f000000000606043b00000000006704350000000105500039000000000645004b000004e60000413d000000000502004b000004fd0000613d0000000504400210000000000343034f00000000044100190000000302200210000000000504043300000000052501cf000000000525022f000000000303043b0000010002200089000000000323022f00000000022301cf000000000252019f00000000002404350000000b01100029000000000001043500000000010004140000000802000029000000040220008c0000051e0000613d0000000b020000290000001f022000390000000a0220017f000001a2030000410000000905000029000001a20450009c0000000004030019000000000405401900000040044002100000006402200039000001a20520009c00000000020380190000006002200210000000000224019f000001a20410009c0000000001038019000000c001100210000000000121019f0000000802000029068106770000040f00000000030100190000006003300270000101a20030019d000001a20330019700030000000103550000000102200190000005db0000613d0000000901000029000001bd0110009c000002170000213d0000000901000029000000400010043f0000000802000029000000050120014f000001b601100198000005f80000c13d000000060100002900000000001004350000000401000029000000200010043f000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001be011001c700008010020000390681067c0000040f00000001022001900000000f03000029000000400000613d000000000101043b000000000201041a000001d902200197000000000232019f000000000021041b000003af0000013d000300000001035500000000020100190000006002200270000101a20020019d000001a202200197000000400300043d0000001f0420018f00000005052002720000054e0000613d000000000600001900000005076002100000000008730019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000005460000413d000000000604004b0000055d0000613d0000000505500210000000000151034f00000000055300190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f00000000001504350000041d0000013d000001b6031001970000000101000039000000000201041a000001d902200197000000000232019f000000000021041b00000002010000390000000f02000029000000000021041b000001b9010000410000000000100439001000000003001d0000000400300443000001a2010000410000000002000414000001a20320009c0000000002018019000000c001200210000001ba011001c700008002020000390681067c0000040f00000001022001900000059c0000613d000000000101043b000000000101004b0000000e02000029000000400000613d000000400300043d000001ee010000410000000000130435000c00000003001d0000000401300039000000000021043500000000010004140000001002000029000000040220008c000005960000613d000001a202000041000001a20310009c00000000010280190000000c04000029000001a20340009c00000000020440190000004002200210000000c001100210000000000121019f000001ef011001c70000001002000029068106770000040f00000000030100190000006003300270000101a20030019d000001a20330019700030000000103550000000102200190000005be0000613d0000000c01000029000001bd0110009c000002170000213d0000000c01000029000000400010043f000003940000013d000000000001042f000000400200043d0000001f0430018f0000000505300272000005aa0000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000005a20000413d000000000604004b000005b90000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000002800000013d000000400100043d0000004402100039000001d603000041000004290000013d000000400200043d0000001f0430018f0000000505300272000005cb0000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000005c30000413d000000000604004b000002800000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000002800000013d000000400200043d0000001f0430018f0000000505300272000005e80000613d000000000600001900000005076002100000000008720019000000000771034f000000000707043b00000000007804350000000106600039000000000756004b000005e00000413d000000000604004b000005f70000613d0000000505500210000000000151034f00000000055200190000000304400210000000000605043300000000064601cf000000000646022f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f0000000000150435000002800000013d000001a60100004100000009030000290000000000130435000000200100003900000002020000290000000000120435000000070100002900000003020000290000000000120435000001d80100004100000001020000290000000000120435000002bb0000013d0001000000000002000100000001001d0000000101000039000000000301041a000000400100043d00000040021000390000004004000039000000000042043500000060020000390000000002210436000001b603300197000000000032043500000060031000390000000000030435000001f60310009c000006580000813d0000008003100039000000400030043f000001a203000041000001a20420009c000000000203801900000040022002100000000001010433000001a20410009c00000000010380190000006001100210000000000121019f0000000002000414000001a20420009c0000000002038019000000c002200210000000000112019f000001cd011001c700008010020000390681067c0000040f00000001022001900000065e0000613d0000000202000039000000000202041a000000000301043b000000400100043d000000a0041000390000000000340435000000800310003900000000002304350000000102000029000001b602200197000000600310003900000000002304350000004002100039000000000300041000000000003204350000002002100039000001cb030000410000000000320435000000a0030000390000000000310435000001cc0310009c000006580000213d000000c003100039000000400030043f000001a203000041000001a20420009c000000000203801900000040022002100000000001010433000001a20410009c00000000010380190000006001100210000000000121019f0000000002000414000001a20420009c0000000002038019000000c002200210000000000112019f000001cd011001c700008010020000390681067c0000040f00000001022001900000065e0000613d000000000101043b000001b601100197000000000001042d000001f00100004100000000001004350000004101000039000000040010043f000001ef01000041000006830001043000000000010000190000068300010430000000000001042f000001a203000041000001a20410009c00000000010380190000004001100210000001a20420009c00000000020380190000006002200210000000000112019f0000000002000414000001a20420009c0000000002038019000000c002200210000000000112019f000001cd011001c700008010020000390681067c0000040f0000000102200190000006750000613d000000000101043b000000000001042d000000000100001900000683000104300000067a002104210000000102000039000000000001042d0000000002000019000000000001042d0000067f002104230000000102000039000000000001042d0000000002000019000000000001042d0000068100000432000006820001042e0000068300010430000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000000000001ffffffe0616c697a696e6700000000000000000000000000000000000000000000000000496e697469616c697a61626c653a20636f6e747261637420697320696e69746908c379a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008400000000000000000000000002000000000000000000000000000000000000200000000000000000000000007f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498000000020000000000000000000000000000008000000100000000000000000000000000000000000000000000000000000000000000000000000000cfe7af7b00000000000000000000000000000000000000000000000000000000f54266a100000000000000000000000000000000000000000000000000000000f54266a200000000000000000000000000000000000000000000000000000000f5f1516800000000000000000000000000000000000000000000000000000000cfe7af7c00000000000000000000000000000000000000000000000000000000d9caed1200000000000000000000000000000000000000000000000000000000a31ee5af00000000000000000000000000000000000000000000000000000000a31ee5b000000000000000000000000000000000000000000000000000000000b852ad36000000000000000000000000000000000000000000000000000000006dde720900000000000000000000000000000000000000000000000000000000969b53da000000000000000000000000ffffffffffffffffffffffffffffffffffffffff000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000008000000000000000001806aa1896bbf26568e884a7374b41e002500962caba6a15023a8d90e8508b83020000020000000000000000000000000000002400000000000000000000000074f4f547000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000044000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffff020000000000000000000000000000000000004000000000000000000000000011a2ccc100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff7f62f84b24000000000000000000000000000000000000000000000000000000002fc3848834aac8e883a2d2a17a7514dc4f2d3dd268089df9b9f5d918259ef3b079680000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064000000000000000000000000416d6f756e742063616e6e6f74206265207a65726f000000000000000000000000000000000000000000000000000000000000640000008000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000eeeeffffffffffffffffffffffffffffffffeeef6d710000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000060000000a000000000000000002020dba91b30cc0006188af794c2fb30dd8520db7e2c088b7fc7c103c00ca494000000000000000000000000000000000000000000000000ffffffffffffff3f020000000000000000000000000000000000000000000000000000000000000067670000000000000000000000000000000000000000000000000000000000003cda335100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000ffffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000ffffffff00000000000000000000000001000000000000000000000000000000000000000000000000000000000000006d6b00000000000000000000000000000000000000000000000000000000000095f11a40000000000000000000000000000000000000000000000000000000006d74000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000008c2a993e00000000000000000000000000000000000000000000000000000000b84fba9af218da60d299dc177abd5805e7ac541d2673cbee7808c10017874f634f766572666c6f77000000000000000000000000000000000000000000000000496e697469616c697a61626c653a20636f6e747261637420697320616c726561647920696e697469616c697a65640000000000000000000000000000000000000000000000000000000000000000000000000084000000800000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000ffffffffffffffffffff0000000000000000000000000000000000000000010200000000000000000000ffffffffffffffffffffffffffffffffffffffff0000310ab089e4439a4c15d089f94afb7896ff553aecb10793d0ab882de59d99a32e02000002000000000000000000000000000000440000000000000000000000009a8a0592ac89c5ad3bc6df8224c17b485976f597df104ee20d0df415241f670b0200000200000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff7c010004751688ab9322961547058fd0f36d3edf69880b64cbb2857041d33f4a133cda33511d41a8a5431b1770c5bc0ddd62e1cd30555d16659b89c0d60f4f9f570200000000000000000000000000000000000084000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff7b010000691fa4f751f8312bc555242f18ed78cdc9aabc0ea77d7d5a675ee8ac6f02000000000000000000000000000000000000a4000000000000000000000000f2fde38b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000240000000000000000000000004e487b7100000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00ff6266320000000000000000000000000000000000000000000000000000000000736600000000000000000000000000000000000000000000000000000000000064660000000000000000000000000000000000000000000000000000000000006266000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff800000000000000000000000000000000000000000000000000000000000000000f5cf0be6820df44d868e986d4d5cafabd5702ac45d181a5ac4eb5ed59a001b03", + "linkReferences": {}, + "deployedLinkReferences": {}, + "factoryDeps": { + "0x010000691fa4f751f8312bc555242f18ed78cdc9aabc0ea77d7d5a675ee8ac6f": "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol:UpgradeableBeacon", + "0x010004751688ab9322961547058fd0f36d3edf69880b64cbb2857041d33f4a13": "contracts/bridge/L2StandardERC20.sol:L2StandardERC20" + } +} diff --git a/l1-contracts/script-config/artifacts/TransparentUpgradeableProxy.json b/l1-contracts/script-config/artifacts/TransparentUpgradeableProxy.json new file mode 100644 index 000000000..c8880c120 --- /dev/null +++ b/l1-contracts/script-config/artifacts/TransparentUpgradeableProxy.json @@ -0,0 +1,86 @@ +{ + "_format": "hh-zksolc-artifact-1", + "contractName": "TransparentUpgradeableProxy", + "sourceName": "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol", + "abi": [ + { + "inputs": [ + { + "internalType": "address", + "name": "_logic", + "type": "address" + }, + { + "internalType": "address", + "name": "admin_", + "type": "address" + }, + { + "internalType": "bytes", + "name": "_data", + "type": "bytes" + } + ], + "stateMutability": "payable", + "type": "constructor" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "internalType": "address", + "name": "previousAdmin", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "newAdmin", + "type": "address" + } + ], + "name": "AdminChanged", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "beacon", + "type": "address" + } + ], + "name": "BeaconUpgraded", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "implementation", + "type": "address" + } + ], + "name": "Upgraded", + "type": "event" + }, + { + "stateMutability": "payable", + "type": "fallback" + }, + { + "stateMutability": "payable", + "type": "receive" + } + ], + "bytecode": "0x00020000000000020008000000000002000000000301001900000060033002700000012c0330019700010000003103550000008008000039000000400080043f00000001022001900000001e0000c13d000000000431034f00000000050004110000013d02000041000000000702041a0000013002700197000000000603004b000000270000c13d000000000325004b0000010c0000c13d000000000101043b0000014101100197000001420310009c0000001b0000613d000001430310009c000002c20000613d000001440310009c000002680000c13d00000000010004160000000001000019000004ac000104300000012d023000410000012e0220009c0000005f0000213d000001520100004100000000001004350000004101000039000000040010043f0000015301000041000004ac00010430000000000525004b0000012d0000c13d000000000401043b0000014104400197000001420540009c000001670000c13d0000000002000416000000000202004b000002c20000c13d000000240230008c000002c20000413d0000000401100370000000000201043b000001300120009c000002c20000213d000000a001000039000000400010043f000000800000043f00000133010000410000000000100439000800000002001d00000004002004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b000002a80000c13d000000400100043d00000064021000390000015403000041000000000032043500000044021000390000015503000041000000000032043500000024021000390000002d0300003900000000003204350000013c0200004100000000002104350000000402100039000000200300003900000000003204350000012c020000410000012c0310009c000000000102801900000040011002100000014c011001c7000004ac000104300000009f023000390000012f02200197000000400020043f0000001f0230018f00000005043002720000006e0000613d00000000050000190000000506500210000000000761034f000000000707043b000000800660003900000000007604350000000105500039000000000645004b000000660000413d000000000502004b0000007d0000613d0000000504400210000000000141034f00000003022002100000008004400039000000000504043300000000052501cf000000000525022f000000000101043b0000010002200089000000000121022f00000000012101cf000000000151019f00000000001404350000005f0130008c000002c20000a13d000000800900043d000001300190009c000002c20000213d000000a00700043d000001300170009c000002c20000213d000000c00200043d000001310120009c000002c20000213d0000001f012000390000013204000041000000000531004b000000000500001900000000050480190000013201100197000000000601004b0000000004008019000001320110009c000000000405c019000000000104004b000002c20000c13d00000080012000390000000001010433000001310410009c000000210000213d0000003f04100039000000200a00008a0000000004a4016f000000400b00043d00000000044b00190000000005b4004b00000000050000190000000105004039000001310640009c000000210000213d0000000105500190000000210000c13d0000008003300039000000400040043f00000000061b0436000000a0022000390000000004210019000000000334004b000002c20000213d00060000000b001d00050000000a001d000700000007001d000300000008001d000000000301004b000000b90000613d000000000300001900000000046300190000000005230019000000000505043300000000005404350000002003300039000000000413004b000000b20000413d000400000006001d0000000001160019000000000001043500000133010000410000000000100439000800000009001d00000004009004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b0000004a0000613d000000080100002900000130051001970000013501000041000000000201041a0000013602200197000000000252019f000000000021041b0000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000137011001c70000800d020000390000000203000039000001380400004104aa049b0000040f0000000803000029000000010120019000000007020000290000000605000029000002c20000613d0000000001050433000000000101004b000003770000c13d0000013d01000041000000000301041a0000013004200197000000400100043d0000002002100039000800000004001d0000000000420435000700000003001d000001300230019700000000002104350000012c0200004100000000030004140000012c0430009c00000000030280190000012c0410009c00000000010280190000004001100210000000c002300210000000000112019f0000013e011001c70000800d0200003900000001030000390000013f0400004104aa049b0000040f0000000101200190000002c20000613d000000080100006b0000025a0000613d0000000701000029000001360110019700000008011001af0000013d02000041000000000012041b0000002001000039000001000010044300000120000004430000014001000041000004ab0001042e0000013501000041000000000201041a00000000010004140000013002200197000000040320008c000001e90000c13d00000000030000310000001f0230018f00000005013002720000011e0000613d00000000050000190000000506500210000000000764034f000000000707043b00000000007604350000000105500039000000000615004b000001170000413d000000000502004b0000020e0000613d00000003022002100000000501100210000000000501043300000000052501cf000000000525022f000000000414034f000000000404043b0000010002200089000000000424022f00000000022401cf000000000252019f00000000002104350000020e0000013d0000001f0530018f0000013502000041000000000202041a000001300220019700000005063002720000013b0000613d00000000070000190000000508700210000000000981034f000000000909043b00000000009804350000000107700039000000000867004b000001340000413d000000000705004b000001490000613d00000003055002100000000506600210000000000706043300000000075701cf000000000757022f000000000161034f000000000101043b0000010005500089000000000151022f00000000015101cf000000000171019f00000000001604350000000001000414000000040520008c0000020f0000c13d00000000030000310000001f0230018f0000000501300272000001580000613d00000000050000190000000506500210000000000764034f000000000707043b00000000007604350000000105500039000000000615004b000001510000413d000000000502004b000002360000613d00000003022002100000000501100210000000000501043300000000052501cf000000000525022f000000000414034f000000000404043b0000010002200089000000000424022f00000000022401cf000000000252019f0000000000210435000002360000013d000001430540009c0000023b0000c13d000000440230008c000002c20000413d0000000402100370000000000802043b000001300280009c000002c20000213d0000002402100370000000000402043b000001310240009c000002c20000213d00000023024000390000013205000041000000000632004b000000000600001900000000060580190000013202200197000000000702004b0000000005008019000001320220009c000000000506c019000000000205004b000002c20000c13d0000000405400039000000000251034f000000000202043b000001310620009c000000210000213d000000bf06200039000000200900008a000000000696016f000001310760009c000000210000213d000000400060043f000000800020043f00000000042400190000002404400039000000000334004b000002c20000213d0000002003500039000000000131034f0000001f0320018f00000005042002720000019d0000613d00000000050000190000000506500210000000000761034f000000000707043b000000a00660003900000000007604350000000105500039000000000645004b000001950000413d000700000009001d000000000503004b000001ad0000613d0000000504400210000000000141034f0000000303300210000000a004400039000000000504043300000000053501cf000000000535022f000000000101043b0000010003300089000000000131022f00000000013101cf000000000151019f0000000000140435000000a001200039000000000001043500000133010000410000000000100439000800000008001d00000004008004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b0000004a0000613d0000013501000041000000000201041a000001360220019700000008022001af0000000805000029000000000021041b0000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000137011001c70000800d020000390000000203000039000001380400004104aa049b0000040f00000008030000290000000101200190000002c20000613d000000400100043d000600000001001d000001390110009c000000210000213d00000006040000290000006001400039000000400010043f00000040014000390000013a02000041000000000021043500000020014000390000013b02000041000000000021043500000027010000390000000000140435000000800200043d0000000001000414000000040330008c0000040d0000c13d000000010200003900000000040000310000041d0000013d0000012c030000410000012c0410009c0000000001038019000000c00110021004aa04a50000040f0001000000010355000000000301001900000060033002700000001f0430018f0000012c0030019d0000012c033001970000000505300272000001fe0000613d00000000060000190000000507600210000000000871034f000000000808043b00000000008704350000000106600039000000000756004b000001f70000413d000000000604004b0000020c0000613d00000003044002100000000505500210000000000605043300000000064601cf000000000646022f000000000151034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f00000000001504350000000101200190000002640000613d000002360000013d0000012c040000410000012c0510009c0000000001048019000000c0011002100000006003300210000000000131019f04aa04a50000040f0001000000010355000000000301001900000060033002700000001f0430018f0000012c0030019d0000012c033001970000000505300272000002260000613d00000000060000190000000507600210000000000871034f000000000808043b00000000008704350000000106600039000000000756004b0000021f0000413d000000000604004b000002340000613d00000003044002100000000505500210000000000605043300000000064601cf000000000646022f000000000151034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f00000000001504350000000101200190000002660000613d0000012c010000410000012c0230009c00000000030180190000006001300210000004ab0001042e000001440540009c0000026e0000c13d0000000004000416000000000404004b000002c20000c13d000000240330008c000002c20000413d0000000401100370000000000401043b000001300140009c000002c20000213d000000800020043f000000a00040043f0000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000148011001c70000800d020000390000000103000039000700000004001d0000013f04000041000800000007001d04aa049b0000040f000000070400002900000008030000290000000101200190000002c20000613d000000000104004b000002c40000c13d000000400100043d00000064021000390000014a03000041000000000032043500000044021000390000014b03000041000000000032043500000024021000390000002603000039000000530000013d0000006001300210000004ac000104300000006001300210000004ac00010430000001450310009c000002750000c13d0000000001000416000000000101004b000002c20000c13d0000027d0000013d000001450140009c000002840000c13d0000000001000416000000000101004b000002c20000c13d000000a00020043f0000028d0000013d000001460110009c0000029a0000c13d0000000001000416000000000101004b000002c20000c13d0000013501000041000000000101041a0000013002100197000000a00020043f0000002001000039000000800010043f000000c001000039000000400010043f0000015a01000041000004ab0001042e000001460140009c0000029a0000c13d0000000001000416000000000101004b000002c20000c13d0000013501000041000000000101041a0000013001100197000000a00010043f0000002001000039000000800010043f000000c001000039000000400010043f000000800100003900000147020000410000015003000041000001500410009c000000000103801900000040011002100000015101100041000000000121019f000004ab0001042e0000013c01000041000000800010043f0000002001000039000000840010043f0000004201000039000000a40010043f0000015601000041000000c40010043f0000015701000041000000e40010043f0000015801000041000001040010043f0000015901000041000004ac000104300000013501000041000000000201041a000001360220019700000008022001af0000000805000029000000000021041b0000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000137011001c70000800d020000390000000203000039000001380400004104aa049b0000040f00000008080000290000000101200190000002c20000613d000000800100043d000000000101004b000002d00000c13d000000400100043d000001490210009c000000210000213d000002cb0000013d0000000001000019000004ac000104300000013601300197000000000114019f0000013d02000041000000000012041b000000400100043d000001490210009c000000210000213d0000002002100039000000400020043f00000000000104350000000002000019000002930000013d000000400900043d000001390190009c000000210000213d0000006001900039000000400010043f00000040019000390000013a02000041000000000021043500000020019000390000013b02000041000000000021043500000027010000390000000000190435000000800200043d0000000001000414000000040380008c000002e40000c13d00000001020000390000000004000031000002f70000013d0000012c030000410000012c0410009c00000000010380190000012c0420009c00000000020380190000006002200210000000c001100210000000000121019f0000014d011001c70000000002080019000700000009001d04aa04a50000040f00000007090000290000000808000029000000010220018f000100000001035500000060011002700000012c0010019d0000012c0410019700000060030000390000008001000039000000000504004b000003230000c13d0000000003030433000000000202004b000003530000c13d000000000203004b0000038c0000c13d000000400100043d0000013c0200004100000000002104350000000402100039000000200300003900000000003204350000000002090433000000240310003900000000002304350000004403100039000000000402004b000003140000613d000000000400001900000000053400190000002004400039000000000694001900000000060604330000000000650435000000000524004b0000030d0000413d0000001f04200039000000200500008a000000000454016f0000000002320019000000000002043500000044024000390000012c030000410000012c0420009c00000000020380190000012c0410009c000000000103801900000040011002100000006002200210000000000112019f000004ac00010430000001310140009c000000210000213d0000003f01400039000000200300008a000000000131016f000000400300043d0000000001130019000000000531004b00000000050000190000000105004039000001310610009c000000210000213d0000000105500190000000210000c13d000000000a090019000000400010043f0000001f0540018f000000000143043600000001060003670000000504400272000003410000613d000000000700001900000005087002100000000009810019000000000886034f000000000808043b00000000008904350000000107700039000000000847004b000003390000413d000000000705004b000000080800002900000000090a0019000002fb0000613d0000000504400210000000000646034f00000000044100190000000305500210000000000704043300000000075701cf000000000757022f000000000606043b0000010005500089000000000656022f00000000055601cf000000000575019f0000000000540435000002fb0000013d000000000103004b000002be0000c13d0000013301000041000000000010043900000004008004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b000002be0000c13d000000400100043d00000044021000390000014e03000041000000000032043500000024021000390000001d0300003900000000003204350000013c0200004100000000002104350000000402100039000000200300003900000000003204350000012c020000410000012c0310009c000000000102801900000040011002100000014f011001c7000004ac00010430000000400400043d000001390140009c000000210000213d0000006001400039000000400010043f00000040014000390000013a0200004100000000002104350000002701000039000200000004001d00000000021404360000013b01000041000100000002001d000000000012043500000000020504330000000001000414000000040330008c000003950000c13d00000001020000390000000003000031000003a90000013d0000012c020000410000012c0430009c00000000030280190000012c0410009c000000000102801900000040011002100000006002300210000000000112019f000004ac000104300000012c0300004100000004050000290000012c0450009c000000000503801900000040045002100000012c0520009c00000000020380190000006002200210000000000242019f0000012c0410009c0000000001038019000000c001100210000000000112019f000000080200002904aa04a50000040f000000010220018f000100000001035500000060011002700000012c0010019d0000012c031001970000006001000039000000000403004b000003c90000c13d0000000001010433000000000202004b000003f70000c13d000000000201004b000004830000c13d000000400400043d000800000004001d0000013c01000041000000000014043500000004014000390000002002000039000000000021043500000002010000290000000003010433000700000003001d000000240140003900000000003104350000004402400039000000010100002904aa048d0000040f00000007010000290000001f01100039000000050110017f00000044011000390000012c020000410000012c0310009c00000000010280190000000804000029000004870000013d000001310130009c0000000504000029000000210000213d0000003f01300039000000000441016f000000400100043d0000000004410019000000000514004b00000000050000190000000105004039000001310640009c000000210000213d0000000105500190000000210000c13d000000400040043f0000001f0430018f000000000931043600000001050003670000000503300272000003e60000613d000000000600001900000005076002100000000008790019000000000775034f000000000707043b00000000007804350000000106600039000000000736004b000003de0000413d000300000009001d000000000604004b000003ac0000613d0000000503300210000000000535034f00000003033000290000000304400210000000000603043300000000064601cf000000000646022f000000000505043b0000010004400089000000000545022f00000000044501cf000000000464019f0000000000430435000003ac0000013d000000000101004b00000007020000290000000803000029000000e60000c13d0000013301000041000000000010043900000004003004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b0000000702000029000000e60000c13d000003650000013d0000012c030000410000012c0410009c00000000010380190000012c0420009c00000000020380190000006002200210000000c001100210000000000121019f0000014d011001c7000000080200002904aa04a50000040f000000010220018f000100000001035500000060011002700000012c0010019d0000012c0410019700000060030000390000008001000039000000000504004b0000043e0000c13d0000000003030433000000000202004b0000046b0000c13d000000000203004b0000038c0000c13d000000400100043d0000013c02000041000000000021043500000004021000390000002003000039000000000032043500000006070000290000000002070433000000240310003900000000002304350000004403100039000000000402004b0000043b0000613d000000000400001900000000053400190000002004400039000000000674001900000000060604330000000000650435000000000524004b000004340000413d0000001f042000390000000705000029000003160000013d000001310140009c0000000703000029000000210000213d0000003f01400039000000000131016f000000400300043d0000000001130019000000000531004b00000000050000190000000105004039000001310610009c000000210000213d0000000105500190000000210000c13d000000400010043f0000001f0540018f0000000001430436000000010600036700000005044002720000045b0000613d000000000700001900000005087002100000000009810019000000000886034f000000000808043b00000000008904350000000107700039000000000847004b000004530000413d000000000705004b000004210000613d0000000504400210000000000646034f00000000044100190000000305500210000000000704043300000000075701cf000000000757022f000000000606043b0000010005500089000000000656022f00000000055601cf000000000575019f0000000000540435000004210000013d000000000103004b0000047e0000c13d00000133010000410000000000100439000000080100002900000004001004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b000003650000613d000000400100043d000001490210009c000000210000213d000002cb0000013d000000000001042f0000012c020000410000012c0310009c000000000102801900000003040000290000012c0340009c000000000402801900000040024002100000006001100210000000000121019f000004ac00010430000000000403004b000004970000613d000000000400001900000000052400190000000006140019000000000606043300000000006504350000002004400039000000000534004b000004900000413d00000000012300190000000000010435000000000001042d000000000001042f0000049e002104210000000102000039000000000001042d0000000002000019000000000001042d000004a3002104230000000102000039000000000001042d0000000002000019000000000001042d000004a8002104250000000102000039000000000001042d0000000002000019000000000001042d000004aa00000432000004ab0001042e000004ac0001043000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000009fffffffffffffffffffffffffffffffffffffffffffffffff000000000000007f00000000000000000000000000000000000000000000000000000001ffffffe0000000000000000000000000ffffffffffffffffffffffffffffffffffffffff000000000000000000000000000000000000000000000000ffffffffffffffff80000000000000000000000000000000000000000000000000000000000000001806aa1896bbf26568e884a7374b41e002500962caba6a15023a8d90e8508b830200000200000000000000000000000000000024000000000000000000000000360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbcffffffffffffffffffffffff00000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000bc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b000000000000000000000000000000000000000000000000ffffffffffffff9f206661696c656400000000000000000000000000000000000000000000000000416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c08c379a000000000000000000000000000000000000000000000000000000000b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610302000000000000000000000000000000000000400000000000000000000000007e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f0000000200000000000000000000000000000040000001000000000000000000ffffffff000000000000000000000000000000000000000000000000000000003659cfe6000000000000000000000000000000000000000000000000000000004f1ef286000000000000000000000000000000000000000000000000000000008f28397000000000000000000000000000000000000000000000000000000000f851a440000000000000000000000000000000000000000000000000000000005c60da1b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000200000000000000000000000000000000000040000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffdf6464726573730000000000000000000000000000000000000000000000000000455243313936373a206e65772061646d696e20697320746865207a65726f206100000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000000000000000000000000000000000000000006400000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffdf00000000000000000000000000000000000000000000002000000000000000004e487b710000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000240000000000000000000000006f74206120636f6e747261637400000000000000000000000000000000000000455243313936373a206e657720696d706c656d656e746174696f6e206973206e5472616e73706172656e745570677261646561626c6550726f78793a2061646d696e2063616e6e6f742066616c6c6261636b20746f2070726f78792074617267657400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a40000008000000000000000000000000000000000000000000000000000000020000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000007444ff0b02dc9864c7dbf97ccd7719c286d6972190eeb0285ea9e04a713977c0", + "deployedBytecode": "0x00020000000000020008000000000002000000000301001900000060033002700000012c0330019700010000003103550000008008000039000000400080043f00000001022001900000001e0000c13d000000000431034f00000000050004110000013d02000041000000000702041a0000013002700197000000000603004b000000270000c13d000000000325004b0000010c0000c13d000000000101043b0000014101100197000001420310009c0000001b0000613d000001430310009c000002c20000613d000001440310009c000002680000c13d00000000010004160000000001000019000004ac000104300000012d023000410000012e0220009c0000005f0000213d000001520100004100000000001004350000004101000039000000040010043f0000015301000041000004ac00010430000000000525004b0000012d0000c13d000000000401043b0000014104400197000001420540009c000001670000c13d0000000002000416000000000202004b000002c20000c13d000000240230008c000002c20000413d0000000401100370000000000201043b000001300120009c000002c20000213d000000a001000039000000400010043f000000800000043f00000133010000410000000000100439000800000002001d00000004002004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b000002a80000c13d000000400100043d00000064021000390000015403000041000000000032043500000044021000390000015503000041000000000032043500000024021000390000002d0300003900000000003204350000013c0200004100000000002104350000000402100039000000200300003900000000003204350000012c020000410000012c0310009c000000000102801900000040011002100000014c011001c7000004ac000104300000009f023000390000012f02200197000000400020043f0000001f0230018f00000005043002720000006e0000613d00000000050000190000000506500210000000000761034f000000000707043b000000800660003900000000007604350000000105500039000000000645004b000000660000413d000000000502004b0000007d0000613d0000000504400210000000000141034f00000003022002100000008004400039000000000504043300000000052501cf000000000525022f000000000101043b0000010002200089000000000121022f00000000012101cf000000000151019f00000000001404350000005f0130008c000002c20000a13d000000800900043d000001300190009c000002c20000213d000000a00700043d000001300170009c000002c20000213d000000c00200043d000001310120009c000002c20000213d0000001f012000390000013204000041000000000531004b000000000500001900000000050480190000013201100197000000000601004b0000000004008019000001320110009c000000000405c019000000000104004b000002c20000c13d00000080012000390000000001010433000001310410009c000000210000213d0000003f04100039000000200a00008a0000000004a4016f000000400b00043d00000000044b00190000000005b4004b00000000050000190000000105004039000001310640009c000000210000213d0000000105500190000000210000c13d0000008003300039000000400040043f00000000061b0436000000a0022000390000000004210019000000000334004b000002c20000213d00060000000b001d00050000000a001d000700000007001d000300000008001d000000000301004b000000b90000613d000000000300001900000000046300190000000005230019000000000505043300000000005404350000002003300039000000000413004b000000b20000413d000400000006001d0000000001160019000000000001043500000133010000410000000000100439000800000009001d00000004009004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b0000004a0000613d000000080100002900000130051001970000013501000041000000000201041a0000013602200197000000000252019f000000000021041b0000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000137011001c70000800d020000390000000203000039000001380400004104aa049b0000040f0000000803000029000000010120019000000007020000290000000605000029000002c20000613d0000000001050433000000000101004b000003770000c13d0000013d01000041000000000301041a0000013004200197000000400100043d0000002002100039000800000004001d0000000000420435000700000003001d000001300230019700000000002104350000012c0200004100000000030004140000012c0430009c00000000030280190000012c0410009c00000000010280190000004001100210000000c002300210000000000112019f0000013e011001c70000800d0200003900000001030000390000013f0400004104aa049b0000040f0000000101200190000002c20000613d000000080100006b0000025a0000613d0000000701000029000001360110019700000008011001af0000013d02000041000000000012041b0000002001000039000001000010044300000120000004430000014001000041000004ab0001042e0000013501000041000000000201041a00000000010004140000013002200197000000040320008c000001e90000c13d00000000030000310000001f0230018f00000005013002720000011e0000613d00000000050000190000000506500210000000000764034f000000000707043b00000000007604350000000105500039000000000615004b000001170000413d000000000502004b0000020e0000613d00000003022002100000000501100210000000000501043300000000052501cf000000000525022f000000000414034f000000000404043b0000010002200089000000000424022f00000000022401cf000000000252019f00000000002104350000020e0000013d0000001f0530018f0000013502000041000000000202041a000001300220019700000005063002720000013b0000613d00000000070000190000000508700210000000000981034f000000000909043b00000000009804350000000107700039000000000867004b000001340000413d000000000705004b000001490000613d00000003055002100000000506600210000000000706043300000000075701cf000000000757022f000000000161034f000000000101043b0000010005500089000000000151022f00000000015101cf000000000171019f00000000001604350000000001000414000000040520008c0000020f0000c13d00000000030000310000001f0230018f0000000501300272000001580000613d00000000050000190000000506500210000000000764034f000000000707043b00000000007604350000000105500039000000000615004b000001510000413d000000000502004b000002360000613d00000003022002100000000501100210000000000501043300000000052501cf000000000525022f000000000414034f000000000404043b0000010002200089000000000424022f00000000022401cf000000000252019f0000000000210435000002360000013d000001430540009c0000023b0000c13d000000440230008c000002c20000413d0000000402100370000000000802043b000001300280009c000002c20000213d0000002402100370000000000402043b000001310240009c000002c20000213d00000023024000390000013205000041000000000632004b000000000600001900000000060580190000013202200197000000000702004b0000000005008019000001320220009c000000000506c019000000000205004b000002c20000c13d0000000405400039000000000251034f000000000202043b000001310620009c000000210000213d000000bf06200039000000200900008a000000000696016f000001310760009c000000210000213d000000400060043f000000800020043f00000000042400190000002404400039000000000334004b000002c20000213d0000002003500039000000000131034f0000001f0320018f00000005042002720000019d0000613d00000000050000190000000506500210000000000761034f000000000707043b000000a00660003900000000007604350000000105500039000000000645004b000001950000413d000700000009001d000000000503004b000001ad0000613d0000000504400210000000000141034f0000000303300210000000a004400039000000000504043300000000053501cf000000000535022f000000000101043b0000010003300089000000000131022f00000000013101cf000000000151019f0000000000140435000000a001200039000000000001043500000133010000410000000000100439000800000008001d00000004008004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b0000004a0000613d0000013501000041000000000201041a000001360220019700000008022001af0000000805000029000000000021041b0000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000137011001c70000800d020000390000000203000039000001380400004104aa049b0000040f00000008030000290000000101200190000002c20000613d000000400100043d000600000001001d000001390110009c000000210000213d00000006040000290000006001400039000000400010043f00000040014000390000013a02000041000000000021043500000020014000390000013b02000041000000000021043500000027010000390000000000140435000000800200043d0000000001000414000000040330008c0000040d0000c13d000000010200003900000000040000310000041d0000013d0000012c030000410000012c0410009c0000000001038019000000c00110021004aa04a50000040f0001000000010355000000000301001900000060033002700000001f0430018f0000012c0030019d0000012c033001970000000505300272000001fe0000613d00000000060000190000000507600210000000000871034f000000000808043b00000000008704350000000106600039000000000756004b000001f70000413d000000000604004b0000020c0000613d00000003044002100000000505500210000000000605043300000000064601cf000000000646022f000000000151034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f00000000001504350000000101200190000002640000613d000002360000013d0000012c040000410000012c0510009c0000000001048019000000c0011002100000006003300210000000000131019f04aa04a50000040f0001000000010355000000000301001900000060033002700000001f0430018f0000012c0030019d0000012c033001970000000505300272000002260000613d00000000060000190000000507600210000000000871034f000000000808043b00000000008704350000000106600039000000000756004b0000021f0000413d000000000604004b000002340000613d00000003044002100000000505500210000000000605043300000000064601cf000000000646022f000000000151034f000000000101043b0000010004400089000000000141022f00000000014101cf000000000161019f00000000001504350000000101200190000002660000613d0000012c010000410000012c0230009c00000000030180190000006001300210000004ab0001042e000001440540009c0000026e0000c13d0000000004000416000000000404004b000002c20000c13d000000240330008c000002c20000413d0000000401100370000000000401043b000001300140009c000002c20000213d000000800020043f000000a00040043f0000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000148011001c70000800d020000390000000103000039000700000004001d0000013f04000041000800000007001d04aa049b0000040f000000070400002900000008030000290000000101200190000002c20000613d000000000104004b000002c40000c13d000000400100043d00000064021000390000014a03000041000000000032043500000044021000390000014b03000041000000000032043500000024021000390000002603000039000000530000013d0000006001300210000004ac000104300000006001300210000004ac00010430000001450310009c000002750000c13d0000000001000416000000000101004b000002c20000c13d0000027d0000013d000001450140009c000002840000c13d0000000001000416000000000101004b000002c20000c13d000000a00020043f0000028d0000013d000001460110009c0000029a0000c13d0000000001000416000000000101004b000002c20000c13d0000013501000041000000000101041a0000013002100197000000a00020043f0000002001000039000000800010043f000000c001000039000000400010043f0000015a01000041000004ab0001042e000001460140009c0000029a0000c13d0000000001000416000000000101004b000002c20000c13d0000013501000041000000000101041a0000013001100197000000a00010043f0000002001000039000000800010043f000000c001000039000000400010043f000000800100003900000147020000410000015003000041000001500410009c000000000103801900000040011002100000015101100041000000000121019f000004ab0001042e0000013c01000041000000800010043f0000002001000039000000840010043f0000004201000039000000a40010043f0000015601000041000000c40010043f0000015701000041000000e40010043f0000015801000041000001040010043f0000015901000041000004ac000104300000013501000041000000000201041a000001360220019700000008022001af0000000805000029000000000021041b0000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000137011001c70000800d020000390000000203000039000001380400004104aa049b0000040f00000008080000290000000101200190000002c20000613d000000800100043d000000000101004b000002d00000c13d000000400100043d000001490210009c000000210000213d000002cb0000013d0000000001000019000004ac000104300000013601300197000000000114019f0000013d02000041000000000012041b000000400100043d000001490210009c000000210000213d0000002002100039000000400020043f00000000000104350000000002000019000002930000013d000000400900043d000001390190009c000000210000213d0000006001900039000000400010043f00000040019000390000013a02000041000000000021043500000020019000390000013b02000041000000000021043500000027010000390000000000190435000000800200043d0000000001000414000000040380008c000002e40000c13d00000001020000390000000004000031000002f70000013d0000012c030000410000012c0410009c00000000010380190000012c0420009c00000000020380190000006002200210000000c001100210000000000121019f0000014d011001c70000000002080019000700000009001d04aa04a50000040f00000007090000290000000808000029000000010220018f000100000001035500000060011002700000012c0010019d0000012c0410019700000060030000390000008001000039000000000504004b000003230000c13d0000000003030433000000000202004b000003530000c13d000000000203004b0000038c0000c13d000000400100043d0000013c0200004100000000002104350000000402100039000000200300003900000000003204350000000002090433000000240310003900000000002304350000004403100039000000000402004b000003140000613d000000000400001900000000053400190000002004400039000000000694001900000000060604330000000000650435000000000524004b0000030d0000413d0000001f04200039000000200500008a000000000454016f0000000002320019000000000002043500000044024000390000012c030000410000012c0420009c00000000020380190000012c0410009c000000000103801900000040011002100000006002200210000000000112019f000004ac00010430000001310140009c000000210000213d0000003f01400039000000200300008a000000000131016f000000400300043d0000000001130019000000000531004b00000000050000190000000105004039000001310610009c000000210000213d0000000105500190000000210000c13d000000000a090019000000400010043f0000001f0540018f000000000143043600000001060003670000000504400272000003410000613d000000000700001900000005087002100000000009810019000000000886034f000000000808043b00000000008904350000000107700039000000000847004b000003390000413d000000000705004b000000080800002900000000090a0019000002fb0000613d0000000504400210000000000646034f00000000044100190000000305500210000000000704043300000000075701cf000000000757022f000000000606043b0000010005500089000000000656022f00000000055601cf000000000575019f0000000000540435000002fb0000013d000000000103004b000002be0000c13d0000013301000041000000000010043900000004008004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b000002be0000c13d000000400100043d00000044021000390000014e03000041000000000032043500000024021000390000001d0300003900000000003204350000013c0200004100000000002104350000000402100039000000200300003900000000003204350000012c020000410000012c0310009c000000000102801900000040011002100000014f011001c7000004ac00010430000000400400043d000001390140009c000000210000213d0000006001400039000000400010043f00000040014000390000013a0200004100000000002104350000002701000039000200000004001d00000000021404360000013b01000041000100000002001d000000000012043500000000020504330000000001000414000000040330008c000003950000c13d00000001020000390000000003000031000003a90000013d0000012c020000410000012c0430009c00000000030280190000012c0410009c000000000102801900000040011002100000006002300210000000000112019f000004ac000104300000012c0300004100000004050000290000012c0450009c000000000503801900000040045002100000012c0520009c00000000020380190000006002200210000000000242019f0000012c0410009c0000000001038019000000c001100210000000000112019f000000080200002904aa04a50000040f000000010220018f000100000001035500000060011002700000012c0010019d0000012c031001970000006001000039000000000403004b000003c90000c13d0000000001010433000000000202004b000003f70000c13d000000000201004b000004830000c13d000000400400043d000800000004001d0000013c01000041000000000014043500000004014000390000002002000039000000000021043500000002010000290000000003010433000700000003001d000000240140003900000000003104350000004402400039000000010100002904aa048d0000040f00000007010000290000001f01100039000000050110017f00000044011000390000012c020000410000012c0310009c00000000010280190000000804000029000004870000013d000001310130009c0000000504000029000000210000213d0000003f01300039000000000441016f000000400100043d0000000004410019000000000514004b00000000050000190000000105004039000001310640009c000000210000213d0000000105500190000000210000c13d000000400040043f0000001f0430018f000000000931043600000001050003670000000503300272000003e60000613d000000000600001900000005076002100000000008790019000000000775034f000000000707043b00000000007804350000000106600039000000000736004b000003de0000413d000300000009001d000000000604004b000003ac0000613d0000000503300210000000000535034f00000003033000290000000304400210000000000603043300000000064601cf000000000646022f000000000505043b0000010004400089000000000545022f00000000044501cf000000000464019f0000000000430435000003ac0000013d000000000101004b00000007020000290000000803000029000000e60000c13d0000013301000041000000000010043900000004003004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b0000000702000029000000e60000c13d000003650000013d0000012c030000410000012c0410009c00000000010380190000012c0420009c00000000020380190000006002200210000000c001100210000000000121019f0000014d011001c7000000080200002904aa04a50000040f000000010220018f000100000001035500000060011002700000012c0010019d0000012c0410019700000060030000390000008001000039000000000504004b0000043e0000c13d0000000003030433000000000202004b0000046b0000c13d000000000203004b0000038c0000c13d000000400100043d0000013c02000041000000000021043500000004021000390000002003000039000000000032043500000006070000290000000002070433000000240310003900000000002304350000004403100039000000000402004b0000043b0000613d000000000400001900000000053400190000002004400039000000000674001900000000060604330000000000650435000000000524004b000004340000413d0000001f042000390000000705000029000003160000013d000001310140009c0000000703000029000000210000213d0000003f01400039000000000131016f000000400300043d0000000001130019000000000531004b00000000050000190000000105004039000001310610009c000000210000213d0000000105500190000000210000c13d000000400010043f0000001f0540018f0000000001430436000000010600036700000005044002720000045b0000613d000000000700001900000005087002100000000009810019000000000886034f000000000808043b00000000008904350000000107700039000000000847004b000004530000413d000000000705004b000004210000613d0000000504400210000000000646034f00000000044100190000000305500210000000000704043300000000075701cf000000000757022f000000000606043b0000010005500089000000000656022f00000000055601cf000000000575019f0000000000540435000004210000013d000000000103004b0000047e0000c13d00000133010000410000000000100439000000080100002900000004001004430000012c0100004100000000020004140000012c0320009c0000000002018019000000c00120021000000134011001c7000080020200003904aa04a00000040f0000000102200190000004820000613d000000000101043b000000000101004b000003650000613d000000400100043d000001490210009c000000210000213d000002cb0000013d000000000001042f0000012c020000410000012c0310009c000000000102801900000003040000290000012c0340009c000000000402801900000040024002100000006001100210000000000121019f000004ac00010430000000000403004b000004970000613d000000000400001900000000052400190000000006140019000000000606043300000000006504350000002004400039000000000534004b000004900000413d00000000012300190000000000010435000000000001042d000000000001042f0000049e002104210000000102000039000000000001042d0000000002000019000000000001042d000004a3002104230000000102000039000000000001042d0000000002000019000000000001042d000004a8002104250000000102000039000000000001042d0000000002000019000000000001042d000004aa00000432000004ab0001042e000004ac0001043000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff000000000000009fffffffffffffffffffffffffffffffffffffffffffffffff000000000000007f00000000000000000000000000000000000000000000000000000001ffffffe0000000000000000000000000ffffffffffffffffffffffffffffffffffffffff000000000000000000000000000000000000000000000000ffffffffffffffff80000000000000000000000000000000000000000000000000000000000000001806aa1896bbf26568e884a7374b41e002500962caba6a15023a8d90e8508b830200000200000000000000000000000000000024000000000000000000000000360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbcffffffffffffffffffffffff00000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000bc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b000000000000000000000000000000000000000000000000ffffffffffffff9f206661696c656400000000000000000000000000000000000000000000000000416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c08c379a000000000000000000000000000000000000000000000000000000000b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d610302000000000000000000000000000000000000400000000000000000000000007e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f0000000200000000000000000000000000000040000001000000000000000000ffffffff000000000000000000000000000000000000000000000000000000003659cfe6000000000000000000000000000000000000000000000000000000004f1ef286000000000000000000000000000000000000000000000000000000008f28397000000000000000000000000000000000000000000000000000000000f851a440000000000000000000000000000000000000000000000000000000005c60da1b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000200000000000000000000000000000000000040000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffdf6464726573730000000000000000000000000000000000000000000000000000455243313936373a206e65772061646d696e20697320746865207a65726f206100000000000000000000000000000000000000840000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000000000000000000000000000000000000000006400000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffdf00000000000000000000000000000000000000000000002000000000000000004e487b710000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000240000000000000000000000006f74206120636f6e747261637400000000000000000000000000000000000000455243313936373a206e657720696d706c656d656e746174696f6e206973206e5472616e73706172656e745570677261646561626c6550726f78793a2061646d696e2063616e6e6f742066616c6c6261636b20746f2070726f78792074617267657400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a40000008000000000000000000000000000000000000000000000000000000020000000a0000000000000000000000000000000000000000000000000000000000000000000000000000000007444ff0b02dc9864c7dbf97ccd7719c286d6972190eeb0285ea9e04a713977c0", + "linkReferences": {}, + "deployedLinkReferences": {}, + "factoryDeps": {} +} diff --git a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol b/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol index 703d0d81b..1096b3db1 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol @@ -1,4 +1,4 @@ -//SPDX-License-Identifier: UNLICENSED +// SPDX-License-Identifier: MIT pragma solidity 0.8.24; diff --git a/l2-contracts/contracts/Dependencies.sol b/l2-contracts/contracts/Dependencies.sol index 591cb9fd9..8a606d45a 100644 --- a/l2-contracts/contracts/Dependencies.sol +++ b/l2-contracts/contracts/Dependencies.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /* solhint-disable-next-line no-unused-import */ diff --git a/l2-contracts/contracts/L2ContractHelper.sol b/l2-contracts/contracts/L2ContractHelper.sol index fde9b34d1..56afdca9e 100644 --- a/l2-contracts/contracts/L2ContractHelper.sol +++ b/l2-contracts/contracts/L2ContractHelper.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {EfficientCall} from "@matterlabs/zksync-contracts/l2/system-contracts/libraries/EfficientCall.sol"; diff --git a/l2-contracts/contracts/SystemContractsCaller.sol b/l2-contracts/contracts/SystemContractsCaller.sol index 79161eaaf..ba3136792 100644 --- a/l2-contracts/contracts/SystemContractsCaller.sol +++ b/l2-contracts/contracts/SystemContractsCaller.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT // solhint-disable one-contract-per-file -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {MSG_VALUE_SYSTEM_CONTRACT} from "./L2ContractHelper.sol"; diff --git a/l2-contracts/contracts/TestnetPaymaster.sol b/l2-contracts/contracts/TestnetPaymaster.sol index 36087352d..54558fe3b 100644 --- a/l2-contracts/contracts/TestnetPaymaster.sol +++ b/l2-contracts/contracts/TestnetPaymaster.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; diff --git a/l2-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol b/l2-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol index fd930fc17..84c9a3363 100644 --- a/l2-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol +++ b/l2-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /// @title L1 Bridge contract interface diff --git a/l2-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol b/l2-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol index 19d04bd6f..ed76b84b1 100644 --- a/l2-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol +++ b/l2-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /// @author Matter Labs diff --git a/l2-contracts/contracts/bridge/interfaces/IL2SharedBridge.sol b/l2-contracts/contracts/bridge/interfaces/IL2SharedBridge.sol index 71e569795..ee31f6691 100644 --- a/l2-contracts/contracts/bridge/interfaces/IL2SharedBridge.sol +++ b/l2-contracts/contracts/bridge/interfaces/IL2SharedBridge.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /// @author Matter Labs diff --git a/l2-contracts/contracts/bridge/interfaces/IL2StandardToken.sol b/l2-contracts/contracts/bridge/interfaces/IL2StandardToken.sol index 1c07b9e15..38cad77d3 100644 --- a/l2-contracts/contracts/bridge/interfaces/IL2StandardToken.sol +++ b/l2-contracts/contracts/bridge/interfaces/IL2StandardToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; interface IL2StandardToken { diff --git a/l2-contracts/contracts/bridge/interfaces/IL2WrappedBaseToken.sol b/l2-contracts/contracts/bridge/interfaces/IL2WrappedBaseToken.sol index df447e0f8..ae7e1a916 100644 --- a/l2-contracts/contracts/bridge/interfaces/IL2WrappedBaseToken.sol +++ b/l2-contracts/contracts/bridge/interfaces/IL2WrappedBaseToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; interface IL2WrappedBaseToken { diff --git a/l2-contracts/contracts/errors/L2ContractErrors.sol b/l2-contracts/contracts/errors/L2ContractErrors.sol index 1d8d0a621..c7d5deffe 100644 --- a/l2-contracts/contracts/errors/L2ContractErrors.sol +++ b/l2-contracts/contracts/errors/L2ContractErrors.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; // 0x1f73225f diff --git a/l2-contracts/contracts/interfaces/IPaymaster.sol b/l2-contracts/contracts/interfaces/IPaymaster.sol index f7246457c..ed7e5c50f 100644 --- a/l2-contracts/contracts/interfaces/IPaymaster.sol +++ b/l2-contracts/contracts/interfaces/IPaymaster.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {Transaction} from "../L2ContractHelper.sol"; diff --git a/l2-contracts/contracts/interfaces/IPaymasterFlow.sol b/l2-contracts/contracts/interfaces/IPaymasterFlow.sol index 75e94a323..207aee24e 100644 --- a/l2-contracts/contracts/interfaces/IPaymasterFlow.sol +++ b/l2-contracts/contracts/interfaces/IPaymasterFlow.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/l2-contracts/contracts/vendor/AddressAliasHelper.sol b/l2-contracts/contracts/vendor/AddressAliasHelper.sol index 0dec0b9ee..6adab1d92 100644 --- a/l2-contracts/contracts/vendor/AddressAliasHelper.sol +++ b/l2-contracts/contracts/vendor/AddressAliasHelper.sol @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; library AddressAliasHelper { diff --git a/l2-contracts/foundry.toml b/l2-contracts/foundry.toml index b5c0f534d..b369e211f 100644 --- a/l2-contracts/foundry.toml +++ b/l2-contracts/foundry.toml @@ -12,9 +12,9 @@ ignored_warnings_from = ["test", "contracts/dev-contracts"] remappings = [ "forge-std/=lib/forge-std/src/", "foundry-test/=test/foundry/", - "@openzeppelin/contracts-v4/=./lib/openzeppelin-contracts-v4/contracts/", - "@openzeppelin/contracts-upgradeable-v4/=./lib/openzeppelin-contracts-upgradeable-v4/contracts/", - "@matterlabs/zksync-contracts/=./lib/@matterlabs/zksync-contracts/", + "@openzeppelin/contracts-v4/=lib/openzeppelin-contracts-v4/contracts/", + "@openzeppelin/contracts-upgradeable-v4/=lib/openzeppelin-contracts-upgradeable-v4/contracts/", + "@matterlabs/zksync-contracts/=lib/@matterlabs/zksync-contracts/", ] fs_permissions = [ { access = "read", path = "zkout" }, diff --git a/system-contracts/README.md b/system-contracts/README.md index 1449c936f..4058a356b 100644 --- a/system-contracts/README.md +++ b/system-contracts/README.md @@ -1,10 +1,10 @@ -# zkSync Era: System Contracts +# ZKsync Era: System Contracts [![Logo](../eraLogo.svg)](https://zksync.io/) -zkSync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or +ZKsync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or decentralization. Since it's EVM compatible (Solidity/Vyper), 99% of Ethereum projects can redeploy without refactoring -or re-auditing a single line of code. zkSync Era also uses an LLVM-based compiler that will eventually let developers +or re-auditing a single line of code. ZKsync Era also uses an LLVM-based compiler that will eventually let developers write smart contracts in C++, Rust and other popular languages. ## system-contracts @@ -17,7 +17,7 @@ the most commonly used contracts: each deployed contract is known. This contract also defines the derivation address. Whenever a contract is deployed, a ContractDeployed event is emitted. -`L1Messenger` This contract is used to send messages from zkSync to Ethereum. For each message sent, the L1MessageSent +`L1Messenger` This contract is used to send messages from ZKsync to Ethereum. For each message sent, the L1MessageSent event is emitted. `NonceHolder` This contract stores account nonces. The account nonces are stored in a single place for efficiency (the @@ -43,7 +43,7 @@ Update the system contracts hashes: `yarn sc calculate-hashes:fix` ### Run tests -The tests of the system contracts utilize the zkSync test node. In order to run the tests, execute the following commands in the root of the repository: +The tests of the system contracts utilize the ZKsync test node. In order to run the tests, execute the following commands in the root of the repository: ``` yarn test-node @@ -150,7 +150,7 @@ changes. ## License -The zkSync Era system-contracts are distributed under the terms of the MIT license. +The ZKsync Era system-contracts are distributed under the terms of the MIT license. See [LICENSE-MIT](LICENSE-MIT) for details. @@ -166,7 +166,7 @@ See [LICENSE-MIT](LICENSE-MIT) for details. ## Disclaimer -zkSync Era has been through lots of testing and audits. Although it is live, it is still in alpha state and will go +ZKsync Era has been through lots of testing and audits. Although it is live, it is still in alpha state and will go through more audits and bug bounties programs. We would love to hear our community's thoughts and suggestions about it! It is important to state that forking it now can potentially lead to missing important security updates, critical features, and performance improvements. diff --git a/system-contracts/SystemContractsHashes.json b/system-contracts/SystemContractsHashes.json index bf802069d..d1677fb34 100644 --- a/system-contracts/SystemContractsHashes.json +++ b/system-contracts/SystemContractsHashes.json @@ -3,49 +3,49 @@ "contractName": "AccountCodeStorage", "bytecodePath": "artifacts-zk/contracts-preprocessed/AccountCodeStorage.sol/AccountCodeStorage.json", "sourceCodePath": "contracts-preprocessed/AccountCodeStorage.sol", - "bytecodeHash": "0x0100005dc1b65c520b5e3161d34ea6e1f10f68b2c3a9c4a11eaf9d6819e05351", + "bytecodeHash": "0x0100005d1c6473b263ab40de73ff5461263937a5b5b530d3e21a4a09ffff26e2", "sourceCodeHash": "0x2e0e09d57a04bd1e722d8bf8c6423fdf3f8bca44e5e8c4f6684f987794be066e" }, { "contractName": "BootloaderUtilities", "bytecodePath": "artifacts-zk/contracts-preprocessed/BootloaderUtilities.sol/BootloaderUtilities.json", "sourceCodePath": "contracts-preprocessed/BootloaderUtilities.sol", - "bytecodeHash": "0x010007c768dd2c1047c4daea165a185ffdebac9e2d0ce5421e5780ebe8c3c43a", + "bytecodeHash": "0x010007c7d513c9efb7a0b6889ef23d9e2f12599206c68d47414b9d4a4d35b688", "sourceCodeHash": "0x0f1213c4b95acb71f4ab5d4082cc1aeb2bd5017e1cccd46afc66e53268609d85" }, { "contractName": "ComplexUpgrader", "bytecodePath": "artifacts-zk/contracts-preprocessed/ComplexUpgrader.sol/ComplexUpgrader.json", "sourceCodePath": "contracts-preprocessed/ComplexUpgrader.sol", - "bytecodeHash": "0x0100004d3d9b08518ad8024aab5d366eb550790b5ca357f8c30b2214c199c925", + "bytecodeHash": "0x0100004df7e1557399a894818311c1204e36704aa2cb8e1b4dc7c19069f4a5a4", "sourceCodeHash": "0x796046a914fb676ba2bbd337b2924311ee2177ce54571c18a2c3945755c83614" }, { "contractName": "Compressor", "bytecodePath": "artifacts-zk/contracts-preprocessed/Compressor.sol/Compressor.json", "sourceCodePath": "contracts-preprocessed/Compressor.sol", - "bytecodeHash": "0x0100014b337cdc6148383125713964020101129bda295cdd9592647769648d43", + "bytecodeHash": "0x0100014b38f55ea99e1426e1a590bee7a4532981c2b163364fdf728ca13700af", "sourceCodeHash": "0x7240b5fb2ea8e184522e731fb14f764ebae52b8a69d1870a55daedac9a3ed617" }, { "contractName": "ContractDeployer", "bytecodePath": "artifacts-zk/contracts-preprocessed/ContractDeployer.sol/ContractDeployer.json", "sourceCodePath": "contracts-preprocessed/ContractDeployer.sol", - "bytecodeHash": "0x010004e5d444e5e2e061d32fbc1f3c64b7895fe6edd60b2532c8659b061e43a2", + "bytecodeHash": "0x010004e5c2c77a9baba3fb7d270c83356c507fd3e7ba472278ec1d4c48758208", "sourceCodeHash": "0x92bc09da23ed9d86ba7a84f0dbf48503c99582ae58cdbebbdcc5f14ea1fcf014" }, { "contractName": "Create2Factory", "bytecodePath": "artifacts-zk/contracts-preprocessed/Create2Factory.sol/Create2Factory.json", "sourceCodePath": "contracts-preprocessed/Create2Factory.sol", - "bytecodeHash": "0x01000049d4168a23e7f90d08db5c201341adf2980ce84b2c3ca518366fbf39df", + "bytecodeHash": "0x010000490ad13757765aaab46fa001866899f2da546a73212eb1ca932638c753", "sourceCodeHash": "0x114d9322a9ca654989f3e0b3b21f1311dbc4db84f443d054cd414f6414d84de3" }, { "contractName": "DefaultAccount", "bytecodePath": "artifacts-zk/contracts-preprocessed/DefaultAccount.sol/DefaultAccount.json", "sourceCodePath": "contracts-preprocessed/DefaultAccount.sol", - "bytecodeHash": "0x0100055da05bf3eb2d670dec0f54ebbdacdfc0dba488f0c0b57738a69127a5d0", + "bytecodeHash": "0x0100055de35cfc69c9f9104583cebafb0aa8059f60c4eca0895ffa9da8efba62", "sourceCodeHash": "0xebffe840ebbd9329edb1ebff8ca50f6935e7dabcc67194a896fcc2e968d46dfb" }, { @@ -59,161 +59,161 @@ "contractName": "ImmutableSimulator", "bytecodePath": "artifacts-zk/contracts-preprocessed/ImmutableSimulator.sol/ImmutableSimulator.json", "sourceCodePath": "contracts-preprocessed/ImmutableSimulator.sol", - "bytecodeHash": "0x01000039b6cf03855b8d396ca3075bb260df8b9778e2fe42b6b6a5678e1f3b85", + "bytecodeHash": "0x010000390e4ef990eeab943e7c5259b1efd6875f9aaf0c33022c2c7889d6651a", "sourceCodeHash": "0x9659e69f7db09e8f60a8bb95314b1ed26afcc689851665cf27f5408122f60c98" }, { "contractName": "KnownCodesStorage", "bytecodePath": "artifacts-zk/contracts-preprocessed/KnownCodesStorage.sol/KnownCodesStorage.json", "sourceCodePath": "contracts-preprocessed/KnownCodesStorage.sol", - "bytecodeHash": "0x0100006fa2e61946c8c84ca1d54e68bc9cb98efdb13e6a38ff03cbe8f6548fbd", + "bytecodeHash": "0x0100006fa34602c123e0252354d614c5b1eb0da3c68f98cd0ba8b15187446a19", "sourceCodeHash": "0xb39b5b81168653e0c5062f7b8e1d6d15a4e186df3317f192f0cb2fc3a74f5448" }, { "contractName": "L1Messenger", "bytecodePath": "artifacts-zk/contracts-preprocessed/L1Messenger.sol/L1Messenger.json", "sourceCodePath": "contracts-preprocessed/L1Messenger.sol", - "bytecodeHash": "0x010001f7702744e441c008ef4dee7db6a4c29c206ed5a18eba3830a1d5b7ba3f", + "bytecodeHash": "0x010001f71930117a55abba23949c6777afd29da9ec62c2592657434ebf14b195", "sourceCodeHash": "0x8d22a4019347a45cb0c27bed9e98f7033637a7bdcd90fafb1922caa48f2b05de" }, { "contractName": "L2BaseToken", "bytecodePath": "artifacts-zk/contracts-preprocessed/L2BaseToken.sol/L2BaseToken.json", "sourceCodePath": "contracts-preprocessed/L2BaseToken.sol", - "bytecodeHash": "0x010001035a8d01af74085ad4135e95313f4251863b8a02470808fcda33ce6c41", + "bytecodeHash": "0x010001031eaf329b64e6a16d520dd365cb92195f46475a3b10eb1352a77c6495", "sourceCodeHash": "0x8bdd2b4d0b53dba84c9f0af250bbaa2aad10b3de6747bba957f0bd3721090dfa" }, { "contractName": "L2GenesisUpgrade", "bytecodePath": "artifacts-zk/contracts-preprocessed/L2GenesisUpgrade.sol/L2GenesisUpgrade.json", "sourceCodePath": "contracts-preprocessed/L2GenesisUpgrade.sol", - "bytecodeHash": "0x010000d57346397e03e7b9ec8c18c36bacd26d75a785906799e0797ad26ac4c8", + "bytecodeHash": "0x010000d58674e0a1b0e07b3587401d7e17a9b62986c34a9171463a39f8e92bf3", "sourceCodeHash": "0x27584533f7229befe23288d5a157514cdbdfd5935295efaf5fe1da11a12569f3" }, { "contractName": "MsgValueSimulator", "bytecodePath": "artifacts-zk/contracts-preprocessed/MsgValueSimulator.sol/MsgValueSimulator.json", "sourceCodePath": "contracts-preprocessed/MsgValueSimulator.sol", - "bytecodeHash": "0x0100005de778be0b3f1b4a9f78920525a2cc3ce54c68d0cbdb09102381bf5636", + "bytecodeHash": "0x0100005deecb5b2ce8f6fd90c5bdce18a43e933a3f2b5f7ba0343d8b1c6d2b78", "sourceCodeHash": "0x082f3dcbc2fe4d93706c86aae85faa683387097d1b676e7ebd00f71ee0f13b71" }, { "contractName": "NonceHolder", "bytecodePath": "artifacts-zk/contracts-preprocessed/NonceHolder.sol/NonceHolder.json", "sourceCodePath": "contracts-preprocessed/NonceHolder.sol", - "bytecodeHash": "0x010000d9f5f188f29a3ae4fb5298e096e4cf7ca7d38d109ddfc969a1b22c16aa", + "bytecodeHash": "0x010000d900645c7940341daa06f46dbf804acfb98fb6437fd28fdaf46da79c1f", "sourceCodeHash": "0xcd0c0366effebf2c98c58cf96322cc242a2d1c675620ef5514b7ed1f0a869edc" }, { "contractName": "PubdataChunkPublisher", "bytecodePath": "artifacts-zk/contracts-preprocessed/PubdataChunkPublisher.sol/PubdataChunkPublisher.json", "sourceCodePath": "contracts-preprocessed/PubdataChunkPublisher.sol", - "bytecodeHash": "0x01000049e737cf07fad71b47afb4e412f98973087a3eecc45ae90cfcc7ad086f", + "bytecodeHash": "0x01000049299f3ee802b7e84d6a655dc67924a3bf5aa377347fb05a09e59abc57", "sourceCodeHash": "0x04d3d2e4019081c87aae5c22a060d84ae2e9d631ebce59801ecce37b9c87e4c7" }, { "contractName": "SystemContext", "bytecodePath": "artifacts-zk/contracts-preprocessed/SystemContext.sol/SystemContext.json", "sourceCodePath": "contracts-preprocessed/SystemContext.sol", - "bytecodeHash": "0x010001a7e1740a9262a2b226064f8a3264dad861962cdca3787a57a88f9a9692", + "bytecodeHash": "0x010001a717f01d12bc8686cbec93be57f6c8dd13a8912ad698bef9e6ed873fa1", "sourceCodeHash": "0xb3b8c1f57928938ac590984442bc96c2c888282793014845d5ce2f90bbf2677f" }, { "contractName": "EventWriter", "bytecodePath": "contracts-preprocessed/artifacts/EventWriter.yul.zbin", "sourceCodePath": "contracts-preprocessed/EventWriter.yul", - "bytecodeHash": "0x010000159a3a08da3ac57cdefec0e9e30da60456bc5643134cf16d6957bcf1ac", - "sourceCodeHash": "0x55cfee65f174350edfd690c949bc0a29458f25da11f1d5f90b57621567df1fc3" + "bytecodeHash": "0x010000159b30cba9e2096353695b63ca5cbf566416a545a6bcb2ff2e4e672f98", + "sourceCodeHash": "0xfcf4828bcc109dea5f88c38f428d9ac5e18d5a2767fa4909277802c7e38c1f93" }, { "contractName": "CodeOracle", "bytecodePath": "contracts-preprocessed/precompiles/artifacts/CodeOracle.yul.zbin", "sourceCodePath": "contracts-preprocessed/precompiles/CodeOracle.yul", - "bytecodeHash": "0x01000023b02bbb21baf1367835e56ae17b82688527dc8f78caf34b12e670ee65", - "sourceCodeHash": "0x55692fab0ef8b5bab3f6fb77aec84f3d1f1cdf97c0640b327d10594ea61218d2" + "bytecodeHash": "0x01000023d652655672eafbb0adc385bd423a4a59f752a28f3dde16e74fa205e3", + "sourceCodeHash": "0x476063e7907f2b7a532c4da6f606fa07186b5a10d77af8fdd83dbea3d9f23f93" }, { "contractName": "EcAdd", "bytecodePath": "contracts-preprocessed/precompiles/artifacts/EcAdd.yul.zbin", "sourceCodePath": "contracts-preprocessed/precompiles/EcAdd.yul", - "bytecodeHash": "0x010000872dd7e2dc1b34416c174086aa84fd80c78acc7b670214da955bd55728", - "sourceCodeHash": "0xc04879ed27207cd276997a856b6507d6d003801a2ee4c4bb4491f0032370895f" + "bytecodeHash": "0x01000087be6181fcb16bebb0567c58b658eec345822aec1d42d471e84f758b85", + "sourceCodeHash": "0xdfec1c5f8c6a93df1c8821f1ac15058a18a640bcbdeb67dc4a017f2153ff1c86" }, { "contractName": "EcMul", "bytecodePath": "contracts-preprocessed/precompiles/artifacts/EcMul.yul.zbin", "sourceCodePath": "contracts-preprocessed/precompiles/EcMul.yul", - "bytecodeHash": "0x010000bd8bd7ab008f76e359dc296ff5fe0e8a95fedce1d570943e90143acdfd", - "sourceCodeHash": "0xb142465167a02139087fda7640ff859489b33081dcc7c2a8089da5b480bcb58c" + "bytecodeHash": "0x010000bd553a916fcda3726f7b6b3ccfc17887166982915ced63abc78ba43b66", + "sourceCodeHash": "0x0e3f320c8a9532425b85809bf0a2136e707046a01bf20491ec03c77887516c43" }, { "contractName": "EcPairing", "bytecodePath": "contracts-preprocessed/precompiles/artifacts/EcPairing.yul.zbin", "sourceCodePath": "contracts-preprocessed/precompiles/EcPairing.yul", - "bytecodeHash": "0x01000f1b3432a32f9fba2115f5dd3b0ee8127e7bf2c609d57d3e231f19119c43", - "sourceCodeHash": "0x149f025b222369ab65b9995a6d61df8b557b23f8b52a05f21dc2164839befb18" + "bytecodeHash": "0x01000f1b5f8dd50a00b502d2663746a49a81a01857b6ee1e1b38c9959142b299", + "sourceCodeHash": "0x5d008cedc44e0e52c2567fd2b877916b2ec5e7c80294cf99b66485e50a6f2c12" }, { "contractName": "Ecrecover", "bytecodePath": "contracts-preprocessed/precompiles/artifacts/Ecrecover.yul.zbin", "sourceCodePath": "contracts-preprocessed/precompiles/Ecrecover.yul", - "bytecodeHash": "0x0100001112e34172b2bc31574d155893a087a1cf4b608cf9895a2201ea7bd6ee", - "sourceCodeHash": "0xe2334f04fa8003d448c7e6bfb345e644f2c851328aa5b49cb30acf45d6e0bbcf" + "bytecodeHash": "0x010000113d6b03e34605f26aa1fc6fb8953561eb55bb5ea192a5a38f7de3053b", + "sourceCodeHash": "0x21e03ab7a5f518a21258669c82506b1d4d1141f8fd4f30bb385f9730580ddd3c" }, { "contractName": "Keccak256", "bytecodePath": "contracts-preprocessed/precompiles/artifacts/Keccak256.yul.zbin", "sourceCodePath": "contracts-preprocessed/precompiles/Keccak256.yul", - "bytecodeHash": "0x0100000f248e111a1b587fef850dc4585c39af2dd505bc8a0d5cc6d3fcc7ed3c", - "sourceCodeHash": "0x3e6b02b36eb6d8cebe19ae258c2aed531f9be6c261ae02d301ba31b2cd388776" + "bytecodeHash": "0x0100000ff991d5847f1e9c10c5969d0f03b34a25411ad86d5cb3e0d9c3931e0b", + "sourceCodeHash": "0xb454e7760732ce1fffc75174c8cf54dca422206cf1e52a29d274b310b574f26d" }, { "contractName": "P256Verify", "bytecodePath": "contracts-preprocessed/precompiles/artifacts/P256Verify.yul.zbin", "sourceCodePath": "contracts-preprocessed/precompiles/P256Verify.yul", - "bytecodeHash": "0x0100001169cd6aa311c1bc9bbe2e7dd085720c96bb197e3223be7e9c66e46ef9", - "sourceCodeHash": "0x4fa14862937a646a2440a8ef5c4358b59e3e53dff5f11a65a1167cd31894b94c" + "bytecodeHash": "0x010000116595cfcc96291f95d47ede2ce630f25ccbd7428f00dc7f8135fb565a", + "sourceCodeHash": "0x976b68d0362307313fd1aaea309eaa2d849187f37da451618c70dd3a6ac3cf3c" }, { "contractName": "SHA256", "bytecodePath": "contracts-preprocessed/precompiles/artifacts/SHA256.yul.zbin", "sourceCodePath": "contracts-preprocessed/precompiles/SHA256.yul", - "bytecodeHash": "0x0100001752dc8a1a374a6346781205017b7b594d97c28812265865f3a45fcb45", - "sourceCodeHash": "0x6de4b57a9cca1cfda7a8edbf6f3e06aafa32c70458a3cc09972b548714ec51d3" + "bytecodeHash": "0x010000171e4e61b14feacd43cb555bffa5f194d38117132957708dcef83ac15a", + "sourceCodeHash": "0xfd4290467e26e992f39db9ca132e78ce99ce042b0254a368f1d7832dc94ddefb" }, { "contractName": "bootloader_test", "bytecodePath": "bootloader/build/artifacts/bootloader_test.yul.zbin", "sourceCodePath": "bootloader/build/bootloader_test.yul", - "bytecodeHash": "0x010003cb3058e6c8d287767d58a42b96a0c59202ff7aa63ed0e261be758f291d", - "sourceCodeHash": "0x3c5cdec1265e4e656d08d84657cdbdadd1ec78b5076d93e112adb8b49dce4f47" + "bytecodeHash": "0x010003cb529c933b02800df76c52ecd5c75c9a426449834a444b03e6ee33e90a", + "sourceCodeHash": "0xe478f7c49dc5e69c82ffd1b88dd94b8f6bde5716829fc9be2302fe3e452ccbf9" }, { "contractName": "fee_estimate", "bytecodePath": "bootloader/build/artifacts/fee_estimate.yul.zbin", "sourceCodePath": "bootloader/build/fee_estimate.yul", - "bytecodeHash": "0x01000931e61cd9213605a7426d76a19f1a3bbaebc982f964dd5bccb5a9d0e420", - "sourceCodeHash": "0xef1e3cb5b4c57ba10729cc96782bb3dd8f9c2d7614d036a55053da67cce48cf7" + "bytecodeHash": "0x01000931cba6b0eae852a0e3b05d5276fbd396b631b922c92fc613719283fdb5", + "sourceCodeHash": "0x17dcacbdaea19447e2fef615f3488fe8f3d68f1cdeed913e32373af08534e8b3" }, { "contractName": "gas_test", "bytecodePath": "bootloader/build/artifacts/gas_test.yul.zbin", "sourceCodePath": "bootloader/build/gas_test.yul", - "bytecodeHash": "0x010008b7293f56db664f6badce1643955385744fc2a59d7ee2d8fb354afb7085", - "sourceCodeHash": "0x3ff185982954a2e64ef9cc9f023291de9e703320d48278b66937be438b51537d" + "bytecodeHash": "0x010008b783276a2887da8e7a6d66bd499eb60004227b692c329e43d4576c624c", + "sourceCodeHash": "0x3fae183e6f154c66148579eb68a6e412328c27aa4ae7687a8a6348e97cf83383" }, { "contractName": "playground_batch", "bytecodePath": "bootloader/build/artifacts/playground_batch.yul.zbin", "sourceCodePath": "bootloader/build/playground_batch.yul", - "bytecodeHash": "0x01000937ed2bf87e75ff5cb1842f4039454c5db8610a96be1174454a3c3a3439", - "sourceCodeHash": "0xdba117b37c06932da3411b7d7248e26f82ed4296ac879282f8fde669646eb097" + "bytecodeHash": "0x01000937545179d7a4ba1f862260de4e9815dc68e0f4166ee40a392911247d32", + "sourceCodeHash": "0x505644754c6771415c044a8fc7618bd1368fdee5bd618d05ffc0f14be6222a68" }, { "contractName": "proved_batch", "bytecodePath": "bootloader/build/artifacts/proved_batch.yul.zbin", "sourceCodePath": "bootloader/build/proved_batch.yul", - "bytecodeHash": "0x010008c79a8fece61d5d29508af0214834522fb17f3419f7df7400cd2776a9d5", - "sourceCodeHash": "0x8fcc2982eed10ca9dde7e31a2c1dfc815ab1cb5d49c95c14946a7c2228562efb" + "bytecodeHash": "0x010008c71c7330aa11b7915a0772d08d446eca39d7a432541347a42aee686146", + "sourceCodeHash": "0x048c2951119868de0b8b8c8f15d0d664d221b4541f47768ca82ee2dfa42de993" } ] diff --git a/system-contracts/bootloader/bootloader.yul b/system-contracts/bootloader/bootloader.yul index 7943a54b3..73b65186c 100644 --- a/system-contracts/bootloader/bootloader.yul +++ b/system-contracts/bootloader/bootloader.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + object "Bootloader" { code { } @@ -620,10 +622,10 @@ object "Bootloader" { switch isETHCall case 1 { let gasLimitForTx, reservedGas := getGasLimitForTx( - innerTxDataOffset, - transactionIndex, + innerTxDataOffset, + transactionIndex, gasPerPubdata, - L2_TX_INTRINSIC_GAS(), + L2_TX_INTRINSIC_GAS(), L2_TX_INTRINSIC_PUBDATA() ) @@ -1279,7 +1281,7 @@ object "Bootloader" { /// @param gasLimitForTx The L2 gas limit for the transaction validation & execution. /// @param gasPrice The L2 gas price that should be used by the transaction. /// @param basePubdataSpent The amount of pubdata spent at the beginning of the transaction. - /// @param reservedGas The amount of gas reserved for the pubdata. + /// @param reservedGas The amount of gas reserved for the pubdata. /// @param gasPerPubdata The price of each byte of pubdata in L2 gas. /// @return gasLeft The gas left after the validation step. function l2TxValidation( @@ -1343,7 +1345,7 @@ object "Bootloader" { /// @param txDataOffset The offset to the ABI-encoded Transaction struct. /// @param gasLeft The gas left after the validation step. /// @param basePubdataSpent The amount of pubdata spent at the beginning of the transaction. - /// @param reservedGas The amount of gas reserved for the pubdata. + /// @param reservedGas The amount of gas reserved for the pubdata. /// @param gasPerPubdata The price of each byte of pubdata in L2 gas. /// @return success Whether or not the execution step was successful. /// @return gasSpentOnExecute The gas spent on the transaction execution. @@ -1440,7 +1442,7 @@ object "Bootloader" { /// @param abi The nearCall ABI. It is implicitly used as gasLimit for the call of this function. /// @param txDataOffset The offset to the ABI-encoded Transaction struct. /// @param basePubdataSpent The amount of pubdata spent at the beginning of the transaction. - /// @param reservedGas The amount of gas reserved for the pubdata. + /// @param reservedGas The amount of gas reserved for the pubdata. /// @param gasPerPubdata The price of each byte of pubdata in L2 gas. function ZKSYNC_NEAR_CALL_executeL2Tx( abi, @@ -1483,7 +1485,7 @@ object "Bootloader" { /// @param abi The nearCall ABI. It is implicitly used as gasLimit for the call of this function. /// @param txDataOffset The offset to the ABI-encoded Transaction struct. /// @param basePubdataSpent The amount of pubdata spent at the beginning of the transaction. - /// @param reservedGas The amount of gas reserved for the pubdata. + /// @param reservedGas The amount of gas reserved for the pubdata. /// @param gasPerPubdata The price of each byte of pubdata in L2 gas. function ZKSYNC_NEAR_CALL_markFactoryDepsL2( abi, @@ -1835,7 +1837,7 @@ object "Bootloader" { debugLog("from", from) debugLog("gasPrice", gasPrice) - // We assume that addresses of smart contracts on zkSync and Ethereum + // We assume that addresses of smart contracts on ZKsync and Ethereum // never overlap, so no need to check whether `from` is an EOA here. debugLog("setting tx origin", from) @@ -2268,7 +2270,7 @@ object "Bootloader" { /// @param maxRefundedGas The maximum number of gas the bootloader can be refunded. /// @param basePubdataSpent The amount of pubdata spent at the beginning of the transaction. /// @param gasPerPubdata The price of each byte of pubdata in L2 gas. - /// @param reservedGas The amount of gas reserved for the pubdata. + /// @param reservedGas The amount of gas reserved for the pubdata. /// This is the `maximum` number because it does not take into account the number of gas that /// can be spent by the paymaster itself. function ZKSYNC_NEAR_CALL_callPostOp( @@ -2552,7 +2554,7 @@ object "Bootloader" { } /// - /// zkSync-specific utilities: + /// ZKsync-specific utilities: /// /// @dev Returns an ABI that can be used for low-level @@ -2797,7 +2799,7 @@ object "Bootloader" { let spentErgs := getErgsSpentForPubdata(basePubdataSpent, gasPerPubdata) debugLog("spentErgsPubdata", spentErgs) let allowedGasLimit := add(computeGas, reservedGas) - + ret := lt(allowedGasLimit, spentErgs) } @@ -3587,7 +3589,7 @@ object "Bootloader" { } /// @dev Asks operator for the refund for the transaction. The function provides - /// the operator with the proposed refund gas by the bootloader, + /// the operator with the proposed refund gas by the bootloader, /// total spent gas on the pubdata and gas per 1 byte of pubdata. /// This function is called before the refund stage, because at that point /// only the operator knows how close does a transaction diff --git a/system-contracts/contracts/Constants.sol b/system-contracts/contracts/Constants.sol index 1c68b60e1..6aa3fc34d 100644 --- a/system-contracts/contracts/Constants.sol +++ b/system-contracts/contracts/Constants.sol @@ -1,6 +1,5 @@ // SPDX-License-Identifier: MIT - -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {IAccountCodeStorage} from "./interfaces/IAccountCodeStorage.sol"; diff --git a/system-contracts/contracts/EventWriter.yul b/system-contracts/contracts/EventWriter.yul index 4cd4a3814..c85151b90 100644 --- a/system-contracts/contracts/EventWriter.yul +++ b/system-contracts/contracts/EventWriter.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + /** * @author Matter Labs * @custom:security-contact security@matterlabs.dev diff --git a/system-contracts/contracts/SystemContractErrors.sol b/system-contracts/contracts/SystemContractErrors.sol index 134c5f2d5..a54c4efd0 100644 --- a/system-contracts/contracts/SystemContractErrors.sol +++ b/system-contracts/contracts/SystemContractErrors.sol @@ -1,6 +1,5 @@ // SPDX-License-Identifier: MIT - -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; // 0x86bb51b8 diff --git a/system-contracts/contracts/abstract/SystemContractBase.sol b/system-contracts/contracts/abstract/SystemContractBase.sol index 53f9af11e..b0bdc36b5 100644 --- a/system-contracts/contracts/abstract/SystemContractBase.sol +++ b/system-contracts/contracts/abstract/SystemContractBase.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {SystemContractHelper} from "../libraries/SystemContractHelper.sol"; diff --git a/system-contracts/contracts/interfaces/IAccount.sol b/system-contracts/contracts/interfaces/IAccount.sol index dad81b1b2..cebe91d17 100644 --- a/system-contracts/contracts/interfaces/IAccount.sol +++ b/system-contracts/contracts/interfaces/IAccount.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {Transaction} from "../libraries/TransactionHelper.sol"; diff --git a/system-contracts/contracts/interfaces/IAccountCodeStorage.sol b/system-contracts/contracts/interfaces/IAccountCodeStorage.sol index 0115393a1..5183e77f6 100644 --- a/system-contracts/contracts/interfaces/IAccountCodeStorage.sol +++ b/system-contracts/contracts/interfaces/IAccountCodeStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; interface IAccountCodeStorage { diff --git a/system-contracts/contracts/interfaces/IBaseToken.sol b/system-contracts/contracts/interfaces/IBaseToken.sol index b5a4cf912..fc32c7b83 100644 --- a/system-contracts/contracts/interfaces/IBaseToken.sol +++ b/system-contracts/contracts/interfaces/IBaseToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; interface IBaseToken { diff --git a/system-contracts/contracts/interfaces/IBootloaderUtilities.sol b/system-contracts/contracts/interfaces/IBootloaderUtilities.sol index 4437c9807..e900bfb5e 100644 --- a/system-contracts/contracts/interfaces/IBootloaderUtilities.sol +++ b/system-contracts/contracts/interfaces/IBootloaderUtilities.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {Transaction} from "../libraries/TransactionHelper.sol"; diff --git a/system-contracts/contracts/interfaces/IComplexUpgrader.sol b/system-contracts/contracts/interfaces/IComplexUpgrader.sol index 8ed670a10..3b1468417 100644 --- a/system-contracts/contracts/interfaces/IComplexUpgrader.sol +++ b/system-contracts/contracts/interfaces/IComplexUpgrader.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/interfaces/ICompressor.sol b/system-contracts/contracts/interfaces/ICompressor.sol index 077f30a2b..854aa7904 100644 --- a/system-contracts/contracts/interfaces/ICompressor.sol +++ b/system-contracts/contracts/interfaces/ICompressor.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; // The bitmask by applying which to the compressed state diff metadata we retrieve its operation. diff --git a/system-contracts/contracts/interfaces/IContractDeployer.sol b/system-contracts/contracts/interfaces/IContractDeployer.sol index d0d13d6a9..f72aa19d4 100644 --- a/system-contracts/contracts/interfaces/IContractDeployer.sol +++ b/system-contracts/contracts/interfaces/IContractDeployer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /// @notice A struct that describes a forced deployment on an address diff --git a/system-contracts/contracts/interfaces/IImmutableSimulator.sol b/system-contracts/contracts/interfaces/IImmutableSimulator.sol index cb7027fa1..840053849 100644 --- a/system-contracts/contracts/interfaces/IImmutableSimulator.sol +++ b/system-contracts/contracts/interfaces/IImmutableSimulator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; struct ImmutableData { diff --git a/system-contracts/contracts/interfaces/IKnownCodesStorage.sol b/system-contracts/contracts/interfaces/IKnownCodesStorage.sol index 39687ddfc..551cfb0d8 100644 --- a/system-contracts/contracts/interfaces/IKnownCodesStorage.sol +++ b/system-contracts/contracts/interfaces/IKnownCodesStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/interfaces/IL1Messenger.sol b/system-contracts/contracts/interfaces/IL1Messenger.sol index 808b5a082..88e2c81d8 100644 --- a/system-contracts/contracts/interfaces/IL1Messenger.sol +++ b/system-contracts/contracts/interfaces/IL1Messenger.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /// @dev The log passed from L2 diff --git a/system-contracts/contracts/interfaces/IL2StandardToken.sol b/system-contracts/contracts/interfaces/IL2StandardToken.sol index 3439ba3c6..d67a3ea1f 100644 --- a/system-contracts/contracts/interfaces/IL2StandardToken.sol +++ b/system-contracts/contracts/interfaces/IL2StandardToken.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; interface IL2StandardToken { diff --git a/system-contracts/contracts/interfaces/IMailbox.sol b/system-contracts/contracts/interfaces/IMailbox.sol index 703612039..a9dcdad05 100644 --- a/system-contracts/contracts/interfaces/IMailbox.sol +++ b/system-contracts/contracts/interfaces/IMailbox.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; interface IMailbox { diff --git a/system-contracts/contracts/interfaces/INonceHolder.sol b/system-contracts/contracts/interfaces/INonceHolder.sol index 30af5d100..ce3b0279d 100644 --- a/system-contracts/contracts/interfaces/INonceHolder.sol +++ b/system-contracts/contracts/interfaces/INonceHolder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/interfaces/IPaymaster.sol b/system-contracts/contracts/interfaces/IPaymaster.sol index 68d520eee..1c8af5b28 100644 --- a/system-contracts/contracts/interfaces/IPaymaster.sol +++ b/system-contracts/contracts/interfaces/IPaymaster.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {Transaction} from "../libraries/TransactionHelper.sol"; diff --git a/system-contracts/contracts/interfaces/IPaymasterFlow.sol b/system-contracts/contracts/interfaces/IPaymasterFlow.sol index 0458c3026..4c9683fd4 100644 --- a/system-contracts/contracts/interfaces/IPaymasterFlow.sol +++ b/system-contracts/contracts/interfaces/IPaymasterFlow.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/interfaces/IPubdataChunkPublisher.sol b/system-contracts/contracts/interfaces/IPubdataChunkPublisher.sol index b690b8eaa..b422bb359 100644 --- a/system-contracts/contracts/interfaces/IPubdataChunkPublisher.sol +++ b/system-contracts/contracts/interfaces/IPubdataChunkPublisher.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/interfaces/ISystemContext.sol b/system-contracts/contracts/interfaces/ISystemContext.sol index 2e940bdf2..ff083fd0b 100644 --- a/system-contracts/contracts/interfaces/ISystemContext.sol +++ b/system-contracts/contracts/interfaces/ISystemContext.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/interfaces/ISystemContextDeprecated.sol b/system-contracts/contracts/interfaces/ISystemContextDeprecated.sol index a7f3740be..ac5153270 100644 --- a/system-contracts/contracts/interfaces/ISystemContextDeprecated.sol +++ b/system-contracts/contracts/interfaces/ISystemContextDeprecated.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/libraries/EfficientCall.sol b/system-contracts/contracts/libraries/EfficientCall.sol index 8f203b02a..27fea6396 100644 --- a/system-contracts/contracts/libraries/EfficientCall.sol +++ b/system-contracts/contracts/libraries/EfficientCall.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {SystemContractHelper, ADDRESS_MASK} from "./SystemContractHelper.sol"; diff --git a/system-contracts/contracts/libraries/RLPEncoder.sol b/system-contracts/contracts/libraries/RLPEncoder.sol index b21969731..16eaa4053 100644 --- a/system-contracts/contracts/libraries/RLPEncoder.sol +++ b/system-contracts/contracts/libraries/RLPEncoder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/libraries/SystemContractHelper.sol b/system-contracts/contracts/libraries/SystemContractHelper.sol index e112ea129..77407b2cd 100644 --- a/system-contracts/contracts/libraries/SystemContractHelper.sol +++ b/system-contracts/contracts/libraries/SystemContractHelper.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {MAX_SYSTEM_CONTRACT_ADDRESS} from "../Constants.sol"; diff --git a/system-contracts/contracts/libraries/SystemContractsCaller.sol b/system-contracts/contracts/libraries/SystemContractsCaller.sol index 4ee958b39..9497b0c52 100644 --- a/system-contracts/contracts/libraries/SystemContractsCaller.sol +++ b/system-contracts/contracts/libraries/SystemContractsCaller.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {MSG_VALUE_SYSTEM_CONTRACT, MSG_VALUE_SIMULATOR_IS_SYSTEM_BIT} from "../Constants.sol"; diff --git a/system-contracts/contracts/libraries/TransactionHelper.sol b/system-contracts/contracts/libraries/TransactionHelper.sol index f699e5b8c..467eb57f9 100644 --- a/system-contracts/contracts/libraries/TransactionHelper.sol +++ b/system-contracts/contracts/libraries/TransactionHelper.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {IERC20} from "../openzeppelin/token/ERC20/IERC20.sol"; diff --git a/system-contracts/contracts/libraries/UnsafeBytesCalldata.sol b/system-contracts/contracts/libraries/UnsafeBytesCalldata.sol index 4c72d3542..82b4c5c1d 100644 --- a/system-contracts/contracts/libraries/UnsafeBytesCalldata.sol +++ b/system-contracts/contracts/libraries/UnsafeBytesCalldata.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /** diff --git a/system-contracts/contracts/libraries/Utils.sol b/system-contracts/contracts/libraries/Utils.sol index 4440cd53a..fc23de94b 100644 --- a/system-contracts/contracts/libraries/Utils.sol +++ b/system-contracts/contracts/libraries/Utils.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; import {EfficientCall} from "./EfficientCall.sol"; diff --git a/system-contracts/contracts/openzeppelin/token/ERC20/IERC20.sol b/system-contracts/contracts/openzeppelin/token/ERC20/IERC20.sol index dc3ad760b..18b39a7a9 100644 --- a/system-contracts/contracts/openzeppelin/token/ERC20/IERC20.sol +++ b/system-contracts/contracts/openzeppelin/token/ERC20/IERC20.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts (last updated v4.6.0) (token/ERC20/IERC20.sol) -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.0; /** diff --git a/system-contracts/contracts/openzeppelin/token/ERC20/extensions/IERC20Permit.sol b/system-contracts/contracts/openzeppelin/token/ERC20/extensions/IERC20Permit.sol index d98bfbce9..5e0875438 100644 --- a/system-contracts/contracts/openzeppelin/token/ERC20/extensions/IERC20Permit.sol +++ b/system-contracts/contracts/openzeppelin/token/ERC20/extensions/IERC20Permit.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts v4.4.1 (token/ERC20/extensions/IERC20Permit.sol) -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.0; /** diff --git a/system-contracts/contracts/openzeppelin/token/ERC20/utils/SafeERC20.sol b/system-contracts/contracts/openzeppelin/token/ERC20/utils/SafeERC20.sol index 2c94d1b59..a23e6d1f7 100644 --- a/system-contracts/contracts/openzeppelin/token/ERC20/utils/SafeERC20.sol +++ b/system-contracts/contracts/openzeppelin/token/ERC20/utils/SafeERC20.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts (last updated v4.8.0) (token/ERC20/utils/SafeERC20.sol) -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.0; import {IERC20} from "../IERC20.sol"; diff --git a/system-contracts/contracts/openzeppelin/utils/Address.sol b/system-contracts/contracts/openzeppelin/utils/Address.sol index 9669a9c14..5d6de78c4 100644 --- a/system-contracts/contracts/openzeppelin/utils/Address.sol +++ b/system-contracts/contracts/openzeppelin/utils/Address.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT // OpenZeppelin Contracts (last updated v4.8.0) (utils/Address.sol) -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.1; /** diff --git a/system-contracts/contracts/precompiles/CodeOracle.yul b/system-contracts/contracts/precompiles/CodeOracle.yul index 820b8df70..63b386788 100644 --- a/system-contracts/contracts/precompiles/CodeOracle.yul +++ b/system-contracts/contracts/precompiles/CodeOracle.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + /** * @author Matter Labs * @custom:security-contact security@matterlabs.dev diff --git a/system-contracts/contracts/precompiles/EcAdd.yul b/system-contracts/contracts/precompiles/EcAdd.yul index 5771df8f9..8b7f25618 100644 --- a/system-contracts/contracts/precompiles/EcAdd.yul +++ b/system-contracts/contracts/precompiles/EcAdd.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + object "EcAdd" { code { return(0, 0) diff --git a/system-contracts/contracts/precompiles/EcMul.yul b/system-contracts/contracts/precompiles/EcMul.yul index 84838ec2a..63fd0bc42 100644 --- a/system-contracts/contracts/precompiles/EcMul.yul +++ b/system-contracts/contracts/precompiles/EcMul.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + object "EcMul" { code { return(0, 0) diff --git a/system-contracts/contracts/precompiles/EcPairing.yul b/system-contracts/contracts/precompiles/EcPairing.yul index 6ea6e92de..5e8011bcc 100644 --- a/system-contracts/contracts/precompiles/EcPairing.yul +++ b/system-contracts/contracts/precompiles/EcPairing.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + object "EcPairing" { code { return(0, 0) diff --git a/system-contracts/contracts/precompiles/Ecrecover.yul b/system-contracts/contracts/precompiles/Ecrecover.yul index cbb8fcc0f..9c64d509f 100644 --- a/system-contracts/contracts/precompiles/Ecrecover.yul +++ b/system-contracts/contracts/precompiles/Ecrecover.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + /** * @author Matter Labs * @custom:security-contact security@matterlabs.dev diff --git a/system-contracts/contracts/precompiles/Keccak256.yul b/system-contracts/contracts/precompiles/Keccak256.yul index 8eaa53671..397ee89bb 100644 --- a/system-contracts/contracts/precompiles/Keccak256.yul +++ b/system-contracts/contracts/precompiles/Keccak256.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + /** * @author Matter Labs * @custom:security-contact security@matterlabs.dev diff --git a/system-contracts/contracts/precompiles/P256Verify.yul b/system-contracts/contracts/precompiles/P256Verify.yul index 8cd14beb2..80b782209 100644 --- a/system-contracts/contracts/precompiles/P256Verify.yul +++ b/system-contracts/contracts/precompiles/P256Verify.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + /** * @author Matter Labs * @custom:security-contact security@matterlabs.dev diff --git a/system-contracts/contracts/precompiles/SHA256.yul b/system-contracts/contracts/precompiles/SHA256.yul index ff52632cd..8173502ef 100644 --- a/system-contracts/contracts/precompiles/SHA256.yul +++ b/system-contracts/contracts/precompiles/SHA256.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + /** * @author Matter Labs * @custom:security-contact security@matterlabs.dev diff --git a/system-contracts/contracts/precompiles/test-contracts/Keccak256Mock.yul b/system-contracts/contracts/precompiles/test-contracts/Keccak256Mock.yul index b37eb69ca..e3cb9ac1e 100644 --- a/system-contracts/contracts/precompiles/test-contracts/Keccak256Mock.yul +++ b/system-contracts/contracts/precompiles/test-contracts/Keccak256Mock.yul @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: MIT + /** * @author Matter Labs * @notice The contract used to emulate EVM's keccak256 opcode. diff --git a/system-contracts/contracts/test-contracts/CodeOracleTest.sol b/system-contracts/contracts/test-contracts/CodeOracleTest.sol index f022fb77b..31de9d366 100644 --- a/system-contracts/contracts/test-contracts/CodeOracleTest.sol +++ b/system-contracts/contracts/test-contracts/CodeOracleTest.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: UNLICENSED +// SPDX-License-Identifier: MIT pragma solidity ^0.8.20; diff --git a/system-contracts/contracts/test-contracts/TransferTest.sol b/system-contracts/contracts/test-contracts/TransferTest.sol index 1b9e9bd75..ca76a9932 100644 --- a/system-contracts/contracts/test-contracts/TransferTest.sol +++ b/system-contracts/contracts/test-contracts/TransferTest.sol @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: UNLICENSED +// SPDX-License-Identifier: MIT pragma solidity ^0.8.20; diff --git a/system-contracts/scripts/constants.ts b/system-contracts/scripts/constants.ts index c01f0a0ed..171c2b9f3 100644 --- a/system-contracts/scripts/constants.ts +++ b/system-contracts/scripts/constants.ts @@ -224,7 +224,7 @@ export const EIP712_DOMAIN = { name: "zkSync", version: "2", chainId: CHAIN_ID, - // zkSync contract doesn't verify EIP712 signatures. + // ZKsync contract doesn't verify EIP712 signatures. }; export interface TransactionData { diff --git a/system-contracts/scripts/deploy-preimages.ts b/system-contracts/scripts/deploy-preimages.ts index 7a4a96880..0029f56a0 100644 --- a/system-contracts/scripts/deploy-preimages.ts +++ b/system-contracts/scripts/deploy-preimages.ts @@ -103,7 +103,7 @@ class ZkSyncDeployer { this.nonce += 1; } - // Returns the current default account bytecode on zkSync + // Returns the current default account bytecode on ZKsync async currentDefaultAccountBytecode(): Promise { const zkSync = await this.deployer.zkWallet.getMainContract(); return await zkSync.getL2DefaultAccountBytecodeHash(); @@ -114,7 +114,7 @@ class ZkSyncDeployer { const bytecodeHash = ethers.utils.hexlify(hashBytecode(defaultAccountBytecode)); const currentDefaultAccountBytecode = ethers.utils.hexlify(await this.currentDefaultAccountBytecode()); - // If the bytecode is not the same as the one deployed on zkSync, we need to add it to the deployment + // If the bytecode is not the same as the one deployed on ZKsync, we need to add it to the deployment if (bytecodeHash.toLowerCase() !== currentDefaultAccountBytecode) { this.defaultAccountToUpgrade = { name: DEFAULT_ACCOUNT_CONTRACT_NAME, @@ -161,7 +161,7 @@ class ZkSyncDeployer { const bytecodeHash = ethers.utils.hexlify(hashBytecode(bootloaderCode)); const currentBootloaderBytecode = ethers.utils.hexlify(await this.currentBootloaderBytecode()); - // If the bytecode is not the same as the one deployed on zkSync, we need to add it to the deployment + // If the bytecode is not the same as the one deployed on ZKsync, we need to add it to the deployment if (bytecodeHash.toLowerCase() !== currentBootloaderBytecode) { this.bootloaderToUpgrade = { name: BOOTLOADER_CONTRACT_NAME, diff --git a/system-contracts/scripts/utils.ts b/system-contracts/scripts/utils.ts index e06c14e50..4c1060ee2 100644 --- a/system-contracts/scripts/utils.ts +++ b/system-contracts/scripts/utils.ts @@ -84,7 +84,7 @@ export async function outputSystemContracts(): Promise { return await Promise.all(upgradeParamsPromises); } -// Script that publishes preimages for all the system contracts on zkSync +// Script that publishes preimages for all the system contracts on ZKsync // and outputs the JSON that can be used for performing the necessary upgrade const DEFAULT_L2_TX_GAS_LIMIT = 2097152; From 28aadaaec1b3d48ff52e3e74874813d1690c5d8d Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Wed, 4 Sep 2024 23:25:17 +0200 Subject: [PATCH 15/53] migrate in script files as well --- docs/gateway/contracts-review-gateway.md | 2 +- .../PrepareZKChainRegistrationCalldata.s.sol | 4 +- l1-contracts/scripts/sync-layer.ts | 20 ++--- .../scripts/upgrade-consistency-checker.ts | 36 ++++----- l1-contracts/scripts/verify.ts | 6 +- l1-contracts/src.ts/deploy-process.ts | 4 +- l1-contracts/src.ts/deploy-test-process.ts | 2 +- l1-contracts/src.ts/deploy.ts | 74 +++++++++---------- l1-contracts/src.ts/utils.ts | 4 +- l1-contracts/test/unit_tests/gateway.spec.ts | 12 +-- .../test/unit_tests/governance_test.spec.ts | 6 +- .../initial_deployment_test.spec.ts | 14 ++-- .../test/unit_tests/l2-upgrade.test.spec.ts | 62 ++++++++-------- .../test/unit_tests/proxy_test.spec.ts | 2 +- .../validator_timelock_test.spec.ts | 26 +++---- .../test/L2GenesisUpgrade.spec.ts | 6 +- 16 files changed, 140 insertions(+), 140 deletions(-) diff --git a/docs/gateway/contracts-review-gateway.md b/docs/gateway/contracts-review-gateway.md index 1b2980c37..21ffe5885 100644 --- a/docs/gateway/contracts-review-gateway.md +++ b/docs/gateway/contracts-review-gateway.md @@ -60,7 +60,7 @@ The majority of the rest of the changes. This makes the scope quite big, so plea - Bridgehub.sol - Config.sol - L2ContractAddresses.sol -- StateTransitionManager.sol +- ChainTypeManager.sol - ValidatorTimelock.sol - DiamondInit.sol - ZkSyncHyperchainStorage.sol diff --git a/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol index 0a7e20a53..63f8d6084 100644 --- a/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol +++ b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol @@ -11,7 +11,7 @@ import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; import {L2ContractHelper} from "contracts/common/libraries/L2ContractHelper.sol"; import {AddressAliasHelper} from "contracts/vendor/AddressAliasHelper.sol"; import {L1SharedBridge} from "contracts/bridge/L1SharedBridge.sol"; -import {IStateTransitionManager} from "contracts/state-transition/IStateTransitionManager.sol"; +import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol"; import {IGovernance} from "contracts/governance/IGovernance.sol"; import {Utils} from "./Utils.sol"; @@ -141,7 +141,7 @@ contract PrepareZKChainRegistrationCalldataScript is Script { config.stateTransitionProxy = toml.readAddress("$.deployed_addresses.state_transition_proxy_addr"); config.erc20BridgeProxy = toml.readAddress("$.deployed_addresses.erc20_bridge_proxy_addr"); - ecosystem.bridgehub = IStateTransitionManager(config.stateTransitionProxy).BRIDGE_HUB(); + ecosystem.bridgehub = IChainTypeManager(config.stateTransitionProxy).BRIDGE_HUB(); ecosystem.l1SharedBridgeProxy = address(Bridgehub(ecosystem.bridgehub).sharedBridge()); ecosystem.governance = Bridgehub(ecosystem.bridgehub).owner(); diff --git a/l1-contracts/scripts/sync-layer.ts b/l1-contracts/scripts/sync-layer.ts index e51a6da3c..ec0a5c372 100644 --- a/l1-contracts/scripts/sync-layer.ts +++ b/l1-contracts/scripts/sync-layer.ts @@ -19,7 +19,7 @@ import { } from "../src.ts/utils"; import { Wallet as ZkWallet, Provider as ZkProvider, utils as zkUtils } from "zksync-ethers"; -import { IStateTransitionManagerFactory } from "../typechain/IStateTransitionManagerFactory"; +import { IChainTypeManagerFactory } from "../typechain/IChainTypeManagerFactory"; import { TestnetERC20TokenFactory } from "../typechain/TestnetERC20TokenFactory"; import { BOOTLOADER_FORMAL_ADDRESS } from "zksync-ethers/build/utils"; @@ -146,7 +146,7 @@ async function main() { const currentChainId = getNumberFromEnv("CHAIN_ETH_ZKSYNC_NETWORK_ID"); - const stm = deployer.stateTransitionManagerContract(deployer.deployWallet); + const ctm = deployer.chainTypeManagerContract(deployer.deployWallet); const counterPart = getAddressFromEnv("GATEWAY_STATE_TRANSITION_PROXY_ADDR"); @@ -161,7 +161,7 @@ async function main() { const receipt = await deployer.moveChainToGateway(gatewayChainId, gasPrice); - const gatewayAddress = await stm.getHyperchain(gatewayChainId); + const gatewayAddress = await ctm.getHyperchain(gatewayChainId); const l2TxHash = zkUtils.getL2HashFromPriorityOp(receipt, gatewayAddress); @@ -176,8 +176,8 @@ async function main() { const receiptOnSL = await (await txL2Handle).wait(); console.log("Finalized on SL with hash:", receiptOnSL.transactionHash); - const stmOnSL = IStateTransitionManagerFactory.connect(counterPart, gatewayProvider); - const hyperchainAddress = await stmOnSL.getHyperchain(currentChainId); + const ctmOnSL = IChainTypeManagerFactory.connect(counterPart, gatewayProvider); + const hyperchainAddress = await ctmOnSL.getHyperchain(currentChainId); console.log(`CONTRACTS_DIAMOND_PROXY_ADDR=${hyperchainAddress}`); console.log("Success!"); @@ -314,7 +314,7 @@ async function registerSLContractsOnL1(deployer: Deployer) { console.log(`Gateway chain Id: ${chainId}`); const l1Bridgehub = deployer.bridgehubContract(deployer.deployWallet); - const l1STM = deployer.stateTransitionManagerContract(deployer.deployWallet); + const l1STM = deployer.chainTypeManagerContract(deployer.deployWallet); console.log(deployer.addresses.StateTransition.StateTransitionProxy); const gatewayAddress = await l1Bridgehub.getHyperchain(chainId); // this script only works when owner is the deployer @@ -342,9 +342,9 @@ async function registerSLContractsOnL1(deployer: Deployer) { baseToken.interface.encodeFunctionData("approve", [this.addresses.Bridges.SharedBridgeProxy, value.mul(2)]) ); } - const stmDeploymentTracker = deployer.stmDeploymentTracker(deployer.deployWallet); + const ctmDeploymentTracker = deployer.ctmDeploymentTracker(deployer.deployWallet); const assetRouter = deployer.defaultSharedBridge(deployer.deployWallet); - const assetId = await l1Bridgehub.stmAssetIdFromChainId(chainId); + const assetId = await l1Bridgehub.ctmAssetIdFromChainId(chainId); // Setting the L2 bridgehub as the counterpart for the STM asset const receipt2 = await deployer.executeUpgrade( @@ -376,7 +376,7 @@ async function registerSLContractsOnL1(deployer: Deployer) { chainId, L2_BRIDGEHUB_ADDRESS, gasPrice, - l1Bridgehub.interface.encodeFunctionData("addStateTransitionManager", [l2STMAddress]), + l1Bridgehub.interface.encodeFunctionData("addChainTypeManager", [l2STMAddress]), priorityTxMaxGasLimit ); console.log(`L2 STM address ${l2STMAddress} registered on gateway, txHash: ${receipt3.transactionHash}`); @@ -393,7 +393,7 @@ async function registerSLContractsOnL1(deployer: Deployer) { l2GasLimit: priorityTxMaxGasLimit, l2GasPerPubdataByteLimit: SYSTEM_CONFIG.requiredL2GasPricePerPubdata, refundRecipient: deployer.deployWallet.address, - secondBridgeAddress: stmDeploymentTracker.address, + secondBridgeAddress: ctmDeploymentTracker.address, secondBridgeValue: 0, secondBridgeCalldata: "0x01" + ethers.utils.defaultAbiCoder.encode(["address", "address"], [l1STM.address, l2STMAddress]).slice(2), diff --git a/l1-contracts/scripts/upgrade-consistency-checker.ts b/l1-contracts/scripts/upgrade-consistency-checker.ts index b6850b1bd..ecae97d84 100644 --- a/l1-contracts/scripts/upgrade-consistency-checker.ts +++ b/l1-contracts/scripts/upgrade-consistency-checker.ts @@ -36,10 +36,10 @@ const gettersFacet = process.env.CONTRACTS_GETTERS_FACET_ADDR!; const diamondInit = process.env.CONTRACTS_DIAMOND_INIT_ADDR!; -const stmImplDeployTx = "0xe01c0bb497017a25c92bfc712e370e8f900554b107fe0b6022976d05c349f2b6"; -const stmImpl = process.env.CONTRACTS_STATE_TRANSITION_IMPL_ADDR!; -const stmDeployTx = "0x514bbf46d227eee8567825bf5c8ee1855aa8a1916f7fee7b191e2e3d5ecba849"; -const stm = process.env.CONTRACTS_STATE_TRANSITION_PROXY_ADDR!; +const ctmImplDeployTx = "0xe01c0bb497017a25c92bfc712e370e8f900554b107fe0b6022976d05c349f2b6"; +const ctmImpl = process.env.CONTRACTS_STATE_TRANSITION_IMPL_ADDR!; +const ctmDeployTx = "0x514bbf46d227eee8567825bf5c8ee1855aa8a1916f7fee7b191e2e3d5ecba849"; +const ctm = process.env.CONTRACTS_STATE_TRANSITION_PROXY_ADDR!; const sharedBridgeImplDeployTx = "0x074204db79298c2f6beccae881c2ad7321c331e97fb4bd93adce2eb23bf17a17"; const sharedBridgeImpl = process.env.CONTRACTS_L1_SHARED_BRIDGE_IMPL_ADDR!; @@ -290,9 +290,9 @@ async function checkValidatorTimelock() { throw new Error("ValidatorTimelock owner is not correct"); } - const usedStm = await contract.stateTransitionManager(); - if (usedStm.toLowerCase() != stm.toLowerCase()) { - throw new Error("ValidatorTimelock stateTransitionManager is not correct"); + const usedCtm = await contract.chainTypeManager(); + if (usedCtm.toLowerCase() != ctm.toLowerCase()) { + throw new Error("ValidatorTimelock chainTypeManager is not correct"); } const validatorOneIsSet = await contract.validators(eraChainId, validatorOne); @@ -338,14 +338,14 @@ async function checkBridgehub() { throw new Error("Bridgehub sharedBridge is not correct"); } - const usedSTM = await contract.stateTransitionManager(eraChainId); - if (usedSTM.toLowerCase() != stm.toLowerCase()) { - throw new Error("Bridgehub stateTransitionManager is not correct"); + const usedSTM = await contract.chainTypeManager(eraChainId); + if (usedSTM.toLowerCase() != ctm.toLowerCase()) { + throw new Error("Bridgehub chainTypeManager is not correct"); } - const isRegistered = await contract.stateTransitionManagerIsRegistered(usedSTM); + const isRegistered = await contract.chainTypeManagerIsRegistered(usedSTM); if (!isRegistered) { - throw new Error("Bridgehub stateTransitionManager is not registered"); + throw new Error("Bridgehub chainTypeManager is not registered"); } const baseTokenAssetId = encodeNTVAssetId( @@ -369,18 +369,18 @@ async function checkMailbox() { } async function checkSTMImpl() { - const artifact = await hardhat.artifacts.readArtifact("StateTransitionManager"); - const contract = new ethers.Contract(stmImpl, artifact.abi, l1Provider); + const artifact = await hardhat.artifacts.readArtifact("ChainTypeManager"); + const contract = new ethers.Contract(ctmImpl, artifact.abi, l1Provider); - await checkCorrectInitCode(stmImplDeployTx, contract, artifact.bytecode, [bridgeHub, maxNumberOfHyperchains]); + await checkCorrectInitCode(ctmImplDeployTx, contract, artifact.bytecode, [bridgeHub, maxNumberOfHyperchains]); console.log("STM impl correct!"); } async function checkSTM() { - const artifact = await hardhat.artifacts.readArtifact("StateTransitionManager"); + const artifact = await hardhat.artifacts.readArtifact("ChainTypeManager"); - const contract = new ethers.Contract(stm, artifact.abi, l1Provider); + const contract = new ethers.Contract(ctm, artifact.abi, l1Provider); const usedBH = await contract.BRIDGE_HUB(); if (usedBH.toLowerCase() != bridgeHub.toLowerCase()) { @@ -408,7 +408,7 @@ async function checkSTM() { console.log("STM is correct!"); - await extractProxyInitializationData(contract, (await l1Provider.getTransaction(stmDeployTx)).data); + await extractProxyInitializationData(contract, (await l1Provider.getTransaction(ctmDeployTx)).data); } async function checkL1AssetRouterImpl() { diff --git a/l1-contracts/scripts/verify.ts b/l1-contracts/scripts/verify.ts index 5abb2a42a..4d03357de 100644 --- a/l1-contracts/scripts/verify.ts +++ b/l1-contracts/scripts/verify.ts @@ -108,7 +108,7 @@ async function main() { ]); promises.push(promise7); - // stm + // ctm // Contracts without constructor parameters for (const address of [ @@ -131,14 +131,14 @@ async function main() { ]); promises.push(promise8); - const stateTransitionManager = new Interface(hardhat.artifacts.readArtifactSync("StateTransitionManager").abi); + const chainTypeManager = new Interface(hardhat.artifacts.readArtifactSync("ChainTypeManager").abi); const genesisBatchHash = getHashFromEnv("CONTRACTS_GENESIS_ROOT"); // TODO: confusing name const genesisRollupLeafIndex = getNumberFromEnv("CONTRACTS_GENESIS_ROLLUP_LEAF_INDEX"); const genesisBatchCommitment = getHashFromEnv("CONTRACTS_GENESIS_BATCH_COMMITMENT"); const diamondCut = await deployer.initialZkSyncHyperchainDiamondCut([]); const protocolVersion = packSemver(...unpackStringSemVer(process.env.CONTRACTS_GENESIS_PROTOCOL_SEMANTIC_VERSION)); - const initCalldata2 = stateTransitionManager.encodeFunctionData("initialize", [ + const initCalldata2 = chainTypeManager.encodeFunctionData("initialize", [ { owner: addresses.Governance, validatorTimelock: addresses.ValidatorTimeLock, diff --git a/l1-contracts/src.ts/deploy-process.ts b/l1-contracts/src.ts/deploy-process.ts index 248f2a5ef..15aeda12d 100644 --- a/l1-contracts/src.ts/deploy-process.ts +++ b/l1-contracts/src.ts/deploy-process.ts @@ -94,8 +94,8 @@ export async function initialBridgehubDeployment( } else { await deployer.deployBlobVersionedHashRetriever(create2Salt, { gasPrice }); } - await deployer.deployStateTransitionManagerContract(create2Salt, extraFacets, gasPrice); - await deployer.setStateTransitionManagerInValidatorTimelock({ gasPrice }); + await deployer.deployChainTypeManagerContract(create2Salt, extraFacets, gasPrice); + await deployer.setChainTypeManagerInValidatorTimelock({ gasPrice }); } export async function registerHyperchain( diff --git a/l1-contracts/src.ts/deploy-test-process.ts b/l1-contracts/src.ts/deploy-test-process.ts index d8637fa52..51f23d2d8 100644 --- a/l1-contracts/src.ts/deploy-test-process.ts +++ b/l1-contracts/src.ts/deploy-test-process.ts @@ -329,7 +329,7 @@ export class EraDeployer extends Deployer { { chainId: this.chainId, // era chain Id bridgehub: this.addresses.Bridgehub.BridgehubProxy, - stateTransitionManager: this.addresses.StateTransition.StateTransitionProxy, + chainTypeManager: this.addresses.StateTransition.StateTransitionProxy, protocolVersion: CONTRACTS_GENESIS_PROTOCOL_VERSION, admin: this.ownerAddress, validatorTimelock: ADDRESS_ONE, diff --git a/l1-contracts/src.ts/deploy.ts b/l1-contracts/src.ts/deploy.ts index cdc48a800..7f1b84ba7 100644 --- a/l1-contracts/src.ts/deploy.ts +++ b/l1-contracts/src.ts/deploy.ts @@ -68,7 +68,7 @@ import { ValidatorTimelockFactory } from "../typechain/ValidatorTimelockFactory" import type { FacetCut } from "./diamondCut"; import { getCurrentFacetCutsForAdd } from "./diamondCut"; -import { BridgehubFactory, ChainAdminFactory, ERC20Factory, StateTransitionManagerFactory } from "../typechain"; +import { BridgehubFactory, ChainAdminFactory, ERC20Factory, ChainTypeManagerFactory } from "../typechain"; import { IL1AssetRouterFactory } from "../typechain/IL1AssetRouterFactory"; import { IL1NativeTokenVaultFactory } from "../typechain/IL1NativeTokenVaultFactory"; @@ -167,12 +167,12 @@ export class Deployer { ); console.log(`Diamond cut hash: ${hash}`); - const stm = StateTransitionManagerFactory.connect( + const ctm = ChainTypeManagerFactory.connect( this.addresses.StateTransition.StateTransitionProxy, this.deployWallet ); - const hashFromSTM = await stm.initialCutHash(); + const hashFromSTM = await ctm.initialCutHash(); if (hash != hashFromSTM) { throw new Error(`Has from STM ${hashFromSTM} does not match the computed hash ${hash}`); } @@ -517,12 +517,12 @@ export class Deployer { this.addresses.Bridgehub.MessageRootProxy = contractAddress; } - public async deployStateTransitionManagerImplementation( + public async deployChainTypeManagerImplementation( create2Salt: string, ethTxOptions: ethers.providers.TransactionRequest ) { const contractAddress = await this.deployViaCreate2( - "StateTransitionManager", + "ChainTypeManager", [this.addresses.Bridgehub.BridgehubProxy], create2Salt, { @@ -538,7 +538,7 @@ export class Deployer { this.addresses.StateTransition.StateTransitionImplementation = contractAddress; } - public async deployStateTransitionManagerProxy( + public async deployChainTypeManagerProxy( create2Salt: string, ethTxOptions: ethers.providers.TransactionRequest, extraFacets?: FacetCut[] @@ -549,7 +549,7 @@ export class Deployer { const diamondCut = await this.initialZkSyncHyperchainDiamondCut(extraFacets); const protocolVersion = packSemver(...unpackStringSemVer(process.env.CONTRACTS_GENESIS_PROTOCOL_SEMANTIC_VERSION)); - const stateTransitionManager = new Interface(hardhat.artifacts.readArtifactSync("StateTransitionManager").abi); + const chainTypeManager = new Interface(hardhat.artifacts.readArtifactSync("ChainTypeManager").abi); const forceDeploymentsData = await this.genesisForceDeploymentsData(); const chainCreationParams = { genesisUpgrade: this.addresses.StateTransition.GenesisUpgrade, @@ -560,7 +560,7 @@ export class Deployer { forceDeploymentsData, }; - const initCalldata = stateTransitionManager.encodeFunctionData("initialize", [ + const initCalldata = chainTypeManager.encodeFunctionData("initialize", [ { owner: this.addresses.Governance, validatorTimelock: this.addresses.ValidatorTimeLock, @@ -581,7 +581,7 @@ export class Deployer { ); if (this.verbose) { - console.log(`StateTransitionManagerProxy deployed, with protocol version: ${protocolVersion}`); + console.log(`ChainTypeManagerProxy deployed, with protocol version: ${protocolVersion}`); console.log(`CONTRACTS_STATE_TRANSITION_PROXY_ADDR=${contractAddress}`); } @@ -1073,7 +1073,7 @@ export class Deployer { await this.deployMessageRootProxy(create2Salt, { gasPrice }); } - public async deployStateTransitionManagerContract( + public async deployChainTypeManagerContract( create2Salt: string, extraFacets?: FacetCut[], gasPrice?: BigNumberish, @@ -1081,9 +1081,9 @@ export class Deployer { ) { nonce = nonce ? parseInt(nonce) : await this.deployWallet.getTransactionCount(); await this.deployStateTransitionDiamondFacets(create2Salt, gasPrice, nonce); - await this.deployStateTransitionManagerImplementation(create2Salt, { gasPrice }); - await this.deployStateTransitionManagerProxy(create2Salt, { gasPrice }, extraFacets); - await this.registerStateTransitionManager(); + await this.deployChainTypeManagerImplementation(create2Salt, { gasPrice }); + await this.deployChainTypeManagerProxy(create2Salt, { gasPrice }, extraFacets); + await this.registerChainTypeManager(); } public async deployStateTransitionDiamondFacets(create2Salt: string, gasPrice?: BigNumberish, nonce?) { @@ -1096,11 +1096,11 @@ export class Deployer { await this.deployStateTransitionDiamondInit(create2Salt, { gasPrice, nonce: nonce + 4 }); } - public async registerStateTransitionManager() { + public async registerChainTypeManager() { const bridgehub = this.bridgehubContract(this.deployWallet); - if (!(await bridgehub.stateTransitionManagerIsRegistered(this.addresses.StateTransition.StateTransitionProxy))) { - const upgradeData = bridgehub.interface.encodeFunctionData("addStateTransitionManager", [ + if (!(await bridgehub.chainTypeManagerIsRegistered(this.addresses.StateTransition.StateTransitionProxy))) { + const upgradeData = bridgehub.interface.encodeFunctionData("addChainTypeManager", [ this.addresses.StateTransition.StateTransitionProxy, ]); @@ -1111,22 +1111,22 @@ export class Deployer { console.log(`StateTransition System registered, gas used: ${receipt1.gasUsed.toString()}`); } - const stmDeploymentTracker = this.stmDeploymentTracker(this.deployWallet); + const ctmDeploymentTracker = this.ctmDeploymentTracker(this.deployWallet); const l1AssetRouter = this.defaultSharedBridge(this.deployWallet); const whitelistData = l1AssetRouter.interface.encodeFunctionData("setAssetDeploymentTracker", [ ethers.utils.hexZeroPad(this.addresses.StateTransition.StateTransitionProxy, 32), - stmDeploymentTracker.address, + ctmDeploymentTracker.address, ]); const receipt2 = await this.executeUpgrade(l1AssetRouter.address, 0, whitelistData); if (this.verbose) { console.log("STM deployment tracker whitelisted in L1 Shared Bridge", receipt2.gasUsed.toString()); console.log( - `CONTRACTS_STM_ASSET_INFO=${await bridgehub.stmAssetId(this.addresses.StateTransition.StateTransitionProxy)}` + `CONTRACTS_STM_ASSET_INFO=${await bridgehub.ctmAssetId(this.addresses.StateTransition.StateTransitionProxy)}` ); } - const data1 = stmDeploymentTracker.interface.encodeFunctionData("registerSTMAssetOnL1", [ + const data1 = ctmDeploymentTracker.interface.encodeFunctionData("registerSTMAssetOnL1", [ this.addresses.StateTransition.StateTransitionProxy, ]); const receipt3 = await this.executeUpgrade(this.addresses.Bridgehub.STMDeploymentTrackerProxy, 0, data1); @@ -1136,7 +1136,7 @@ export class Deployer { receipt3.gasUsed.toString() ); console.log( - `CONTRACTS_STM_ASSET_INFO=${await bridgehub.stmAssetId(this.addresses.StateTransition.StateTransitionProxy)}` + `CONTRACTS_STM_ASSET_INFO=${await bridgehub.ctmAssetId(this.addresses.StateTransition.StateTransitionProxy)}` ); } } @@ -1168,17 +1168,17 @@ export class Deployer { const diamondCutData = await this.initialZkSyncHyperchainDiamondCut(); const initialDiamondCut = new ethers.utils.AbiCoder().encode([DIAMOND_CUT_DATA_ABI_STRING], [diamondCutData]); - const stmData = new ethers.utils.AbiCoder().encode(["uint256", "bytes"], [newAdmin, initialDiamondCut]); + const ctmData = new ethers.utils.AbiCoder().encode(["uint256", "bytes"], [newAdmin, initialDiamondCut]); const bridgehubData = new ethers.utils.AbiCoder().encode( [BRIDGEHUB_STM_ASSET_DATA_ABI_STRING], - [[this.chainId, stmData, chainData]] + [[this.chainId, ctmData, chainData]] ); // console.log("bridgehubData", bridgehubData) // console.log("this.addresses.ChainAssetInfo", this.addresses.ChainAssetInfo) - // The stmAssetIFromChainId gives us a unique 'asset' identifier for a given chain. - const chainAssetId = await bridgehub.stmAssetIdFromChainId(this.chainId); + // The ctmAssetIFromChainId gives us a unique 'asset' identifier for a given chain. + const chainAssetId = await bridgehub.ctmAssetIdFromChainId(this.chainId); console.log("Chain asset id is: ", chainAssetId); let sharedBridgeData = ethers.utils.defaultAbiCoder.encode( @@ -1225,7 +1225,7 @@ export class Deployer { // const sharedBridgeData = ethers.utils.defaultAbiCoder.encode( // ["bytes32", "bytes"], - // [await bridgehub.stmAssetInfoFromChainId(this.chainId), bridgehubData] + // [await bridgehub.ctmAssetInfoFromChainId(this.chainId), bridgehubData] // ); const l2BatchNumber = 1; const l2MsgIndex = 1; @@ -1262,13 +1262,13 @@ export class Deployer { nonce = nonce ? parseInt(nonce) : await this.deployWallet.getTransactionCount(); const bridgehub = this.bridgehubContract(this.deployWallet); - const stateTransitionManager = this.stateTransitionManagerContract(this.deployWallet); + const chainTypeManager = this.chainTypeManagerContract(this.deployWallet); const ntv = this.nativeTokenVault(this.deployWallet); const baseTokenAddress = await ntv.tokenAddress(baseTokenAssetId); const inputChainId = predefinedChainId || getNumberFromEnv("CHAIN_ETH_ZKSYNC_NETWORK_ID"); const alreadyRegisteredInSTM = - (await stateTransitionManager.getHyperchain(inputChainId)) != ethers.constants.AddressZero; + (await chainTypeManager.getHyperchain(inputChainId)) != ethers.constants.AddressZero; const admin = process.env.CHAIN_ADMIN_ADDRESS || this.ownerAddress; const diamondCutData = await this.initialZkSyncHyperchainDiamondCut(extraFacets, compareDiamondCutHash); @@ -1328,7 +1328,7 @@ export class Deployer { const diamondProxyAddress = "0x" + receipt.logs - .find((log) => log.topics[0] == stateTransitionManager.interface.getEventTopic("NewHyperchain")) + .find((log) => log.topics[0] == chainTypeManager.interface.getEventTopic("NewHyperchain")) .topics[2].slice(26); this.addresses.StateTransition.DiamondProxy = diamondProxyAddress; if (this.verbose) { @@ -1410,8 +1410,8 @@ export class Deployer { } public async transferAdminFromDeployerToChainAdmin() { - const stm = this.stateTransitionManagerContract(this.deployWallet); - const diamondProxyAddress = await stm.getHyperchain(this.chainId); + const ctm = this.chainTypeManagerContract(this.deployWallet); + const diamondProxyAddress = await ctm.getHyperchain(this.chainId); const hyperchain = IZkSyncHyperchainFactory.connect(diamondProxyAddress, this.deployWallet); const receipt = await (await hyperchain.setPendingAdmin(this.addresses.ChainAdmin)).wait(); @@ -1461,15 +1461,15 @@ export class Deployer { this.addresses.ValidatorTimeLock = contractAddress; } - public async setStateTransitionManagerInValidatorTimelock(ethTxOptions: ethers.providers.TransactionRequest) { + public async setChainTypeManagerInValidatorTimelock(ethTxOptions: ethers.providers.TransactionRequest) { const validatorTimelock = this.validatorTimelock(this.deployWallet); - const tx = await validatorTimelock.setStateTransitionManager( + const tx = await validatorTimelock.setChainTypeManager( this.addresses.StateTransition.StateTransitionProxy, ethTxOptions ); const receipt = await tx.wait(); if (this.verbose) { - console.log(`StateTransitionManager was set in ValidatorTimelock, gas used: ${receipt.gasUsed.toString()}`); + console.log(`ChainTypeManager was set in ValidatorTimelock, gas used: ${receipt.gasUsed.toString()}`); } } @@ -1565,8 +1565,8 @@ export class Deployer { return BridgehubFactory.connect(this.addresses.Bridgehub.BridgehubProxy, signerOrProvider); } - public stateTransitionManagerContract(signerOrProvider: Signer | providers.Provider) { - return StateTransitionManagerFactory.connect(this.addresses.StateTransition.StateTransitionProxy, signerOrProvider); + public chainTypeManagerContract(signerOrProvider: Signer | providers.Provider) { + return ChainTypeManagerFactory.connect(this.addresses.StateTransition.StateTransitionProxy, signerOrProvider); } public stateTransitionContract(signerOrProvider: Signer | providers.Provider) { @@ -1589,7 +1589,7 @@ export class Deployer { return IL1NativeTokenVaultFactory.connect(this.addresses.Bridges.NativeTokenVaultProxy, signerOrProvider); } - public stmDeploymentTracker(signerOrProvider: Signer | providers.Provider) { + public ctmDeploymentTracker(signerOrProvider: Signer | providers.Provider) { return ISTMDeploymentTrackerFactory.connect(this.addresses.Bridgehub.STMDeploymentTrackerProxy, signerOrProvider); } diff --git a/l1-contracts/src.ts/utils.ts b/l1-contracts/src.ts/utils.ts index 3552a563d..126639523 100644 --- a/l1-contracts/src.ts/utils.ts +++ b/l1-contracts/src.ts/utils.ts @@ -38,7 +38,7 @@ export const DIAMOND_CUT_DATA_ABI_STRING = "tuple(tuple(address facet, uint8 action, bool isFreezable, bytes4[] selectors)[] facetCuts, address initAddress, bytes initCalldata)"; export const FORCE_DEPLOYMENT_ABI_STRING = "tuple(bytes32 bytecodeHash, address newAddress, bool callConstructor, uint256 value, bytes input)[]"; -export const BRIDGEHUB_STM_ASSET_DATA_ABI_STRING = "tuple(uint256 chainId, bytes stmData, bytes chainData)"; +export const BRIDGEHUB_STM_ASSET_DATA_ABI_STRING = "tuple(uint256 chainId, bytes ctmData, bytes chainData)"; export function applyL1ToL2Alias(address: string): string { return ethers.utils.hexlify(ethers.BigNumber.from(address).add(L1_TO_L2_ALIAS_OFFSET).mod(ADDRESS_MODULO)); @@ -302,7 +302,7 @@ export function compileInitialCutHash( { chainId: "0x0000000000000000000000000000000000000000000000000000000000000001", bridgehub: "0x0000000000000000000000000000000000001234", - stateTransitionManager: "0x0000000000000000000000000000000000002234", + chainTypeManager: "0x0000000000000000000000000000000000002234", protocolVersion: "0x0000000000000000000000000000000000002234", admin: "0x0000000000000000000000000000000000003234", validatorTimelock: "0x0000000000000000000000000000000000004234", diff --git a/l1-contracts/test/unit_tests/gateway.spec.ts b/l1-contracts/test/unit_tests/gateway.spec.ts index 6a88c20f6..55ade079d 100644 --- a/l1-contracts/test/unit_tests/gateway.spec.ts +++ b/l1-contracts/test/unit_tests/gateway.spec.ts @@ -23,7 +23,7 @@ import type { Deployer } from "../../src.ts/deploy"; describe("Gateway", function () { let bridgehub: Bridgehub; - // let stateTransition: StateTransitionManager; + // let stateTransition: ChainTypeManager; let owner: ethers.Signer; let migratingDeployer: Deployer; let gatewayDeployer: Deployer; @@ -86,15 +86,15 @@ describe("Gateway", function () { }); it("Check l2 registration", async () => { - const stm = migratingDeployer.stateTransitionManagerContract(migratingDeployer.deployWallet); + const ctm = migratingDeployer.chainTypeManagerContract(migratingDeployer.deployWallet); const gasPrice = await migratingDeployer.deployWallet.provider.getGasPrice(); const value = ( await bridgehub.l2TransactionBaseCost(chainId, gasPrice, priorityTxMaxGasLimit, REQUIRED_L2_GAS_PRICE_PER_PUBDATA) ).mul(10); - const stmDeploymentTracker = migratingDeployer.stmDeploymentTracker(migratingDeployer.deployWallet); + const ctmDeploymentTracker = migratingDeployer.ctmDeploymentTracker(migratingDeployer.deployWallet); const assetRouter = migratingDeployer.defaultSharedBridge(migratingDeployer.deployWallet); - const assetId = await bridgehub.stmAssetIdFromChainId(chainId); + const assetId = await bridgehub.ctmAssetIdFromChainId(chainId); await migratingDeployer.executeUpgrade( bridgehub.address, @@ -126,10 +126,10 @@ describe("Gateway", function () { l2GasLimit: priorityTxMaxGasLimit, l2GasPerPubdataByteLimit: SYSTEM_CONFIG.requiredL2GasPricePerPubdata, refundRecipient: migratingDeployer.deployWallet.address, - secondBridgeAddress: stmDeploymentTracker.address, + secondBridgeAddress: ctmDeploymentTracker.address, secondBridgeValue: 0, secondBridgeCalldata: - "0x01" + ethers.utils.defaultAbiCoder.encode(["address", "address"], [stm.address, stm.address]).slice(2), + "0x01" + ethers.utils.defaultAbiCoder.encode(["address", "address"], [ctm.address, ctm.address]).slice(2), }, ]) ); diff --git a/l1-contracts/test/unit_tests/governance_test.spec.ts b/l1-contracts/test/unit_tests/governance_test.spec.ts index ce982079d..e689def8d 100644 --- a/l1-contracts/test/unit_tests/governance_test.spec.ts +++ b/l1-contracts/test/unit_tests/governance_test.spec.ts @@ -24,7 +24,7 @@ describe("Admin facet tests", function () { randomSigner = (await hardhat.ethers.getSigners())[1]; }); - it("StateTransitionManager successfully set validator", async () => { + it("ChainTypeManager successfully set validator", async () => { const validatorAddress = randomAddress(); await adminFacetTest.setValidator(validatorAddress, true); @@ -40,7 +40,7 @@ describe("Admin facet tests", function () { expect(revertReason).contains("Unauthorized"); }); - it("StateTransitionManager successfully set porter availability", async () => { + it("ChainTypeManager successfully set porter availability", async () => { await adminFacetTest.setPorterAvailability(true); const porterAvailability = await adminFacetTest.getPorterAvailability(); @@ -52,7 +52,7 @@ describe("Admin facet tests", function () { expect(revertReason).contains("Unauthorized"); }); - it("StateTransitionManager successfully set priority transaction max gas limit", async () => { + it("ChainTypeManager successfully set priority transaction max gas limit", async () => { const gasLimit = "12345678"; await adminFacetTest.setPriorityTxMaxGasLimit(gasLimit); diff --git a/l1-contracts/test/unit_tests/initial_deployment_test.spec.ts b/l1-contracts/test/unit_tests/initial_deployment_test.spec.ts index bf381402e..4905daac0 100644 --- a/l1-contracts/test/unit_tests/initial_deployment_test.spec.ts +++ b/l1-contracts/test/unit_tests/initial_deployment_test.spec.ts @@ -3,8 +3,8 @@ import * as ethers from "ethers"; import { Wallet } from "ethers"; import * as hardhat from "hardhat"; -import type { Bridgehub, StateTransitionManager } from "../../typechain"; -import { BridgehubFactory, StateTransitionManagerFactory } from "../../typechain"; +import type { Bridgehub, ChainTypeManager } from "../../typechain"; +import { BridgehubFactory, ChainTypeManagerFactory } from "../../typechain"; import { initialTestnetDeploymentProcess } from "../../src.ts/deploy-test-process"; import { ethTestConfig } from "../../src.ts/utils"; @@ -13,7 +13,7 @@ import type { Deployer } from "../../src.ts/deploy"; describe("Initial deployment test", function () { let bridgehub: Bridgehub; - let stateTransition: StateTransitionManager; + let stateTransition: ChainTypeManager; let owner: ethers.Signer; let deployer: Deployer; // const MAX_CODE_LEN_WORDS = (1 << 16) - 1; @@ -47,16 +47,16 @@ describe("Initial deployment test", function () { // await deploySharedBridgeOnL2ThroughL1(deployer, chainId.toString(), gasPrice); bridgehub = BridgehubFactory.connect(deployer.addresses.Bridgehub.BridgehubProxy, deployWallet); - stateTransition = StateTransitionManagerFactory.connect( + stateTransition = ChainTypeManagerFactory.connect( deployer.addresses.StateTransition.StateTransitionProxy, deployWallet ); }); it("Check addresses", async () => { - const stateTransitionManagerAddress1 = deployer.addresses.StateTransition.StateTransitionProxy; - const stateTransitionManagerAddress2 = await bridgehub.stateTransitionManager(chainId); - expect(stateTransitionManagerAddress1.toLowerCase()).equal(stateTransitionManagerAddress2.toLowerCase()); + const chainTypeManagerAddress1 = deployer.addresses.StateTransition.StateTransitionProxy; + const chainTypeManagerAddress2 = await bridgehub.chainTypeManager(chainId); + expect(chainTypeManagerAddress1.toLowerCase()).equal(chainTypeManagerAddress2.toLowerCase()); const stateTransitionAddress1 = deployer.addresses.StateTransition.DiamondProxy; const stateTransitionAddress2 = await stateTransition.getHyperchain(chainId); diff --git a/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts b/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts index 522b24da9..cd8c76f3c 100644 --- a/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts +++ b/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts @@ -5,7 +5,7 @@ import * as ethers from "ethers"; import * as hardhat from "hardhat"; import { hashBytecode } from "zksync-ethers/build/utils"; -import type { AdminFacet, ExecutorFacet, GettersFacet, StateTransitionManager } from "../../typechain"; +import type { AdminFacet, ExecutorFacet, GettersFacet, ChainTypeManager } from "../../typechain"; import { AdminFacetFactory, DummyAdminFacetFactory, @@ -13,7 +13,7 @@ import { DefaultUpgradeFactory, ExecutorFacetFactory, GettersFacetFactory, - StateTransitionManagerFactory, + ChainTypeManagerFactory, } from "../../typechain"; import { Ownable2StepFactory } from "../../typechain/Ownable2StepFactory"; @@ -49,7 +49,7 @@ describe("L2 upgrade test", function () { let proxyAdmin: AdminFacet; let proxyGetters: GettersFacet; - let stateTransitionManager: StateTransitionManager; + let chainTypeManager: ChainTypeManager; let owner: ethers.Signer; @@ -115,7 +115,7 @@ describe("L2 upgrade test", function () { deployWallet ); - stateTransitionManager = StateTransitionManagerFactory.connect( + chainTypeManager = ChainTypeManagerFactory.connect( deployer.addresses.StateTransition.StateTransitionProxy, deployWallet ); @@ -159,7 +159,7 @@ describe("L2 upgrade test", function () { expect(await proxyGetters.getL2SystemContractsUpgradeTxHash()).to.equal(ethers.constants.HashZero); await ( - await executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + await executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { newProtocolVersion: addToProtocolVersion(initialProtocolVersion, 1, 0), l2ProtocolUpgradeTx: noopUpgradeTransaction, }) @@ -176,7 +176,7 @@ describe("L2 upgrade test", function () { const { 0: major, 1: minor, 2: patch } = await proxyGetters.getSemverProtocolVersion(); const bootloaderRevertReason = await getCallRevertReason( - executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { newProtocolVersion: packSemver(major, minor, patch + 1), bootloaderHash: ethers.utils.hexlify(hashBytecode(ethers.utils.randomBytes(32))), l2ProtocolUpgradeTx: noopUpgradeTransaction, @@ -185,7 +185,7 @@ describe("L2 upgrade test", function () { expect(bootloaderRevertReason).to.contain("PatchUpgradeCantSetBootloader"); const defaultAccountRevertReason = await getCallRevertReason( - executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { newProtocolVersion: packSemver(major, minor, patch + 1), defaultAccountHash: ethers.utils.hexlify(hashBytecode(ethers.utils.randomBytes(32))), l2ProtocolUpgradeTx: noopUpgradeTransaction, @@ -203,7 +203,7 @@ describe("L2 upgrade test", function () { }); const bootloaderRevertReason = await getCallRevertReason( - executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { newProtocolVersion: packSemver(major, minor, patch + 1), l2ProtocolUpgradeTx: someTx, }) @@ -221,7 +221,7 @@ describe("L2 upgrade test", function () { }); const bootloaderRevertReason = await getCallRevertReason( - executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { newProtocolVersion: newVersion, l2ProtocolUpgradeTx: someTx, }) @@ -232,14 +232,14 @@ describe("L2 upgrade test", function () { it("Timestamp should behave correctly", async () => { // Upgrade was scheduled for now should work fine const timeNow = (await hardhat.ethers.provider.getBlock("latest")).timestamp; - await executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + await executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { upgradeTimestamp: ethers.BigNumber.from(timeNow), l2ProtocolUpgradeTx: noopUpgradeTransaction, }); // Upgrade that was scheduled for the future should not work now const revertReason = await getCallRevertReason( - executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { upgradeTimestamp: ethers.BigNumber.from(timeNow).mul(2), l2ProtocolUpgradeTx: noopUpgradeTransaction, }) @@ -252,7 +252,7 @@ describe("L2 upgrade test", function () { txType: 255, }); const revertReason = await getCallRevertReason( - executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { l2ProtocolUpgradeTx: wrongTx, newProtocolVersion: addToProtocolVersion(initialProtocolVersion, 3, 0), }) @@ -268,7 +268,7 @@ describe("L2 upgrade test", function () { }); const revertReason = await getCallRevertReason( - executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { l2ProtocolUpgradeTx: wrongTx, newProtocolVersion: addToProtocolVersion(initialProtocolVersion, 4, 0), }) @@ -284,7 +284,7 @@ describe("L2 upgrade test", function () { }); const revertReason = await getCallRevertReason( - executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { l2ProtocolUpgradeTx: wrongTx, newProtocolVersion: 0, }) @@ -300,7 +300,7 @@ describe("L2 upgrade test", function () { }); const revertReason = await getCallRevertReason( - executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { l2ProtocolUpgradeTx: wrongTx, newProtocolVersion: addToProtocolVersion(initialProtocolVersion, 10000, 0), }) @@ -316,7 +316,7 @@ describe("L2 upgrade test", function () { }); const revertReason = await getCallRevertReason( - executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { l2ProtocolUpgradeTx: wrongTx, newProtocolVersion: addToProtocolVersion(initialProtocolVersion, 4, 0), }) @@ -332,7 +332,7 @@ describe("L2 upgrade test", function () { }); const revertReason = await getCallRevertReason( - executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { l2ProtocolUpgradeTx: wrongTx, newProtocolVersion: addToProtocolVersion(initialProtocolVersion, 4, 0), }) @@ -349,7 +349,7 @@ describe("L2 upgrade test", function () { }); const revertReason = await getCallRevertReason( - executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { l2ProtocolUpgradeTx: wrongTx, newProtocolVersion: addToProtocolVersion(initialProtocolVersion, 4, 0), }) @@ -367,7 +367,7 @@ describe("L2 upgrade test", function () { }); const revertReason = await getCallRevertReason( - executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { l2ProtocolUpgradeTx: wrongTx, factoryDeps: [myFactoryDep], newProtocolVersion: addToProtocolVersion(initialProtocolVersion, 4, 0), @@ -385,7 +385,7 @@ describe("L2 upgrade test", function () { }); const revertReason = await getCallRevertReason( - executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { l2ProtocolUpgradeTx: wrongTx, factoryDeps: [myFactoryDep], newProtocolVersion: addToProtocolVersion(initialProtocolVersion, 4, 0), @@ -405,7 +405,7 @@ describe("L2 upgrade test", function () { }); const revertReason = await getCallRevertReason( - executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { l2ProtocolUpgradeTx: wrongTx, factoryDeps: Array(33).fill(myFactoryDep), newProtocolVersion: addToProtocolVersion(initialProtocolVersion, 4, 0), @@ -447,7 +447,7 @@ describe("L2 upgrade test", function () { }; const upgradeReceipt = await ( - await executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, upgrade) + await executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, upgrade) ).wait(); const defaultUpgradeFactory = await hardhat.ethers.getContractFactory("DefaultUpgrade"); @@ -534,7 +534,7 @@ describe("L2 upgrade test", function () { }; const upgradeReceipt = await ( - await executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, upgrade) + await executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, upgrade) ).wait(); const defaultUpgradeFactory = await hardhat.ethers.getContractFactory("DefaultUpgrade"); @@ -612,11 +612,11 @@ describe("L2 upgrade test", function () { newProtocolVersion: addToProtocolVersion(initialProtocolVersion, 5 + 1, 0), }; const revertReason = await getCallRevertReason( - executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, upgrade) + executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, upgrade) ); await rollBackToVersion( addToProtocolVersion(initialProtocolVersion, 5, 1).toString(), - stateTransitionManager, + chainTypeManager, upgrade ); expect(revertReason).to.contains("PreviousUpgradeNotFinalized"); @@ -788,7 +788,7 @@ describe("L2 upgrade test", function () { it("Should successfully commit a sequential upgrade", async () => { expect(await proxyGetters.getL2SystemContractsUpgradeBatchNumber()).to.equal(0); await ( - await executeUpgrade(chainId, proxyGetters, stateTransitionManager, proxyAdmin, { + await executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, { newProtocolVersion: addToProtocolVersion(initialProtocolVersion, 5 + 1, 0), l2ProtocolUpgradeTx: noopUpgradeTransaction, }) @@ -829,7 +829,7 @@ describe("L2 upgrade test", function () { it("Should successfully commit custom upgrade", async () => { const upgradeReceipt = await ( - await executeCustomUpgrade(chainId, proxyGetters, proxyAdmin, stateTransitionManager, { + await executeCustomUpgrade(chainId, proxyGetters, proxyAdmin, chainTypeManager, { newProtocolVersion: addToProtocolVersion(initialProtocolVersion, 6 + 1, 0), l2ProtocolUpgradeTx: noopUpgradeTransaction, }) @@ -982,7 +982,7 @@ function buildProposeUpgrade(proposedUpgrade: PartialProposedUpgrade): ProposedU async function executeUpgrade( chainId: BigNumberish, proxyGetters: GettersFacet, - stateTransitionManager: StateTransitionManager, + chainTypeManager: ChainTypeManager, proxyAdmin: AdminFacet, partialUpgrade: Partial, contractFactory?: ethers.ethers.ContractFactory @@ -1008,7 +1008,7 @@ async function executeUpgrade( const oldProtocolVersion = await proxyGetters.getProtocolVersion(); // This promise will be handled in the tests ( - await stateTransitionManager.setNewVersionUpgrade( + await chainTypeManager.setNewVersionUpgrade( diamondCutData, oldProtocolVersion, 999999999999, @@ -1021,7 +1021,7 @@ async function executeUpgrade( // we rollback the protocolVersion ( we don't clear the upgradeHash mapping, but that is ok) async function rollBackToVersion( protocolVersion: string, - stateTransition: StateTransitionManager, + stateTransition: ChainTypeManager, partialUpgrade: Partial ) { partialUpgrade.newProtocolVersion = protocolVersion; @@ -1052,7 +1052,7 @@ async function executeCustomUpgrade( chainId: BigNumberish, proxyGetters: GettersFacet, proxyAdmin: AdminFacet, - stateTransition: StateTransitionManager, + stateTransition: ChainTypeManager, partialUpgrade: Partial, contractFactory?: ethers.ethers.ContractFactory ) { diff --git a/l1-contracts/test/unit_tests/proxy_test.spec.ts b/l1-contracts/test/unit_tests/proxy_test.spec.ts index d801fb640..46067e16f 100644 --- a/l1-contracts/test/unit_tests/proxy_test.spec.ts +++ b/l1-contracts/test/unit_tests/proxy_test.spec.ts @@ -88,7 +88,7 @@ describe("Diamond proxy tests", function () { { chainId, bridgehub: dummyBridgehub.address, - stateTransitionManager: await owner.getAddress(), + chainTypeManager: await owner.getAddress(), protocolVersion: 0, admin: governorAddress, validatorTimelock: governorAddress, diff --git a/l1-contracts/test/unit_tests/validator_timelock_test.spec.ts b/l1-contracts/test/unit_tests/validator_timelock_test.spec.ts index 019f731ca..23c3a40fc 100644 --- a/l1-contracts/test/unit_tests/validator_timelock_test.spec.ts +++ b/l1-contracts/test/unit_tests/validator_timelock_test.spec.ts @@ -1,8 +1,8 @@ import { expect } from "chai"; import { ethers } from "ethers"; import * as hardhat from "hardhat"; -import type { DummyExecutor, ValidatorTimelock, DummyStateTransitionManager } from "../../typechain"; -import { DummyExecutorFactory, ValidatorTimelockFactory, DummyStateTransitionManagerFactory } from "../../typechain"; +import type { DummyExecutor, ValidatorTimelock, DummyChainTypeManager } from "../../typechain"; +import { DummyExecutorFactory, ValidatorTimelockFactory, DummyChainTypeManagerFactory } from "../../typechain"; import { getCallRevertReason } from "./utils"; describe("ValidatorTimelock tests", function () { @@ -11,7 +11,7 @@ describe("ValidatorTimelock tests", function () { let randomSigner: ethers.Signer; let validatorTimelock: ValidatorTimelock; let dummyExecutor: DummyExecutor; - let dummyStateTransitionManager: DummyStateTransitionManager; + let dummyChainTypeManager: DummyChainTypeManager; const chainId: number = 270; const MOCK_PROOF_INPUT = { @@ -55,16 +55,16 @@ describe("ValidatorTimelock tests", function () { const dummyExecutorContract = await dummyExecutorFactory.deploy(); dummyExecutor = DummyExecutorFactory.connect(dummyExecutorContract.address, dummyExecutorContract.signer); - const dummyStateTransitionManagerFactory = await hardhat.ethers.getContractFactory( - "DummyStateTransitionManagerForValidatorTimelock" + const dummyChainTypeManagerFactory = await hardhat.ethers.getContractFactory( + "DummyChainTypeManagerForValidatorTimelock" ); - const dummyStateTransitionManagerContract = await dummyStateTransitionManagerFactory.deploy( + const dummyChainTypeManagerContract = await dummyChainTypeManagerFactory.deploy( await owner.getAddress(), dummyExecutor.address ); - dummyStateTransitionManager = DummyStateTransitionManagerFactory.connect( - dummyStateTransitionManagerContract.address, - dummyStateTransitionManagerContract.signer + dummyChainTypeManager = DummyChainTypeManagerFactory.connect( + dummyChainTypeManagerContract.address, + dummyChainTypeManagerContract.signer ); const validatorTimelockFactory = await hardhat.ethers.getContractFactory("ValidatorTimelock"); @@ -73,7 +73,7 @@ describe("ValidatorTimelock tests", function () { validatorTimelockContract.address, validatorTimelockContract.signer ); - const setSTMtx = await validatorTimelock.setStateTransitionManager(dummyStateTransitionManager.address); + const setSTMtx = await validatorTimelock.setChainTypeManager(dummyChainTypeManager.address); await setSTMtx.wait(); }); @@ -81,9 +81,9 @@ describe("ValidatorTimelock tests", function () { expect(await validatorTimelock.owner()).equal(await owner.getAddress()); expect(await validatorTimelock.executionDelay()).equal(0); expect(await validatorTimelock.validators(chainId, ethers.constants.AddressZero)).equal(false); - expect(await validatorTimelock.stateTransitionManager()).equal(dummyStateTransitionManager.address); - expect(await dummyStateTransitionManager.getHyperchain(chainId)).equal(dummyExecutor.address); - expect(await dummyStateTransitionManager.getChainAdmin(chainId)).equal(await owner.getAddress()); + expect(await validatorTimelock.chainTypeManager()).equal(dummyChainTypeManager.address); + expect(await dummyChainTypeManager.getHyperchain(chainId)).equal(dummyExecutor.address); + expect(await dummyChainTypeManager.getChainAdmin(chainId)).equal(await owner.getAddress()); expect(await dummyExecutor.getAdmin()).equal(await owner.getAddress()); }); diff --git a/system-contracts/test/L2GenesisUpgrade.spec.ts b/system-contracts/test/L2GenesisUpgrade.spec.ts index c549bd50a..e64fb116a 100644 --- a/system-contracts/test/L2GenesisUpgrade.spec.ts +++ b/system-contracts/test/L2GenesisUpgrade.spec.ts @@ -17,7 +17,7 @@ describe("L2GenesisUpgrade tests", function () { let complexUpgrader: ComplexUpgrader; const chainId = 270; - const stmDeployerAddress = ethers.utils.hexlify(ethers.utils.randomBytes(20)); + const ctmDeployerAddress = ethers.utils.hexlify(ethers.utils.randomBytes(20)); const bridgehubOwnerAddress = ethers.utils.hexlify(ethers.utils.randomBytes(20)); const forceDeployments = [ @@ -40,7 +40,7 @@ describe("L2GenesisUpgrade tests", function () { await setResult( "IBridgehub", "setAddresses", - [REAL_L2_ASSET_ROUTER_ADDRESS, stmDeployerAddress, REAL_L2_MESSAGE_ROOT_ADDRESS], + [REAL_L2_ASSET_ROUTER_ADDRESS, ctmDeployerAddress, REAL_L2_MESSAGE_ROOT_ADDRESS], { failure: false, returnData: "0x", @@ -71,7 +71,7 @@ describe("L2GenesisUpgrade tests", function () { const data = l2GenesisUpgrade.interface.encodeFunctionData("genesisUpgrade", [ chainId, - stmDeployerAddress, + ctmDeployerAddress, forceDeploymentsData, ]); From e8d47b4f6b6802d38ae46461a16d3167f9cf04ab Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Wed, 4 Sep 2024 23:35:20 +0200 Subject: [PATCH 16/53] l1 foundry test work --- .../script-out/output-deploy-l1.toml | 50 +++++++++---------- .../Admin.t.sol | 2 +- .../CreateNewChain.t.sol | 0 .../FreezeChain.t.sol | 0 .../RevertBatches.t.sol | 0 .../SetChainCreationParams.t.sol | 0 .../SetNewVersionUpgrade.t.sol | 0 .../SetUpgradeDiamondCut.t.sol | 0 .../SetValidatorTimelock.t.sol | 0 .../StateTransitionOwnerZero.t.sol | 0 .../_ChainTypeManager_Shared.t.sol} | 0 .../facets/Admin/ChangeFeeParams.t.sol | 12 ++--- 12 files changed, 32 insertions(+), 32 deletions(-) rename l1-contracts/test/foundry/unit/concrete/state-transition/{StateTransitionManager => ChainTypeManager}/Admin.t.sol (98%) rename l1-contracts/test/foundry/unit/concrete/state-transition/{StateTransitionManager => ChainTypeManager}/CreateNewChain.t.sol (100%) rename l1-contracts/test/foundry/unit/concrete/state-transition/{StateTransitionManager => ChainTypeManager}/FreezeChain.t.sol (100%) rename l1-contracts/test/foundry/unit/concrete/state-transition/{StateTransitionManager => ChainTypeManager}/RevertBatches.t.sol (100%) rename l1-contracts/test/foundry/unit/concrete/state-transition/{StateTransitionManager => ChainTypeManager}/SetChainCreationParams.t.sol (100%) rename l1-contracts/test/foundry/unit/concrete/state-transition/{StateTransitionManager => ChainTypeManager}/SetNewVersionUpgrade.t.sol (100%) rename l1-contracts/test/foundry/unit/concrete/state-transition/{StateTransitionManager => ChainTypeManager}/SetUpgradeDiamondCut.t.sol (100%) rename l1-contracts/test/foundry/unit/concrete/state-transition/{StateTransitionManager => ChainTypeManager}/SetValidatorTimelock.t.sol (100%) rename l1-contracts/test/foundry/unit/concrete/state-transition/{StateTransitionManager => ChainTypeManager}/StateTransitionOwnerZero.t.sol (100%) rename l1-contracts/test/foundry/unit/concrete/state-transition/{StateTransitionManager/_StateTransitionManager_Shared.t.sol => ChainTypeManager/_ChainTypeManager_Shared.t.sol} (100%) diff --git a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml index cbb67dc28..434f4a4cf 100644 --- a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml +++ b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml @@ -2,13 +2,13 @@ create2_factory_addr = "0x4e59b44847b379578588920cA78FbF26c0B4956C" create2_factory_salt = "0x00000000000000000000000000000000000000000000000000000000000000ff" deployer_addr = "0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496" era_chain_id = 9 -force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000002a093831bf373db45086a901f45805c61f07944b1b7f596761f084f8dfc3e0bea2200000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad979ed796c3d846e1b70fae457404e519165deaa186a5f2357eeb1aef830c86b9600000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001629ac8f4a74ebd8df4688cdedcfe5120809a334ecdc277c65e30475a8ed6616100000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9349c400bc5cef9910dcd7cd1328960b14d2c095f0e5d26c14f4f8a467160578500000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000000" +force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000004405f28668a8b47a6fa4ad18152630edc34d2dd694790bb988c097bbfd13c53c48300000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9447bf69c0e623e1365f68b9682081c8aaf2005f3346a6bb9df35dc505c91cbbc00000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001542f9245b27fa8a082741b6727b86d24c07131b4afdfb66bba0b75c767bf668500000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9554b5e8820768894caf758e182b80205d2a55d217795c711cc044cf83539f66000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000009fe28704985138d9d23820fd13685161fcb5e7aab142bdc8c83b78879f75ddc500000000000000000000000000000000000000000000000000000000000100050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010002" l1_chain_id = 31337 multicall3_addr = "0xb4CA672635D5E33C2725B4F250Dc5D3BFC489469" owner_address = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" [contracts_config] -diamond_cut_data = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000ae70b8622851519e3af6215b0d2bf8bb7e94ee5e0000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc000000000000000000000000062476c57821675af1a33b39eb1655540fdf9a17c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db865000000000000000000000000000000000000000000000000000000000000000000000000000000004e4cf6187167b8e081cb736a75d3554cb7090dfc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005518c73b000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000000000000000000000000000009c68efaa09262647f5bbb9afb4c7fb2dd7c6c642000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab700000000000000000000000000000000000000000000000000000000000000000000000000000000b6aac5d171cfc9c0a4069d825873ffac5ce96b83000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c000000000000000000000000064fd27c7082f2f3e4f8629977eab095b82ddc422000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" +diamond_cut_data = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000c6d5d5daf360cf405c9189cd61c80b3a231f9af90000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc0000000000000000000000000f96cb73f69207dfb592a5cfaae862d914f9c7b5f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db865000000000000000000000000000000000000000000000000000000000000000000000000000000000de0bbb7ca452668332afdfa04f2ec54a4adbe12000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000946ebad100000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c0000000000000000000000000000000000000000000000000000000000000000000000000000000019f0dbf4fb6c4e1a637620d963a97b47c4b2afc2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab700000000000000000000000000000000000000000000000000000000000000000000000000000000c6c467b3194c0c4d00271727d321634af6c0e205000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000f44dbff7963d66ef6ac70d6e95e9f5cf043f617a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" diamond_init_batch_overhead_l1_gas = 1000000 diamond_init_max_l2_gas_per_batch = 80000000 diamond_init_max_pubdata_per_batch = 120000 @@ -23,34 +23,34 @@ recursion_node_level_vk_hash = "0x0000000000000000000000000000000000000000000000 [deployed_addresses] blob_versioned_hash_retriever_addr = "0xA4cB26d6933D2c3E76718D30de8547bCDF8dD241" -governance_addr = "0x61918895E9eB44Caf1B8B9b7e625C65b9AFda41E" -native_token_vault_addr = "0xe5e7Bd646699F63A72AF6A11983DB4e8127A154A" +governance_addr = "0xebcb5F594Fb1B5f0126B35EA5B21ADEEbcDf2c71" +native_token_vault_addr = "0x43E3242EF90fDE18343ec89A2e763f6eF9420012" transparent_proxy_admin_addr = "0xD718d5A27a29FF1cD22403426084bA0d479869a0" -validator_timelock_addr = "0x3C3D72cec2cecC40672b9e144b32ADB3b7Fd084F" +validator_timelock_addr = "0x5C07E911e2A97DA661E7ae0c87e4124A7062eE51" [deployed_addresses.bridgehub] -bridgehub_implementation_addr = "0x66CAF057C87e15eF8108502BD90cB52E2E90Cf5e" -bridgehub_proxy_addr = "0x15b26f421C552Ce0EF27EDDa4f646Ae347Fe0B11" -message_root_implementation_addr = "0xD84b2C4928190dC10Bbb7D87de213509D9F59394" -message_root_proxy_addr = "0x9348A4Dfd3bB679b42eFb06bb77F1B98eE5CF465" -stm_deployment_tracker_implementation_addr = "0x72a154C815aF6505cec588885950Fa1Ae784D2C2" -stm_deployment_tracker_proxy_addr = "0x9fA6Bcfd5A27252299d718557Ae6556d14419D34" +bridgehub_implementation_addr = "0xbF2dD4dA9172f29CcA257f8A5B4b03A8c16B0E72" +bridgehub_proxy_addr = "0x88447bE84740510642784157D9CC5026e2F02701" +ctm_deployment_tracker_implementation_addr = "0x84e6Ccf5A59C2Cfb4d4C97b88Be5E720c94466cF" +ctm_deployment_tracker_proxy_addr = "0x74Bc9503D94c93432a415e761F8130144EA291a7" +message_root_implementation_addr = "0x4553F80D9664b1e82CFC501a48e5038554b6eC8A" +message_root_proxy_addr = "0x271Cf378823104A537f531e5E3E813525CCFD724" [deployed_addresses.bridges] -erc20_bridge_implementation_addr = "0xc68a437d6146d097Bf7fEa4135B65D97FC2a6D89" -erc20_bridge_proxy_addr = "0x1be63449BF1Ab0fDFE9D53A73A2a484b61368d94" -shared_bridge_implementation_addr = "0x162D9044486A4bA9A8e3AC0E9171D13e6A9eCf1b" -shared_bridge_proxy_addr = "0x4D8C730646430d6BF2B7a965Ad39c12CBDc7eEcD" +erc20_bridge_implementation_addr = "0xF5A6545DcC6936AC939056816e75c951a08fa3f0" +erc20_bridge_proxy_addr = "0x012056b2bD54e4215D8C1A5d17CB9956a84CFAAc" +shared_bridge_implementation_addr = "0x95Ac7bf72040fe030F211EbA4c06efFaE40324dD" +shared_bridge_proxy_addr = "0x4582A251c26AaC491A36Aee74b9Ec103da56effE" [deployed_addresses.state_transition] -admin_facet_addr = "0x62476C57821675Af1a33B39EB1655540fDF9a17C" -default_upgrade_addr = "0xf16Fda6af9D791828C86B96d2BEd3055f73AFb13" -diamond_init_addr = "0xAe70b8622851519e3Af6215b0d2bf8Bb7e94EE5E" +admin_facet_addr = "0xf96cB73f69207DFb592A5cfaAE862D914F9c7B5f" +default_upgrade_addr = "0x882f6399bc0bBacCa232e14C3C56525c6EbF599c" +diamond_init_addr = "0xC6D5D5dAF360CF405C9189CD61c80B3a231F9AF9" diamond_proxy_addr = "0x0000000000000000000000000000000000000000" -executor_facet_addr = "0xB6aaC5d171Cfc9c0a4069d825873FFaC5ce96b83" -genesis_upgrade_addr = "0x71750BC31260B2802107505b6914C2c1de87fe53" -getters_facet_addr = "0x4E4Cf6187167B8E081cB736A75D3554cB7090dFc" -mailbox_facet_addr = "0x9C68eFaA09262647f5BBb9AFb4C7fb2DD7C6C642" -state_transition_implementation_addr = "0x71464D3Af9c91EbDdEc6e0EAb60e226FAe580d75" -state_transition_proxy_addr = "0xe4f8f48b99d537067f45b46205E9c36a6A4c984a" -verifier_addr = "0x64Fd27c7082F2f3E4F8629977eaB095b82ddC422" +executor_facet_addr = "0xC6c467b3194C0C4D00271727d321634AF6c0E205" +genesis_upgrade_addr = "0xF7260f5de7762B3ccF529F05226c6d9bFc66620A" +getters_facet_addr = "0x0De0bbb7Ca452668332afDfA04f2ec54a4aDbe12" +mailbox_facet_addr = "0x19f0dBf4Fb6c4e1a637620d963a97b47C4B2AfC2" +state_transition_implementation_addr = "0x559296f30630Ce6818Ca81c7eb2cC56282b2B05c" +state_transition_proxy_addr = "0x5Da2B8E18b4347767924aFaCb82c8C106d635842" +verifier_addr = "0xF44dBFf7963D66Ef6Ac70d6E95E9f5CF043F617a" diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/Admin.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/Admin.t.sol similarity index 98% rename from l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/Admin.t.sol rename to l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/Admin.t.sol index 2bad40139..6c3c27b89 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/Admin.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/Admin.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol +import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol"; import {ChainTypeManagerTest} from "./_ChainTypeManager_Shared.t.sol"; contract AdminTest is ChainTypeManagerTest { diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/CreateNewChain.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/CreateNewChain.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/CreateNewChain.t.sol rename to l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/CreateNewChain.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/FreezeChain.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/FreezeChain.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/FreezeChain.t.sol rename to l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/FreezeChain.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/RevertBatches.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/RevertBatches.t.sol rename to l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetChainCreationParams.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetChainCreationParams.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetChainCreationParams.t.sol rename to l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetChainCreationParams.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetNewVersionUpgrade.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetNewVersionUpgrade.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetNewVersionUpgrade.t.sol rename to l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetNewVersionUpgrade.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetUpgradeDiamondCut.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetUpgradeDiamondCut.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetUpgradeDiamondCut.t.sol rename to l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetUpgradeDiamondCut.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetValidatorTimelock.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetValidatorTimelock.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetValidatorTimelock.t.sol rename to l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetValidatorTimelock.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/StateTransitionOwnerZero.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/StateTransitionOwnerZero.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/StateTransitionOwnerZero.t.sol rename to l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/StateTransitionOwnerZero.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/_StateTransitionManager_Shared.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/_StateTransitionManager_Shared.t.sol rename to l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol index 0d1aebe92..f7a546924 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol @@ -25,8 +25,8 @@ contract ChangeFeeParamsTest is AdminTest { ); } - function test_revertWhen_calledByNonChainTypeManagerlic { - address nonChainTypeManagereAddr("nonChainTChainTypeManager + function test_revertWhen_calledByNonChainTypeManager() public { + address nonChainTypeManager = makeAddr("nonChainTypeManager"); FeeParams memory newFeeParams = FeeParams({ pubdataPricingMode: PubdataPricingMode.Rollup, batchOverheadL1Gas: 1_000_000, @@ -36,14 +36,14 @@ contract ChangeFeeParamsTest is AdminTest { minimalL2GasPrice: 250_000_000 }); - vm.startPrank(nonChainTypeManager - vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonChainTypeManager + vm.startPrank(nonChainTypeManager); + vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, nonChainTypeManager)); adminFacet.changeFeeParams(newFeeParams); } function test_revertWhen_newMaxPubdataPerBatchIsLessThanMaxPubdataPerTransaction() public { - address chainTypeManager = utilsFacet.util_getChainTypeManager + address chainTypeManager = utilsFacet.util_getChainTypeManager(); uint32 priorityTxMaxPubdata = 88_000; uint32 maxPubdataPerBatch = priorityTxMaxPubdata - 1; FeeParams memory newFeeParams = FeeParams({ @@ -62,7 +62,7 @@ contract ChangeFeeParamsTest is AdminTest { } function test_successfulChange() public { - address chainTypeManager = utilsFacet.util_getChainTypeManager + address chainTypeManager = utilsFacet.util_getChainTypeManager(); FeeParams memory oldFeeParams = utilsFacet.util_getFeeParams(); FeeParams memory newFeeParams = FeeParams({ pubdataPricingMode: PubdataPricingMode.Rollup, From ae911bba95f91731e03f3edf5ab1ff32396f8339 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Wed, 4 Sep 2024 23:41:38 +0200 Subject: [PATCH 17/53] fix ts tests --- docs/gateway/chain-migration.md | 8 +-- docs/gateway/contracts-review-gateway.md | 4 +- .../PrepareZKChainRegistrationCalldata.s.sol | 4 +- l1-contracts/scripts/sync-layer.ts | 24 ++++---- .../scripts/upgrade-consistency-checker.ts | 32 +++++----- l1-contracts/src.ts/deploy-test-process.ts | 4 +- l1-contracts/src.ts/deploy-utils.ts | 8 +-- l1-contracts/src.ts/deploy.ts | 60 +++++++++---------- l1-contracts/src.ts/utils.ts | 2 +- .../test/test_config/constant/hardhat.json | 34 +++++------ l1-contracts/test/unit_tests/gateway.spec.ts | 2 +- .../validator_timelock_test.spec.ts | 4 +- .../src/upgrade-consistency-checker.ts | 2 +- 13 files changed, 94 insertions(+), 94 deletions(-) diff --git a/docs/gateway/chain-migration.md b/docs/gateway/chain-migration.md index e19276ec2..c638cc5c9 100644 --- a/docs/gateway/chain-migration.md +++ b/docs/gateway/chain-migration.md @@ -2,11 +2,11 @@ Chain migration uses the Custom Asset Bridging framework: -- STMs can be deployed on the Gateway. Each STM has its own assetId. -- The STM Deployment Tracker deployed on L1 registers assetId in the L1 and L2 AssetRouters, with the Bridgehub as the AssetHandler. It also registers the L1 and L2 STM contracts to be associated to the assetId in the Bridgehubs. -- Bridging of a chain happens via the Bridgehub, AssetRouters, and STM. +- CTMs can be deployed on the Gateway. Each CTM has its own assetId. +- The CTM Deployment Tracker deployed on L1 registers assetId in the L1 and L2 AssetRouters, with the Bridgehub as the AssetHandler. It also registers the L1 and L2 CTM contracts to be associated to the assetId in the Bridgehubs. +- Bridging of a chain happens via the Bridgehub, AssetRouters, and CTM. -![STM assetId registration](./chain-asset-id-registration.png) +![CTM assetId registration](./chain-asset-id-registration.png) _Note these are separate calls_ ![Chain migration](./chain-migration.png) diff --git a/docs/gateway/contracts-review-gateway.md b/docs/gateway/contracts-review-gateway.md index 21ffe5885..ea0f9936f 100644 --- a/docs/gateway/contracts-review-gateway.md +++ b/docs/gateway/contracts-review-gateway.md @@ -10,7 +10,7 @@ List of changes and new features: - Custom Data Availability contracts. This is needed to handle the relayed data availability on the Gateway. - L1 -> Gateway -> ZKChain transactions. This is done by forwarding transactions to Chain's Mailbox on the Gateway via the Gateway's Mailbox. - ZKChain -> Gateway -> L1 transactions. This is done by aggregating the logs of different chains in the MessageRoot contract, and sending a single log to L1. -- Migration of chains to and from the Gateway. This is done using our Custom Asset Bridging framework, each STM has an assetId and is managed by a shared STMDeploymentTracker, the L2AssetRouter = L2SharedBridge is deployed on the Gateway, but only holds the chains as assets, with the Bridgehub as the AssetHandler. +- Migration of chains to and from the Gateway. This is done using our Custom Asset Bridging framework, each CTM has an assetId and is managed by a shared CTMDeploymentTracker, the L2AssetRouter = L2SharedBridge is deployed on the Gateway, but only holds the chains as assets, with the Bridgehub as the AssetHandler. Other smaller changes: @@ -56,7 +56,7 @@ Known issues, and features that still need to be implemented: The majority of the rest of the changes. This makes the scope quite big, so please focus on the initial scope in more detail, and if you have time include the later scope. - MessageRoot.sol -- STMDeploymentTracker.sol +- CTMDeploymentTracker.sol - Bridgehub.sol - Config.sol - L2ContractAddresses.sol diff --git a/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol index 63f8d6084..9a0447d56 100644 --- a/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol +++ b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol @@ -58,7 +58,7 @@ contract PrepareZKChainRegistrationCalldataScript is Script { struct Config { // Admin of the yet-to-be-registered chain (L1-based address) address chainAdmin; - // STM proxy address + // CTM proxy address address stateTransitionProxy; // Chain ID of the new chain uint256 chainId; @@ -69,7 +69,7 @@ contract PrepareZKChainRegistrationCalldataScript is Script { // Address of the new chain's base token address baseToken; // Diamond cut data is a "configuration" for the Diamond proxy that will be created for a new chain. - // It can only be the one that's allowed by the STM. It can be generated by the other scripts or taken from the + // It can only be the one that's allowed by the CTM. It can be generated by the other scripts or taken from the // `etc/env/ecosystems/ENV.yaml` file in `zksync-era` repository bytes diamondCutData; // Address of the L1 ERC20 bridge proxy (required for the L2 bridge deployment) diff --git a/l1-contracts/scripts/sync-layer.ts b/l1-contracts/scripts/sync-layer.ts index ec0a5c372..d05766d1c 100644 --- a/l1-contracts/scripts/sync-layer.ts +++ b/l1-contracts/scripts/sync-layer.ts @@ -306,7 +306,7 @@ async function main() { } async function registerSLContractsOnL1(deployer: Deployer) { - /// STM asset info + /// CTM asset info /// l2Bridgehub in L1Bridghub const chainId = getNumberFromEnv("CHAIN_ETH_ZKSYNC_NETWORK_ID"); @@ -314,11 +314,11 @@ async function registerSLContractsOnL1(deployer: Deployer) { console.log(`Gateway chain Id: ${chainId}`); const l1Bridgehub = deployer.bridgehubContract(deployer.deployWallet); - const l1STM = deployer.chainTypeManagerContract(deployer.deployWallet); + const l1CTM = deployer.chainTypeManagerContract(deployer.deployWallet); console.log(deployer.addresses.StateTransition.StateTransitionProxy); const gatewayAddress = await l1Bridgehub.getHyperchain(chainId); // this script only works when owner is the deployer - console.log("Registering Gateway chain id on the STM"); + console.log("Registering Gateway chain id on the CTM"); const receipt1 = await deployer.executeUpgrade( l1Bridgehub.address, 0, @@ -346,7 +346,7 @@ async function registerSLContractsOnL1(deployer: Deployer) { const assetRouter = deployer.defaultSharedBridge(deployer.deployWallet); const assetId = await l1Bridgehub.ctmAssetIdFromChainId(chainId); - // Setting the L2 bridgehub as the counterpart for the STM asset + // Setting the L2 bridgehub as the counterpart for the CTM asset const receipt2 = await deployer.executeUpgrade( l1Bridgehub.address, ethIsBaseToken ? value : 0, @@ -367,21 +367,21 @@ async function registerSLContractsOnL1(deployer: Deployer) { ]) ); const l2TxHash = zkUtils.getL2HashFromPriorityOp(receipt2, gatewayAddress); - console.log("STM asset registered in L2SharedBridge on SL l2 tx hash: ", l2TxHash); + console.log("CTM asset registered in L2SharedBridge on SL l2 tx hash: ", l2TxHash); - const l2STMAddress = getAddressFromEnv("GATEWAY_STATE_TRANSITION_PROXY_ADDR"); + const l2CTMAddress = getAddressFromEnv("GATEWAY_STATE_TRANSITION_PROXY_ADDR"); - // Whitelisting the STM address on L2 + // Whitelisting the CTM address on L2 const receipt3 = await deployer.executeUpgradeOnL2( chainId, L2_BRIDGEHUB_ADDRESS, gasPrice, - l1Bridgehub.interface.encodeFunctionData("addChainTypeManager", [l2STMAddress]), + l1Bridgehub.interface.encodeFunctionData("addChainTypeManager", [l2CTMAddress]), priorityTxMaxGasLimit ); - console.log(`L2 STM address ${l2STMAddress} registered on gateway, txHash: ${receipt3.transactionHash}`); + console.log(`L2 CTM address ${l2CTMAddress} registered on gateway, txHash: ${receipt3.transactionHash}`); - // Setting the corresponding STM address on L2. + // Setting the corresponding CTM address on L2. const receipt4 = await deployer.executeUpgrade( l1Bridgehub.address, value, @@ -396,12 +396,12 @@ async function registerSLContractsOnL1(deployer: Deployer) { secondBridgeAddress: ctmDeploymentTracker.address, secondBridgeValue: 0, secondBridgeCalldata: - "0x01" + ethers.utils.defaultAbiCoder.encode(["address", "address"], [l1STM.address, l2STMAddress]).slice(2), + "0x01" + ethers.utils.defaultAbiCoder.encode(["address", "address"], [l1CTM.address, l2CTMAddress]).slice(2), }, ]) ); const l2TxHash3 = zkUtils.getL2HashFromPriorityOp(receipt4, gatewayAddress); - console.log("STM asset registered in L2 Bridgehub on SL", l2TxHash3); + console.log("CTM asset registered in L2 Bridgehub on SL", l2TxHash3); } // TODO: maybe move it to SDK diff --git a/l1-contracts/scripts/upgrade-consistency-checker.ts b/l1-contracts/scripts/upgrade-consistency-checker.ts index ecae97d84..58a0f66e4 100644 --- a/l1-contracts/scripts/upgrade-consistency-checker.ts +++ b/l1-contracts/scripts/upgrade-consistency-checker.ts @@ -14,7 +14,7 @@ import { encodeNTVAssetId } from "../src.ts/utils"; // Things that still have to be manually double checked: // 1. Contracts must be verified. -// 2. Getter methods in STM. +// 2. Getter methods in CTM. // List the contracts that should become the upgrade targets const genesisUpgrade = process.env.CONTRACTS_GENESIS_UPGRADE_ADDR!; @@ -278,7 +278,7 @@ async function extractProxyInitializationData(contract: ethers.Contract, data: s throw new Error("L2 default account bytecode hash is not correct"); } - console.log("STM init data correct!"); + console.log("CTM init data correct!"); } async function checkValidatorTimelock() { @@ -338,12 +338,12 @@ async function checkBridgehub() { throw new Error("Bridgehub sharedBridge is not correct"); } - const usedSTM = await contract.chainTypeManager(eraChainId); - if (usedSTM.toLowerCase() != ctm.toLowerCase()) { + const usedCTM = await contract.chainTypeManager(eraChainId); + if (usedCTM.toLowerCase() != ctm.toLowerCase()) { throw new Error("Bridgehub chainTypeManager is not correct"); } - const isRegistered = await contract.chainTypeManagerIsRegistered(usedSTM); + const isRegistered = await contract.chainTypeManagerIsRegistered(usedCTM); if (!isRegistered) { throw new Error("Bridgehub chainTypeManager is not registered"); } @@ -368,45 +368,45 @@ async function checkMailbox() { console.log("Mailbox is correct!"); } -async function checkSTMImpl() { +async function checkCTMImpl() { const artifact = await hardhat.artifacts.readArtifact("ChainTypeManager"); const contract = new ethers.Contract(ctmImpl, artifact.abi, l1Provider); await checkCorrectInitCode(ctmImplDeployTx, contract, artifact.bytecode, [bridgeHub, maxNumberOfHyperchains]); - console.log("STM impl correct!"); + console.log("CTM impl correct!"); } -async function checkSTM() { +async function checkCTM() { const artifact = await hardhat.artifacts.readArtifact("ChainTypeManager"); const contract = new ethers.Contract(ctm, artifact.abi, l1Provider); const usedBH = await contract.BRIDGE_HUB(); if (usedBH.toLowerCase() != bridgeHub.toLowerCase()) { - throw new Error("STM bridgeHub is not correct"); + throw new Error("CTM bridgeHub is not correct"); } const usedMaxNumberOfHyperchains = (await contract.MAX_NUMBER_OF_HYPERCHAINS()).toNumber(); if (usedMaxNumberOfHyperchains != maxNumberOfHyperchains) { - throw new Error("STM maxNumberOfHyperchains is not correct"); + throw new Error("CTM maxNumberOfHyperchains is not correct"); } const genUpgrade = await contract.genesisUpgrade(); if (genUpgrade.toLowerCase() != genesisUpgrade.toLowerCase()) { - throw new Error("STM genesisUpgrade is not correct"); + throw new Error("CTM genesisUpgrade is not correct"); } const storedBatchHashZero = await contract.storedBatchZero(); if (storedBatchHashZero.toLowerCase() != expectedStoredBatchHashZero.toLowerCase()) { - throw new Error("STM storedBatchHashZero is not correct"); + throw new Error("CTM storedBatchHashZero is not correct"); } const currentOwner = await contract.owner(); if (currentOwner.toLowerCase() != expectedOwner.toLowerCase()) { - throw new Error("STM owner is not correct"); + throw new Error("CTM owner is not correct"); } - console.log("STM is correct!"); + console.log("CTM is correct!"); await extractProxyInitializationData(contract, (await l1Provider.getTransaction(ctmDeployTx)).data); } @@ -502,8 +502,8 @@ async function main() { await checkLegacyBridge(); - await checkSTMImpl(); - await checkSTM(); + await checkCTMImpl(); + await checkCTM(); }); await program.parseAsync(process.argv); diff --git a/l1-contracts/src.ts/deploy-test-process.ts b/l1-contracts/src.ts/deploy-test-process.ts index 51f23d2d8..f54e74d16 100644 --- a/l1-contracts/src.ts/deploy-test-process.ts +++ b/l1-contracts/src.ts/deploy-test-process.ts @@ -185,8 +185,8 @@ export async function initialPreUpgradeContractsDeployment( // note we should also deploy the old ERC20Bridge here, but we can do that later. // // for Era we first deploy the DiamondProxy manually, set the vars manually, - // // and register it in the system via STM.registerAlreadyDeployedStateTransition and bridgehub.createNewChain(ERA_CHAIN_ID, ..) - // // note we just deploy the STM to get the storedBatchZero + // // and register it in the system via CTM.registerAlreadyDeployedStateTransition and bridgehub.createNewChain(ERA_CHAIN_ID, ..) + // // note we just deploy the CTM to get the storedBatchZero await deployer.deployDiamondProxy(extraFacets, {}); // we have to know the address of the diamond proxy in the mailbox so we separate the deployment diff --git a/l1-contracts/src.ts/deploy-utils.ts b/l1-contracts/src.ts/deploy-utils.ts index 3c18645a0..1f2f265f7 100644 --- a/l1-contracts/src.ts/deploy-utils.ts +++ b/l1-contracts/src.ts/deploy-utils.ts @@ -102,8 +102,8 @@ export interface DeployedAddresses { Bridgehub: { BridgehubProxy: string; BridgehubImplementation: string; - STMDeploymentTrackerImplementation: string; - STMDeploymentTrackerProxy: string; + CTMDeploymentTrackerImplementation: string; + CTMDeploymentTrackerProxy: string; MessageRootImplementation: string; MessageRootProxy: string; }; @@ -161,8 +161,8 @@ export function deployedAddressesFromEnv(): DeployedAddresses { Bridgehub: { BridgehubProxy: getAddressFromEnv("CONTRACTS_BRIDGEHUB_PROXY_ADDR"), BridgehubImplementation: getAddressFromEnv("CONTRACTS_BRIDGEHUB_IMPL_ADDR"), - STMDeploymentTrackerImplementation: getAddressFromEnv("CONTRACTS_STM_DEPLOYMENT_TRACKER_IMPL_ADDR"), - STMDeploymentTrackerProxy: getAddressFromEnv("CONTRACTS_STM_DEPLOYMENT_TRACKER_PROXY_ADDR"), + CTMDeploymentTrackerImplementation: getAddressFromEnv("CONTRACTS_CTM_DEPLOYMENT_TRACKER_IMPL_ADDR"), + CTMDeploymentTrackerProxy: getAddressFromEnv("CONTRACTS_CTM_DEPLOYMENT_TRACKER_PROXY_ADDR"), MessageRootImplementation: getAddressFromEnv("CONTRACTS_MESSAGE_ROOT_IMPL_ADDR"), MessageRootProxy: getAddressFromEnv("CONTRACTS_MESSAGE_ROOT_PROXY_ADDR"), }, diff --git a/l1-contracts/src.ts/deploy.ts b/l1-contracts/src.ts/deploy.ts index 7f1b84ba7..5b1eb4ea6 100644 --- a/l1-contracts/src.ts/deploy.ts +++ b/l1-contracts/src.ts/deploy.ts @@ -48,7 +48,7 @@ import { compileInitialCutHash, readBytecode, applyL1ToL2Alias, - BRIDGEHUB_STM_ASSET_DATA_ABI_STRING, + BRIDGEHUB_CTM_ASSET_DATA_ABI_STRING, // priorityTxMaxGasLimit, encodeNTVAssetId, ETH_ADDRESS_IN_CONTRACTS, @@ -72,7 +72,7 @@ import { BridgehubFactory, ChainAdminFactory, ERC20Factory, ChainTypeManagerFact import { IL1AssetRouterFactory } from "../typechain/IL1AssetRouterFactory"; import { IL1NativeTokenVaultFactory } from "../typechain/IL1NativeTokenVaultFactory"; -import { ISTMDeploymentTrackerFactory } from "../typechain/ISTMDeploymentTrackerFactory"; +import { ICTMDeploymentTrackerFactory } from "../typechain/ICTMDeploymentTrackerFactory"; import { TestnetERC20TokenFactory } from "../typechain/TestnetERC20TokenFactory"; @@ -172,9 +172,9 @@ export class Deployer { this.deployWallet ); - const hashFromSTM = await ctm.initialCutHash(); - if (hash != hashFromSTM) { - throw new Error(`Has from STM ${hashFromSTM} does not match the computed hash ${hash}`); + const hashFromCTM = await ctm.initialCutHash(); + if (hash != hashFromCTM) { + throw new Error(`Has from CTM ${hashFromCTM} does not match the computed hash ${hash}`); } } @@ -918,48 +918,48 @@ export class Deployer { } } - public async deploySTMDeploymentTrackerImplementation( + public async deployCTMDeploymentTrackerImplementation( create2Salt: string, ethTxOptions: ethers.providers.TransactionRequest ) { const contractAddress = await this.deployViaCreate2( - "STMDeploymentTracker", + "CTMDeploymentTracker", [this.addresses.Bridgehub.BridgehubProxy, this.addresses.Bridges.SharedBridgeProxy], create2Salt, ethTxOptions ); if (this.verbose) { - console.log(`CONTRACTS_STM_DEPLOYMENT_TRACKER_IMPL_ADDR=${contractAddress}`); + console.log(`CONTRACTS_CTM_DEPLOYMENT_TRACKER_IMPL_ADDR=${contractAddress}`); } - this.addresses.Bridgehub.STMDeploymentTrackerImplementation = contractAddress; + this.addresses.Bridgehub.CTMDeploymentTrackerImplementation = contractAddress; } - public async deploySTMDeploymentTrackerProxy(create2Salt: string, ethTxOptions: ethers.providers.TransactionRequest) { + public async deployCTMDeploymentTrackerProxy(create2Salt: string, ethTxOptions: ethers.providers.TransactionRequest) { const initCalldata = new Interface( - hardhat.artifacts.readArtifactSync("STMDeploymentTracker").abi + hardhat.artifacts.readArtifactSync("CTMDeploymentTracker").abi ).encodeFunctionData("initialize", [this.addresses.Governance]); const contractAddress = await this.deployViaCreate2( "TransparentUpgradeableProxy", - [this.addresses.Bridgehub.STMDeploymentTrackerImplementation, this.addresses.TransparentProxyAdmin, initCalldata], + [this.addresses.Bridgehub.CTMDeploymentTrackerImplementation, this.addresses.TransparentProxyAdmin, initCalldata], create2Salt, ethTxOptions ); if (this.verbose) { - console.log(`CONTRACTS_STM_DEPLOYMENT_TRACKER_PROXY_ADDR=${contractAddress}`); + console.log(`CONTRACTS_CTM_DEPLOYMENT_TRACKER_PROXY_ADDR=${contractAddress}`); } - this.addresses.Bridgehub.STMDeploymentTrackerProxy = contractAddress; + this.addresses.Bridgehub.CTMDeploymentTrackerProxy = contractAddress; // const bridgehub = this.bridgehubContract(this.deployWallet); - // const data0 = bridgehub.interface.encodeFunctionData("setSTMDeployer", [ - // this.addresses.Bridgehub.STMDeploymentTrackerProxy, + // const data0 = bridgehub.interface.encodeFunctionData("setCTMDeployer", [ + // this.addresses.Bridgehub.CTMDeploymentTrackerProxy, // ]); // await this.executeUpgrade(this.addresses.Bridgehub.BridgehubProxy, 0, data0); // if (this.verbose) { - // console.log("STM DT registered in Bridgehub"); + // console.log("CTM DT registered in Bridgehub"); // } } @@ -978,7 +978,7 @@ export class Deployer { const upgradeData1 = await bridgehub.interface.encodeFunctionData("setAddresses", [ this.addresses.Bridges.SharedBridgeProxy, - this.addresses.Bridgehub.STMDeploymentTrackerProxy, + this.addresses.Bridgehub.CTMDeploymentTrackerProxy, this.addresses.Bridgehub.MessageRootProxy, ]); await this.executeUpgrade(this.addresses.Bridgehub.BridgehubProxy, 0, upgradeData1); @@ -1120,23 +1120,23 @@ export class Deployer { ]); const receipt2 = await this.executeUpgrade(l1AssetRouter.address, 0, whitelistData); if (this.verbose) { - console.log("STM deployment tracker whitelisted in L1 Shared Bridge", receipt2.gasUsed.toString()); + console.log("CTM deployment tracker whitelisted in L1 Shared Bridge", receipt2.gasUsed.toString()); console.log( - `CONTRACTS_STM_ASSET_INFO=${await bridgehub.ctmAssetId(this.addresses.StateTransition.StateTransitionProxy)}` + `CONTRACTS_CTM_ASSET_INFO=${await bridgehub.ctmAssetId(this.addresses.StateTransition.StateTransitionProxy)}` ); } - const data1 = ctmDeploymentTracker.interface.encodeFunctionData("registerSTMAssetOnL1", [ + const data1 = ctmDeploymentTracker.interface.encodeFunctionData("registerCTMAssetOnL1", [ this.addresses.StateTransition.StateTransitionProxy, ]); - const receipt3 = await this.executeUpgrade(this.addresses.Bridgehub.STMDeploymentTrackerProxy, 0, data1); + const receipt3 = await this.executeUpgrade(this.addresses.Bridgehub.CTMDeploymentTrackerProxy, 0, data1); if (this.verbose) { console.log( - "STM asset registered in L1 Shared Bridge via STM Deployment Tracker", + "CTM asset registered in L1 Shared Bridge via CTM Deployment Tracker", receipt3.gasUsed.toString() ); console.log( - `CONTRACTS_STM_ASSET_INFO=${await bridgehub.ctmAssetId(this.addresses.StateTransition.StateTransitionProxy)}` + `CONTRACTS_CTM_ASSET_INFO=${await bridgehub.ctmAssetId(this.addresses.StateTransition.StateTransitionProxy)}` ); } } @@ -1170,7 +1170,7 @@ export class Deployer { const ctmData = new ethers.utils.AbiCoder().encode(["uint256", "bytes"], [newAdmin, initialDiamondCut]); const bridgehubData = new ethers.utils.AbiCoder().encode( - [BRIDGEHUB_STM_ASSET_DATA_ABI_STRING], + [BRIDGEHUB_CTM_ASSET_DATA_ABI_STRING], [[this.chainId, ctmData, chainData]] ); @@ -1267,7 +1267,7 @@ export class Deployer { const baseTokenAddress = await ntv.tokenAddress(baseTokenAssetId); const inputChainId = predefinedChainId || getNumberFromEnv("CHAIN_ETH_ZKSYNC_NETWORK_ID"); - const alreadyRegisteredInSTM = + const alreadyRegisteredInCTM = (await chainTypeManager.getHyperchain(inputChainId)) != ethers.constants.AddressZero; const admin = process.env.CHAIN_ADMIN_ADDRESS || this.ownerAddress; @@ -1324,7 +1324,7 @@ export class Deployer { console.log(`CONTRACTS_BASE_TOKEN_ADDR=${baseTokenAddress}`); } - if (!alreadyRegisteredInSTM) { + if (!alreadyRegisteredInCTM) { const diamondProxyAddress = "0x" + receipt.logs @@ -1440,8 +1440,8 @@ export class Deployer { await this.deploySharedBridgeProxy(create2Salt, { gasPrice, nonce: nonce + 1 }); await this.deployNativeTokenVaultImplementation(create2Salt, { gasPrice, nonce: nonce + 2 }); await this.deployNativeTokenVaultProxy(create2Salt, { gasPrice }); - await this.deploySTMDeploymentTrackerImplementation(create2Salt, { gasPrice }); - await this.deploySTMDeploymentTrackerProxy(create2Salt, { gasPrice }); + await this.deployCTMDeploymentTrackerImplementation(create2Salt, { gasPrice }); + await this.deployCTMDeploymentTrackerProxy(create2Salt, { gasPrice }); await this.registerAddresses(); } @@ -1590,7 +1590,7 @@ export class Deployer { } public ctmDeploymentTracker(signerOrProvider: Signer | providers.Provider) { - return ISTMDeploymentTrackerFactory.connect(this.addresses.Bridgehub.STMDeploymentTrackerProxy, signerOrProvider); + return ICTMDeploymentTrackerFactory.connect(this.addresses.Bridgehub.CTMDeploymentTrackerProxy, signerOrProvider); } public baseTokenContract(signerOrProvider: Signer | providers.Provider) { diff --git a/l1-contracts/src.ts/utils.ts b/l1-contracts/src.ts/utils.ts index 126639523..3f048dc5d 100644 --- a/l1-contracts/src.ts/utils.ts +++ b/l1-contracts/src.ts/utils.ts @@ -38,7 +38,7 @@ export const DIAMOND_CUT_DATA_ABI_STRING = "tuple(tuple(address facet, uint8 action, bool isFreezable, bytes4[] selectors)[] facetCuts, address initAddress, bytes initCalldata)"; export const FORCE_DEPLOYMENT_ABI_STRING = "tuple(bytes32 bytecodeHash, address newAddress, bool callConstructor, uint256 value, bytes input)[]"; -export const BRIDGEHUB_STM_ASSET_DATA_ABI_STRING = "tuple(uint256 chainId, bytes ctmData, bytes chainData)"; +export const BRIDGEHUB_CTM_ASSET_DATA_ABI_STRING = "tuple(uint256 chainId, bytes ctmData, bytes chainData)"; export function applyL1ToL2Alias(address: string): string { return ethers.utils.hexlify(ethers.BigNumber.from(address).add(L1_TO_L2_ALIAS_OFFSET).mod(ADDRESS_MODULO)); diff --git a/l1-contracts/test/test_config/constant/hardhat.json b/l1-contracts/test/test_config/constant/hardhat.json index 2af0fafc8..1f62a51f3 100644 --- a/l1-contracts/test/test_config/constant/hardhat.json +++ b/l1-contracts/test/test_config/constant/hardhat.json @@ -3,96 +3,96 @@ "name": "DAI", "symbol": "DAI", "decimals": 18, - "address": "0x0cF9F4F741BC64982B69b925dAB4Bae9624E882A" + "address": "0x3577F97253469b560CD6442AB37A262a292003f3" }, { "name": "wBTC", "symbol": "wBTC", "decimals": 8, - "address": "0x2F7063B72b83d05aCAF311B8B675e4C4C98a17E7" + "address": "0x4A9D48Db0008F8778160dDF142b28a858c427B48" }, { "name": "BAT", "symbol": "BAT", "decimals": 18, - "address": "0x4e5261FDDB30B6FaC019ab8517119B06fb65A8D8" + "address": "0x8ce06E5aF9A1221a88282A5Ce65D750BE16b0079" }, { "name": "GNT", "symbol": "GNT", "decimals": 18, - "address": "0xC04fcb89ea8AF6E0d7407304F6f8e2471975f676" + "address": "0xF1286aD858DeE56B79D5F23f14040849fA3631dA" }, { "name": "MLTT", "symbol": "MLTT", "decimals": 18, - "address": "0x0bADaf09ddaC0F1Fd1ef1bc6F9871F322245F075" + "address": "0x9267631d42C7D2747f8e5573169BdceAE87535b8" }, { "name": "DAIK", "symbol": "DAIK", "decimals": 18, - "address": "0x57E6A02f8622D71B293f9c291177C857a1d3FadB" + "address": "0xea21B9a6C6D13d1C6AbAEc73c6F330D601779e15" }, { "name": "wBTCK", "symbol": "wBTCK", "decimals": 8, - "address": "0x9F9Cd69A2a3b296B8C3b0E59A942d1B893c6c988" + "address": "0x389f272Ae7D1061608Af3E2203d24c8e654FcEd5" }, { "name": "BATK", "symbol": "BATS", "decimals": 18, - "address": "0xe7B8C0dd29D50D54b9d75e923FB96562B7513A6f" + "address": "0x6890D8DB20db3A5d06eC6DE69F7DB1d5A183922C" }, { "name": "GNTK", "symbol": "GNTS", "decimals": 18, - "address": "0x4C56e415d1C59c69FE953aEd7C41686f5ee33B2c" + "address": "0x037f096F289dF1c0dBf3C89Dd6CAbc07599dD150" }, { "name": "MLTTK", "symbol": "MLTTS", "decimals": 18, - "address": "0x7D12865902a998Ae6C7B8Bea02277dF1707bB7E2" + "address": "0x23886B9856326226A5de9368C3781843b58Bd2bE" }, { "name": "DAIL", "symbol": "DAIL", "decimals": 18, - "address": "0xD4Ba730aA7b2E7Bb7515b265c39dd0796cF7d440" + "address": "0x039D76D9b98e856da082ddf5Ab504352BB2096E0" }, { "name": "wBTCL", "symbol": "wBTCP", "decimals": 8, - "address": "0xee80cFA1F62427E52A62197A86f76a16eA7b7627" + "address": "0x341a1D5df70E56DCA0bCe2892F70A9e83bFA7958" }, { "name": "BATL", "symbol": "BATW", "decimals": 18, - "address": "0x2dD8d8B7E8489E361fa3a455888a371eDcB645d4" + "address": "0x1268Cf85f3D4306059A3fa7aDE2a9a49467E0E0C" }, { "name": "GNTL", "symbol": "GNTW", "decimals": 18, - "address": "0x3dE741Ebc93DbEC9C97eccbbA1aD2577b4335980" + "address": "0x75fe8be7615e5b8b116AF4ffD67993E03b7568b5" }, { "name": "MLTTL", "symbol": "MLTTW", "decimals": 18, - "address": "0x6989065500a6B9AAF59F3DCC4cf9e30d0ea9d394" + "address": "0x35e4ba9B6913426C15410DeD184Ba642E858f3Ef" }, { "name": "Wrapped Ether", "symbol": "WETH", "decimals": 18, - "address": "0x18c1BC9b6049FCC6780549Ad2aA247426f81e916" + "address": "0x8ed463C98Ba3A08d1263D785Ac74CD93bDBbcFD4" } -] +] \ No newline at end of file diff --git a/l1-contracts/test/unit_tests/gateway.spec.ts b/l1-contracts/test/unit_tests/gateway.spec.ts index 55ade079d..8d905397f 100644 --- a/l1-contracts/test/unit_tests/gateway.spec.ts +++ b/l1-contracts/test/unit_tests/gateway.spec.ts @@ -133,7 +133,7 @@ describe("Gateway", function () { }, ]) ); - // console.log("STM asset registered in L2 Bridgehub on SL"); + // console.log("CTM asset registered in L2 Bridgehub on SL"); }); it("Check start message to L3 on L1", async () => { diff --git a/l1-contracts/test/unit_tests/validator_timelock_test.spec.ts b/l1-contracts/test/unit_tests/validator_timelock_test.spec.ts index 23c3a40fc..fbd7edb42 100644 --- a/l1-contracts/test/unit_tests/validator_timelock_test.spec.ts +++ b/l1-contracts/test/unit_tests/validator_timelock_test.spec.ts @@ -73,8 +73,8 @@ describe("ValidatorTimelock tests", function () { validatorTimelockContract.address, validatorTimelockContract.signer ); - const setSTMtx = await validatorTimelock.setChainTypeManager(dummyChainTypeManager.address); - await setSTMtx.wait(); + const setCTMtx = await validatorTimelock.setChainTypeManager(dummyChainTypeManager.address); + await setCTMtx.wait(); }); it("Should check deployment", async () => { diff --git a/l2-contracts/src/upgrade-consistency-checker.ts b/l2-contracts/src/upgrade-consistency-checker.ts index 8bebe197d..da2ebcc29 100644 --- a/l2-contracts/src/upgrade-consistency-checker.ts +++ b/l2-contracts/src/upgrade-consistency-checker.ts @@ -10,7 +10,7 @@ import { Provider } from "zksync-ethers"; // Things that still have to be manually double checked: // 1. Contracts must be verified. -// 2. Getter methods in STM. +// 2. Getter methods in CTM. // List the contracts that should become the upgrade targets const l2BridgeImplAddr = "0x470afaacce2acdaefcc662419b74c79d76c914ae"; From b23bf7ca0814b04770c538b6e46c2e6870c58279 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Wed, 4 Sep 2024 23:47:28 +0200 Subject: [PATCH 18/53] lint --- l1-contracts/contracts/bridgehub/Bridgehub.sol | 6 ++++-- .../contracts/state-transition/ChainTypeManager.sol | 4 +--- l1-contracts/deploy-scripts/DeployL1.s.sol | 4 +--- l1-contracts/src.ts/deploy.ts | 3 +-- .../unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol | 6 +++--- .../chain-deps/facets/Base/_Base_Shared.t.sol | 5 +---- l1-contracts/test/test_config/constant/hardhat.json | 2 +- l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts | 6 +----- 8 files changed, 13 insertions(+), 23 deletions(-) diff --git a/l1-contracts/contracts/bridgehub/Bridgehub.sol b/l1-contracts/contracts/bridgehub/Bridgehub.sol index cdd4ae357..4f1e1d923 100644 --- a/l1-contracts/contracts/bridgehub/Bridgehub.sol +++ b/l1-contracts/contracts/bridgehub/Bridgehub.sol @@ -695,8 +695,10 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus require(hyperchain != address(0), "BH: hyperchain not registered"); require(_prevMsgSender == IZkSyncHyperchain(hyperchain).getAdmin(), "BH: incorrect sender"); - bytes memory ctmMintData = IChainTypeManager(chainTypeManager[bridgeData.chainId]) - .forwardedBridgeBurn(bridgeData.chainId, bridgeData.ctmData); + bytes memory ctmMintData = IChainTypeManager(chainTypeManager[bridgeData.chainId]).forwardedBridgeBurn( + bridgeData.chainId, + bridgeData.ctmData + ); bytes memory chainMintData = IZkSyncHyperchain(hyperchain).forwardedBridgeBurn( hyperchainMap.get(_settlementChainId), _prevMsgSender, diff --git a/l1-contracts/contracts/state-transition/ChainTypeManager.sol b/l1-contracts/contracts/state-transition/ChainTypeManager.sol index 4bd4f02ec..fbffb648c 100644 --- a/l1-contracts/contracts/state-transition/ChainTypeManager.sol +++ b/l1-contracts/contracts/state-transition/ChainTypeManager.sol @@ -116,9 +116,7 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg } /// @dev initialize - function initialize( - ChainTypeManagerInitializeData calldata _initializeData - ) external reentrancyGuardInitializer { + function initialize(ChainTypeManagerInitializeData calldata _initializeData) external reentrancyGuardInitializer { if (_initializeData.owner == address(0)) { revert ZeroAddress(); } diff --git a/l1-contracts/deploy-scripts/DeployL1.s.sol b/l1-contracts/deploy-scripts/DeployL1.s.sol index 19421a5ac..427ab79e6 100644 --- a/l1-contracts/deploy-scripts/DeployL1.s.sol +++ b/l1-contracts/deploy-scripts/DeployL1.s.sol @@ -605,9 +605,7 @@ contract DeployL1Script is Script { function setChainTypeManagerInValidatorTimelock() internal { ValidatorTimelock validatorTimelock = ValidatorTimelock(addresses.validatorTimelock); vm.broadcast(msg.sender); - validatorTimelock.setChainTypeManager( - IChainTypeManager(addresses.stateTransition.stateTransitionProxy) - ); + validatorTimelock.setChainTypeManager(IChainTypeManager(addresses.stateTransition.stateTransitionProxy)); console.log("ChainTypeManager set in ValidatorTimelock"); } diff --git a/l1-contracts/src.ts/deploy.ts b/l1-contracts/src.ts/deploy.ts index 5b1eb4ea6..9778dda1a 100644 --- a/l1-contracts/src.ts/deploy.ts +++ b/l1-contracts/src.ts/deploy.ts @@ -1267,8 +1267,7 @@ export class Deployer { const baseTokenAddress = await ntv.tokenAddress(baseTokenAssetId); const inputChainId = predefinedChainId || getNumberFromEnv("CHAIN_ETH_ZKSYNC_NETWORK_ID"); - const alreadyRegisteredInCTM = - (await chainTypeManager.getHyperchain(inputChainId)) != ethers.constants.AddressZero; + const alreadyRegisteredInCTM = (await chainTypeManager.getHyperchain(inputChainId)) != ethers.constants.AddressZero; const admin = process.env.CHAIN_ADMIN_ADDRESS || this.ownerAddress; const diamondCutData = await this.initialZkSyncHyperchainDiamondCut(extraFacets, compareDiamondCutHash); diff --git a/l1-contracts/test/foundry/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol b/l1-contracts/test/foundry/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol index e215030b5..9a7b7bcf4 100644 --- a/l1-contracts/test/foundry/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol @@ -99,9 +99,9 @@ contract ValidatorTimelockTest is Test { assert(validator.chainTypeManager() == IChainTypeManager(address(chainTypeManager))); DummyChainTypeManagerForValidatorTimelock newManager = new DummyChainTypeManagerForValidatorTimelock( - bob, - zkSync - ); + bob, + zkSync + ); vm.prank(owner); validator.setChainTypeManager(IChainTypeManager(address(newManager))); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol index 0eff0cba7..bcf162669 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol @@ -21,10 +21,7 @@ contract TestBaseFacet is ZkSyncHyperchainBase { function functionWithOnlyAdminOrChainTypeManagerModifier() external onlyAdminOrChainTypeManager {} - function functionWithonlyValidatorOrChainTypeManagerModifier() - external - onlyValidatorOrChainTypeManager - {} + function functionWithonlyValidatorOrChainTypeManagerModifier() external onlyValidatorOrChainTypeManager {} // add this to be excluded from coverage report function test() internal virtual {} diff --git a/l1-contracts/test/test_config/constant/hardhat.json b/l1-contracts/test/test_config/constant/hardhat.json index 1f62a51f3..60af027f7 100644 --- a/l1-contracts/test/test_config/constant/hardhat.json +++ b/l1-contracts/test/test_config/constant/hardhat.json @@ -95,4 +95,4 @@ "decimals": 18, "address": "0x8ed463C98Ba3A08d1263D785Ac74CD93bDBbcFD4" } -] \ No newline at end of file +] diff --git a/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts b/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts index cd8c76f3c..c85afab1f 100644 --- a/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts +++ b/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts @@ -614,11 +614,7 @@ describe("L2 upgrade test", function () { const revertReason = await getCallRevertReason( executeUpgrade(chainId, proxyGetters, chainTypeManager, proxyAdmin, upgrade) ); - await rollBackToVersion( - addToProtocolVersion(initialProtocolVersion, 5, 1).toString(), - chainTypeManager, - upgrade - ); + await rollBackToVersion(addToProtocolVersion(initialProtocolVersion, 5, 1).toString(), chainTypeManager, upgrade); expect(revertReason).to.contains("PreviousUpgradeNotFinalized"); }); From 566a54ba1b5c73ed9ed9071ef378ed84da2e54cc Mon Sep 17 00:00:00 2001 From: Stanislav Bezkorovainyi Date: Thu, 5 Sep 2024 11:44:31 +0200 Subject: [PATCH 19/53] Resolve some of the leftover todos (#765) --- docs/Overview.md | 4 +- .../chain-deps/facets/Admin.sol | 39 +- .../chain-deps/facets/Executor.sol | 13 +- .../chain-deps/facets/Getters.sol | 1 - .../chain-interfaces/IAdmin.sol | 2 +- .../chain-interfaces/IExecutor.sol | 2 - .../chain-interfaces/IGetters.sol | 2 +- .../script-out/output-deploy-l1.toml | 42 +- .../unit/concrete/Executor/Committing.t.sol | 25 +- .../foundry/unit/concrete/Utils/Utils.sol | 19 +- .../foundry/unit/concrete/Utils/Utils.t.sol | 41 +- l1-contracts/test/unit_tests/utils.ts | 7 - .../contracts/data-availability/DAErrors.sol | 2 - .../RollupL2DAValidator.t.sol | 154 ++++++++ .../TestStateDiffComposer.sol | 97 +++++ .../ValidiumL2DAValidator.t.sol | 19 + system-contracts/SystemContractsHashes.json | 52 +-- system-contracts/bootloader/bootloader.yul | 6 +- .../tests/bootloader/bootloader_test.yul | 6 +- system-contracts/contracts/Constants.sol | 2 - .../contracts/SystemContractErrors.sol | 2 - system-contracts/package.json | 1 + system-contracts/test/L1Messenger.spec.ts | 366 ++++++++---------- system-contracts/test/shared/mocks.ts | 3 + 24 files changed, 525 insertions(+), 382 deletions(-) create mode 100644 l2-contracts/test/foundry/unit/data-availability/RollupL2DAValidator.t.sol create mode 100644 l2-contracts/test/foundry/unit/data-availability/TestStateDiffComposer.sol create mode 100644 l2-contracts/test/foundry/unit/data-availability/ValidiumL2DAValidator.t.sol diff --git a/docs/Overview.md b/docs/Overview.md index 4529a8dda..b3003ec88 100644 --- a/docs/Overview.md +++ b/docs/Overview.md @@ -178,12 +178,12 @@ Each L2 -> L1 system log will have a key that is part of the following: ```solidity enum SystemLogKey { L2_TO_L1_LOGS_TREE_ROOT_KEY, - TOTAL_L2_TO_L1_PUBDATA_KEY, - STATE_DIFF_HASH_KEY, PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY, PREV_BATCH_HASH_KEY, CHAINED_PRIORITY_TXN_HASH_KEY, NUMBER_OF_LAYER_1_TXS_KEY, + L2_DA_VALIDATOR_OUTPUT_HASH_KEY, + USED_L2_DA_VALIDATOR_ADDRESS_KEY, EXPECTED_SYSTEM_CONTRACT_UPGRADE_TX_HASH_KEY } ``` diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol index e09f3b6a3..45628bfe8 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol @@ -260,6 +260,12 @@ contract AdminFacet is ZkSyncHyperchainBase, IAdmin { require(currentProtocolVersion == protocolVersion, "STM: protocolVersion not up to date"); + if (block.chainid != L1_CHAIN_ID) { + // We assume that GW -> L1 transactions can never fail and provide no recovery mechanism from it. + // That's why we need to bound the gas that can be consumed during such a migration. + require(s.totalBatchesCommitted == s.totalBatchesExecuted, "Af: not all batches executed"); + } + s.settlementLayer = _settlementLayer; chainBridgeMintData = abi.encode(prepareChainCommitment()); } @@ -391,37 +397,4 @@ contract AdminFacet is ZkSyncHyperchainBase, IAdmin { commitment.batchHashes = batchHashes; } - - // function recoverFromFailedMigrationToGateway( - // uint256 _settlementLayerChainId, - // uint256 _l2BatchNumber, - // uint256 _l2MessageIndex, - // uint16 _l2TxNumberInBatch, - // bytes32[] calldata _merkleProof - // ) external onlyAdmin { - // require(s.settlementLayerState == SettlementLayerState.MigratedFromL1, "not migrated L1"); - - // bytes32 migrationHash = s.settlementLayerMigrationHash; - // require(migrationHash != bytes32(0), "can not recover when there is no migration"); - - // require( - // IBridgehub(s.bridgehub).proveL1ToL2TransactionStatus( - // _settlementLayerChainId, - // migrationHash, - // _l2BatchNumber, - // _l2MessageIndex, - // _l2TxNumberInBatch, - // _merkleProof, - // TxStatus.Failure - // ), - // "Migration not failed" - // ); - - // s.settlementLayerState = SettlementLayerState.ActiveOnL1; - // s.settlementLayerChainId = 0; - // s.settlementLayerMigrationHash = bytes32(0); - - // // We do not need to perform any additional actions, since no changes related to the chain commitment can be performed - // // while the chain is in the "migrated" state. - // } } diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol index ea459a6d0..7d514a673 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol @@ -16,7 +16,7 @@ import {L2_BOOTLOADER_ADDRESS, L2_TO_L1_MESSENGER_SYSTEM_CONTRACT_ADDR, L2_SYSTE import {IStateTransitionManager} from "../../IStateTransitionManager.sol"; import {PriorityTree, PriorityOpsBatchInfo} from "../../libraries/PriorityTree.sol"; import {IL1DAValidator, L1DAValidatorOutput} from "../../chain-interfaces/IL1DAValidator.sol"; -import {BatchNumberMismatch, TimeNotReached, ValueMismatch, HashMismatch, NonIncreasingTimestamp, TimestampError, InvalidLogSender, TxHashMismatch, UnexpectedSystemLog, LogAlreadyProcessed, InvalidProtocolVersion, CanOnlyProcessOneBatch, BatchHashMismatch, UpgradeBatchNumberIsNotZero, NonSequentialBatch, CantExecuteUnprovenBatches, SystemLogsSizeTooBig, InvalidNumberOfBlobs, VerifiedBatchesExceedsCommittedBatches, InvalidProof, RevertedBatchNotAfterNewLastBatch, CantRevertExecutedBatch, L2TimestampTooBig, PriorityOperationsRollingHashMismatch} from "../../../common/L1ContractErrors.sol"; +import {MissingSystemLogs, BatchNumberMismatch, TimeNotReached, ValueMismatch, HashMismatch, NonIncreasingTimestamp, TimestampError, InvalidLogSender, TxHashMismatch, UnexpectedSystemLog, LogAlreadyProcessed, InvalidProtocolVersion, CanOnlyProcessOneBatch, BatchHashMismatch, UpgradeBatchNumberIsNotZero, NonSequentialBatch, CantExecuteUnprovenBatches, SystemLogsSizeTooBig, InvalidNumberOfBlobs, VerifiedBatchesExceedsCommittedBatches, InvalidProof, RevertedBatchNotAfterNewLastBatch, CantRevertExecutedBatch, L2TimestampTooBig, PriorityOperationsRollingHashMismatch} from "../../../common/L1ContractErrors.sol"; // While formally the following import is not used, it is needed to inherit documentation from it import {IZkSyncHyperchainBase} from "../../chain-interfaces/IZkSyncHyperchainBase.sol"; @@ -216,16 +216,15 @@ contract ExecutorFacet is ZkSyncHyperchainBase, IExecutor { } } - // FIXME: temporarily old logs were kept for backwards compatibility. This check cannot work now. - // // We only require 8 logs to be checked, the 9th is if we are expecting a protocol upgrade // Without the protocol upgrade we expect 8 logs: 2^8 - 1 = 255 // With the protocol upgrade we expect 9 logs: 2^9 - 1 = 511 if (_expectedSystemContractUpgradeTxHash == bytes32(0)) { - // require(processedLogs == 255, "b7"); - } else { - // FIXME: do restore this code to the one that was before - require(_checkBit(processedLogs, uint8(SystemLogKey.EXPECTED_SYSTEM_CONTRACT_UPGRADE_TX_HASH_KEY)), "b8"); + if (processedLogs != 127) { + revert MissingSystemLogs(127, processedLogs); + } + } else if (processedLogs != 255) { + revert MissingSystemLogs(255, processedLogs); } } diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol index 7542c63fe..f492c599f 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol @@ -233,7 +233,6 @@ contract GettersFacet is ZkSyncHyperchainBase, IGetters, ILegacyGetters { /// @inheritdoc IGetters function getSettlementLayer() external view returns (address) { - // TODO: consider making private so that no one relies on it return s.settlementLayer; } diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol index 61802b674..486240734 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol @@ -115,7 +115,7 @@ interface IAdmin is IZkSyncHyperchainBase { /// @notice Emitted when an upgrade is executed. event ExecuteUpgrade(Diamond.DiamondCutData diamondCut); - /// TODO: maybe include some params + /// @notice Emitted when the migration to the new settlement layer is complete. event MigrationComplete(); /// @notice Emitted when the contract is frozen. diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol index 6f5462f73..86def9b82 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol @@ -8,8 +8,6 @@ import {PriorityOpsBatchInfo} from "../libraries/PriorityTree.sol"; /// @dev Enum used by L2 System Contracts to differentiate logs. enum SystemLogKey { L2_TO_L1_LOGS_TREE_ROOT_KEY, - TOTAL_L2_TO_L1_PUBDATA_KEY, - STATE_DIFF_HASH_KEY, PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY, PREV_BATCH_HASH_KEY, CHAINED_PRIORITY_TXN_HASH_KEY, diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol index f1eb7f865..4a2aa5c9f 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol @@ -156,6 +156,6 @@ interface IGetters is IZkSyncHyperchainBase { /// @return isFreezable Whether the facet can be frozen by the admin or always accessible function isFacetFreezable(address _facet) external view returns (bool isFreezable); - /// TODO + /// @return The address of the current settlement layer. function getSettlementLayer() external view returns (address); } diff --git a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml index cbb67dc28..917346ec5 100644 --- a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml +++ b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml @@ -2,13 +2,13 @@ create2_factory_addr = "0x4e59b44847b379578588920cA78FbF26c0B4956C" create2_factory_salt = "0x00000000000000000000000000000000000000000000000000000000000000ff" deployer_addr = "0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496" era_chain_id = 9 -force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000002a093831bf373db45086a901f45805c61f07944b1b7f596761f084f8dfc3e0bea2200000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad979ed796c3d846e1b70fae457404e519165deaa186a5f2357eeb1aef830c86b9600000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001629ac8f4a74ebd8df4688cdedcfe5120809a334ecdc277c65e30475a8ed6616100000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9349c400bc5cef9910dcd7cd1328960b14d2c095f0e5d26c14f4f8a467160578500000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000000" +force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002c00000000000000000000000000000000000000000000000000000000000000440479fd527ba27eb8ef691b359730a2d9dd5aa41c783d184ac0a851548be5a1f9600000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9447bf69c0e623e1365f68b9682081c8aaf2005f3346a6bb9df35dc505c91cbbc00000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001542f9245b27fa8a082741b6727b86d24c07131b4afdfb66bba0b75c767bf668500000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9554b5e8820768894caf758e182b80205d2a55d217795c711cc044cf83539f66000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000000a7e2e0952e4de366512e12ba0703e9dd6ea5ca6880aeae0344cdd1b1a3cf13d400000000000000000000000000000000000000000000000000000000000100050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010002" l1_chain_id = 31337 multicall3_addr = "0xb4CA672635D5E33C2725B4F250Dc5D3BFC489469" owner_address = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" [contracts_config] -diamond_cut_data = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000ae70b8622851519e3af6215b0d2bf8bb7e94ee5e0000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc000000000000000000000000062476c57821675af1a33b39eb1655540fdf9a17c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db865000000000000000000000000000000000000000000000000000000000000000000000000000000004e4cf6187167b8e081cb736a75d3554cb7090dfc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005518c73b000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000000000000000000000000000009c68efaa09262647f5bbb9afb4c7fb2dd7c6c642000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab700000000000000000000000000000000000000000000000000000000000000000000000000000000b6aac5d171cfc9c0a4069d825873ffac5ce96b83000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c000000000000000000000000064fd27c7082f2f3e4f8629977eab095b82ddc422000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" +diamond_cut_data = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000ae70b8622851519e3af6215b0d2bf8bb7e94ee5e0000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc000000000000000000000000005dece56f93491d5dda155d918de47cc41e3239b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000000000000000000000000000c64c035376af18afb8f7787554c24199fad29383000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005518c73b000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000000000000000000000000000fc6b3f1e8d93cec434ff208ce9d19011df49b2f4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab7000000000000000000000000000000000000000000000000000000000000000000000000000000003c526b4b50b8a3f20bf4200e728aeb4c1298179b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c000000000000000000000000064fd27c7082f2f3e4f8629977eab095b82ddc422000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" diamond_init_batch_overhead_l1_gas = 1000000 diamond_init_max_l2_gas_per_batch = 80000000 diamond_init_max_pubdata_per_batch = 120000 @@ -24,33 +24,33 @@ recursion_node_level_vk_hash = "0x0000000000000000000000000000000000000000000000 [deployed_addresses] blob_versioned_hash_retriever_addr = "0xA4cB26d6933D2c3E76718D30de8547bCDF8dD241" governance_addr = "0x61918895E9eB44Caf1B8B9b7e625C65b9AFda41E" -native_token_vault_addr = "0xe5e7Bd646699F63A72AF6A11983DB4e8127A154A" +native_token_vault_addr = "0x72c8dA88057aEf671Bc2265c97c061a474b079dE" transparent_proxy_admin_addr = "0xD718d5A27a29FF1cD22403426084bA0d479869a0" -validator_timelock_addr = "0x3C3D72cec2cecC40672b9e144b32ADB3b7Fd084F" +validator_timelock_addr = "0x296D4B4d5F4AD8969FB99bD6E1447B68730731f2" [deployed_addresses.bridgehub] -bridgehub_implementation_addr = "0x66CAF057C87e15eF8108502BD90cB52E2E90Cf5e" -bridgehub_proxy_addr = "0x15b26f421C552Ce0EF27EDDa4f646Ae347Fe0B11" -message_root_implementation_addr = "0xD84b2C4928190dC10Bbb7D87de213509D9F59394" -message_root_proxy_addr = "0x9348A4Dfd3bB679b42eFb06bb77F1B98eE5CF465" -stm_deployment_tracker_implementation_addr = "0x72a154C815aF6505cec588885950Fa1Ae784D2C2" -stm_deployment_tracker_proxy_addr = "0x9fA6Bcfd5A27252299d718557Ae6556d14419D34" +bridgehub_implementation_addr = "0x707A27c33F7A4AC4E565DbaDdb5b419a6b584AE6" +bridgehub_proxy_addr = "0x91779E4566816493541AD16df6BF445043c41713" +message_root_implementation_addr = "0xA53Abaa516fc476b93810484131c2E7772d28B89" +message_root_proxy_addr = "0x2BB1Ddf7EC79b03362c75EDF120c68620531dF00" +stm_deployment_tracker_implementation_addr = "0xa7c7453d96bbB4d3fb3d91AA9e3D8a71F2027238" +stm_deployment_tracker_proxy_addr = "0x9014441FA25B02598dAf1C4049B56eC1E2fECDE9" [deployed_addresses.bridges] -erc20_bridge_implementation_addr = "0xc68a437d6146d097Bf7fEa4135B65D97FC2a6D89" -erc20_bridge_proxy_addr = "0x1be63449BF1Ab0fDFE9D53A73A2a484b61368d94" -shared_bridge_implementation_addr = "0x162D9044486A4bA9A8e3AC0E9171D13e6A9eCf1b" -shared_bridge_proxy_addr = "0x4D8C730646430d6BF2B7a965Ad39c12CBDc7eEcD" +erc20_bridge_implementation_addr = "0x9ac46E47b60258225008080348306D7D8F6cf65f" +erc20_bridge_proxy_addr = "0xd5366f3FF894f8dc364844Ed44E7577E56e8bF55" +shared_bridge_implementation_addr = "0x4274E94711858255df5C142D1dE463b8650726a8" +shared_bridge_proxy_addr = "0xF4854259a618c9b580499763e70fDA8d74947323" [deployed_addresses.state_transition] -admin_facet_addr = "0x62476C57821675Af1a33B39EB1655540fDF9a17C" +admin_facet_addr = "0x05deCE56F93491D5dDA155d918dE47cC41E3239b" default_upgrade_addr = "0xf16Fda6af9D791828C86B96d2BEd3055f73AFb13" diamond_init_addr = "0xAe70b8622851519e3Af6215b0d2bf8Bb7e94EE5E" diamond_proxy_addr = "0x0000000000000000000000000000000000000000" -executor_facet_addr = "0xB6aaC5d171Cfc9c0a4069d825873FFaC5ce96b83" -genesis_upgrade_addr = "0x71750BC31260B2802107505b6914C2c1de87fe53" -getters_facet_addr = "0x4E4Cf6187167B8E081cB736A75D3554cB7090dFc" -mailbox_facet_addr = "0x9C68eFaA09262647f5BBb9AFb4C7fb2DD7C6C642" -state_transition_implementation_addr = "0x71464D3Af9c91EbDdEc6e0EAb60e226FAe580d75" -state_transition_proxy_addr = "0xe4f8f48b99d537067f45b46205E9c36a6A4c984a" +executor_facet_addr = "0x3C526b4B50b8A3f20Bf4200e728AEb4C1298179b" +genesis_upgrade_addr = "0x47bE12cEb3F02469fD2d24c563F7a26EAD2214DE" +getters_facet_addr = "0xc64C035376af18aFb8f7787554C24199faD29383" +mailbox_facet_addr = "0xFc6B3f1E8D93CeC434Ff208ce9D19011dF49B2f4" +state_transition_implementation_addr = "0xc4e58Ae93055727E149A20290AB8fc9d2A8713e4" +state_transition_proxy_addr = "0xE738E5bd89Bf84049bcAEa6E5Ee7514BFbE4892f" verifier_addr = "0x64Fd27c7082F2f3E4F8629977eaB095b82ddC422" diff --git a/l1-contracts/test/foundry/unit/concrete/Executor/Committing.t.sol b/l1-contracts/test/foundry/unit/concrete/Executor/Committing.t.sol index f2323358d..e7bfa5fc0 100644 --- a/l1-contracts/test/foundry/unit/concrete/Executor/Committing.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Executor/Committing.t.sol @@ -229,7 +229,7 @@ contract CommittingTest is ExecutorTest { vm.prank(validator); vm.blobhashes(defaultBlobVersionedHashes); - vm.expectRevert(abi.encodeWithSelector(LogAlreadyProcessed.selector, 3)); + vm.expectRevert(abi.encodeWithSelector(LogAlreadyProcessed.selector, 1)); executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); } @@ -330,9 +330,7 @@ contract CommittingTest is ExecutorTest { } function test_RevertWhen_SystemLogIsFromIncorrectAddress() public { - bytes32[9] memory values = [ - bytes32(""), - bytes32(""), + bytes32[7] memory values = [ bytes32(""), bytes32(""), bytes32(""), @@ -342,26 +340,7 @@ contract CommittingTest is ExecutorTest { bytes32("") ]; - bytes[9] memory errors = [ - bytes.concat("lm"), - bytes.concat(""), - bytes.concat(""), - bytes.concat("sc"), - bytes.concat("sv"), - bytes.concat("bl"), - bytes.concat("bk"), - bytes.concat("lp2"), - bytes.concat("vk") - ]; - for (uint256 i = 0; i < values.length; i++) { - // these logs are not checked by the executor, thus they can't cause a revert - if ( - i == uint256(SystemLogKey.TOTAL_L2_TO_L1_PUBDATA_KEY) || i == uint256(SystemLogKey.STATE_DIFF_HASH_KEY) - ) { - continue; - } - bytes[] memory wrongL2Logs = Utils.createSystemLogs(l2DAValidatorOutputHash); address wrongAddress = makeAddr("randomAddress"); wrongL2Logs[i] = Utils.constructL2Log(true, wrongAddress, i, values[i]); diff --git a/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol b/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol index 08291b5b1..e6e9c1ea2 100644 --- a/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol +++ b/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol @@ -60,7 +60,7 @@ library Utils { } function createSystemLogs(bytes32 _outputHash) public returns (bytes[] memory) { - bytes[] memory logs = new bytes[](9); + bytes[] memory logs = new bytes[](7); logs[0] = constructL2Log( true, L2_TO_L1_MESSENGER, @@ -68,44 +68,37 @@ library Utils { bytes32("") ); logs[1] = constructL2Log( - true, - L2_TO_L1_MESSENGER, - uint256(SystemLogKey.TOTAL_L2_TO_L1_PUBDATA_KEY), - 0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563 - ); - logs[2] = constructL2Log(true, L2_TO_L1_MESSENGER, uint256(SystemLogKey.STATE_DIFF_HASH_KEY), bytes32("")); - logs[3] = constructL2Log( true, L2_SYSTEM_CONTEXT_ADDRESS, uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY), bytes32("") ); - logs[4] = constructL2Log( + logs[2] = constructL2Log( true, L2_SYSTEM_CONTEXT_ADDRESS, uint256(SystemLogKey.PREV_BATCH_HASH_KEY), bytes32("") ); - logs[5] = constructL2Log( + logs[3] = constructL2Log( true, L2_BOOTLOADER_ADDRESS, uint256(SystemLogKey.CHAINED_PRIORITY_TXN_HASH_KEY), keccak256("") ); - logs[6] = constructL2Log( + logs[4] = constructL2Log( true, L2_BOOTLOADER_ADDRESS, uint256(SystemLogKey.NUMBER_OF_LAYER_1_TXS_KEY), bytes32("") ); - logs[7] = constructL2Log( + logs[5] = constructL2Log( true, L2_TO_L1_MESSENGER, uint256(SystemLogKey.L2_DA_VALIDATOR_OUTPUT_HASH_KEY), _outputHash ); - logs[8] = constructL2Log( + logs[6] = constructL2Log( true, L2_TO_L1_MESSENGER, uint256(SystemLogKey.USED_L2_DA_VALIDATOR_ADDRESS_KEY), diff --git a/l1-contracts/test/foundry/unit/concrete/Utils/Utils.t.sol b/l1-contracts/test/foundry/unit/concrete/Utils/Utils.t.sol index ffa7770ca..0c9ad684f 100644 --- a/l1-contracts/test/foundry/unit/concrete/Utils/Utils.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Utils/Utils.t.sol @@ -45,7 +45,7 @@ contract UtilsTest is Test { function test_CreateSystemLogs() public { bytes[] memory logs = Utils.createSystemLogs(bytes32(0)); - assertEq(logs.length, 9, "logs length should be correct"); + assertEq(logs.length, 7, "logs length should be correct"); assertEq( logs[0], @@ -60,85 +60,68 @@ contract UtilsTest is Test { assertEq( logs[1], - Utils.constructL2Log( - true, - L2_TO_L1_MESSENGER, - uint256(SystemLogKey.TOTAL_L2_TO_L1_PUBDATA_KEY), - 0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563 - ), - "log[1] should be correct" - ); - - assertEq( - logs[2], - Utils.constructL2Log(true, L2_TO_L1_MESSENGER, uint256(SystemLogKey.STATE_DIFF_HASH_KEY), bytes32("")), - "log[2] should be correct" - ); - - assertEq( - logs[3], Utils.constructL2Log( true, L2_SYSTEM_CONTEXT_ADDRESS, uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY), bytes32("") ), - "log[3] should be correct" + "log[1] should be correct" ); assertEq( - logs[4], + logs[2], Utils.constructL2Log( true, L2_SYSTEM_CONTEXT_ADDRESS, uint256(SystemLogKey.PREV_BATCH_HASH_KEY), bytes32("") ), - "log[4] should be correct" + "log[2] should be correct" ); assertEq( - logs[5], + logs[3], Utils.constructL2Log( true, L2_BOOTLOADER_ADDRESS, uint256(SystemLogKey.CHAINED_PRIORITY_TXN_HASH_KEY), keccak256("") ), - "log[5] should be correct" + "log[3] should be correct" ); assertEq( - logs[6], + logs[4], Utils.constructL2Log( true, L2_BOOTLOADER_ADDRESS, uint256(SystemLogKey.NUMBER_OF_LAYER_1_TXS_KEY), bytes32("") ), - "log[6] should be correct" + "log[4] should be correct" ); assertEq( - logs[7], + logs[5], Utils.constructL2Log( true, L2_TO_L1_MESSENGER, uint256(SystemLogKey.L2_DA_VALIDATOR_OUTPUT_HASH_KEY), bytes32(0) ), - "log[7] should be correct" + "log[5] should be correct" ); assertEq( - logs[8], + logs[6], Utils.constructL2Log( true, L2_TO_L1_MESSENGER, uint256(SystemLogKey.USED_L2_DA_VALIDATOR_ADDRESS_KEY), bytes32(uint256(uint160(L2_DA_VALIDATOR_ADDRESS))) ), - "log[8] should be correct" + "log[6] should be correct" ); } diff --git a/l1-contracts/test/unit_tests/utils.ts b/l1-contracts/test/unit_tests/utils.ts index 70f50de68..3d9fd89b7 100644 --- a/l1-contracts/test/unit_tests/utils.ts +++ b/l1-contracts/test/unit_tests/utils.ts @@ -30,7 +30,6 @@ export const L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR = "0x000000000000000000000000000 export const L2_BYTECODE_COMPRESSOR_ADDRESS = "0x000000000000000000000000000000000000800e"; export const DEPLOYER_SYSTEM_CONTRACT_ADDRESS = "0x0000000000000000000000000000000000008006"; export const PUBDATA_CHUNK_PUBLISHER_ADDRESS = "0x0000000000000000000000000000000000008011"; -const PUBDATA_HASH = "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"; export const SYSTEM_UPGRADE_TX_TYPE = 254; @@ -40,8 +39,6 @@ export function randomAddress() { export enum SYSTEM_LOG_KEYS { L2_TO_L1_LOGS_TREE_ROOT_KEY, - TOTAL_L2_TO_L1_PUBDATA_KEY, - STATE_DIFF_HASH_KEY, PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY, PREV_BATCH_HASH_KEY, CHAINED_PRIORITY_TXN_HASH_KEY, @@ -213,8 +210,6 @@ export function createSystemLogs( ) { return [ constructL2Log(true, L2_TO_L1_MESSENGER, SYSTEM_LOG_KEYS.L2_TO_L1_LOGS_TREE_ROOT_KEY, ethers.constants.HashZero), - constructL2Log(true, L2_TO_L1_MESSENGER, SYSTEM_LOG_KEYS.TOTAL_L2_TO_L1_PUBDATA_KEY, PUBDATA_HASH), - constructL2Log(true, L2_TO_L1_MESSENGER, SYSTEM_LOG_KEYS.STATE_DIFF_HASH_KEY, ethers.constants.HashZero), constructL2Log( true, L2_SYSTEM_CONTEXT_ADDRESS, @@ -264,8 +259,6 @@ export function createSystemLogsWithUpgrade( ) { return [ constructL2Log(true, L2_TO_L1_MESSENGER, SYSTEM_LOG_KEYS.L2_TO_L1_LOGS_TREE_ROOT_KEY, ethers.constants.HashZero), - constructL2Log(true, L2_TO_L1_MESSENGER, SYSTEM_LOG_KEYS.TOTAL_L2_TO_L1_PUBDATA_KEY, PUBDATA_HASH), - constructL2Log(true, L2_TO_L1_MESSENGER, SYSTEM_LOG_KEYS.STATE_DIFF_HASH_KEY, ethers.constants.HashZero), constructL2Log( true, L2_SYSTEM_CONTEXT_ADDRESS, diff --git a/l2-contracts/contracts/data-availability/DAErrors.sol b/l2-contracts/contracts/data-availability/DAErrors.sol index 457c7ff8b..c3f032d2a 100644 --- a/l2-contracts/contracts/data-availability/DAErrors.sol +++ b/l2-contracts/contracts/data-availability/DAErrors.sol @@ -3,8 +3,6 @@ pragma solidity 0.8.24; enum PubdataField { - NumberOfLogs, - LogsHash, MsgHash, Bytecode, StateDiffCompressionVersion, diff --git a/l2-contracts/test/foundry/unit/data-availability/RollupL2DAValidator.t.sol b/l2-contracts/test/foundry/unit/data-availability/RollupL2DAValidator.t.sol new file mode 100644 index 000000000..5a56e7118 --- /dev/null +++ b/l2-contracts/test/foundry/unit/data-availability/RollupL2DAValidator.t.sol @@ -0,0 +1,154 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.8.20; + +// solhint-disable gas-custom-errors + +import {Test} from "forge-std/Test.sol"; + +import {TestStateDiffComposer} from "./TestStateDiffComposer.sol"; + +import {RollupL2DAValidator} from "contracts/data-availability/RollupL2DAValidator.sol"; +import {STATE_DIFF_ENTRY_SIZE} from "contracts/data-availability/StateDiffL2DAValidator.sol"; +import {ReconstructionMismatch, PubdataField} from "contracts/data-availability/DAErrors.sol"; + +import {COMPRESSOR_CONTRACT, PUBDATA_CHUNK_PUBLISHER} from "contracts/L2ContractHelper.sol"; + +import {console2 as console} from "forge-std/Script.sol"; + +contract RollupL2DAValidatorTest is Test { + RollupL2DAValidator internal l2DAValidator; + TestStateDiffComposer internal composer; + + function setUp() public { + l2DAValidator = new RollupL2DAValidator(); + composer = new TestStateDiffComposer(); + + bytes memory emptyArray = new bytes(0); + + // Setting dummy state diffs, so it works fine. + composer.setDummyStateDiffs(1, 0, 64, emptyArray, 0, emptyArray); + + bytes memory verifyCompressedStateDiffsData = abi.encodeCall( + COMPRESSOR_CONTRACT.verifyCompressedStateDiffs, + (0, 64, emptyArray, emptyArray) + ); + vm.mockCall(address(COMPRESSOR_CONTRACT), verifyCompressedStateDiffsData, new bytes(32)); + + bytes memory chunkPubdataToBlobsData = abi.encodeCall( + PUBDATA_CHUNK_PUBLISHER.chunkPubdataToBlobs, + (emptyArray) + ); + vm.mockCall(address(PUBDATA_CHUNK_PUBLISHER), chunkPubdataToBlobsData, new bytes(32)); + } + + function finalizeAndCall(bytes memory revertMessage) internal returns (bytes32) { + bytes32 rollingMessagesHash = composer.correctRollingMessagesHash(); + bytes32 rollingBytecodeHash = composer.correctRollingBytecodesHash(); + bytes memory totalL2ToL1PubdataAndStateDiffs = composer.generateTotalStateDiffsAndPubdata(); + + if (revertMessage.length > 0) { + vm.expectRevert(revertMessage); + } + return + l2DAValidator.validatePubdata( + bytes32(0), + bytes32(0), + rollingMessagesHash, + rollingBytecodeHash, + totalL2ToL1PubdataAndStateDiffs + ); + } + + function test_incorrectChainMessagesHash() public { + composer.appendAMessage("message", true, false); + + bytes memory revertMessage = abi.encodeWithSelector( + ReconstructionMismatch.selector, + PubdataField.MsgHash, + composer.correctRollingMessagesHash(), + composer.currentRollingMessagesHash() + ); + finalizeAndCall(revertMessage); + } + + function test_incorrectChainBytecodeHash() public { + composer.appendBytecode(new bytes(32), true, false); + + bytes memory revertMessage = abi.encodeWithSelector( + ReconstructionMismatch.selector, + PubdataField.Bytecode, + composer.correctRollingBytecodesHash(), + composer.currentRollingBytecodesHash() + ); + finalizeAndCall(revertMessage); + } + + function test_incorrectStateDiffVersion() public { + composer.setDummyStateDiffs(2, 0, 64, new bytes(0), 0, new bytes(0)); + + bytes memory revertMessage = abi.encodeWithSelector( + ReconstructionMismatch.selector, + PubdataField.StateDiffCompressionVersion, + bytes32(uint256(1)), + bytes32(uint256(2)) + ); + finalizeAndCall(revertMessage); + } + + function test_nonZeroLeftOver() public { + composer.setDummyStateDiffs(1, 0, 64, new bytes(0), 0, new bytes(32)); + + bytes memory revertMessage = abi.encodeWithSelector( + ReconstructionMismatch.selector, + PubdataField.ExtraData, + bytes32(0), + bytes32(uint256(32)) + ); + finalizeAndCall(revertMessage); + } + + function test_fullCorrectCompression() public { + composer.appendAMessage("message", true, true); + composer.appendBytecode(new bytes(32), true, true); + + uint256 numberOfStateDiffs = 1; + // Just some non-zero array, the structure does not matter here. + bytes memory compressedStateDiffs = new bytes(12); + bytes memory uncompressedStateDiffs = new bytes(STATE_DIFF_ENTRY_SIZE * numberOfStateDiffs); + + composer.setDummyStateDiffs( + 1, + uint24(compressedStateDiffs.length), + 64, + compressedStateDiffs, + uint32(numberOfStateDiffs), + uncompressedStateDiffs + ); + + bytes32 stateDiffsHash = keccak256(uncompressedStateDiffs); + bytes memory verifyCompressedStateDiffsData = abi.encodeCall( + COMPRESSOR_CONTRACT.verifyCompressedStateDiffs, + (numberOfStateDiffs, 64, uncompressedStateDiffs, compressedStateDiffs) + ); + vm.mockCall(address(COMPRESSOR_CONTRACT), verifyCompressedStateDiffsData, abi.encodePacked(stateDiffsHash)); + + bytes memory totalPubdata = composer.getTotalPubdata(); + bytes32 blobHash = keccak256(totalPubdata); + bytes32[] memory blobHashes = new bytes32[](1); + blobHashes[0] = blobHash; + bytes memory chunkPubdataToBlobsData = abi.encodeCall( + PUBDATA_CHUNK_PUBLISHER.chunkPubdataToBlobs, + (totalPubdata) + ); + vm.mockCall(address(PUBDATA_CHUNK_PUBLISHER), chunkPubdataToBlobsData, abi.encode(blobHashes)); + + bytes32 operatorDAHash = finalizeAndCall(new bytes(0)); + + bytes32 expectedOperatorDAHash = keccak256( + abi.encodePacked(stateDiffsHash, keccak256(totalPubdata), uint8(blobHashes.length), blobHashes) + ); + + assertEq(operatorDAHash, expectedOperatorDAHash); + } +} diff --git a/l2-contracts/test/foundry/unit/data-availability/TestStateDiffComposer.sol b/l2-contracts/test/foundry/unit/data-availability/TestStateDiffComposer.sol new file mode 100644 index 000000000..05c639818 --- /dev/null +++ b/l2-contracts/test/foundry/unit/data-availability/TestStateDiffComposer.sol @@ -0,0 +1,97 @@ +// SPDX-License-Identifier: MIT + +import {L2_TO_L1_LOG_SERIALIZE_SIZE} from "contracts/data-availability/StateDiffL2DAValidator.sol"; + +import {L2ContractHelper} from "contracts/L2ContractHelper.sol"; + +/// @notice The contract that is used in testing to compose the pubdata needed for the +/// state diff DA validator. +contract TestStateDiffComposer { + // The following two are always correct + // as these qre expected to be already checked by the L1Messenger + uint256 internal logsNumber; + bytes internal logs; + + uint256 internal messagesNumber; + bytes internal messages; + bytes32 public currentRollingMessagesHash; + bytes32 public correctRollingMessagesHash; + + uint256 internal bytecodesNumber; + bytes internal bytecodes; + bytes32 public currentRollingBytecodesHash; + bytes32 public correctRollingBytecodesHash; + + bytes internal uncomressedStateDiffsPart; + bytes internal compressedStateDiffsPart; + + function appendALog() public { + // This function is not fully implemented, i.e. we do not insert the correct + // content of the log. The reason for that is that it is not needed for the + // testing + + ++logsNumber; + logs = bytes.concat(logs, new bytes(L2_TO_L1_LOG_SERIALIZE_SIZE)); + } + + function appendAMessage(bytes memory message, bool includeToArray, bool includeToCorrectHash) public { + if (includeToArray) { + ++messagesNumber; + messages = bytes.concat(messages, bytes4(uint32(message.length)), message); + currentRollingMessagesHash = keccak256(abi.encode(currentRollingMessagesHash, keccak256(message))); + } + + if (includeToCorrectHash) { + correctRollingMessagesHash = keccak256(abi.encode(correctRollingMessagesHash, keccak256(message))); + } + } + + function appendBytecode(bytes memory bytecode, bool includeToArray, bool includeToCorrectHash) public { + if (includeToArray) { + ++bytecodesNumber; + bytecodes = bytes.concat(bytecodes, bytes4(uint32(bytecode.length)), bytecode); + currentRollingBytecodesHash = keccak256( + abi.encode(currentRollingBytecodesHash, L2ContractHelper.hashL2BytecodeMemory(bytecode)) + ); + } + if (includeToCorrectHash) { + correctRollingBytecodesHash = keccak256( + abi.encode(correctRollingBytecodesHash, L2ContractHelper.hashL2BytecodeMemory(bytecode)) + ); + } + } + + function setDummyStateDiffs( + uint8 _version, + uint24 _compressedStateDiffSize, + uint8 _enumIndexSize, + bytes memory _compressedStateDiffs, + uint32 _numberOfStateDiffs, + bytes memory _stateDiffs + ) public { + compressedStateDiffsPart = abi.encodePacked( + _version, + _compressedStateDiffSize, + _enumIndexSize, + _compressedStateDiffs + ); + + uncomressedStateDiffsPart = abi.encodePacked(_numberOfStateDiffs, _stateDiffs); + } + + function getTotalPubdata() public returns (bytes memory _totalPubdata) { + _totalPubdata = abi.encodePacked( + uint32(logsNumber), + logs, + uint32(messagesNumber), + messages, + uint32(bytecodesNumber), + bytecodes, + compressedStateDiffsPart + ); + } + + function generateTotalStateDiffsAndPubdata() public returns (bytes memory _totalL2ToL1PubdataAndStateDiffs) { + _totalL2ToL1PubdataAndStateDiffs = abi.encodePacked(getTotalPubdata(), uncomressedStateDiffsPart); + } +} diff --git a/l2-contracts/test/foundry/unit/data-availability/ValidiumL2DAValidator.t.sol b/l2-contracts/test/foundry/unit/data-availability/ValidiumL2DAValidator.t.sol new file mode 100644 index 000000000..c54367295 --- /dev/null +++ b/l2-contracts/test/foundry/unit/data-availability/ValidiumL2DAValidator.t.sol @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.8.20; + +// solhint-disable gas-custom-errors + +import {Test} from "forge-std/Test.sol"; + +import {ValidiumL2DAValidator} from "contracts/data-availability/ValidiumL2DAValidator.sol"; + +contract L2Erc20BridgeTest is Test { + function test_callValidiumDAValidator(address depositor, address receiver, uint256 amount) internal { + ValidiumL2DAValidator validator = new ValidiumL2DAValidator(); + + bytes32 outputHash = validator.validatePubdata(bytes32(0), bytes32(0), bytes32(0), bytes32(0), hex""); + + assertEq(outputHash, bytes32(0)); + } +} diff --git a/system-contracts/SystemContractsHashes.json b/system-contracts/SystemContractsHashes.json index d1677fb34..6dd2a63e1 100644 --- a/system-contracts/SystemContractsHashes.json +++ b/system-contracts/SystemContractsHashes.json @@ -3,49 +3,49 @@ "contractName": "AccountCodeStorage", "bytecodePath": "artifacts-zk/contracts-preprocessed/AccountCodeStorage.sol/AccountCodeStorage.json", "sourceCodePath": "contracts-preprocessed/AccountCodeStorage.sol", - "bytecodeHash": "0x0100005d1c6473b263ab40de73ff5461263937a5b5b530d3e21a4a09ffff26e2", + "bytecodeHash": "0x0100005d2e07d901f9f7530c0352881d39faf5fe3342a9859952023efde08052", "sourceCodeHash": "0x2e0e09d57a04bd1e722d8bf8c6423fdf3f8bca44e5e8c4f6684f987794be066e" }, { "contractName": "BootloaderUtilities", "bytecodePath": "artifacts-zk/contracts-preprocessed/BootloaderUtilities.sol/BootloaderUtilities.json", "sourceCodePath": "contracts-preprocessed/BootloaderUtilities.sol", - "bytecodeHash": "0x010007c7d513c9efb7a0b6889ef23d9e2f12599206c68d47414b9d4a4d35b688", + "bytecodeHash": "0x010007c7e02c8232d673335f7a0bf4e93cc8ace003f58ab7c37e9d3cb55d0a99", "sourceCodeHash": "0x0f1213c4b95acb71f4ab5d4082cc1aeb2bd5017e1cccd46afc66e53268609d85" }, { "contractName": "ComplexUpgrader", "bytecodePath": "artifacts-zk/contracts-preprocessed/ComplexUpgrader.sol/ComplexUpgrader.json", "sourceCodePath": "contracts-preprocessed/ComplexUpgrader.sol", - "bytecodeHash": "0x0100004df7e1557399a894818311c1204e36704aa2cb8e1b4dc7c19069f4a5a4", + "bytecodeHash": "0x0100004dc8a1644de8694ced12125eca269ab7d680bdef7ff9738a8d6b3c7c5f", "sourceCodeHash": "0x796046a914fb676ba2bbd337b2924311ee2177ce54571c18a2c3945755c83614" }, { "contractName": "Compressor", "bytecodePath": "artifacts-zk/contracts-preprocessed/Compressor.sol/Compressor.json", "sourceCodePath": "contracts-preprocessed/Compressor.sol", - "bytecodeHash": "0x0100014b38f55ea99e1426e1a590bee7a4532981c2b163364fdf728ca13700af", + "bytecodeHash": "0x0100014b5d3366c794bd56d66003e6522b04228ad9ba7ac51e412388eb4a1d16", "sourceCodeHash": "0x7240b5fb2ea8e184522e731fb14f764ebae52b8a69d1870a55daedac9a3ed617" }, { "contractName": "ContractDeployer", "bytecodePath": "artifacts-zk/contracts-preprocessed/ContractDeployer.sol/ContractDeployer.json", "sourceCodePath": "contracts-preprocessed/ContractDeployer.sol", - "bytecodeHash": "0x010004e5c2c77a9baba3fb7d270c83356c507fd3e7ba472278ec1d4c48758208", + "bytecodeHash": "0x010004e5de8ca987ebff2190fc9249a082417ef2a93ef1c9642af543eecf17d5", "sourceCodeHash": "0x92bc09da23ed9d86ba7a84f0dbf48503c99582ae58cdbebbdcc5f14ea1fcf014" }, { "contractName": "Create2Factory", "bytecodePath": "artifacts-zk/contracts-preprocessed/Create2Factory.sol/Create2Factory.json", "sourceCodePath": "contracts-preprocessed/Create2Factory.sol", - "bytecodeHash": "0x010000490ad13757765aaab46fa001866899f2da546a73212eb1ca932638c753", + "bytecodeHash": "0x01000049bf340365d1f711da176afcd895f2c7e0ff4bd1383e2375cce9a51231", "sourceCodeHash": "0x114d9322a9ca654989f3e0b3b21f1311dbc4db84f443d054cd414f6414d84de3" }, { "contractName": "DefaultAccount", "bytecodePath": "artifacts-zk/contracts-preprocessed/DefaultAccount.sol/DefaultAccount.json", "sourceCodePath": "contracts-preprocessed/DefaultAccount.sol", - "bytecodeHash": "0x0100055de35cfc69c9f9104583cebafb0aa8059f60c4eca0895ffa9da8efba62", + "bytecodeHash": "0x0100055d1df6d5bfe11a8123f1a6d12f8d306258a4a0b6ebd6c24373e1cd555b", "sourceCodeHash": "0xebffe840ebbd9329edb1ebff8ca50f6935e7dabcc67194a896fcc2e968d46dfb" }, { @@ -59,63 +59,63 @@ "contractName": "ImmutableSimulator", "bytecodePath": "artifacts-zk/contracts-preprocessed/ImmutableSimulator.sol/ImmutableSimulator.json", "sourceCodePath": "contracts-preprocessed/ImmutableSimulator.sol", - "bytecodeHash": "0x010000390e4ef990eeab943e7c5259b1efd6875f9aaf0c33022c2c7889d6651a", + "bytecodeHash": "0x01000039e18b0a92c14722bca9a87eef1c1917afdf8ffa383f00ed1c47da8956", "sourceCodeHash": "0x9659e69f7db09e8f60a8bb95314b1ed26afcc689851665cf27f5408122f60c98" }, { "contractName": "KnownCodesStorage", "bytecodePath": "artifacts-zk/contracts-preprocessed/KnownCodesStorage.sol/KnownCodesStorage.json", "sourceCodePath": "contracts-preprocessed/KnownCodesStorage.sol", - "bytecodeHash": "0x0100006fa34602c123e0252354d614c5b1eb0da3c68f98cd0ba8b15187446a19", + "bytecodeHash": "0x0100006f6b4f871edf5e11a752a8e8eb963eeb48dd058bff6749eb7235971cc1", "sourceCodeHash": "0xb39b5b81168653e0c5062f7b8e1d6d15a4e186df3317f192f0cb2fc3a74f5448" }, { "contractName": "L1Messenger", "bytecodePath": "artifacts-zk/contracts-preprocessed/L1Messenger.sol/L1Messenger.json", "sourceCodePath": "contracts-preprocessed/L1Messenger.sol", - "bytecodeHash": "0x010001f71930117a55abba23949c6777afd29da9ec62c2592657434ebf14b195", + "bytecodeHash": "0x010001f7f9ae1adb089ecba169f6e10f1981f031eebb123f64078b2a118ae04a", "sourceCodeHash": "0x8d22a4019347a45cb0c27bed9e98f7033637a7bdcd90fafb1922caa48f2b05de" }, { "contractName": "L2BaseToken", "bytecodePath": "artifacts-zk/contracts-preprocessed/L2BaseToken.sol/L2BaseToken.json", "sourceCodePath": "contracts-preprocessed/L2BaseToken.sol", - "bytecodeHash": "0x010001031eaf329b64e6a16d520dd365cb92195f46475a3b10eb1352a77c6495", + "bytecodeHash": "0x01000103d97079f37f32641d7493b825e24fb00c8e49d3c89f0b664ccd23ad7c", "sourceCodeHash": "0x8bdd2b4d0b53dba84c9f0af250bbaa2aad10b3de6747bba957f0bd3721090dfa" }, { "contractName": "L2GenesisUpgrade", "bytecodePath": "artifacts-zk/contracts-preprocessed/L2GenesisUpgrade.sol/L2GenesisUpgrade.json", "sourceCodePath": "contracts-preprocessed/L2GenesisUpgrade.sol", - "bytecodeHash": "0x010000d58674e0a1b0e07b3587401d7e17a9b62986c34a9171463a39f8e92bf3", + "bytecodeHash": "0x010000d5696456676605b43a10d7cd0f33fbc465b4afa49f874e1cebba7aa6c4", "sourceCodeHash": "0x27584533f7229befe23288d5a157514cdbdfd5935295efaf5fe1da11a12569f3" }, { "contractName": "MsgValueSimulator", "bytecodePath": "artifacts-zk/contracts-preprocessed/MsgValueSimulator.sol/MsgValueSimulator.json", "sourceCodePath": "contracts-preprocessed/MsgValueSimulator.sol", - "bytecodeHash": "0x0100005deecb5b2ce8f6fd90c5bdce18a43e933a3f2b5f7ba0343d8b1c6d2b78", + "bytecodeHash": "0x0100005db7df69a12c3b379f4ae12d3be20d1008824d49e2ac0d601cdd4544be", "sourceCodeHash": "0x082f3dcbc2fe4d93706c86aae85faa683387097d1b676e7ebd00f71ee0f13b71" }, { "contractName": "NonceHolder", "bytecodePath": "artifacts-zk/contracts-preprocessed/NonceHolder.sol/NonceHolder.json", "sourceCodePath": "contracts-preprocessed/NonceHolder.sol", - "bytecodeHash": "0x010000d900645c7940341daa06f46dbf804acfb98fb6437fd28fdaf46da79c1f", + "bytecodeHash": "0x010000d90d0318d546cda8958c88105657769679f17d7c460773a0501817898e", "sourceCodeHash": "0xcd0c0366effebf2c98c58cf96322cc242a2d1c675620ef5514b7ed1f0a869edc" }, { "contractName": "PubdataChunkPublisher", "bytecodePath": "artifacts-zk/contracts-preprocessed/PubdataChunkPublisher.sol/PubdataChunkPublisher.json", "sourceCodePath": "contracts-preprocessed/PubdataChunkPublisher.sol", - "bytecodeHash": "0x01000049299f3ee802b7e84d6a655dc67924a3bf5aa377347fb05a09e59abc57", + "bytecodeHash": "0x0100004900240bd8dcb7d87634a7547fb6d6ffaea7a190fb61c6850b375b7bd1", "sourceCodeHash": "0x04d3d2e4019081c87aae5c22a060d84ae2e9d631ebce59801ecce37b9c87e4c7" }, { "contractName": "SystemContext", "bytecodePath": "artifacts-zk/contracts-preprocessed/SystemContext.sol/SystemContext.json", "sourceCodePath": "contracts-preprocessed/SystemContext.sol", - "bytecodeHash": "0x010001a717f01d12bc8686cbec93be57f6c8dd13a8912ad698bef9e6ed873fa1", + "bytecodeHash": "0x010001a7c0458a11bd86f2fcbc0643f84ec93a4d4e4356ce0db3367c357ff222", "sourceCodeHash": "0xb3b8c1f57928938ac590984442bc96c2c888282793014845d5ce2f90bbf2677f" }, { @@ -185,35 +185,35 @@ "contractName": "bootloader_test", "bytecodePath": "bootloader/build/artifacts/bootloader_test.yul.zbin", "sourceCodePath": "bootloader/build/bootloader_test.yul", - "bytecodeHash": "0x010003cb529c933b02800df76c52ecd5c75c9a426449834a444b03e6ee33e90a", - "sourceCodeHash": "0xe478f7c49dc5e69c82ffd1b88dd94b8f6bde5716829fc9be2302fe3e452ccbf9" + "bytecodeHash": "0x010003cb2fe407ac312db0aa6a6e746ca41cd19ab0eea216a14ec725f5cc7444", + "sourceCodeHash": "0xd7748f25eeb4f17b5d5bc09172f09ffdd9b8a34d011b3fb62aac5b494231b168" }, { "contractName": "fee_estimate", "bytecodePath": "bootloader/build/artifacts/fee_estimate.yul.zbin", "sourceCodePath": "bootloader/build/fee_estimate.yul", - "bytecodeHash": "0x01000931cba6b0eae852a0e3b05d5276fbd396b631b922c92fc613719283fdb5", - "sourceCodeHash": "0x17dcacbdaea19447e2fef615f3488fe8f3d68f1cdeed913e32373af08534e8b3" + "bytecodeHash": "0x01000931a58a1d205bdf0b87674e56f96bb5f2192173c96a07886121b6867c47", + "sourceCodeHash": "0x67877a2bd129d189c32e63333325fff1e0ee19650a270b6bfa55906e1eaa79d6" }, { "contractName": "gas_test", "bytecodePath": "bootloader/build/artifacts/gas_test.yul.zbin", "sourceCodePath": "bootloader/build/gas_test.yul", - "bytecodeHash": "0x010008b783276a2887da8e7a6d66bd499eb60004227b692c329e43d4576c624c", - "sourceCodeHash": "0x3fae183e6f154c66148579eb68a6e412328c27aa4ae7687a8a6348e97cf83383" + "bytecodeHash": "0x010008b7e13ae7b54e537ea6f7b4e030f7b3c81e44b05f41dea2eb13c19e6235", + "sourceCodeHash": "0xa173ad90cabe1b3431ee803b2c9b3943ece686c98df1600dad4cec28f5a027c8" }, { "contractName": "playground_batch", "bytecodePath": "bootloader/build/artifacts/playground_batch.yul.zbin", "sourceCodePath": "bootloader/build/playground_batch.yul", - "bytecodeHash": "0x01000937545179d7a4ba1f862260de4e9815dc68e0f4166ee40a392911247d32", - "sourceCodeHash": "0x505644754c6771415c044a8fc7618bd1368fdee5bd618d05ffc0f14be6222a68" + "bytecodeHash": "0x010009358206ce648b88a76f3199a3ea0c0e1183a9ebfca11cdcba924453db98", + "sourceCodeHash": "0xda17354bca78e6b816ce8f7d1d7ff45e1c5ed0cd9f6ea0437b7cac614ff2019c" }, { "contractName": "proved_batch", "bytecodePath": "bootloader/build/artifacts/proved_batch.yul.zbin", "sourceCodePath": "bootloader/build/proved_batch.yul", - "bytecodeHash": "0x010008c71c7330aa11b7915a0772d08d446eca39d7a432541347a42aee686146", - "sourceCodeHash": "0x048c2951119868de0b8b8c8f15d0d664d221b4541f47768ca82ee2dfa42de993" + "bytecodeHash": "0x010008c753336bc8d1ddca235602b9f31d346412b2d463cd342899f7bfb73baf", + "sourceCodeHash": "0x7a5776e8001a2d93e14165af0b08cadcf1170354401d0c31fdc0d2a8f8439989" } ] diff --git a/system-contracts/bootloader/bootloader.yul b/system-contracts/bootloader/bootloader.yul index 73b65186c..1c58a3bf7 100644 --- a/system-contracts/bootloader/bootloader.yul +++ b/system-contracts/bootloader/bootloader.yul @@ -3900,17 +3900,17 @@ object "Bootloader" { /// @dev Log key used by Executor.sol for processing. See Constants.sol::SystemLogKey enum function chainedPriorityTxnHashLogKey() -> ret { - ret := 5 + ret := 3 } /// @dev Log key used by Executor.sol for processing. See Constants.sol::SystemLogKey enum function numberOfLayer1TxsLogKey() -> ret { - ret := 6 + ret := 4 } /// @dev Log key used by Executor.sol for processing. See Constants.sol::SystemLogKey enum function protocolUpgradeTxHashKey() -> ret { - ret := 9 + ret := 7 } //////////////////////////////////////////////////////////////////////////// diff --git a/system-contracts/bootloader/tests/bootloader/bootloader_test.yul b/system-contracts/bootloader/tests/bootloader/bootloader_test.yul index 7658ae9bb..9e620fccf 100644 --- a/system-contracts/bootloader/tests/bootloader/bootloader_test.yul +++ b/system-contracts/bootloader/tests/bootloader/bootloader_test.yul @@ -105,7 +105,7 @@ function TEST_systemLogKeys() { let numberOfLayer1TxsLogKey := numberOfLayer1TxsLogKey() let protocolUpgradeTxHashKey := protocolUpgradeTxHashKey() - testing_assertEq(chainedPriorityTxnHashLogKey, 5, "Invalid priority txn hash log key") - testing_assertEq(numberOfLayer1TxsLogKey, 6, "Invalid num layer 1 txns log key") - testing_assertEq(protocolUpgradeTxHashKey, 9, "Invalid protocol upgrade txn hash log key") + testing_assertEq(chainedPriorityTxnHashLogKey, 3, "Invalid priority txn hash log key") + testing_assertEq(numberOfLayer1TxsLogKey, 4, "Invalid num layer 1 txns log key") + testing_assertEq(protocolUpgradeTxHashKey, 7, "Invalid protocol upgrade txn hash log key") } diff --git a/system-contracts/contracts/Constants.sol b/system-contracts/contracts/Constants.sol index 6aa3fc34d..a0b22c047 100644 --- a/system-contracts/contracts/Constants.sol +++ b/system-contracts/contracts/Constants.sol @@ -117,8 +117,6 @@ uint256 constant STATE_DIFF_ENTRY_SIZE = 272; enum SystemLogKey { L2_TO_L1_LOGS_TREE_ROOT_KEY, - TOTAL_L2_TO_L1_PUBDATA_KEY, - STATE_DIFF_HASH_KEY, PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY, PREV_BATCH_HASH_KEY, CHAINED_PRIORITY_TXN_HASH_KEY, diff --git a/system-contracts/contracts/SystemContractErrors.sol b/system-contracts/contracts/SystemContractErrors.sol index a54c4efd0..d61e99c10 100644 --- a/system-contracts/contracts/SystemContractErrors.sol +++ b/system-contracts/contracts/SystemContractErrors.sol @@ -129,8 +129,6 @@ enum PubdataField { LogsHash, MsgHash, Bytecode, - StateDiffCompressionVersion, - ExtraData, InputDAFunctionSig, InputLogsHash, InputLogsRootHash, diff --git a/system-contracts/package.json b/system-contracts/package.json index 70e7208b7..e55cb1a7b 100644 --- a/system-contracts/package.json +++ b/system-contracts/package.json @@ -66,6 +66,7 @@ "preprocess:system-contracts": "rm -rf ./contracts-preprocessed && ts-node scripts/preprocess-system-contracts.ts", "verify-on-explorer": "hardhat run scripts/verify-on-explorer.ts", "test": "yarn build:test-system-contracts && hardhat test --network zkSyncTestNode", + "test-no-build": "hardhat test --network zkSyncTestNode", "test-node": "hardhat node-zksync --tag v0.0.1-vm1.5.0", "test:bootloader": "cd bootloader/test_infra && cargo run" } diff --git a/system-contracts/test/L1Messenger.spec.ts b/system-contracts/test/L1Messenger.spec.ts index a67d4089f..225b197d6 100644 --- a/system-contracts/test/L1Messenger.spec.ts +++ b/system-contracts/test/L1Messenger.spec.ts @@ -1,32 +1,33 @@ import { ethers, network } from "hardhat"; import type { L1Messenger } from "../typechain"; +import { IL2DAValidatorFactory } from "../typechain/IL2DAValidatorFactory"; import { L1MessengerFactory } from "../typechain"; import { prepareEnvironment, setResult } from "./shared/mocks"; -import type { StateDiff } from "./shared/utils"; -import { compressStateDiffs, deployContractOnAddress, encodeStateDiffs, getCode, getWallets } from "./shared/utils"; -import { utils } from "zksync-ethers"; +import { deployContractOnAddress, getCode, getWallets } from "./shared/utils"; +import { utils, L2VoidSigner } from "zksync-ethers"; import type { Wallet } from "zksync-ethers"; import { TEST_KNOWN_CODE_STORAGE_CONTRACT_ADDRESS, TEST_L1_MESSENGER_SYSTEM_CONTRACT_ADDRESS, TEST_BOOTLOADER_FORMAL_ADDRESS, - TWO_IN_256, } from "./shared/constants"; import { expect } from "chai"; -import { BigNumber } from "ethers"; import { randomBytes } from "crypto"; -// FIXME: restore the test after the changes from the custom DA integration -describe.skip("L1Messenger tests", () => { +const EXPECTED_DA_INPUT_OFFSET = 160; +const L2_TO_L1_LOGS_MERKLE_TREE_LEAVES = 16_384; +const L2_TO_L1_LOG_SERIALIZE_SIZE = 88; +const L2_L1_LOGS_TREE_DEFAULT_LEAF_HASH = "0x72abee45b59e344af8a6e520241c4744aff26ed411f4c4b00f8af09adada43ba"; + +describe("L1Messenger tests", () => { let l1Messenger: L1Messenger; let wallet: Wallet; let l1MessengerAccount: ethers.Signer; let knownCodeStorageAccount: ethers.Signer; let bootloaderAccount: ethers.Signer; - let stateDiffsSetupData: StateDiffSetupData; let logData: LogData; - let bytecodeData: ContentLengthPair; let emulator: L1MessengerPubdataEmulator; + let bytecode; before(async () => { await prepareEnvironment(); @@ -37,13 +38,16 @@ describe.skip("L1Messenger tests", () => { knownCodeStorageAccount = await ethers.getImpersonatedSigner(TEST_KNOWN_CODE_STORAGE_CONTRACT_ADDRESS); bootloaderAccount = await ethers.getImpersonatedSigner(TEST_BOOTLOADER_FORMAL_ADDRESS); // setup - stateDiffsSetupData = await setupStateDiffs(); logData = setupLogData(l1MessengerAccount, l1Messenger); - bytecodeData = await setupBytecodeData(ethers.constants.AddressZero); + bytecode = await getCode(TEST_L1_MESSENGER_SYSTEM_CONTRACT_ADDRESS); await setResult("SystemContext", "txNumberInBlock", [], { failure: false, returnData: ethers.utils.defaultAbiCoder.encode(["uint16"], [1]), }); + await setResult("IMessageRoot", "getAggregatedRoot", [], { + failure: false, + returnData: ethers.constants.HashZero, + }); emulator = new L1MessengerPubdataEmulator(); }); @@ -51,7 +55,10 @@ describe.skip("L1Messenger tests", () => { // cleaning the state of l1Messenger await l1Messenger .connect(bootloaderAccount) - .publishPubdataAndClearState(emulator.buildTotalL2ToL1PubdataAndStateDiffs()); + .publishPubdataAndClearState( + ethers.constants.AddressZero, + await emulator.buildTotalL2ToL1PubdataAndStateDiffs(l1Messenger) + ); await network.provider.request({ method: "hardhat_stopImpersonatingAccount", params: [TEST_L1_MESSENGER_SYSTEM_CONTRACT_ADDRESS], @@ -74,23 +81,15 @@ describe.skip("L1Messenger tests", () => { emulator.addLog(logData.logs[0].log); await (await l1Messenger.connect(l1MessengerAccount).sendToL1(logData.messages[0].message)).wait(); emulator.addLog(logData.messages[0].log); - emulator.addMessage({ - lengthBytes: logData.messages[0].currentMessageLengthBytes, - content: logData.messages[0].message, - }); - await ( - await l1Messenger - .connect(knownCodeStorageAccount) - .requestBytecodeL1Publication(await ethers.utils.hexlify(utils.hashBytecode(bytecodeData.content)), { - gasLimit: 130000000, - }) - ).wait(); - emulator.addBytecode(bytecodeData); - emulator.setStateDiffsSetupData(stateDiffsSetupData); + await ( await l1Messenger .connect(bootloaderAccount) - .publishPubdataAndClearState(emulator.buildTotalL2ToL1PubdataAndStateDiffs(), { gasLimit: 1000000000 }) + .publishPubdataAndClearState( + ethers.constants.AddressZero, + await emulator.buildTotalL2ToL1PubdataAndStateDiffs(l1Messenger), + { gasLimit: 1000000000 } + ) ).wait(); }); @@ -99,7 +98,21 @@ describe.skip("L1Messenger tests", () => { await expect( l1Messenger .connect(bootloaderAccount) - .publishPubdataAndClearState(emulator.buildTotalL2ToL1PubdataAndStateDiffs({ numberOfLogs: 0x4002 })) + .publishPubdataAndClearState( + ethers.constants.AddressZero, + await emulator.buildTotalL2ToL1PubdataAndStateDiffs(l1Messenger, { numberOfLogs: 0x4002 }) + ) + ).to.be.revertedWithCustomError(l1Messenger, "ReconstructionMismatch"); + }); + + it("should revert Invalid input DA signature", async () => { + await expect( + l1Messenger + .connect(bootloaderAccount) + .publishPubdataAndClearState( + ethers.constants.AddressZero, + await emulator.buildTotalL2ToL1PubdataAndStateDiffs(l1Messenger, { l2DaValidatorFunctionSig: "0x12121212" }) + ) ).to.be.revertedWithCustomError(l1Messenger, "ReconstructionMismatch"); }); @@ -121,50 +134,71 @@ describe.skip("L1Messenger tests", () => { await expect( l1Messenger .connect(bootloaderAccount) - .publishPubdataAndClearState(emulator.buildTotalL2ToL1PubdataAndStateDiffs(overrideData)) + .publishPubdataAndClearState( + ethers.constants.AddressZero, + await emulator.buildTotalL2ToL1PubdataAndStateDiffs(l1Messenger, overrideData) + ) ).to.be.revertedWithCustomError(l1Messenger, "ReconstructionMismatch"); }); - it("should revert chainedMessageHash mismatch", async () => { - // Buffer.alloc(32, 6), to trigger the revert - const wrongMessage = { lengthBytes: logData.messages[0].currentMessageLengthBytes, content: Buffer.alloc(32, 6) }; - const overrideData = { messages: [...emulator.messages] }; - overrideData.messages[0] = wrongMessage; + it("should revert Invalid input msgs hash", async () => { + const correctChainedMessagesHash = await l1Messenger.provider.getStorageAt(l1Messenger.address, 2); + await expect( - l1Messenger - .connect(bootloaderAccount) - .publishPubdataAndClearState(emulator.buildTotalL2ToL1PubdataAndStateDiffs(overrideData)) + l1Messenger.connect(bootloaderAccount).publishPubdataAndClearState( + ethers.constants.AddressZero, + await emulator.buildTotalL2ToL1PubdataAndStateDiffs(l1Messenger, { + chainedMessagesHash: ethers.utils.keccak256(correctChainedMessagesHash), + }) + ) ).to.be.revertedWithCustomError(l1Messenger, "ReconstructionMismatch"); }); - it("should revert state diff compression version mismatch", async () => { - await ( - await l1Messenger - .connect(knownCodeStorageAccount) - .requestBytecodeL1Publication(await ethers.utils.hexlify(utils.hashBytecode(bytecodeData.content)), { - gasLimit: 130000000, + it("should revert Invalid bytecodes hash", async () => { + const correctChainedBytecodesHash = await l1Messenger.provider.getStorageAt(l1Messenger.address, 3); + + await expect( + l1Messenger.connect(bootloaderAccount).publishPubdataAndClearState( + ethers.constants.AddressZero, + await emulator.buildTotalL2ToL1PubdataAndStateDiffs(l1Messenger, { + chainedBytecodeHash: ethers.utils.keccak256(correctChainedBytecodesHash), }) - ).wait(); - // modify version to trigger the revert + ) + ).to.be.revertedWithCustomError(l1Messenger, "ReconstructionMismatch"); + }); + + it("should revert Invalid offset", async () => { await expect( l1Messenger.connect(bootloaderAccount).publishPubdataAndClearState( - emulator.buildTotalL2ToL1PubdataAndStateDiffs({ - version: ethers.utils.hexZeroPad(ethers.utils.hexlify(66), 1), + ethers.constants.AddressZero, + await emulator.buildTotalL2ToL1PubdataAndStateDiffs(l1Messenger, { + operatorDataOffset: EXPECTED_DA_INPUT_OFFSET + 1, }) ) ).to.be.revertedWithCustomError(l1Messenger, "ReconstructionMismatch"); }); - it("should revert extra data", async () => { - // add extra data to trigger the revert + it("should revert Invalid length", async () => { await expect( l1Messenger .connect(bootloaderAccount) .publishPubdataAndClearState( - ethers.utils.concat([emulator.buildTotalL2ToL1PubdataAndStateDiffs(), Buffer.alloc(1, 64)]) + ethers.constants.AddressZero, + await emulator.buildTotalL2ToL1PubdataAndStateDiffs(l1Messenger, { operatorDataLength: 1 }) ) ).to.be.revertedWithCustomError(l1Messenger, "ReconstructionMismatch"); }); + + it("should revert Invalid root hash", async () => { + await expect( + l1Messenger.connect(bootloaderAccount).publishPubdataAndClearState( + ethers.constants.AddressZero, + await emulator.buildTotalL2ToL1PubdataAndStateDiffs(l1Messenger, { + chainedLogsRootHash: ethers.constants.HashZero, + }) + ) + ).to.be.revertedWithCustomError(l1Messenger, "ReconstructionMismatch"); + }); }); describe("sendL2ToL1Log", async () => { @@ -236,10 +270,6 @@ describe.skip("L1Messenger tests", () => { .and.to.emit(l1Messenger, "L2ToL1LogSent") .withArgs([0, true, 1, l1Messenger.address, expectedKey, ethers.utils.keccak256(logData.messages[0].message)]); emulator.addLog(logData.messages[0].log); - emulator.addMessage({ - lengthBytes: logData.messages[0].currentMessageLengthBytes, - content: logData.messages[0].message, - }); }); }); @@ -256,85 +286,16 @@ describe.skip("L1Messenger tests", () => { await expect( l1Messenger .connect(knownCodeStorageAccount) - .requestBytecodeL1Publication(await ethers.utils.hexlify(utils.hashBytecode(bytecodeData.content)), { - gasLimit: 130000000, + .requestBytecodeL1Publication(ethers.utils.hexlify(utils.hashBytecode(bytecode)), { + gasLimit: 230000000, }) ) .to.emit(l1Messenger, "BytecodeL1PublicationRequested") - .withArgs(await ethers.utils.hexlify(utils.hashBytecode(bytecodeData.content))); - emulator.addBytecode(bytecodeData); + .withArgs(ethers.utils.hexlify(utils.hashBytecode(bytecode))); }); }); }); -// Interface represents the structure of the data that that is used in totalL2ToL1PubdataAndStateDiffs. -interface StateDiffSetupData { - encodedStateDiffs: string; - compressedStateDiffs: string; - enumerationIndexSizeBytes: string; - numberOfStateDiffsBytes: string; - compressedStateDiffsSizeBytes: string; -} - -async function setupStateDiffs(): Promise { - const stateDiffs: StateDiff[] = [ - { - key: "0x1234567890123456789012345678901234567890123456789012345678901230", - index: 0, - initValue: BigNumber.from("0x1234567890123456789012345678901234567890123456789012345678901231"), - finalValue: BigNumber.from("0x1234567890123456789012345678901234567890123456789012345678901230"), - }, - { - key: "0x1234567890123456789012345678901234567890123456789012345678901232", - index: 1, - initValue: TWO_IN_256.sub(1), - finalValue: BigNumber.from(1), - }, - { - key: "0x1234567890123456789012345678901234567890123456789012345678901234", - index: 0, - initValue: TWO_IN_256.div(2), - finalValue: BigNumber.from(1), - }, - { - key: "0x1234567890123456789012345678901234567890123456789012345678901236", - index: 2323, - initValue: BigNumber.from("0x1234567890123456789012345678901234567890123456789012345678901237"), - finalValue: BigNumber.from("0x0239329298382323782378478237842378478237847237237872373272373272"), - }, - { - key: "0x1234567890123456789012345678901234567890123456789012345678901238", - index: 2, - initValue: BigNumber.from(0), - finalValue: BigNumber.from(1), - }, - ]; - const encodedStateDiffs = encodeStateDiffs(stateDiffs); - const compressedStateDiffs = compressStateDiffs(4, stateDiffs); - const enumerationIndexSizeBytes = ethers.utils.hexZeroPad(ethers.utils.hexlify(4), 1); - await setResult( - "Compressor", - "verifyCompressedStateDiffs", - [stateDiffs.length, 4, encodedStateDiffs, compressedStateDiffs], - { - failure: false, - returnData: ethers.utils.defaultAbiCoder.encode(["bytes32"], [ethers.utils.keccak256(encodedStateDiffs)]), - } - ); - const numberOfStateDiffsBytes = ethers.utils.hexZeroPad(ethers.utils.hexlify(stateDiffs.length), 4); - const compressedStateDiffsSizeBytes = ethers.utils.hexZeroPad( - ethers.utils.hexlify(ethers.utils.arrayify(compressedStateDiffs).length), - 3 - ); - return { - encodedStateDiffs, - compressedStateDiffs, - enumerationIndexSizeBytes, - numberOfStateDiffsBytes, - compressedStateDiffsSizeBytes, - }; -} - // Interface for L2ToL1Log struct. interface L2ToL1Log { l2ShardId: number; @@ -417,47 +378,34 @@ function setupLogData(l1MessengerAccount: ethers.Signer, l1Messenger: L1Messenge }; } -// Represents the structure of the bytecode/message data that is part of the pubdata. -interface ContentLengthPair { - content: string; - lengthBytes: string; -} - -async function setupBytecodeData(l1MessengerAddress: string): Promise { - const content = await getCode(l1MessengerAddress); - const lengthBytes = ethers.utils.hexZeroPad(ethers.utils.hexlify(ethers.utils.arrayify(content).length), 4); - return { - content, - lengthBytes, - }; -} - // Used for emulating the pubdata published by the L1Messenger. class L1MessengerPubdataEmulator implements EmulatorData { numberOfLogs: number; encodedLogs: string[]; - numberOfMessages: number; - messages: ContentLengthPair[]; - numberOfBytecodes: number; - bytecodes: ContentLengthPair[]; - stateDiffsSetupData: StateDiffSetupData; - version: string; + l2DaValidatorFunctionSig: string; + chainedLogsHash: string; + chainedLogsRootHash: string; + operatorDataOffset: number; + operatorDataLength: number; + + // These two fields are always zero, we need + // them just to extend the interface. + chainedMessagesHash: string; + chainedBytecodeHash: string; constructor() { this.numberOfLogs = 0; this.encodedLogs = []; - this.numberOfMessages = 0; - this.messages = []; - this.numberOfBytecodes = 0; - this.bytecodes = []; - this.stateDiffsSetupData = { - compressedStateDiffsSizeBytes: "", - enumerationIndexSizeBytes: "", - compressedStateDiffs: "", - numberOfStateDiffsBytes: "", - encodedStateDiffs: "", - }; - this.version = ethers.utils.hexZeroPad(ethers.utils.hexlify(1), 1); + + const factoryInterface = IL2DAValidatorFactory.connect( + ethers.constants.AddressZero, + new L2VoidSigner(ethers.constants.AddressZero) + ); + this.l2DaValidatorFunctionSig = factoryInterface.interface.getSighash("validatePubdata"); + + this.chainedLogsHash = ethers.constants.HashZero; + this.chainedLogsRootHash = ethers.constants.HashZero; + this.operatorDataOffset = EXPECTED_DA_INPUT_OFFSET; } addLog(log: string): void { @@ -465,70 +413,80 @@ class L1MessengerPubdataEmulator implements EmulatorData { this.numberOfLogs++; } - addMessage(message: ContentLengthPair): void { - this.messages.push(message); - this.numberOfMessages++; - } - - addBytecode(bytecode: ContentLengthPair): void { - this.bytecodes.push(bytecode); - this.numberOfBytecodes++; - } - - setStateDiffsSetupData(data: StateDiffSetupData) { - this.stateDiffsSetupData = data; - } + async buildTotalL2ToL1PubdataAndStateDiffs( + l1Messenger: L1Messenger, + overrideData: EmulatorOverrideData = {} + ): Promise { + const storedChainedMessagesHash = await l1Messenger.provider.getStorageAt(l1Messenger.address, 2); + const storedChainedBytecodesHash = await l1Messenger.provider.getStorageAt(l1Messenger.address, 3); - buildTotalL2ToL1PubdataAndStateDiffs(overrideData: EmulatorOverrideData = {}): string { const { + l2DaValidatorFunctionSig = this.l2DaValidatorFunctionSig, + chainedLogsHash = calculateChainedLogsHash(this.encodedLogs), + chainedLogsRootHash = calculateLogsRootHash(this.encodedLogs), + chainedMessagesHash = storedChainedMessagesHash, + chainedBytecodeHash = storedChainedBytecodesHash, + operatorDataOffset = this.operatorDataOffset, numberOfLogs = this.numberOfLogs, encodedLogs = this.encodedLogs, - numberOfMessages = this.numberOfMessages, - messages = this.messages, - numberOfBytecodes = this.numberOfBytecodes, - bytecodes = this.bytecodes, - stateDiffsSetupData = this.stateDiffsSetupData, - version = this.version, } = overrideData; - - const messagePairs = []; - for (let i = 0; i < numberOfMessages; i++) { - messagePairs.push(messages[i].lengthBytes, messages[i].content); - } - - const bytecodePairs = []; - for (let i = 0; i < numberOfBytecodes; i++) { - bytecodePairs.push(bytecodes[i].lengthBytes, bytecodes[i].content); - } + const operatorDataLength = overrideData.operatorDataLength + ? overrideData.operatorDataLength + : numberOfLogs * L2_TO_L1_LOG_SERIALIZE_SIZE + 4; return ethers.utils.concat([ + l2DaValidatorFunctionSig, + chainedLogsHash, + chainedLogsRootHash, + chainedMessagesHash, + chainedBytecodeHash, + ethers.utils.defaultAbiCoder.encode(["uint256"], [operatorDataOffset]), + ethers.utils.defaultAbiCoder.encode(["uint256"], [operatorDataLength]), ethers.utils.hexZeroPad(ethers.utils.hexlify(numberOfLogs), 4), ...encodedLogs, - ethers.utils.hexZeroPad(ethers.utils.hexlify(numberOfMessages), 4), - ...messagePairs, - ethers.utils.hexZeroPad(ethers.utils.hexlify(numberOfBytecodes), 4), - ...bytecodePairs, - version, - stateDiffsSetupData.compressedStateDiffsSizeBytes, - stateDiffsSetupData.enumerationIndexSizeBytes, - stateDiffsSetupData.compressedStateDiffs, - stateDiffsSetupData.numberOfStateDiffsBytes, - stateDiffsSetupData.encodedStateDiffs, ]); } } // Represents the structure of the data that the emulator uses. interface EmulatorData { + l2DaValidatorFunctionSig: string; + chainedLogsHash: string; + chainedLogsRootHash: string; + chainedMessagesHash: string; + chainedBytecodeHash: string; + operatorDataOffset: number; + operatorDataLength: number; numberOfLogs: number; encodedLogs: string[]; - numberOfMessages: number; - messages: ContentLengthPair[]; - numberOfBytecodes: number; - bytecodes: ContentLengthPair[]; - stateDiffsSetupData: StateDiffSetupData; - version: string; } // Represents a type that allows for overriding specific properties of the EmulatorData. // This is useful when you want to change some properties of the emulator data without affecting the others. type EmulatorOverrideData = Partial; + +function calculateChainedLogsHash(logs: string[]): string { + let hash = ethers.constants.HashZero; + for (const log of logs) { + const logHash = ethers.utils.keccak256(log); + hash = ethers.utils.keccak256(ethers.utils.concat([hash, logHash])); + } + + return hash; +} + +function calculateLogsRootHash(logs: string[]): string { + const logsTreeArray: string[] = new Array(L2_TO_L1_LOGS_MERKLE_TREE_LEAVES).fill(L2_L1_LOGS_TREE_DEFAULT_LEAF_HASH); + for (let i = 0; i < logs.length; i++) { + logsTreeArray[i] = ethers.utils.keccak256(logs[i]); + } + + let length = L2_TO_L1_LOGS_MERKLE_TREE_LEAVES; + + while (length > 1) { + for (let i = 0; i < length; i += 2) { + logsTreeArray[i / 2] = ethers.utils.keccak256(ethers.utils.concat([logsTreeArray[i], logsTreeArray[i + 1]])); + } + length /= 2; + } + return logsTreeArray[0]; +} diff --git a/system-contracts/test/shared/mocks.ts b/system-contracts/test/shared/mocks.ts index 846b0be38..8e38ba278 100644 --- a/system-contracts/test/shared/mocks.ts +++ b/system-contracts/test/shared/mocks.ts @@ -15,6 +15,7 @@ import { TEST_COMPRESSOR_CONTRACT_ADDRESS, TEST_PUBDATA_CHUNK_PUBLISHER_ADDRESS, REAL_BRIDGEHUB_ADDRESS, + REAL_L2_MESSAGE_ROOT_ADDRESS, } from "./constants"; import { deployContractOnAddress, getWallets, loadArtifact } from "./utils"; @@ -43,6 +44,8 @@ const TEST_SYSTEM_CONTRACTS_MOCKS = { // For bridgehub we mock the real address for simplicity. // In case of need, it can be ported to use the test address. IBridgehub: REAL_BRIDGEHUB_ADDRESS, + // For similar reasons we mock the L2 message real root only for simplicity + IMessageRoot: REAL_L2_MESSAGE_ROOT_ADDRESS, }; // Deploys mocks, and cleans previous call results during deployments. From 9d1ce1347de7f8cabbc27a4f9819eac67232419b Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Thu, 5 Sep 2024 11:51:02 +0200 Subject: [PATCH 20/53] fix lib to remove it from coverage report --- l1-contracts/foundry.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l1-contracts/foundry.toml b/l1-contracts/foundry.toml index 2820332c9..9fc350844 100644 --- a/l1-contracts/foundry.toml +++ b/l1-contracts/foundry.toml @@ -2,7 +2,7 @@ allow_paths = ["../l2-contracts/contracts"] src = "contracts" out = "out" -libs = ["node_modules", "../lib", "../da-contracts/"] +libs = ["node_modules", "./lib", "../da-contracts/"] cache_path = "cache-forge" test = "test/foundry" solc_version = "0.8.24" From af14533d68bf2ae32a4e0f4ed12d4c4b2562f4be Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Thu, 5 Sep 2024 11:59:18 +0200 Subject: [PATCH 21/53] recalc hashes --- system-contracts/SystemContractsHashes.json | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/system-contracts/SystemContractsHashes.json b/system-contracts/SystemContractsHashes.json index 6dd2a63e1..16b617623 100644 --- a/system-contracts/SystemContractsHashes.json +++ b/system-contracts/SystemContractsHashes.json @@ -3,49 +3,49 @@ "contractName": "AccountCodeStorage", "bytecodePath": "artifacts-zk/contracts-preprocessed/AccountCodeStorage.sol/AccountCodeStorage.json", "sourceCodePath": "contracts-preprocessed/AccountCodeStorage.sol", - "bytecodeHash": "0x0100005d2e07d901f9f7530c0352881d39faf5fe3342a9859952023efde08052", + "bytecodeHash": "0x0100005dda7512d7cf8e4b0fa7494d06204ff2a1592c440afa7349ce69c8e2ee", "sourceCodeHash": "0x2e0e09d57a04bd1e722d8bf8c6423fdf3f8bca44e5e8c4f6684f987794be066e" }, { "contractName": "BootloaderUtilities", "bytecodePath": "artifacts-zk/contracts-preprocessed/BootloaderUtilities.sol/BootloaderUtilities.json", "sourceCodePath": "contracts-preprocessed/BootloaderUtilities.sol", - "bytecodeHash": "0x010007c7e02c8232d673335f7a0bf4e93cc8ace003f58ab7c37e9d3cb55d0a99", + "bytecodeHash": "0x010007c752553baf259f8a7d7e922a2edc2368407f4058f7bc0d343b79d80b4b", "sourceCodeHash": "0x0f1213c4b95acb71f4ab5d4082cc1aeb2bd5017e1cccd46afc66e53268609d85" }, { "contractName": "ComplexUpgrader", "bytecodePath": "artifacts-zk/contracts-preprocessed/ComplexUpgrader.sol/ComplexUpgrader.json", "sourceCodePath": "contracts-preprocessed/ComplexUpgrader.sol", - "bytecodeHash": "0x0100004dc8a1644de8694ced12125eca269ab7d680bdef7ff9738a8d6b3c7c5f", + "bytecodeHash": "0x0100004d569c11e11881dcd626bc1a3c84b56583f42de59c2d604a7117290e8f", "sourceCodeHash": "0x796046a914fb676ba2bbd337b2924311ee2177ce54571c18a2c3945755c83614" }, { "contractName": "Compressor", "bytecodePath": "artifacts-zk/contracts-preprocessed/Compressor.sol/Compressor.json", "sourceCodePath": "contracts-preprocessed/Compressor.sol", - "bytecodeHash": "0x0100014b5d3366c794bd56d66003e6522b04228ad9ba7ac51e412388eb4a1d16", + "bytecodeHash": "0x0100014bc3b9c9a9b7c295487b681aa0e72d42ac49b41585541631620717260c", "sourceCodeHash": "0x7240b5fb2ea8e184522e731fb14f764ebae52b8a69d1870a55daedac9a3ed617" }, { "contractName": "ContractDeployer", "bytecodePath": "artifacts-zk/contracts-preprocessed/ContractDeployer.sol/ContractDeployer.json", "sourceCodePath": "contracts-preprocessed/ContractDeployer.sol", - "bytecodeHash": "0x010004e5de8ca987ebff2190fc9249a082417ef2a93ef1c9642af543eecf17d5", + "bytecodeHash": "0x010004e528f72fa70ea57563d7aae31a1f8234b17a82b51ca69a689259778f91", "sourceCodeHash": "0x92bc09da23ed9d86ba7a84f0dbf48503c99582ae58cdbebbdcc5f14ea1fcf014" }, { "contractName": "Create2Factory", "bytecodePath": "artifacts-zk/contracts-preprocessed/Create2Factory.sol/Create2Factory.json", "sourceCodePath": "contracts-preprocessed/Create2Factory.sol", - "bytecodeHash": "0x01000049bf340365d1f711da176afcd895f2c7e0ff4bd1383e2375cce9a51231", + "bytecodeHash": "0x010000494541dfc0e1ac52f07b81bcdf32d4c22235ce1290c0f58f7cbaaeebcd", "sourceCodeHash": "0x114d9322a9ca654989f3e0b3b21f1311dbc4db84f443d054cd414f6414d84de3" }, { "contractName": "DefaultAccount", "bytecodePath": "artifacts-zk/contracts-preprocessed/DefaultAccount.sol/DefaultAccount.json", "sourceCodePath": "contracts-preprocessed/DefaultAccount.sol", - "bytecodeHash": "0x0100055d1df6d5bfe11a8123f1a6d12f8d306258a4a0b6ebd6c24373e1cd555b", + "bytecodeHash": "0x0100055dd0e43606f94892eeebee66d2d8d640ca1960c7b0e8f92eb1be39c25d", "sourceCodeHash": "0xebffe840ebbd9329edb1ebff8ca50f6935e7dabcc67194a896fcc2e968d46dfb" }, { @@ -59,63 +59,63 @@ "contractName": "ImmutableSimulator", "bytecodePath": "artifacts-zk/contracts-preprocessed/ImmutableSimulator.sol/ImmutableSimulator.json", "sourceCodePath": "contracts-preprocessed/ImmutableSimulator.sol", - "bytecodeHash": "0x01000039e18b0a92c14722bca9a87eef1c1917afdf8ffa383f00ed1c47da8956", + "bytecodeHash": "0x01000039a6d70255b0fb51986fead4e5d1403f82aeffeb60f4f5193ac2c73e5e", "sourceCodeHash": "0x9659e69f7db09e8f60a8bb95314b1ed26afcc689851665cf27f5408122f60c98" }, { "contractName": "KnownCodesStorage", "bytecodePath": "artifacts-zk/contracts-preprocessed/KnownCodesStorage.sol/KnownCodesStorage.json", "sourceCodePath": "contracts-preprocessed/KnownCodesStorage.sol", - "bytecodeHash": "0x0100006f6b4f871edf5e11a752a8e8eb963eeb48dd058bff6749eb7235971cc1", + "bytecodeHash": "0x0100006f44303b3cde1b11a732cb062c67ee72ca08c067467fe77ab56fb556e1", "sourceCodeHash": "0xb39b5b81168653e0c5062f7b8e1d6d15a4e186df3317f192f0cb2fc3a74f5448" }, { "contractName": "L1Messenger", "bytecodePath": "artifacts-zk/contracts-preprocessed/L1Messenger.sol/L1Messenger.json", "sourceCodePath": "contracts-preprocessed/L1Messenger.sol", - "bytecodeHash": "0x010001f7f9ae1adb089ecba169f6e10f1981f031eebb123f64078b2a118ae04a", + "bytecodeHash": "0x010001f763e336c61021351d698976205ffc128b78cf10cfc669079bae4a0361", "sourceCodeHash": "0x8d22a4019347a45cb0c27bed9e98f7033637a7bdcd90fafb1922caa48f2b05de" }, { "contractName": "L2BaseToken", "bytecodePath": "artifacts-zk/contracts-preprocessed/L2BaseToken.sol/L2BaseToken.json", "sourceCodePath": "contracts-preprocessed/L2BaseToken.sol", - "bytecodeHash": "0x01000103d97079f37f32641d7493b825e24fb00c8e49d3c89f0b664ccd23ad7c", + "bytecodeHash": "0x0100010354ff01988b6d6ea47b218e30f576c989bcae6e49d1f65b5309c8c367", "sourceCodeHash": "0x8bdd2b4d0b53dba84c9f0af250bbaa2aad10b3de6747bba957f0bd3721090dfa" }, { "contractName": "L2GenesisUpgrade", "bytecodePath": "artifacts-zk/contracts-preprocessed/L2GenesisUpgrade.sol/L2GenesisUpgrade.json", "sourceCodePath": "contracts-preprocessed/L2GenesisUpgrade.sol", - "bytecodeHash": "0x010000d5696456676605b43a10d7cd0f33fbc465b4afa49f874e1cebba7aa6c4", - "sourceCodeHash": "0x27584533f7229befe23288d5a157514cdbdfd5935295efaf5fe1da11a12569f3" + "bytecodeHash": "0x010000d5ac9ab1a6beabd78c8b6cdf73bbeee76b406023743bf49e885fd770b0", + "sourceCodeHash": "0x15bb6f306f209b618ea5e52671757934d306dcb1d53be73ce49cd200ad485688" }, { "contractName": "MsgValueSimulator", "bytecodePath": "artifacts-zk/contracts-preprocessed/MsgValueSimulator.sol/MsgValueSimulator.json", "sourceCodePath": "contracts-preprocessed/MsgValueSimulator.sol", - "bytecodeHash": "0x0100005db7df69a12c3b379f4ae12d3be20d1008824d49e2ac0d601cdd4544be", + "bytecodeHash": "0x0100005d16e1788320cc01670bc8917b49e8466ed451b9013041563bf2dc2bd8", "sourceCodeHash": "0x082f3dcbc2fe4d93706c86aae85faa683387097d1b676e7ebd00f71ee0f13b71" }, { "contractName": "NonceHolder", "bytecodePath": "artifacts-zk/contracts-preprocessed/NonceHolder.sol/NonceHolder.json", "sourceCodePath": "contracts-preprocessed/NonceHolder.sol", - "bytecodeHash": "0x010000d90d0318d546cda8958c88105657769679f17d7c460773a0501817898e", + "bytecodeHash": "0x010000d959010a9617465fca2e8ac5cc9a35856455de7414247e8a7bfb49f80b", "sourceCodeHash": "0xcd0c0366effebf2c98c58cf96322cc242a2d1c675620ef5514b7ed1f0a869edc" }, { "contractName": "PubdataChunkPublisher", "bytecodePath": "artifacts-zk/contracts-preprocessed/PubdataChunkPublisher.sol/PubdataChunkPublisher.json", "sourceCodePath": "contracts-preprocessed/PubdataChunkPublisher.sol", - "bytecodeHash": "0x0100004900240bd8dcb7d87634a7547fb6d6ffaea7a190fb61c6850b375b7bd1", + "bytecodeHash": "0x01000049fb46caf3b58b691cf4198eb3f884082e4231d286924f60e2c5d63940", "sourceCodeHash": "0x04d3d2e4019081c87aae5c22a060d84ae2e9d631ebce59801ecce37b9c87e4c7" }, { "contractName": "SystemContext", "bytecodePath": "artifacts-zk/contracts-preprocessed/SystemContext.sol/SystemContext.json", "sourceCodePath": "contracts-preprocessed/SystemContext.sol", - "bytecodeHash": "0x010001a7c0458a11bd86f2fcbc0643f84ec93a4d4e4356ce0db3367c357ff222", + "bytecodeHash": "0x010001a71e899b44c90f39304408c3a3b1f335a9b9ca720fbcd40cfb032b83cb", "sourceCodeHash": "0xb3b8c1f57928938ac590984442bc96c2c888282793014845d5ce2f90bbf2677f" }, { From aab2f77ce8a1fa7d0efbb1d4032efc75b1048e90 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Thu, 5 Sep 2024 12:18:56 +0200 Subject: [PATCH 22/53] toml file --- .../script-out/output-deploy-l1.toml | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml index 917346ec5..1f55b1100 100644 --- a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml +++ b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml @@ -2,13 +2,13 @@ create2_factory_addr = "0x4e59b44847b379578588920cA78FbF26c0B4956C" create2_factory_salt = "0x00000000000000000000000000000000000000000000000000000000000000ff" deployer_addr = "0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496" era_chain_id = 9 -force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002c00000000000000000000000000000000000000000000000000000000000000440479fd527ba27eb8ef691b359730a2d9dd5aa41c783d184ac0a851548be5a1f9600000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9447bf69c0e623e1365f68b9682081c8aaf2005f3346a6bb9df35dc505c91cbbc00000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001542f9245b27fa8a082741b6727b86d24c07131b4afdfb66bba0b75c767bf668500000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9554b5e8820768894caf758e182b80205d2a55d217795c711cc044cf83539f66000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000000a7e2e0952e4de366512e12ba0703e9dd6ea5ca6880aeae0344cdd1b1a3cf13d400000000000000000000000000000000000000000000000000000000000100050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010002" +force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000004405f28668a8b47a6fa4ad18152630edc34d2dd694790bb988c097bbfd13c53c48300000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9447bf69c0e623e1365f68b9682081c8aaf2005f3346a6bb9df35dc505c91cbbc00000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001542f9245b27fa8a082741b6727b86d24c07131b4afdfb66bba0b75c767bf668500000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9554b5e8820768894caf758e182b80205d2a55d217795c711cc044cf83539f66000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000009fe28704985138d9d23820fd13685161fcb5e7aab142bdc8c83b78879f75ddc500000000000000000000000000000000000000000000000000000000000100050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010002" l1_chain_id = 31337 -multicall3_addr = "0xb4CA672635D5E33C2725B4F250Dc5D3BFC489469" +multicall3_addr = "0xd9c5dB4509ECD720deFD4c01bF0Fdb3D25B8d588" owner_address = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" [contracts_config] -diamond_cut_data = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000ae70b8622851519e3af6215b0d2bf8bb7e94ee5e0000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc000000000000000000000000005dece56f93491d5dda155d918de47cc41e3239b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000000000000000000000000000c64c035376af18afb8f7787554c24199fad29383000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005518c73b000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000000000000000000000000000fc6b3f1e8d93cec434ff208ce9d19011df49b2f4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab7000000000000000000000000000000000000000000000000000000000000000000000000000000003c526b4b50b8a3f20bf4200e728aeb4c1298179b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c000000000000000000000000064fd27c7082f2f3e4f8629977eab095b82ddc422000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" +diamond_cut_data = "0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000017679a7669b51bb527b1a373dc179aa2ce3c6ec80000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc0000000000000000000000000b96e881482f871091b7dda598a3c49639e87f9a200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db8650000000000000000000000000000000000000000000000000000000000000000000000000000000064a1280b1fe60edb12068555b4a7e8a36db859b8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000946ebad100000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c0000000000000000000000000000000000000000000000000000000000000000000000000000000004f981f9ee3e5e181506d81d84399da2993b153d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab7000000000000000000000000000000000000000000000000000000000000000000000000000000005d81a196afb4cd3fcf690e3d6457e48d4fae61b9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000d8a20fbb43f18dbe883c814ade727ddc2e0a3acd000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" diamond_init_batch_overhead_l1_gas = 1000000 diamond_init_max_l2_gas_per_batch = 80000000 diamond_init_max_pubdata_per_batch = 120000 @@ -23,34 +23,34 @@ recursion_node_level_vk_hash = "0x0000000000000000000000000000000000000000000000 [deployed_addresses] blob_versioned_hash_retriever_addr = "0xA4cB26d6933D2c3E76718D30de8547bCDF8dD241" -governance_addr = "0x61918895E9eB44Caf1B8B9b7e625C65b9AFda41E" -native_token_vault_addr = "0x72c8dA88057aEf671Bc2265c97c061a474b079dE" +governance_addr = "0xcCCD59eeB0aA38bFcb81C67F5807796673f9f956" +native_token_vault_addr = "0xF4c1E3602d46F59f205CAF5fE07408Db73d0a119" transparent_proxy_admin_addr = "0xD718d5A27a29FF1cD22403426084bA0d479869a0" -validator_timelock_addr = "0x296D4B4d5F4AD8969FB99bD6E1447B68730731f2" +validator_timelock_addr = "0x116DD7112bB0bAEBd69bBCA63684c8E12a33b215" [deployed_addresses.bridgehub] -bridgehub_implementation_addr = "0x707A27c33F7A4AC4E565DbaDdb5b419a6b584AE6" -bridgehub_proxy_addr = "0x91779E4566816493541AD16df6BF445043c41713" -message_root_implementation_addr = "0xA53Abaa516fc476b93810484131c2E7772d28B89" -message_root_proxy_addr = "0x2BB1Ddf7EC79b03362c75EDF120c68620531dF00" -stm_deployment_tracker_implementation_addr = "0xa7c7453d96bbB4d3fb3d91AA9e3D8a71F2027238" -stm_deployment_tracker_proxy_addr = "0x9014441FA25B02598dAf1C4049B56eC1E2fECDE9" +bridgehub_implementation_addr = "0x9E895e720E6D6800e05037Cc92fa83E5bFA0B5C9" +bridgehub_proxy_addr = "0x7967266eaf9877f2b710AE67bCeD486e9882D871" +ctm_deployment_tracker_implementation_addr = "0x0796495E33b578E3dCC7a24a9B296bF9b49DAe53" +ctm_deployment_tracker_proxy_addr = "0x3F8c006E70497390aB51e0b8045FfA02F5A98A81" +message_root_implementation_addr = "0xa6460AebD54f34853fC5E1aa497B48aCf2932110" +message_root_proxy_addr = "0x5039f9297f08B61a06859e928632fb7D8b86E366" [deployed_addresses.bridges] -erc20_bridge_implementation_addr = "0x9ac46E47b60258225008080348306D7D8F6cf65f" -erc20_bridge_proxy_addr = "0xd5366f3FF894f8dc364844Ed44E7577E56e8bF55" -shared_bridge_implementation_addr = "0x4274E94711858255df5C142D1dE463b8650726a8" -shared_bridge_proxy_addr = "0xF4854259a618c9b580499763e70fDA8d74947323" +erc20_bridge_implementation_addr = "0x13fCb6Ba80e8d8b8cDe7B404A1EadC15a755b20C" +erc20_bridge_proxy_addr = "0x6c35451413E6CcF0078d89FD4B45E2B6AE1dB560" +shared_bridge_implementation_addr = "0x37baD47Ebfe947CCdfaAA2ca5566342B125c55da" +shared_bridge_proxy_addr = "0x8BECd9b9C1C03B23F266764Efe541516efD9a6f2" [deployed_addresses.state_transition] -admin_facet_addr = "0x05deCE56F93491D5dDA155d918dE47cC41E3239b" -default_upgrade_addr = "0xf16Fda6af9D791828C86B96d2BEd3055f73AFb13" -diamond_init_addr = "0xAe70b8622851519e3Af6215b0d2bf8Bb7e94EE5E" +admin_facet_addr = "0xb96e881482F871091b7DDa598A3C49639E87f9A2" +default_upgrade_addr = "0xCF6DF2E4Af0700514442361f44480f31031685aE" +diamond_init_addr = "0x17679a7669B51bB527b1A373dc179aA2CE3c6eC8" diamond_proxy_addr = "0x0000000000000000000000000000000000000000" -executor_facet_addr = "0x3C526b4B50b8A3f20Bf4200e728AEb4C1298179b" -genesis_upgrade_addr = "0x47bE12cEb3F02469fD2d24c563F7a26EAD2214DE" -getters_facet_addr = "0xc64C035376af18aFb8f7787554C24199faD29383" -mailbox_facet_addr = "0xFc6B3f1E8D93CeC434Ff208ce9D19011dF49B2f4" -state_transition_implementation_addr = "0xc4e58Ae93055727E149A20290AB8fc9d2A8713e4" -state_transition_proxy_addr = "0xE738E5bd89Bf84049bcAEa6E5Ee7514BFbE4892f" -verifier_addr = "0x64Fd27c7082F2f3E4F8629977eaB095b82ddC422" +executor_facet_addr = "0x5d81A196afB4cd3FCf690e3D6457E48d4fae61B9" +genesis_upgrade_addr = "0x0D07F57abc96117836E22Edf4CB6A00b79ec4Bee" +getters_facet_addr = "0x64a1280B1FE60edB12068555B4A7e8A36db859b8" +mailbox_facet_addr = "0x04F981F9eE3e5e181506d81d84399DA2993b153d" +state_transition_implementation_addr = "0xB0C4Bbd27Fd7B78474dD4aC035B7450598cc7659" +state_transition_proxy_addr = "0x0216a9A5210BEC49c3b2C855378DB45e619Db4d4" +verifier_addr = "0xD8A20Fbb43F18dBe883c814adE727ddC2E0A3AcD" From 3d6e02f9a802ac6a8f6bfe8f52fce81e72ce0bbe Mon Sep 17 00:00:00 2001 From: perekopskiy <53865202+perekopskiy@users.noreply.github.com> Date: Thu, 5 Sep 2024 13:19:21 +0300 Subject: [PATCH 23/53] Set foundry optimizer_runs (#770) --- l1-contracts/foundry.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/l1-contracts/foundry.toml b/l1-contracts/foundry.toml index 4d52d0400..57dd0744a 100644 --- a/l1-contracts/foundry.toml +++ b/l1-contracts/foundry.toml @@ -26,3 +26,5 @@ remappings = [ "@openzeppelin/contracts-v4/=lib/openzeppelin-contracts-v4/contracts/", "@openzeppelin/contracts-upgradeable-v4/=lib/openzeppelin-contracts-upgradeable-v4/contracts/", ] +optimizer = true +optimizer_runs = 9999999 From 4a062d0d9c17353d3a3b9553947ae8731c476029 Mon Sep 17 00:00:00 2001 From: Stanislav Bezkorovainyi Date: Thu, 5 Sep 2024 18:04:52 +0200 Subject: [PATCH 24/53] Rename hyperchain -> ZK chain (#771) --- .../workflows/l1-contracts-foundry-ci.yaml | 6 +- docs/Overview.md | 2 +- docs/gateway/contracts-review-gateway.md | 4 +- gas-bound-caller/package.json | 2 +- .../scripts/deploy-on-hyperchain.ts | 4 +- l1-contracts/.env | 6 +- .../contracts/bridgehub/Bridgehub.sol | 127 ++++++++++-------- .../contracts/bridgehub/IBridgehub.sol | 20 +-- .../contracts/bridgehub/MessageRoot.sol | 6 +- l1-contracts/contracts/common/Config.sol | 4 +- .../contracts/common/L1ContractErrors.sol | 2 +- .../common/interfaces/IL2ContractDeployer.sol | 2 +- .../dev-contracts/test/DiamondProxyTest.sol | 4 +- .../dev-contracts/test/DummyAdminFacet.sol | 4 +- .../test/DummyAdminFacetNoOverlap.sol | 4 +- .../dev-contracts/test/DummyBridgehub.sol | 8 +- .../test/DummyBridgehubSetter.sol | 8 +- .../test/DummyChainTypeManager.sol | 6 +- ...myChainTypeManagerForValidatorTimelock.sol | 14 +- ...myChainTypeManagerWithBridgeHubAddress.sol | 6 +- .../dev-contracts/test/DummySharedBridge.sol | 2 +- .../{DummyHyperchain.sol => DummyZKChain.sol} | 4 +- .../test/ExecutorProvingTest.sol | 2 +- .../dev-contracts/test/MailboxFacetTest.sol | 2 +- .../dev-contracts/test/MockExecutor.sol | 4 +- .../contracts/governance/Governance.sol | 2 +- .../state-transition/ChainTypeManager.sol | 81 ++++++----- .../state-transition/IChainTypeManager.sol | 12 +- .../state-transition/ValidatorTimelock.sol | 30 ++--- .../contracts/state-transition/Verifier.sol | 2 +- .../chain-deps/DiamondInit.sol | 6 +- ...perchainStorage.sol => ZKChainStorage.sol} | 4 +- .../chain-deps/facets/Admin.sol | 16 +-- .../chain-deps/facets/Executor.sol | 10 +- .../chain-deps/facets/Getters.sol | 10 +- .../chain-deps/facets/Mailbox.sol | 17 +-- ...SyncHyperchainBase.sol => ZKChainBase.sol} | 6 +- .../chain-interfaces/IAdmin.sol | 6 +- .../chain-interfaces/IDiamondInit.sol | 2 +- .../chain-interfaces/IExecutor.sol | 4 +- .../chain-interfaces/IGetters.sol | 6 +- .../chain-interfaces/ILegacyGetters.sol | 4 +- .../chain-interfaces/IMailbox.sol | 4 +- .../{IZkSyncHyperchain.sol => IZKChain.sol} | 2 +- ...yncHyperchainBase.sol => IZKChainBase.sol} | 2 +- .../RelayedSLDAValidator.sol | 2 +- .../contracts/upgrades/BaseZkSyncUpgrade.sol | 6 +- .../upgrades/BaseZkSyncUpgradeGenesis.sol | 2 +- .../contracts/upgrades/GatewayUpgrade.sol | 2 +- .../contracts/upgrades/IL1GenesisUpgrade.sol | 2 +- l1-contracts/deploy-scripts/AcceptAdmin.s.sol | 6 +- l1-contracts/deploy-scripts/DeployL1.s.sol | 2 +- l1-contracts/deploy-scripts/Gateway.s.sol | 16 +-- .../PrepareZKChainRegistrationCalldata.s.sol | 4 +- ...Hyperchain.s.sol => RegisterZKChain.s.sol} | 34 ++--- l1-contracts/package.json | 2 +- l1-contracts/scripts/register-hyperchain.ts | 4 +- l1-contracts/scripts/revert-reason.ts | 2 +- l1-contracts/scripts/sync-layer.ts | 18 +-- .../scripts/upgrade-consistency-checker.ts | 24 ++-- l1-contracts/scripts/verify.ts | 6 +- l1-contracts/src.ts/deploy-process.ts | 4 +- l1-contracts/src.ts/deploy-test-process.ts | 18 +-- l1-contracts/src.ts/deploy.ts | 42 +++--- l1-contracts/src.ts/diamondCut.ts | 8 +- .../integration/BridgeHubInvariantTests.t.sol | 64 ++++----- .../foundry/integration/BridgehubTests.t.sol | 64 ++++----- .../foundry/integration/DeploymentTest.t.sol | 34 ++--- .../foundry/integration/GatewayTests.t.sol | 42 +++--- .../integration/_SharedGatewayDeployer.t.sol | 6 +- .../_SharedL1ContractDeployer.t.sol | 4 +- ...yer.t.sol => _SharedZKChainDeployer.t.sol} | 64 ++++----- .../script-out/output-deploy-l1.toml | 50 +++---- .../unit/concrete/Bridgehub/MessageRoot.t.sol | 6 +- .../Bridgehub/experimental_bridge.t.sol | 58 ++++---- .../concrete/DiamondCut/UpgradeLogic.t.sol | 2 +- .../concrete/Executor/_Executor_Shared.t.sol | 2 +- .../foundry/unit/concrete/Utils/Utils.sol | 4 +- .../unit/concrete/Utils/UtilsFacet.sol | 8 +- .../ChainTypeManager/FreezeChain.t.sol | 2 +- .../ChainTypeManager/RevertBatches.t.sol | 2 +- .../DiamondProxy/DiamondProxy.t.sol | 4 +- .../facets/Admin/ChangeFeeParams.t.sol | 2 +- .../facets/Base/OnlyBridgehub.t.sol | 4 +- .../chain-deps/facets/Base/OnlyGovernor.t.sol | 4 +- ...OnlyGovernorOrStateTransitionManager.t.sol | 4 +- .../Base/OnlyStateTransitionManager.t.sol | 4 +- .../facets/Base/OnlyValidator.t.sol | 4 +- .../chain-deps/facets/Base/_Base_Shared.t.sol | 18 +-- .../facets/Mailbox/BaseMailboxTests.t.sol | 6 +- .../facets/Mailbox/RequestL2Transaction.t.sol | 2 +- .../RelayedSLDAValidator.t.sol | 2 +- l1-contracts/test/unit_tests/gateway.spec.ts | 4 +- .../initial_deployment_test.spec.ts | 4 +- .../validator_timelock_test.spec.ts | 2 +- l2-contracts/contracts/verifier/Verifier.sol | 2 +- tools/data/verifier_contract_template.txt | 2 +- 97 files changed, 587 insertions(+), 576 deletions(-) rename l1-contracts/contracts/dev-contracts/test/{DummyHyperchain.sol => DummyZKChain.sol} (95%) rename l1-contracts/contracts/state-transition/chain-deps/{ZkSyncHyperchainStorage.sol => ZKChainStorage.sol} (98%) rename l1-contracts/contracts/state-transition/chain-deps/facets/{ZkSyncHyperchainBase.sol => ZKChainBase.sol} (91%) rename l1-contracts/contracts/state-transition/chain-interfaces/{IZkSyncHyperchain.sol => IZKChain.sol} (89%) rename l1-contracts/contracts/state-transition/chain-interfaces/{IZkSyncHyperchainBase.sol => IZKChainBase.sol} (93%) rename l1-contracts/deploy-scripts/{RegisterHyperchain.s.sol => RegisterZKChain.s.sol} (91%) rename l1-contracts/test/foundry/integration/{_SharedHyperchainDeployer.t.sol => _SharedZKChainDeployer.t.sol} (66%) diff --git a/.github/workflows/l1-contracts-foundry-ci.yaml b/.github/workflows/l1-contracts-foundry-ci.yaml index 5e959c124..5205d092c 100644 --- a/.github/workflows/l1-contracts-foundry-ci.yaml +++ b/.github/workflows/l1-contracts-foundry-ci.yaml @@ -119,11 +119,11 @@ jobs: working-directory: ./l1-contracts run: forge script ./deploy-scripts/DeployErc20.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY # TODO restore scripts verification -# - name: Run RegisterHyperchain script +# - name: Run RegisterZKChain script # working-directory: ./l1-contracts # run: | -# cat ./script-out/output-deploy-l1.toml >> ./script-config/register-hyperchain.toml -# forge script ./deploy-scripts/RegisterHyperchain.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY +# cat ./script-out/output-deploy-l1.toml >> ./script-config/register-zk-chain.toml +# forge script ./deploy-scripts/RegisterZKChain.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY # - name: Run InitializeL2WethToken script # working-directory: ./l1-contracts-foundry # run: forge script ./deploy-scripts/InitializeL2WethToken.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY diff --git a/docs/Overview.md b/docs/Overview.md index b3003ec88..bcee716b2 100644 --- a/docs/Overview.md +++ b/docs/Overview.md @@ -157,7 +157,7 @@ this trick: #### L1 -> L2 Transaction filtering There is a mechanism for applying custom filters to the L1 -> L2 communication. It is achieved by having an address of -the `TransactionFilterer` contract in the `ZkSyncHyperchainStorage`. If the filterer exists, it is being called in +the `TransactionFilterer` contract in the `ZkSyncZKChainStorage`. If the filterer exists, it is being called in the `Mailbox` facet with the tx details and has to return whether the transaction can be executed or not. The filterer has to implement the `ITransactionFilterer` interface. The ones intended to use this feature, have to deploy the contract that implements `ITransactionFilterer` and use `setTransactionFilterer` function of `AdminFacet` to set the diff --git a/docs/gateway/contracts-review-gateway.md b/docs/gateway/contracts-review-gateway.md index ea0f9936f..5e14df72e 100644 --- a/docs/gateway/contracts-review-gateway.md +++ b/docs/gateway/contracts-review-gateway.md @@ -29,7 +29,7 @@ Known issues, and features that still need to be implemented: - Bridgehub setAssetHandlerAddress `address sender` might be an issue. - MessageRoot should be renamed to MessageRootAggregator -![Untitled](./Hyperchain-scheme.png) +![Untitled](./ZKChain-scheme.png) ## Initial Scope @@ -63,6 +63,6 @@ The majority of the rest of the changes. This makes the scope quite big, so plea - ChainTypeManager.sol - ValidatorTimelock.sol - DiamondInit.sol -- ZkSyncHyperchainStorage.sol +- ZKChainStorage.sol - Admin.sol - L1GenesisUpgrade.sol diff --git a/gas-bound-caller/package.json b/gas-bound-caller/package.json index af91e7593..fd3ac760c 100644 --- a/gas-bound-caller/package.json +++ b/gas-bound-caller/package.json @@ -56,7 +56,7 @@ "test-node": "hardhat node-zksync --tag v0.0.1-vm1.5.0", "check-canonical-bytecode": "ts-node ./scripts/check-canonical-bytecode.ts", "verify": "hardhat run scripts/verify.ts", - "deploy-on-hyperchain": "ts-node ./scripts/deploy-on-hyperchain.ts", + "deploy-on-zk-chain": "ts-node ./scripts/deploy-on-zk-chain.ts", "deploy-on-localhost": "hardhat deploy --network localhost" } } diff --git a/gas-bound-caller/scripts/deploy-on-hyperchain.ts b/gas-bound-caller/scripts/deploy-on-hyperchain.ts index 35d013fd7..228524de4 100644 --- a/gas-bound-caller/scripts/deploy-on-hyperchain.ts +++ b/gas-bound-caller/scripts/deploy-on-hyperchain.ts @@ -44,8 +44,8 @@ async function main() { program .version("0.1.0") - .name("Deploy on hyperchain") - .description("Deploys the GasBoundCaller on a predetermined Hyperchain network") + .name("Deploy on ZK chain") + .description("Deploys the GasBoundCaller on a predetermined ZK chain network") .option("--private-key ") .option("--l2Rpc ") .action(async (cmd) => { diff --git a/l1-contracts/.env b/l1-contracts/.env index 75ffb77b5..a2cd3b3e8 100644 --- a/l1-contracts/.env +++ b/l1-contracts/.env @@ -33,10 +33,10 @@ CONTRACTS_VALIDATOR_TIMELOCK_EXECUTION_DELAY=0 ETH_SENDER_SENDER_OPERATOR_COMMIT_ETH_ADDR=0x0000000000000000000000000000000000000000 ETH_SENDER_SENDER_OPERATOR_BLOBS_ETH_ADDR=0x0000000000000000000000000000000000000001 CONTRACTS_SHARED_BRIDGE_UPGRADE_STORAGE_SWITCH=0 -CONTRACTS_MAX_NUMBER_OF_HYPERCHAINS=100 +CONTRACTS_MAX_NUMBER_OF_ZK_CHAINS=100 L1_CONFIG=/script-config/config-deploy-l1.toml L1_OUTPUT=/script-out/output-deploy-l1.toml TOKENS_CONFIG=/script-config/config-deploy-erc20.toml -HYPERCHAIN_CONFIG=/script-config/register-hyperchain.toml -HYPERCHAIN_OUTPUT=/script-out/output-deploy-hyperchain-era.toml +ZK_CHAIN_CONFIG=/script-config/register-zk-chain.toml +ZK_CHAIN_OUTPUT=/script-out/output-deploy-zk-chain-era.toml FORCE_DEPLOYMENTS_CONFIG=/script-config/generate-force-deployments-data.toml diff --git a/l1-contracts/contracts/bridgehub/Bridgehub.sol b/l1-contracts/contracts/bridgehub/Bridgehub.sol index 4f1e1d923..823aa1332 100644 --- a/l1-contracts/contracts/bridgehub/Bridgehub.sol +++ b/l1-contracts/contracts/bridgehub/Bridgehub.sol @@ -15,7 +15,7 @@ import {IL1BaseTokenAssetHandler} from "../bridge/interfaces/IL1BaseTokenAssetHa import {IChainTypeManager} from "../state-transition/IChainTypeManager.sol"; import {ReentrancyGuard} from "../common/ReentrancyGuard.sol"; import {DataEncoding} from "../common/libraries/DataEncoding.sol"; -import {IZkSyncHyperchain} from "../state-transition/chain-interfaces/IZkSyncHyperchain.sol"; +import {IZKChain} from "../state-transition/chain-interfaces/IZKChain.sol"; import {ETH_TOKEN_ADDRESS, TWO_BRIDGES_MAGIC_VALUE, BRIDGEHUB_MIN_SECOND_BRIDGE_ADDRESS, SETTLEMENT_LAYER_RELAY_SENDER} from "../common/Config.sol"; import {BridgehubL2TransactionRequest, L2Message, L2Log, TxStatus} from "../common/Messaging.sol"; @@ -23,7 +23,7 @@ import {AddressAliasHelper} from "../vendor/AddressAliasHelper.sol"; import {IMessageRoot} from "./IMessageRoot.sol"; import {ICTMDeploymentTracker} from "./ICTMDeploymentTracker.sol"; import {L2CanonicalTransaction} from "../common/Messaging.sol"; -import {AssetHandlerNotRegistered, HyperchainLimitReached, Unauthorized, CTMAlreadyRegistered, CTMNotRegistered, ZeroChainId, ChainIdTooBig, SharedBridgeNotSet, BridgeHubAlreadyRegistered, AddressTooLow, MsgValueMismatch, WrongMagicValue, ZeroAddress} from "../common/L1ContractErrors.sol"; +import {AssetHandlerNotRegistered, ZKChainLimitReached, Unauthorized, CTMAlreadyRegistered, CTMNotRegistered, ZeroChainId, ChainIdTooBig, SharedBridgeNotSet, BridgeHubAlreadyRegistered, AddressTooLow, MsgValueMismatch, WrongMagicValue, ZeroAddress} from "../common/L1ContractErrors.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev @@ -42,9 +42,9 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// L1 that is at the most base layer. uint256 public immutable L1_CHAIN_ID; - /// @notice The total number of hyperchains can be created/connected to this CTM. + /// @notice The total number of ZK chains can be created/connected to this CTM. /// This is the temporary security measure. - uint256 public immutable MAX_NUMBER_OF_HYPERCHAINS; + uint256 public immutable MAX_NUMBER_OF_ZK_CHAINS; /// @notice all the ether and ERC20 tokens are held by NativeVaultToken managed by this shared Bridge. IL1AssetRouter public sharedBridge; @@ -68,8 +68,8 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @dev used to accept the admin role address private pendingAdmin; - /// @notice The map from chainId => hyperchain contract - EnumerableMap.UintToAddressMap internal hyperchainMap; + /// @notice The map from chainId => zkChain contract + EnumerableMap.UintToAddressMap internal zkChainMap; /// @notice The contract that stores the cross-chain message root for each chain and the aggregated root. /// @dev Note that the message root does not contain messages from the chain it is deployed on. It may @@ -134,10 +134,10 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus } /// @notice to avoid parity hack - constructor(uint256 _l1ChainId, address _owner, uint256 _maxNumberOfHyperchains) reentrancyGuardInitializer { + constructor(uint256 _l1ChainId, address _owner, uint256 _maxNumberOfZKChains) reentrancyGuardInitializer { _disableInitializers(); L1_CHAIN_ID = _l1ChainId; - MAX_NUMBER_OF_HYPERCHAINS = _maxNumberOfHyperchains; + MAX_NUMBER_OF_ZK_CHAINS = _maxNumberOfZKChains; // Note that this assumes that the bridgehub only accepts transactions on chains with ETH base token only. // This is indeed true, since the only methods where this immutable is used are the ones with `onlyL1` modifier. @@ -218,11 +218,11 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus function setLegacyChainAddress(uint256 _chainId) external { address ctm = chainTypeManager[_chainId]; require(ctm != address(0), "BH: chain not legacy"); - require(!hyperchainMap.contains(_chainId), "BH: chain already migrated"); + require(!zkChainMap.contains(_chainId), "BH: chain already migrated"); /// Note we have to do this before CTM is upgraded. - address chainAddress = IChainTypeManager(ctm).getHyperchainLegacy(_chainId); + address chainAddress = IChainTypeManager(ctm).getZKChainLegacy(_chainId); require(chainAddress != address(0), "BH: chain not legacy 2"); - _registerNewHyperchain(_chainId, chainAddress); + _registerNewZKChain(_chainId, chainAddress); } //// Registry @@ -364,19 +364,19 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus _initData: _initData, _factoryDeps: _factoryDeps }); - _registerNewHyperchain(_chainId, chainAddress); + _registerNewZKChain(_chainId, chainAddress); messageRoot.addNewChain(_chainId); emit NewChain(_chainId, _chainTypeManager, _admin); return _chainId; } - /// @dev This internal function is used to register a new hyperchain in the system. - function _registerNewHyperchain(uint256 _chainId, address _hyperchain) internal { + /// @dev This internal function is used to register a new zkChain in the system. + function _registerNewZKChain(uint256 _chainId, address _zkChain) internal { // slither-disable-next-line unused-return - hyperchainMap.set(_chainId, _hyperchain); - if (hyperchainMap.length() > MAX_NUMBER_OF_HYPERCHAINS) { - revert HyperchainLimitReached(); + zkChainMap.set(_chainId, _zkChain); + if (zkChainMap.length() > MAX_NUMBER_OF_ZK_CHAINS) { + revert ZKChainLimitReached(); } } @@ -397,27 +397,27 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus return IL1BaseTokenAssetHandler(assetHandlerAddress).tokenAddress(baseTokenAssetId); } - /// @notice Returns all the registered hyperchain addresses - function getAllHyperchains() public view override returns (address[] memory chainAddresses) { - uint256[] memory keys = hyperchainMap.keys(); + /// @notice Returns all the registered zkChain addresses + function getAllZKChains() public view override returns (address[] memory chainAddresses) { + uint256[] memory keys = zkChainMap.keys(); chainAddresses = new address[](keys.length); uint256 keysLength = keys.length; for (uint256 i = 0; i < keysLength; ++i) { - chainAddresses[i] = hyperchainMap.get(keys[i]); + chainAddresses[i] = zkChainMap.get(keys[i]); } } - /// @notice Returns all the registered hyperchain chainIDs - function getAllHyperchainChainIDs() public view override returns (uint256[] memory) { - return hyperchainMap.keys(); + /// @notice Returns all the registered zkChain chainIDs + function getAllZKChainChainIDs() public view override returns (uint256[] memory) { + return zkChainMap.keys(); } - /// @notice Returns the address of the hyperchain with the corresponding chainID + /// @notice Returns the address of the ZK chain with the corresponding chainID /// @param _chainId the chainId of the chain - /// @return chainAddress the address of the hyperchain - function getHyperchain(uint256 _chainId) public view override returns (address chainAddress) { + /// @return chainAddress the address of the ZK chain + function getZKChain(uint256 _chainId) public view override returns (address chainAddress) { // slither-disable-next-line unused-return - (, chainAddress) = hyperchainMap.tryGet(_chainId); + (, chainAddress) = zkChainMap.tryGet(_chainId); } function ctmAssetIdFromChainId(uint256 _chainId) public view override returns (bytes32) { @@ -442,7 +442,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus function requestL2TransactionDirect( L2TransactionRequestDirect calldata _request ) external payable override nonReentrant whenNotPaused onlyL1 returns (bytes32 canonicalTxHash) { - // Note: If the hyperchain with corresponding `chainId` is not yet created, + // Note: If the ZK chain with corresponding `chainId` is not yet created, // the transaction will revert on `bridgehubRequestL2Transaction` as call to zero address. { bytes32 tokenAssetId = baseTokenAssetId[_request.chainId]; @@ -465,9 +465,9 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus ); } - address hyperchain = hyperchainMap.get(_request.chainId); + address zkChain = zkChainMap.get(_request.chainId); address refundRecipient = AddressAliasHelper.actualRefundRecipient(_request.refundRecipient, msg.sender); - canonicalTxHash = IZkSyncHyperchain(hyperchain).bridgehubRequestL2Transaction( + canonicalTxHash = IZKChain(zkChain).bridgehubRequestL2Transaction( BridgehubL2TransactionRequest({ sender: msg.sender, contractL2: _request.l2Contract, @@ -525,7 +525,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus ); } - address hyperchain = hyperchainMap.get(_request.chainId); + address zkChain = zkChainMap.get(_request.chainId); if (_request.secondBridgeAddress <= BRIDGEHUB_MIN_SECOND_BRIDGE_ADDRESS) { revert AddressTooLow(_request.secondBridgeAddress); @@ -546,7 +546,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus address refundRecipient = AddressAliasHelper.actualRefundRecipient(_request.refundRecipient, msg.sender); - canonicalTxHash = IZkSyncHyperchain(hyperchain).bridgehubRequestL2Transaction( + canonicalTxHash = IZKChain(zkChain).bridgehubRequestL2Transaction( BridgehubL2TransactionRequest({ sender: _request.secondBridgeAddress, contractL2: outputRequest.l2Contract, @@ -581,8 +581,8 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus uint64 _expirationTimestamp ) external override onlySettlementLayerRelayedSender { require(L1_CHAIN_ID != block.chainid, "BH: not in sync layer mode"); - address hyperchain = hyperchainMap.get(_chainId); - IZkSyncHyperchain(hyperchain).bridgehubRequestL2TransactionOnGateway( + address zkChain = zkChainMap.get(_chainId); + IZKChain(zkChain).bridgehubRequestL2TransactionOnGateway( _transaction, _factoryDeps, _canonicalTxHash, @@ -591,7 +591,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus } /// @notice forwards function call to Mailbox based on ChainId - /// @param _chainId The chain ID of the hyperchain where to prove L2 message inclusion. + /// @param _chainId The chain ID of the ZK chain where to prove L2 message inclusion. /// @param _batchNumber The executed L2 batch number in which the message appeared /// @param _index The position in the L2 logs Merkle tree of the l2Log that was sent with the message /// @param _message Information about the sent message: sender address, the message itself, tx index in the L2 batch where the message was sent @@ -604,12 +604,12 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus L2Message calldata _message, bytes32[] calldata _proof ) external view override returns (bool) { - address hyperchain = hyperchainMap.get(_chainId); - return IZkSyncHyperchain(hyperchain).proveL2MessageInclusion(_batchNumber, _index, _message, _proof); + address zkChain = zkChainMap.get(_chainId); + return IZKChain(zkChain).proveL2MessageInclusion(_batchNumber, _index, _message, _proof); } /// @notice forwards function call to Mailbox based on ChainId - /// @param _chainId The chain ID of the hyperchain where to prove L2 log inclusion. + /// @param _chainId The chain ID of the ZK chain where to prove L2 log inclusion. /// @param _batchNumber The executed L2 batch number in which the log appeared /// @param _index The position of the l2log in the L2 logs Merkle tree /// @param _log Information about the sent log @@ -622,12 +622,12 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus L2Log calldata _log, bytes32[] calldata _proof ) external view override returns (bool) { - address hyperchain = hyperchainMap.get(_chainId); - return IZkSyncHyperchain(hyperchain).proveL2LogInclusion(_batchNumber, _index, _log, _proof); + address zkChain = zkChainMap.get(_chainId); + return IZKChain(zkChain).proveL2LogInclusion(_batchNumber, _index, _log, _proof); } /// @notice forwards function call to Mailbox based on ChainId - /// @param _chainId The chain ID of the hyperchain where to prove L1->L2 tx status. + /// @param _chainId The chain ID of the ZK chain where to prove L1->L2 tx status. /// @param _l2TxHash The L2 canonical transaction hash /// @param _l2BatchNumber The L2 batch number where the transaction was processed /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message @@ -645,9 +645,9 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus bytes32[] calldata _merkleProof, TxStatus _status ) external view override returns (bool) { - address hyperchain = hyperchainMap.get(_chainId); + address zkChain = zkChainMap.get(_chainId); return - IZkSyncHyperchain(hyperchain).proveL1ToL2TransactionStatus({ + IZKChain(zkChain).proveL1ToL2TransactionStatus({ _l2TxHash: _l2TxHash, _l2BatchNumber: _l2BatchNumber, _l2MessageIndex: _l2MessageIndex, @@ -664,8 +664,8 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus uint256 _l2GasLimit, uint256 _l2GasPerPubdataByteLimit ) external view returns (uint256) { - address hyperchain = hyperchainMap.get(_chainId); - return IZkSyncHyperchain(hyperchain).l2TransactionBaseCost(_gasPrice, _l2GasLimit, _l2GasPerPubdataByteLimit); + address zkChain = zkChainMap.get(_chainId); + return IZKChain(zkChain).l2TransactionBaseCost(_gasPrice, _l2GasLimit, _l2GasPerPubdataByteLimit); } /*////////////////////////////////////////////////////////////// @@ -691,16 +691,16 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus require(settlementLayer[bridgeData.chainId] == block.chainid, "BH: not current SL"); settlementLayer[bridgeData.chainId] = _settlementChainId; - address hyperchain = hyperchainMap.get(bridgeData.chainId); - require(hyperchain != address(0), "BH: hyperchain not registered"); - require(_prevMsgSender == IZkSyncHyperchain(hyperchain).getAdmin(), "BH: incorrect sender"); + address zkChain = zkChainMap.get(bridgeData.chainId); + require(zkChain != address(0), "BH: zkChain not registered"); + require(_prevMsgSender == IZKChain(zkChain).getAdmin(), "BH: incorrect sender"); bytes memory ctmMintData = IChainTypeManager(chainTypeManager[bridgeData.chainId]).forwardedBridgeBurn( bridgeData.chainId, bridgeData.ctmData ); - bytes memory chainMintData = IZkSyncHyperchain(hyperchain).forwardedBridgeBurn( - hyperchainMap.get(_settlementChainId), + bytes memory chainMintData = IZKChain(zkChain).forwardedBridgeBurn( + zkChainMap.get(_settlementChainId), _prevMsgSender, bridgeData.chainData ); @@ -733,18 +733,18 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus // It is assumed that if the bridging happened, the token was approved on L1 already. assetIdIsRegistered[bridgeData.baseTokenAssetId] = true; - address hyperchain = getHyperchain(bridgeData.chainId); - bool contractAlreadyDeployed = hyperchain != address(0); + address zkChain = getZKChain(bridgeData.chainId); + bool contractAlreadyDeployed = zkChain != address(0); if (!contractAlreadyDeployed) { - hyperchain = IChainTypeManager(ctm).forwardedBridgeMint(bridgeData.chainId, bridgeData.ctmData); - require(hyperchain != address(0), "BH: chain not registered"); - _registerNewHyperchain(bridgeData.chainId, hyperchain); + zkChain = IChainTypeManager(ctm).forwardedBridgeMint(bridgeData.chainId, bridgeData.ctmData); + require(zkChain != address(0), "BH: chain not registered"); + _registerNewZKChain(bridgeData.chainId, zkChain); messageRoot.addNewChain(bridgeData.chainId); } - IZkSyncHyperchain(hyperchain).forwardedBridgeMint(bridgeData.chainData, contractAlreadyDeployed); + IZKChain(zkChain).forwardedBridgeMint(bridgeData.chainData, contractAlreadyDeployed); - emit MigrationFinalized(bridgeData.chainId, _assetId, hyperchain); + emit MigrationFinalized(bridgeData.chainId, _assetId, zkChain); } /// @dev IL1AssetHandler interface, used to undo a failed migration of a chain. @@ -768,7 +768,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus _ctmData: ctmAssetData.ctmData }); - IZkSyncHyperchain(getHyperchain(_chainId)).forwardedBridgeRecoverFailedTransfer({ + IZKChain(getZKChain(_chainId)).forwardedBridgeRecoverFailedTransfer({ _chainId: _chainId, _assetInfo: _assetId, _prevMsgSender: _depositSender, @@ -799,4 +799,13 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus function unpauseMigration() external onlyOwner { migrationPaused = false; } + + /*////////////////////////////////////////////////////////////// + Legacy functions + //////////////////////////////////////////////////////////////*/ + + /// @notice return the ZK chain contract for a chainId + function getHyperchain(uint256 _chainId) public view returns (address) { + return getZKChain(_chainId); + } } diff --git a/l1-contracts/contracts/bridgehub/IBridgehub.sol b/l1-contracts/contracts/bridgehub/IBridgehub.sol index 3a5c45ea5..380a87747 100644 --- a/l1-contracts/contracts/bridgehub/IBridgehub.sol +++ b/l1-contracts/contracts/bridgehub/IBridgehub.sol @@ -74,16 +74,16 @@ interface IBridgehub is IL1AssetHandler { event SettlementLayerRegistered(uint256 indexed chainId, bool indexed isWhitelisted); /// @notice Emitted when the bridging to the chain is started. - /// @param chainId Chain ID of the hyperchain - /// @param assetId Asset ID of the token for the hyperchain's CTM + /// @param chainId Chain ID of the ZK chain + /// @param assetId Asset ID of the token for the zkChain's CTM /// @param settlementLayerChainId The chain id of the settlement layer the chain migrates to. event MigrationStarted(uint256 indexed chainId, bytes32 indexed assetId, uint256 indexed settlementLayerChainId); /// @notice Emitted when the bridging to the chain is complete. - /// @param chainId Chain ID of the hyperchain - /// @param assetId Asset ID of the token for the hyperchain's CTM - /// @param hyperchain The address of the hyperchain on the chain where it is migrated to. - event MigrationFinalized(uint256 indexed chainId, bytes32 indexed assetId, address indexed hyperchain); + /// @param chainId Chain ID of the ZK chain + /// @param assetId Asset ID of the token for the zkChain's CTM + /// @param zkChain The address of the ZK chain on the chain where it is migrated to. + event MigrationFinalized(uint256 indexed chainId, bytes32 indexed assetId, address indexed zkChain); /// @notice Starts the transfer of admin rights. Only the current admin or owner can propose a new pending one. /// @notice New admin can accept admin rights by calling `acceptAdmin` function. @@ -108,11 +108,11 @@ interface IBridgehub is IL1AssetHandler { function messageRoot() external view returns (IMessageRoot); - function getHyperchain(uint256 _chainId) external view returns (address); + function getZKChain(uint256 _chainId) external view returns (address); - function getAllHyperchains() external view returns (address[] memory); + function getAllZKChains() external view returns (address[] memory); - function getAllHyperchainChainIDs() external view returns (uint256[] memory); + function getAllZKChainChainIDs() external view returns (uint256[] memory); function migrationPaused() external view returns (bool); @@ -201,7 +201,7 @@ interface IBridgehub is IL1AssetHandler { // address _sharedBridge, // address _admin, // uint256 _expectedProtocolVersion, - // HyperchainCommitment calldata _commitment, + // ZKChainCommitment calldata _commitment, // bytes calldata _diamondCut // ) external; diff --git a/l1-contracts/contracts/bridgehub/MessageRoot.sol b/l1-contracts/contracts/bridgehub/MessageRoot.sol index 650d88e47..3d81b990f 100644 --- a/l1-contracts/contracts/bridgehub/MessageRoot.sol +++ b/l1-contracts/contracts/bridgehub/MessageRoot.sol @@ -14,7 +14,7 @@ import {FullMerkle} from "../common/libraries/FullMerkle.sol"; import {MessageHashing} from "../common/libraries/MessageHashing.sol"; -import {MAX_NUMBER_OF_HYPERCHAINS} from "../common/Config.sol"; +import {MAX_NUMBER_OF_ZK_CHAINS} from "../common/Config.sol"; // Chain tree consists of batch commitments as their leaves. We use hash of "new bytes(96)" as the hash of an empty leaf. bytes32 constant CHAIN_TREE_EMPTY_ENTRY_HASH = bytes32( @@ -66,7 +66,7 @@ contract MessageRoot is IMessageRoot, ReentrancyGuard { /// @notice only the bridgehub can call /// @param _chainId the chainId of the chain modifier onlyChain(uint256 _chainId) { - require(msg.sender == BRIDGE_HUB.getHyperchain(_chainId), "MR: only chain"); + require(msg.sender == BRIDGE_HUB.getZKChain(_chainId), "MR: only chain"); _; } @@ -145,7 +145,7 @@ contract MessageRoot is IMessageRoot, ReentrancyGuard { /// @param _chainId the chainId of the chain function _addNewChain(uint256 _chainId) internal { uint256 cachedChainCount = chainCount; - require(cachedChainCount < MAX_NUMBER_OF_HYPERCHAINS, "MR: too many chains"); + require(cachedChainCount < MAX_NUMBER_OF_ZK_CHAINS, "MR: too many chains"); ++chainCount; chainIndex[_chainId] = cachedChainCount; diff --git a/l1-contracts/contracts/common/Config.sol b/l1-contracts/contracts/common/Config.sol index dfac8a3bd..beebcd00c 100644 --- a/l1-contracts/contracts/common/Config.sol +++ b/l1-contracts/contracts/common/Config.sol @@ -112,7 +112,7 @@ bytes32 constant TWO_BRIDGES_MAGIC_VALUE = bytes32(uint256(keccak256("TWO_BRIDGE address constant BRIDGEHUB_MIN_SECOND_BRIDGE_ADDRESS = address(uint160(type(uint16).max)); /// @dev the maximum number of supported chains, this is an arbitrary limit. -uint256 constant MAX_NUMBER_OF_HYPERCHAINS = 100; +uint256 constant MAX_NUMBER_OF_ZK_CHAINS = 100; /// @dev Used as the `msg.sender` for transactions that relayed via a settlement layer. address constant SETTLEMENT_LAYER_RELAY_SENDER = address(uint160(0x1111111111111111111111111111111111111111)); @@ -128,7 +128,7 @@ struct PriorityTreeCommitment { } // Info that allows to restore a chain. -struct HyperchainCommitment { +struct ZKChainCommitment { /// @notice Total number of executed batches i.e. batches[totalBatchesExecuted] points at the latest executed batch /// (batch 0 is genesis) uint256 totalBatchesExecuted; diff --git a/l1-contracts/contracts/common/L1ContractErrors.sol b/l1-contracts/contracts/common/L1ContractErrors.sol index a12f812c4..266ddf3c4 100644 --- a/l1-contracts/contracts/common/L1ContractErrors.sol +++ b/l1-contracts/contracts/common/L1ContractErrors.sol @@ -74,7 +74,7 @@ error HashedLogIsDefault(); // 0x0b08d5be error HashMismatch(bytes32 expected, bytes32 actual); // 0xb615c2b1 -error HyperchainLimitReached(); +error ZKChainLimitReached(); // 0x826fb11e error InsufficientChainBalance(); // 0x356680b7 diff --git a/l1-contracts/contracts/common/interfaces/IL2ContractDeployer.sol b/l1-contracts/contracts/common/interfaces/IL2ContractDeployer.sol index 3d5b597df..015442dd9 100644 --- a/l1-contracts/contracts/common/interfaces/IL2ContractDeployer.sol +++ b/l1-contracts/contracts/common/interfaces/IL2ContractDeployer.sol @@ -4,7 +4,7 @@ pragma solidity ^0.8.21; /** * @author Matter Labs - * @notice System smart contract that is responsible for deploying other smart contracts on a ZKsync hyperchain. + * @notice System smart contract that is responsible for deploying other smart contracts on a ZK chain. */ interface IL2ContractDeployer { /// @notice A struct that describes a forced deployment on an address. diff --git a/l1-contracts/contracts/dev-contracts/test/DiamondProxyTest.sol b/l1-contracts/contracts/dev-contracts/test/DiamondProxyTest.sol index 212a2b76a..a8ae37582 100644 --- a/l1-contracts/contracts/dev-contracts/test/DiamondProxyTest.sol +++ b/l1-contracts/contracts/dev-contracts/test/DiamondProxyTest.sol @@ -3,9 +3,9 @@ pragma solidity 0.8.24; import {Diamond} from "../../state-transition/libraries/Diamond.sol"; -import {ZkSyncHyperchainBase} from "../../state-transition/chain-deps/facets/ZkSyncHyperchainBase.sol"; +import {ZKChainBase} from "../../state-transition/chain-deps/facets/ZKChainBase.sol"; -contract DiamondProxyTest is ZkSyncHyperchainBase { +contract DiamondProxyTest is ZKChainBase { // add this to be excluded from coverage report function test() internal virtual {} diff --git a/l1-contracts/contracts/dev-contracts/test/DummyAdminFacet.sol b/l1-contracts/contracts/dev-contracts/test/DummyAdminFacet.sol index 0a27a7e1c..82c64c4e8 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummyAdminFacet.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummyAdminFacet.sol @@ -2,9 +2,9 @@ pragma solidity 0.8.24; -import {ZkSyncHyperchainBase} from "../../state-transition/chain-deps/facets/ZkSyncHyperchainBase.sol"; +import {ZKChainBase} from "../../state-transition/chain-deps/facets/ZKChainBase.sol"; -contract DummyAdminFacet is ZkSyncHyperchainBase { +contract DummyAdminFacet is ZKChainBase { // add this to be excluded from coverage report function test() internal virtual {} diff --git a/l1-contracts/contracts/dev-contracts/test/DummyAdminFacetNoOverlap.sol b/l1-contracts/contracts/dev-contracts/test/DummyAdminFacetNoOverlap.sol index 06085cf7c..ce6eedf50 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummyAdminFacetNoOverlap.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummyAdminFacetNoOverlap.sol @@ -3,12 +3,12 @@ pragma solidity 0.8.24; import {Diamond} from "../../state-transition/libraries/Diamond.sol"; -import {ZkSyncHyperchainBase} from "../../state-transition/chain-deps/facets/ZkSyncHyperchainBase.sol"; +import {ZKChainBase} from "../../state-transition/chain-deps/facets/ZKChainBase.sol"; import {IL1AssetRouter} from "../../bridge/interfaces/IL1AssetRouter.sol"; import {DataEncoding} from "../../common/libraries/DataEncoding.sol"; /// selectors do not overlap with normal facet selectors (getName does not count) -contract DummyAdminFacetNoOverlap is ZkSyncHyperchainBase { +contract DummyAdminFacetNoOverlap is ZKChainBase { // add this to be excluded from coverage report function test() internal virtual {} diff --git a/l1-contracts/contracts/dev-contracts/test/DummyBridgehub.sol b/l1-contracts/contracts/dev-contracts/test/DummyBridgehub.sol index 463cbe017..5038f5f66 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummyBridgehub.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummyBridgehub.sol @@ -13,7 +13,7 @@ import {IGetters} from "../../state-transition/chain-interfaces/IGetters.sol"; contract DummyBridgehub { IMessageRoot public messageRoot; - address public hyperchain; + address public zkChain; // add this to be excluded from coverage report function test() internal virtual {} @@ -34,11 +34,11 @@ contract DummyBridgehub { messageRoot = IMessageRoot(_messageRoot); } - function setHyperchain(uint256, address _hyperchain) external { - hyperchain = _hyperchain; + function setZKChain(uint256, address _zkChain) external { + zkChain = _zkChain; } - function getHyperchain(uint256) external view returns (address) { + function getZKChain(uint256) external view returns (address) { return address(0); } } diff --git a/l1-contracts/contracts/dev-contracts/test/DummyBridgehubSetter.sol b/l1-contracts/contracts/dev-contracts/test/DummyBridgehubSetter.sol index 5293fc26d..8ae0404e7 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummyBridgehubSetter.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummyBridgehubSetter.sol @@ -12,11 +12,11 @@ contract DummyBridgehubSetter is Bridgehub { constructor( uint256 _l1ChainId, address _owner, - uint256 _maxNumberOfHyperchains - ) Bridgehub(_l1ChainId, _owner, _maxNumberOfHyperchains) {} + uint256 _maxNumberOfZKChains + ) Bridgehub(_l1ChainId, _owner, _maxNumberOfZKChains) {} - function setHyperchain(uint256 _chainId, address _hyperchain) external { - _registerNewHyperchain(_chainId, _hyperchain); + function setZKChain(uint256 _chainId, address _zkChain) external { + _registerNewZKChain(_chainId, _zkChain); } function setCTM(uint256 _chainId, address _ctm) external { diff --git a/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManager.sol b/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManager.sol index f2c168910..20cc25328 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManager.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManager.sol @@ -14,12 +14,12 @@ contract DummyChainTypeManager is ChainTypeManager { // add this to be excluded from coverage report function test() internal virtual {} - address hyperchain; + address zkChain; /// @notice Constructor constructor() ChainTypeManager(address(0)) {} - function setHyperchain(uint256 _chainId, address _hyperchain) external { - hyperchain = _hyperchain; + function setZKChain(uint256 _chainId, address _zkChain) external { + zkChain = _zkChain; } } diff --git a/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManagerForValidatorTimelock.sol b/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManagerForValidatorTimelock.sol index fa38984cb..8e876abb2 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManagerForValidatorTimelock.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManagerForValidatorTimelock.sol @@ -9,22 +9,22 @@ contract DummyChainTypeManagerForValidatorTimelock { function test() internal virtual {} address public chainAdmin; - address public hyperchainAddress; + address public zkChainAddress; - constructor(address _chainAdmin, address _hyperchain) { + constructor(address _chainAdmin, address _zkChain) { chainAdmin = _chainAdmin; - hyperchainAddress = _hyperchain; + zkChainAddress = _zkChain; } function getChainAdmin(uint256) external view returns (address) { return chainAdmin; } - function getHyperchain(uint256) external view returns (address) { - return hyperchainAddress; + function getZKChain(uint256) external view returns (address) { + return zkChainAddress; } - function setHyperchain(uint256, address _hyperchain) external { - hyperchainAddress = _hyperchain; + function setZKChain(uint256, address _zkChain) external { + zkChainAddress = _zkChain; } } diff --git a/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManagerWithBridgeHubAddress.sol b/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManagerWithBridgeHubAddress.sol index 55a4c2594..9f6acd198 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManagerWithBridgeHubAddress.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummyChainTypeManagerWithBridgeHubAddress.sol @@ -11,12 +11,12 @@ import {ChainTypeManager} from "../../state-transition/ChainTypeManager.sol"; contract DummyChainTypeManagerWBH is ChainTypeManager { using EnumerableMap for EnumerableMap.UintToAddressMap; - address hyperchain; + address zkChain; /// @notice Constructor constructor(address bridgeHub) ChainTypeManager(bridgeHub) {} - function setHyperchain(uint256 _chainId, address _hyperchain) external { - hyperchain = _hyperchain; + function setZKChain(uint256 _chainId, address _zkChain) external { + zkChain = _zkChain; } // add this to be excluded from coverage report diff --git a/l1-contracts/contracts/dev-contracts/test/DummySharedBridge.sol b/l1-contracts/contracts/dev-contracts/test/DummySharedBridge.sol index b346b2819..aea6099cb 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummySharedBridge.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummySharedBridge.sol @@ -27,7 +27,7 @@ contract DummySharedBridge is PausableUpgradeable { bytes32 dummyL2DepositTxHash; - /// @dev Maps token balances for each chain to prevent unauthorized spending across hyperchains. + /// @dev Maps token balances for each chain to prevent unauthorized spending across zkChains. /// This serves as a security measure until hyperbridging is implemented. mapping(uint256 chainId => mapping(address l1Token => uint256 balance)) public chainBalance; diff --git a/l1-contracts/contracts/dev-contracts/test/DummyHyperchain.sol b/l1-contracts/contracts/dev-contracts/test/DummyZKChain.sol similarity index 95% rename from l1-contracts/contracts/dev-contracts/test/DummyHyperchain.sol rename to l1-contracts/contracts/dev-contracts/test/DummyZKChain.sol index ab817c31b..9a535affe 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummyHyperchain.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummyZKChain.sol @@ -2,9 +2,9 @@ pragma solidity 0.8.24; import {MailboxFacet} from "../../state-transition/chain-deps/facets/Mailbox.sol"; -import {FeeParams, PubdataPricingMode} from "../../state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; +import {FeeParams, PubdataPricingMode} from "../../state-transition/chain-deps/ZKChainStorage.sol"; -contract DummyHyperchain is MailboxFacet { +contract DummyZKChain is MailboxFacet { constructor( address bridgeHubAddress, uint256 _eraChainId, diff --git a/l1-contracts/contracts/dev-contracts/test/ExecutorProvingTest.sol b/l1-contracts/contracts/dev-contracts/test/ExecutorProvingTest.sol index 113d406ac..5794dfbe6 100644 --- a/l1-contracts/contracts/dev-contracts/test/ExecutorProvingTest.sol +++ b/l1-contracts/contracts/dev-contracts/test/ExecutorProvingTest.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.24; import {ExecutorFacet} from "../../state-transition/chain-deps/facets/Executor.sol"; -import {PubdataPricingMode} from "../../state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; +import {PubdataPricingMode} from "../../state-transition/chain-deps/ZKChainStorage.sol"; import {LogProcessingOutput} from "../../state-transition/chain-interfaces/IExecutor.sol"; import {LogProcessingOutput} from "../../state-transition/chain-interfaces/IExecutor.sol"; diff --git a/l1-contracts/contracts/dev-contracts/test/MailboxFacetTest.sol b/l1-contracts/contracts/dev-contracts/test/MailboxFacetTest.sol index 81c2dcca3..5b132f64c 100644 --- a/l1-contracts/contracts/dev-contracts/test/MailboxFacetTest.sol +++ b/l1-contracts/contracts/dev-contracts/test/MailboxFacetTest.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.24; -import {FeeParams} from "../../state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; +import {FeeParams} from "../../state-transition/chain-deps/ZKChainStorage.sol"; import {MailboxFacet} from "../../state-transition/chain-deps/facets/Mailbox.sol"; import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA} from "../../common/Config.sol"; diff --git a/l1-contracts/contracts/dev-contracts/test/MockExecutor.sol b/l1-contracts/contracts/dev-contracts/test/MockExecutor.sol index c69c54d03..954c32ca2 100644 --- a/l1-contracts/contracts/dev-contracts/test/MockExecutor.sol +++ b/l1-contracts/contracts/dev-contracts/test/MockExecutor.sol @@ -2,9 +2,9 @@ pragma solidity 0.8.24; -import {ZkSyncHyperchainBase} from "../../state-transition/chain-deps/facets/ZkSyncHyperchainBase.sol"; +import {ZKChainBase} from "../../state-transition/chain-deps/facets/ZKChainBase.sol"; -contract MockExecutorFacet is ZkSyncHyperchainBase { +contract MockExecutorFacet is ZKChainBase { // add this to be excluded from coverage report function test() internal virtual {} diff --git a/l1-contracts/contracts/governance/Governance.sol b/l1-contracts/contracts/governance/Governance.sol index 790b79a26..bc0c29393 100644 --- a/l1-contracts/contracts/governance/Governance.sol +++ b/l1-contracts/contracts/governance/Governance.sol @@ -12,7 +12,7 @@ import {ZeroAddress, Unauthorized, OperationMustBeReady, OperationMustBePending, /// @notice This contract manages operations (calls with preconditions) for governance tasks. /// The contract allows for operations to be scheduled, executed, and canceled with /// appropriate permissions and delays. It is used for managing and coordinating upgrades -/// and changes in all ZKsync hyperchain governed contracts. +/// and changes in all ZK chain governed contracts. /// /// Operations can be proposed as either fully transparent upgrades with on-chain data, /// or "shadow" upgrades where upgrade data is not published on-chain before execution. Proposed operations diff --git a/l1-contracts/contracts/state-transition/ChainTypeManager.sol b/l1-contracts/contracts/state-transition/ChainTypeManager.sol index fbffb648c..8fc62b922 100644 --- a/l1-contracts/contracts/state-transition/ChainTypeManager.sol +++ b/l1-contracts/contracts/state-transition/ChainTypeManager.sol @@ -13,8 +13,8 @@ import {IAdmin} from "./chain-interfaces/IAdmin.sol"; import {IDiamondInit} from "./chain-interfaces/IDiamondInit.sol"; import {IExecutor} from "./chain-interfaces/IExecutor.sol"; import {IChainTypeManager, ChainTypeManagerInitializeData, ChainCreationParams} from "./IChainTypeManager.sol"; -import {IZkSyncHyperchain} from "./chain-interfaces/IZkSyncHyperchain.sol"; -import {FeeParams} from "./chain-deps/ZkSyncHyperchainStorage.sol"; +import {IZKChain} from "./chain-interfaces/IZKChain.sol"; +import {FeeParams} from "./chain-deps/ZKChainStorage.sol"; import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/access/Ownable2StepUpgradeable.sol"; import {ReentrancyGuard} from "../common/ReentrancyGuard.sol"; import {L2_TO_L1_LOG_SERIALIZE_SIZE, DEFAULT_L2_LOGS_TREE_ROOT_HASH, EMPTY_STRING_KECCAK} from "../common/Config.sol"; @@ -31,8 +31,8 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg /// @notice Address of the bridgehub address public immutable BRIDGE_HUB; - /// @notice The map from chainId => hyperchain contract - EnumerableMap.UintToAddressMap internal __DEPRECATED_hyperchainMap; + /// @notice The map from chainId => zkChain contract + EnumerableMap.UintToAddressMap internal __DEPRECATED_zkChainMap; /// @dev The batch zero hash, calculated at initialization bytes32 public storedBatchZero; @@ -97,22 +97,22 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg } /// @notice return the chain contract address for a chainId - function getHyperchain(uint256 _chainId) public view returns (address) { - return IBridgehub(BRIDGE_HUB).getHyperchain(_chainId); + function getZKChain(uint256 _chainId) public view returns (address) { + return IBridgehub(BRIDGE_HUB).getZKChain(_chainId); } /// @notice return the chain contract address for a chainId - /// @notice Do not use! use getHyperchain instead. This will be removed. - function getHyperchainLegacy(uint256 _chainId) public view returns (address chainAddress) { + /// @notice Do not use! use getZKChain instead. This will be removed. + function getZKChainLegacy(uint256 _chainId) public view returns (address chainAddress) { // slither-disable-next-line unused-return - (, chainAddress) = __DEPRECATED_hyperchainMap.tryGet(_chainId); + (, chainAddress) = __DEPRECATED_zkChainMap.tryGet(_chainId); } - /// @notice Returns the address of the hyperchain admin with the corresponding chainID. + /// @notice Returns the address of the ZK chain admin with the corresponding chainID. /// @notice Not related to the CTM, but it is here for legacy reasons. /// @param _chainId the chainId of the chain function getChainAdmin(uint256 _chainId) external view override returns (address) { - return IZkSyncHyperchain(getHyperchain(_chainId)).getAdmin(); + return IZKChain(getZKChain(_chainId)).getAdmin(); } /// @dev initialize @@ -267,20 +267,20 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg /// @dev freezes the specified chain /// @param _chainId the chainId of the chain function freezeChain(uint256 _chainId) external onlyOwner { - IZkSyncHyperchain(getHyperchain(_chainId)).freezeDiamond(); + IZKChain(getZKChain(_chainId)).freezeDiamond(); } /// @dev freezes the specified chain /// @param _chainId the chainId of the chain function unfreezeChain(uint256 _chainId) external onlyOwner { - IZkSyncHyperchain(getHyperchain(_chainId)).unfreezeDiamond(); + IZKChain(getZKChain(_chainId)).unfreezeDiamond(); } /// @dev reverts batches on the specified chain /// @param _chainId the chainId of the chain /// @param _newLastBatch the new last batch function revertBatches(uint256 _chainId, uint256 _newLastBatch) external onlyOwnerOrAdmin { - IZkSyncHyperchain(getHyperchain(_chainId)).revertBatchesSharedBridge(_chainId, _newLastBatch); + IZKChain(getZKChain(_chainId)).revertBatchesSharedBridge(_chainId, _newLastBatch); } /// @dev execute predefined upgrade @@ -292,21 +292,21 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg uint256 _oldProtocolVersion, Diamond.DiamondCutData calldata _diamondCut ) external onlyOwner { - IZkSyncHyperchain(getHyperchain(_chainId)).upgradeChainFromVersion(_oldProtocolVersion, _diamondCut); + IZKChain(getZKChain(_chainId)).upgradeChainFromVersion(_oldProtocolVersion, _diamondCut); } /// @dev executes upgrade on chain /// @param _chainId the chainId of the chain /// @param _diamondCut the diamond cut data function executeUpgrade(uint256 _chainId, Diamond.DiamondCutData calldata _diamondCut) external onlyOwner { - IZkSyncHyperchain(getHyperchain(_chainId)).executeUpgrade(_diamondCut); + IZKChain(getZKChain(_chainId)).executeUpgrade(_diamondCut); } /// @dev setPriorityTxMaxGasLimit for the specified chain /// @param _chainId the chainId of the chain /// @param _maxGasLimit the new max gas limit function setPriorityTxMaxGasLimit(uint256 _chainId, uint256 _maxGasLimit) external onlyOwner { - IZkSyncHyperchain(getHyperchain(_chainId)).setPriorityTxMaxGasLimit(_maxGasLimit); + IZKChain(getZKChain(_chainId)).setPriorityTxMaxGasLimit(_maxGasLimit); } /// @dev setTokenMultiplier for the specified chain @@ -314,14 +314,14 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg /// @param _nominator the new nominator of the token multiplier /// @param _denominator the new denominator of the token multiplier function setTokenMultiplier(uint256 _chainId, uint128 _nominator, uint128 _denominator) external onlyOwner { - IZkSyncHyperchain(getHyperchain(_chainId)).setTokenMultiplier(_nominator, _denominator); + IZKChain(getZKChain(_chainId)).setTokenMultiplier(_nominator, _denominator); } /// @dev changeFeeParams for the specified chain /// @param _chainId the chainId of the chain /// @param _newFeeParams the new fee params function changeFeeParams(uint256 _chainId, FeeParams calldata _newFeeParams) external onlyOwner { - IZkSyncHyperchain(getHyperchain(_chainId)).changeFeeParams(_newFeeParams); + IZKChain(getZKChain(_chainId)).changeFeeParams(_newFeeParams); } /// @dev setValidator for the specified chain @@ -329,14 +329,14 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg /// @param _validator the new validator /// @param _active whether the validator is active function setValidator(uint256 _chainId, address _validator, bool _active) external onlyOwnerOrAdmin { - IZkSyncHyperchain(getHyperchain(_chainId)).setValidator(_validator, _active); + IZKChain(getZKChain(_chainId)).setValidator(_validator, _active); } /// @dev setPorterAvailability for the specified chain /// @param _chainId the chainId of the chain /// @param _zkPorterIsAvailable whether the zkPorter mode is available function setPorterAvailability(uint256 _chainId, bool _zkPorterIsAvailable) external onlyOwner { - IZkSyncHyperchain(getHyperchain(_chainId)).setPorterAvailability(_zkPorterIsAvailable); + IZKChain(getZKChain(_chainId)).setPorterAvailability(_zkPorterIsAvailable); } /// registration @@ -353,10 +353,10 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg address _sharedBridge, address _admin, bytes memory _diamondCut - ) internal returns (address hyperchainAddress) { - if (getHyperchain(_chainId) != address(0)) { - // Hyperchain already registered - return getHyperchain(_chainId); + ) internal returns (address zkChainAddress) { + if (getZKChain(_chainId) != address(0)) { + // ZKChain already registered + return getZKChain(_chainId); } // check not registered @@ -389,12 +389,12 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg ); diamondCut.initCalldata = initData; - // deploy hyperchainContract + // deploy zkChainContract // slither-disable-next-line reentrancy-no-eth - DiamondProxy hyperchainContract = new DiamondProxy{salt: bytes32(0)}(block.chainid, diamondCut); + DiamondProxy zkChainContract = new DiamondProxy{salt: bytes32(0)}(block.chainid, diamondCut); // save data - hyperchainAddress = address(hyperchainContract); - emit NewHyperchain(_chainId, hyperchainAddress); + zkChainAddress = address(zkChainContract); + emit NewZKChain(_chainId, zkChainAddress); } /// @notice called by Bridgehub when a chain registers @@ -412,11 +412,11 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg address _admin, bytes calldata _initData, bytes[] calldata _factoryDeps - ) external onlyBridgehub returns (address hyperchainAddress) { + ) external onlyBridgehub returns (address zkChainAddress) { (bytes memory _diamondCut, bytes memory _forceDeploymentData) = abi.decode(_initData, (bytes, bytes)); // solhint-disable-next-line func-named-parameters - hyperchainAddress = _deployNewChain(_chainId, _baseTokenAssetId, _sharedBridge, _admin, _diamondCut); + zkChainAddress = _deployNewChain(_chainId, _baseTokenAssetId, _sharedBridge, _admin, _diamondCut); { // check input @@ -424,7 +424,7 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg require(forceDeploymentHash == initialForceDeploymentHash, "CTM: initial force deployment mismatch"); } // genesis upgrade, deploys some contracts, sets chainId - IAdmin(hyperchainAddress).genesisUpgrade( + IAdmin(zkChainAddress).genesisUpgrade( l1GenesisUpgrade, address(IBridgehub(BRIDGE_HUB).l1CtmDeployer()), _forceDeploymentData, @@ -434,7 +434,7 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg /// @param _chainId the chainId of the chain function getProtocolVersion(uint256 _chainId) public view returns (uint256) { - return IZkSyncHyperchain(getHyperchain(_chainId)).getProtocolVersion(); + return IZKChain(getZKChain(_chainId)).getProtocolVersion(); } /// @param _newSettlementLayerChainId the chainId of the chain @@ -443,7 +443,7 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg require(_newSettlementLayerChainId != 0, "Bad chain id"); // Currently, we require that the sync layer is deployed by the same CTM. - require(getHyperchain(_newSettlementLayerChainId) != address(0), "CTM: sync layer not registered"); + require(getZKChain(_newSettlementLayerChainId) != address(0), "CTM: sync layer not registered"); IBridgehub(BRIDGE_HUB).registerSettlementLayer(_newSettlementLayerChainId, _isWhitelisted); } @@ -462,8 +462,8 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg // We ensure that the chain has the latest protocol version to avoid edge cases // related to different protocol version support. - address hyperchain = getHyperchain(_chainId); - require(IZkSyncHyperchain(hyperchain).getProtocolVersion() == protocolVersion, "CTM: outdated pv"); + address zkChain = getZKChain(_chainId); + require(IZKChain(zkChain).getProtocolVersion() == protocolVersion, "CTM: outdated pv"); return abi.encode( @@ -512,4 +512,13 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg // Function is empty due to the fact that when calling `forwardedBridgeBurn` there are no // state updates that occur. } + + /*////////////////////////////////////////////////////////////// + Legacy functions + //////////////////////////////////////////////////////////////*/ + + /// @notice return the chain contract address for a chainId + function getHyperchain(uint256 _chainId) public view returns (address) { + return getZKChain(_chainId); + } } diff --git a/l1-contracts/contracts/state-transition/IChainTypeManager.sol b/l1-contracts/contracts/state-transition/IChainTypeManager.sol index 8c2da3eff..26f27a1ee 100644 --- a/l1-contracts/contracts/state-transition/IChainTypeManager.sol +++ b/l1-contracts/contracts/state-transition/IChainTypeManager.sol @@ -4,7 +4,7 @@ pragma solidity ^0.8.21; import {Diamond} from "./libraries/Diamond.sol"; import {L2CanonicalTransaction} from "../common/Messaging.sol"; -import {FeeParams} from "./chain-deps/ZkSyncHyperchainStorage.sol"; +import {FeeParams} from "./chain-deps/ZKChainStorage.sol"; // import {IBridgehub} from "../bridgehub/IBridgehub.sol"; @@ -39,12 +39,12 @@ struct ChainCreationParams { } interface IChainTypeManager { - /// @dev Emitted when a new Hyperchain is added - event NewHyperchain(uint256 indexed _chainId, address indexed _hyperchainContract); + /// @dev Emitted when a new ZKChain is added + event NewZKChain(uint256 indexed _chainId, address indexed _zkChainContract); /// @dev emitted when an chain registers and a GenesisUpgrade happens event GenesisUpgrade( - address indexed _hyperchain, + address indexed _zkChain, L2CanonicalTransaction _l2Transaction, uint256 indexed _protocolVersion ); @@ -84,9 +84,9 @@ interface IChainTypeManager { function acceptAdmin() external; - function getHyperchain(uint256 _chainId) external view returns (address); + function getZKChain(uint256 _chainId) external view returns (address); - function getHyperchainLegacy(uint256 _chainId) external view returns (address); + function getZKChainLegacy(uint256 _chainId) external view returns (address); function storedBatchZero() external view returns (bytes32); diff --git a/l1-contracts/contracts/state-transition/ValidatorTimelock.sol b/l1-contracts/contracts/state-transition/ValidatorTimelock.sol index 5146952c6..c59b04a01 100644 --- a/l1-contracts/contracts/state-transition/ValidatorTimelock.sol +++ b/l1-contracts/contracts/state-transition/ValidatorTimelock.sol @@ -11,9 +11,9 @@ import {Unauthorized, TimeNotReached, ZeroAddress} from "../common/L1ContractErr /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev -/// @notice Intermediate smart contract between the validator EOA account and the hyperchains state transition diamond smart contract. +/// @notice Intermediate smart contract between the validator EOA account and the ZK chains state transition diamond smart contract. /// @dev The primary purpose of this contract is to provide a trustless means of delaying batch execution without -/// modifying the main hyperchain diamond contract. As such, even if this contract is compromised, it will not impact the main +/// modifying the main zkChain diamond contract. As such, even if this contract is compromised, it will not impact the main /// contract. /// @dev ZKsync actively monitors the chain activity and reacts to any suspicious activity by freezing the chain. /// This allows time for investigation and mitigation before resuming normal operations. @@ -116,7 +116,7 @@ contract ValidatorTimelock is IExecutor, Ownable2Step { } /// @dev Records the timestamp for all provided committed batches and make - /// a call to the hyperchain diamond contract with the same calldata. + /// a call to the zkChain diamond contract with the same calldata. function commitBatchesSharedBridge( uint256 _chainId, StoredBatchInfo calldata, @@ -137,17 +137,17 @@ contract ValidatorTimelock is IExecutor, Ownable2Step { } } - _propagateToZkSyncHyperchain(_chainId); + _propagateToZkSyncZKChain(_chainId); } - /// @dev Make a call to the hyperchain diamond contract with the same calldata. + /// @dev Make a call to the zkChain diamond contract with the same calldata. /// Note: If the batch is reverted, it needs to be committed first before the execution. /// So it's safe to not override the committed batches. function revertBatchesSharedBridge(uint256 _chainId, uint256) external onlyValidator(_chainId) { - _propagateToZkSyncHyperchain(_chainId); + _propagateToZkSyncZKChain(_chainId); } - /// @dev Make a call to the hyperchain diamond contract with the same calldata. + /// @dev Make a call to the zkChain diamond contract with the same calldata. /// Note: We don't track the time when batches are proven, since all information about /// the batch is known on the commit stage and the proved is not finalized (may be reverted). function proveBatchesSharedBridge( @@ -156,11 +156,11 @@ contract ValidatorTimelock is IExecutor, Ownable2Step { StoredBatchInfo[] calldata, ProofInput calldata ) external onlyValidator(_chainId) { - _propagateToZkSyncHyperchain(_chainId); + _propagateToZkSyncZKChain(_chainId); } /// @dev Check that batches were committed at least X time ago and - /// make a call to the hyperchain diamond contract with the same calldata. + /// make a call to the zkChain diamond contract with the same calldata. function executeBatchesSharedBridge( uint256 _chainId, StoredBatchInfo[] calldata _newBatchesData, @@ -187,17 +187,17 @@ contract ValidatorTimelock is IExecutor, Ownable2Step { } } } - _propagateToZkSyncHyperchain(_chainId); + _propagateToZkSyncZKChain(_chainId); } - /// @dev Call the hyperchain diamond contract with the same calldata as this contract was called. - /// Note: it is called the hyperchain diamond contract, not delegatecalled! - function _propagateToZkSyncHyperchain(uint256 _chainId) internal { - address contractAddress = chainTypeManager.getHyperchain(_chainId); + /// @dev Call the zkChain diamond contract with the same calldata as this contract was called. + /// Note: it is called the zkChain diamond contract, not delegatecalled! + function _propagateToZkSyncZKChain(uint256 _chainId) internal { + address contractAddress = chainTypeManager.getZKChain(_chainId); assembly { // Copy function signature and arguments from calldata at zero position into memory at pointer position calldatacopy(0, 0, calldatasize()) - // Call method of the hyperchain diamond contract returns 0 on error + // Call method of the ZK chain diamond contract returns 0 on error let result := call(gas(), contractAddress, 0, 0, calldatasize(), 0, 0) // Get the size of the last return data let size := returndatasize() diff --git a/l1-contracts/contracts/state-transition/Verifier.sol b/l1-contracts/contracts/state-transition/Verifier.sol index a74ecb12c..cb90bf472 100644 --- a/l1-contracts/contracts/state-transition/Verifier.sol +++ b/l1-contracts/contracts/state-transition/Verifier.sol @@ -8,7 +8,7 @@ import {IVerifier} from "./chain-interfaces/IVerifier.sol"; /// @author Matter Labs /// @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 ZKsync hyperchain circuits. +/// 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 0x14f97b81e54b35fe673d8708cc1a19e1ea5b5e348e12d31e39824ed4f42bbca2 /// @dev It uses a custom memory layout inside the inline assembly block. Each reserved memory cell is declared in the /// constants below. diff --git a/l1-contracts/contracts/state-transition/chain-deps/DiamondInit.sol b/l1-contracts/contracts/state-transition/chain-deps/DiamondInit.sol index 453d67f56..3be7dc2b1 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/DiamondInit.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/DiamondInit.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.24; import {Diamond} from "../libraries/Diamond.sol"; -import {ZkSyncHyperchainBase} from "./facets/ZkSyncHyperchainBase.sol"; +import {ZKChainBase} from "./facets/ZKChainBase.sol"; import {L2_TO_L1_LOG_SERIALIZE_SIZE, MAX_GAS_PER_TRANSACTION} from "../../common/Config.sol"; import {InitializeData, IDiamondInit} from "../chain-interfaces/IDiamondInit.sol"; import {PriorityQueue} from "../libraries/PriorityQueue.sol"; @@ -13,14 +13,14 @@ import {ZeroAddress, TooMuchGas} from "../../common/L1ContractErrors.sol"; /// @author Matter Labs /// @dev The contract is used only once to initialize the diamond proxy. /// @dev The deployment process takes care of this contract's initialization. -contract DiamondInit is ZkSyncHyperchainBase, IDiamondInit { +contract DiamondInit is ZKChainBase, IDiamondInit { using PriorityQueue for PriorityQueue.Queue; using PriorityTree for PriorityTree.Tree; /// @dev Initialize the implementation to prevent any possibility of a Parity hack. constructor() reentrancyGuardInitializer {} - /// @notice hyperchain diamond contract initialization + /// @notice ZK chain diamond contract initialization /// @return Magic 32 bytes, which indicates that the contract logic is expected to be used as a diamond proxy /// initializer function initialize(InitializeData calldata _initializeData) external reentrancyGuardInitializer returns (bytes32) { diff --git a/l1-contracts/contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol b/l1-contracts/contracts/state-transition/chain-deps/ZKChainStorage.sol similarity index 98% rename from l1-contracts/contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol rename to l1-contracts/contracts/state-transition/chain-deps/ZKChainStorage.sol index 5611ffbe2..3205a229e 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/ZKChainStorage.sol @@ -60,13 +60,13 @@ struct FeeParams { uint64 minimalL2GasPrice; } -/// @dev storing all storage variables for hyperchain diamond facets +/// @dev storing all storage variables for ZK chain diamond facets /// NOTE: It is used in a proxy, so it is possible to add new variables to the end /// but NOT to modify already existing variables or change their order. /// NOTE: variables prefixed with '__DEPRECATED_' are deprecated and shouldn't be used. /// Their presence is maintained for compatibility and to prevent storage collision. // solhint-disable-next-line gas-struct-packing -struct ZkSyncHyperchainStorage { +struct ZKChainStorage { /// @dev Storage of variables needed for deprecated diamond cut facet uint256[7] __DEPRECATED_diamondCutStorage; /// @notice Address which will exercise critical changes to the Diamond Proxy (upgrades, freezing & unfreezing). Replaced by CTM diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol index 14056c122..54f72f918 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol @@ -6,26 +6,26 @@ pragma solidity 0.8.24; import {IAdmin} from "../../chain-interfaces/IAdmin.sol"; import {Diamond} from "../../libraries/Diamond.sol"; -import {MAX_GAS_PER_TRANSACTION, HyperchainCommitment} from "../../../common/Config.sol"; -import {FeeParams, PubdataPricingMode} from "../ZkSyncHyperchainStorage.sol"; +import {MAX_GAS_PER_TRANSACTION, ZKChainCommitment} from "../../../common/Config.sol"; +import {FeeParams, PubdataPricingMode} from "../ZKChainStorage.sol"; import {PriorityTree} from "../../../state-transition/libraries/PriorityTree.sol"; import {PriorityQueue} from "../../../state-transition/libraries/PriorityQueue.sol"; -import {ZkSyncHyperchainBase} from "./ZkSyncHyperchainBase.sol"; +import {ZKChainBase} from "./ZKChainBase.sol"; import {IChainTypeManager} from "../../IChainTypeManager.sol"; import {IL1GenesisUpgrade} from "../../../upgrades/IL1GenesisUpgrade.sol"; import {Unauthorized, TooMuchGas, PriorityTxPubdataExceedsMaxPubDataPerBatch, InvalidPubdataPricingMode, ProtocolIdMismatch, ChainAlreadyLive, HashMismatch, ProtocolIdNotGreater, DenominatorIsZero, DiamondAlreadyFrozen, DiamondNotFrozen} from "../../../common/L1ContractErrors.sol"; // While formally the following import is not used, it is needed to inherit documentation from it -import {IZkSyncHyperchainBase} from "../../chain-interfaces/IZkSyncHyperchainBase.sol"; +import {IZKChainBase} from "../../chain-interfaces/IZKChainBase.sol"; /// @title Admin Contract controls access rights for contract management. /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev -contract AdminFacet is ZkSyncHyperchainBase, IAdmin { +contract AdminFacet is ZKChainBase, IAdmin { using PriorityTree for PriorityTree.Tree; using PriorityQueue for PriorityQueue.Queue; - /// @inheritdoc IZkSyncHyperchainBase + /// @inheritdoc IZKChainBase string public constant override getName = "AdminFacet"; /// @notice The chain id of L1. This contract can be deployed on multiple layers, but this value is still equal to the @@ -275,7 +275,7 @@ contract AdminFacet is ZkSyncHyperchainBase, IAdmin { bytes calldata _data, bool _contractAlreadyDeployed ) external payable override onlyBridgehub { - HyperchainCommitment memory _commitment = abi.decode(_data, (HyperchainCommitment)); + ZKChainCommitment memory _commitment = abi.decode(_data, (ZKChainCommitment)); IChainTypeManager ctm = IChainTypeManager(s.chainTypeManager); @@ -365,7 +365,7 @@ contract AdminFacet is ZkSyncHyperchainBase, IAdmin { /// @notice Returns the commitment for a chain. /// @dev Note, that this is a getter method helpful for debugging and should not be relied upon by clients. /// @return commitment The commitment for the chain. - function prepareChainCommitment() public view returns (HyperchainCommitment memory commitment) { + function prepareChainCommitment() public view returns (ZKChainCommitment memory commitment) { require(s.priorityQueue.getFirstUnprocessedPriorityTx() >= s.priorityTree.startIndex, "PQ not ready"); commitment.totalBatchesCommitted = s.totalBatchesCommitted; diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol index 91b585fdd..9a76108ad 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.24; // solhint-disable gas-custom-errors, reason-string -import {ZkSyncHyperchainBase} from "./ZkSyncHyperchainBase.sol"; +import {ZKChainBase} from "./ZKChainBase.sol"; import {IBridgehub} from "../../../bridgehub/IBridgehub.sol"; import {IMessageRoot} from "../../../bridgehub/IMessageRoot.sol"; import {COMMIT_TIMESTAMP_NOT_OLDER, COMMIT_TIMESTAMP_APPROXIMATION_DELTA, EMPTY_STRING_KECCAK, L2_TO_L1_LOG_SERIALIZE_SIZE, MAX_L2_TO_L1_LOGS_COMMITMENT_BYTES, PACKED_L2_BLOCK_TIMESTAMP_MASK, PUBLIC_INPUT_SHIFT} from "../../../common/Config.sol"; @@ -19,17 +19,17 @@ import {IL1DAValidator, L1DAValidatorOutput} from "../../chain-interfaces/IL1DAV import {MissingSystemLogs, BatchNumberMismatch, TimeNotReached, ValueMismatch, HashMismatch, NonIncreasingTimestamp, TimestampError, InvalidLogSender, TxHashMismatch, UnexpectedSystemLog, LogAlreadyProcessed, InvalidProtocolVersion, CanOnlyProcessOneBatch, BatchHashMismatch, UpgradeBatchNumberIsNotZero, NonSequentialBatch, CantExecuteUnprovenBatches, SystemLogsSizeTooBig, InvalidNumberOfBlobs, VerifiedBatchesExceedsCommittedBatches, InvalidProof, RevertedBatchNotAfterNewLastBatch, CantRevertExecutedBatch, L2TimestampTooBig, PriorityOperationsRollingHashMismatch} from "../../../common/L1ContractErrors.sol"; // While formally the following import is not used, it is needed to inherit documentation from it -import {IZkSyncHyperchainBase} from "../../chain-interfaces/IZkSyncHyperchainBase.sol"; +import {IZKChainBase} from "../../chain-interfaces/IZKChainBase.sol"; -/// @title ZKsync hyperchain Executor contract capable of processing events emitted in the ZKsync hyperchain protocol. +/// @title ZK chain Executor contract capable of processing events emitted in the ZK chain protocol. /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev -contract ExecutorFacet is ZkSyncHyperchainBase, IExecutor { +contract ExecutorFacet is ZKChainBase, IExecutor { using UncheckedMath for uint256; using PriorityQueue for PriorityQueue.Queue; using PriorityTree for PriorityTree.Tree; - /// @inheritdoc IZkSyncHyperchainBase + /// @inheritdoc IZKChainBase string public constant override getName = "ExecutorFacet"; /// @dev Checks that the chain is connected to the current bridehub and not migrated away. diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol index 0452db0cc..8cd5f7b58 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol @@ -4,8 +4,8 @@ pragma solidity 0.8.24; import {SafeCast} from "@openzeppelin/contracts-v4/utils/math/SafeCast.sol"; -import {ZkSyncHyperchainBase} from "./ZkSyncHyperchainBase.sol"; -import {PubdataPricingMode} from "../ZkSyncHyperchainStorage.sol"; +import {ZKChainBase} from "./ZKChainBase.sol"; +import {PubdataPricingMode} from "../ZKChainStorage.sol"; import {VerifierParams} from "../../../state-transition/chain-interfaces/IVerifier.sol"; import {Diamond} from "../../libraries/Diamond.sol"; import {PriorityQueue} from "../../../state-transition/libraries/PriorityQueue.sol"; @@ -18,17 +18,17 @@ import {InvalidSelector} from "../../../common/L1ContractErrors.sol"; import {SemVer} from "../../../common/libraries/SemVer.sol"; // While formally the following import is not used, it is needed to inherit documentation from it -import {IZkSyncHyperchainBase} from "../../chain-interfaces/IZkSyncHyperchainBase.sol"; +import {IZKChainBase} from "../../chain-interfaces/IZKChainBase.sol"; /// @title Getters Contract implements functions for getting contract state from outside the blockchain. /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev -contract GettersFacet is ZkSyncHyperchainBase, IGetters, ILegacyGetters { +contract GettersFacet is ZKChainBase, IGetters, ILegacyGetters { using UncheckedMath for uint256; using PriorityQueue for PriorityQueue.Queue; using PriorityTree for PriorityTree.Tree; - /// @inheritdoc IZkSyncHyperchainBase + /// @inheritdoc IZKChainBase string public constant override getName = "GettersFacet"; /*////////////////////////////////////////////////////////////// diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol index 25b12bb2c..6277040ce 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol @@ -17,11 +17,11 @@ import {PriorityTree} from "../../libraries/PriorityTree.sol"; import {TransactionValidator} from "../../libraries/TransactionValidator.sol"; import {WritePriorityOpParams, L2CanonicalTransaction, L2Message, L2Log, TxStatus, BridgehubL2TransactionRequest} from "../../../common/Messaging.sol"; import {MessageHashing} from "../../../common/libraries/MessageHashing.sol"; -import {FeeParams, PubdataPricingMode} from "../ZkSyncHyperchainStorage.sol"; +import {FeeParams, PubdataPricingMode} from "../ZKChainStorage.sol"; import {UncheckedMath} from "../../../common/libraries/UncheckedMath.sol"; import {L2ContractHelper} from "../../../common/libraries/L2ContractHelper.sol"; import {AddressAliasHelper} from "../../../vendor/AddressAliasHelper.sol"; -import {ZkSyncHyperchainBase} from "./ZkSyncHyperchainBase.sol"; +import {ZKChainBase} from "./ZKChainBase.sol"; import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA, L1_GAS_PER_PUBDATA_BYTE, L2_L1_LOGS_TREE_DEFAULT_LEAF_HASH, PRIORITY_OPERATION_L2_TX_TYPE, PRIORITY_EXPIRATION, MAX_NEW_FACTORY_DEPS, SETTLEMENT_LAYER_RELAY_SENDER, SUPPORTED_PROOF_METADATA_VERSION} from "../../../common/Config.sol"; import {L2_BOOTLOADER_ADDRESS, L2_TO_L1_MESSENGER_SYSTEM_CONTRACT_ADDR, L2_BRIDGEHUB_ADDR} from "../../../common/L2ContractAddresses.sol"; @@ -30,17 +30,17 @@ import {IL1AssetRouter} from "../../../bridge/interfaces/IL1AssetRouter.sol"; import {MerklePathEmpty, OnlyEraSupported, BatchNotExecuted, HashedLogIsDefault, BaseTokenGasPriceDenominatorNotSet, TransactionNotAllowed, GasPerPubdataMismatch, TooManyFactoryDeps, MsgValueTooLow} from "../../../common/L1ContractErrors.sol"; // While formally the following import is not used, it is needed to inherit documentation from it -import {IZkSyncHyperchainBase} from "../../chain-interfaces/IZkSyncHyperchainBase.sol"; +import {IZKChainBase} from "../../chain-interfaces/IZKChainBase.sol"; /// @title ZKsync Mailbox contract providing interfaces for L1 <-> L2 interaction. /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev -contract MailboxFacet is ZkSyncHyperchainBase, IMailbox { +contract MailboxFacet is ZKChainBase, IMailbox { using UncheckedMath for uint256; using PriorityQueue for PriorityQueue.Queue; using PriorityTree for PriorityTree.Tree; - /// @inheritdoc IZkSyncHyperchainBase + /// @inheritdoc IZKChainBase string public constant override getName = "MailboxFacet"; /// @dev Era's chainID @@ -273,7 +273,7 @@ contract MailboxFacet is ZkSyncHyperchainBase, IMailbox { // We trust all chains whitelisted by the Bridgehub governance. require(IBridgehub(s.bridgehub).whitelistedSettlementLayers(settlementLayerChainId), "Mailbox: wrong CTM"); - settlementLayerAddress = IBridgehub(s.bridgehub).getHyperchain(settlementLayerChainId); + settlementLayerAddress = IBridgehub(s.bridgehub).getZKChain(settlementLayerChainId); } return @@ -372,10 +372,7 @@ contract MailboxFacet is ZkSyncHyperchainBase, IMailbox { uint64 _expirationTimestamp ) external override onlyL1 returns (bytes32 canonicalTxHash) { require(IBridgehub(s.bridgehub).whitelistedSettlementLayers(s.chainId), "Mailbox SL: not SL"); - require( - IChainTypeManager(s.chainTypeManager).getHyperchain(_chainId) == msg.sender, - "Mailbox SL: not hyperchain" - ); + require(IChainTypeManager(s.chainTypeManager).getZKChain(_chainId) == msg.sender, "Mailbox SL: not zkChain"); BridgehubL2TransactionRequest memory wrappedRequest = _wrapRequest({ _chainId: _chainId, diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/ZkSyncHyperchainBase.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/ZKChainBase.sol similarity index 91% rename from l1-contracts/contracts/state-transition/chain-deps/facets/ZkSyncHyperchainBase.sol rename to l1-contracts/contracts/state-transition/chain-deps/facets/ZKChainBase.sol index cc30341e8..23b9a4fa5 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/ZkSyncHyperchainBase.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/ZKChainBase.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.24; -import {ZkSyncHyperchainStorage} from "../ZkSyncHyperchainStorage.sol"; +import {ZKChainStorage} from "../ZKChainStorage.sol"; import {ReentrancyGuard} from "../../../common/ReentrancyGuard.sol"; import {Unauthorized} from "../../../common/L1ContractErrors.sol"; @@ -10,9 +10,9 @@ import {Unauthorized} from "../../../common/L1ContractErrors.sol"; /// @title Base contract containing functions accessible to the other facets. /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev -contract ZkSyncHyperchainBase is ReentrancyGuard { +contract ZKChainBase is ReentrancyGuard { // slither-disable-next-line uninitialized-state - ZkSyncHyperchainStorage internal s; + ZKChainStorage internal s; /// @notice Checks that the message sender is an active admin modifier onlyAdmin() { diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol index 77c8c5f25..8d224f78f 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol @@ -2,15 +2,15 @@ // We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; -import {IZkSyncHyperchainBase} from "../chain-interfaces/IZkSyncHyperchainBase.sol"; +import {IZKChainBase} from "../chain-interfaces/IZKChainBase.sol"; import {Diamond} from "../libraries/Diamond.sol"; -import {FeeParams, PubdataPricingMode} from "../chain-deps/ZkSyncHyperchainStorage.sol"; +import {FeeParams, PubdataPricingMode} from "../chain-deps/ZKChainStorage.sol"; /// @title The interface of the Admin Contract that controls access rights for contract management. /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev -interface IAdmin is IZkSyncHyperchainBase { +interface IAdmin is IZKChainBase { /// @notice Starts the transfer of admin rights. Only the current admin can propose a new pending one. /// @notice New admin can accept admin rights by calling `acceptAdmin` function. /// @param _newPendingAdmin Address of the new admin diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol index 205ac4d44..c5f2bbc90 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.21; import {IVerifier, VerifierParams} from "./IVerifier.sol"; -import {FeeParams} from "../chain-deps/ZkSyncHyperchainStorage.sol"; +import {FeeParams} from "../chain-deps/ZKChainStorage.sol"; /// @param chainId the id of the chain /// @param bridgehub the address of the bridgehub contract diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol index 86def9b82..299b7118b 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol @@ -2,7 +2,7 @@ // We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; -import {IZkSyncHyperchainBase} from "./IZkSyncHyperchainBase.sol"; +import {IZKChainBase} from "./IZKChainBase.sol"; import {PriorityOpsBatchInfo} from "../libraries/PriorityTree.sol"; /// @dev Enum used by L2 System Contracts to differentiate logs. @@ -48,7 +48,7 @@ uint256 constant TOTAL_BLOBS_IN_COMMITMENT = 16; /// @title The interface of the ZKsync Executor contract capable of processing events emitted in the ZKsync protocol. /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev -interface IExecutor is IZkSyncHyperchainBase { +interface IExecutor is IZKChainBase { /// @notice Rollup batch stored data /// @param batchNumber Rollup batch number /// @param batchHash Hash of L2 batch diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol index d27ef80e4..e612c24fb 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol @@ -3,8 +3,8 @@ pragma solidity ^0.8.21; import {VerifierParams} from "../chain-interfaces/IVerifier.sol"; -import {PubdataPricingMode} from "../chain-deps/ZkSyncHyperchainStorage.sol"; -import {IZkSyncHyperchainBase} from "./IZkSyncHyperchainBase.sol"; +import {PubdataPricingMode} from "../chain-deps/ZKChainStorage.sol"; +import {IZKChainBase} from "./IZKChainBase.sol"; /// @title The interface of the Getters Contract that implements functions for getting contract state from outside the blockchain. /// @author Matter Labs @@ -12,7 +12,7 @@ import {IZkSyncHyperchainBase} from "./IZkSyncHyperchainBase.sol"; /// @dev Most of the methods simply return the values that correspond to the current diamond proxy and possibly /// not to the ZK Chain as a whole. For example, if the chain is migrated to another settlement layer, the values returned /// by this facet will correspond to the values stored on this chain and possilbly not the canonical state of the chain. -interface IGetters is IZkSyncHyperchainBase { +interface IGetters is IZKChainBase { /*////////////////////////////////////////////////////////////// CUSTOM GETTERS //////////////////////////////////////////////////////////////*/ diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/ILegacyGetters.sol b/l1-contracts/contracts/state-transition/chain-interfaces/ILegacyGetters.sol index cb62f5087..9c143d93e 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/ILegacyGetters.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/ILegacyGetters.sol @@ -2,13 +2,13 @@ // We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; -import {IZkSyncHyperchainBase} from "./IZkSyncHyperchainBase.sol"; +import {IZKChainBase} from "./IZKChainBase.sol"; /// @author Matter Labs /// @dev This interface contains getters for the ZKsync contract that should not be used, /// but still are kept for backward compatibility. /// @custom:security-contact security@matterlabs.dev -interface ILegacyGetters is IZkSyncHyperchainBase { +interface ILegacyGetters is IZKChainBase { /// @return The total number of batches that were committed /// @dev It is a *deprecated* method, please use `getTotalBatchesCommitted` instead function getTotalBlocksCommitted() external view returns (uint256); diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IMailbox.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IMailbox.sol index f565e8562..c5d9e3596 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IMailbox.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IMailbox.sol @@ -2,13 +2,13 @@ // We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; -import {IZkSyncHyperchainBase} from "./IZkSyncHyperchainBase.sol"; +import {IZKChainBase} from "./IZKChainBase.sol"; import {L2CanonicalTransaction, L2Log, L2Message, TxStatus, BridgehubL2TransactionRequest} from "../../common/Messaging.sol"; /// @title The interface of the ZKsync Mailbox contract that provides interfaces for L1 <-> L2 interaction. /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev -interface IMailbox is IZkSyncHyperchainBase { +interface IMailbox is IZKChainBase { /// @notice Prove that a specific arbitrary-length message was sent in a specific L2 batch number /// @param _batchNumber The executed L2 batch number in which the message appeared /// @param _index The position in the L2 logs Merkle tree of the l2Log that was sent with the message diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IZKChain.sol similarity index 89% rename from l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol rename to l1-contracts/contracts/state-transition/chain-interfaces/IZKChain.sol index 14aa123b0..31d14009b 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IZKChain.sol @@ -9,7 +9,7 @@ import {IMailbox} from "./IMailbox.sol"; import {Diamond} from "../libraries/Diamond.sol"; -interface IZkSyncHyperchain is IAdmin, IExecutor, IGetters, IMailbox { +interface IZKChain is IAdmin, IExecutor, IGetters, IMailbox { // We need this structure for the server for now event ProposeTransparentUpgrade( Diamond.DiamondCutData diamondCut, diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchainBase.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IZKChainBase.sol similarity index 93% rename from l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchainBase.sol rename to l1-contracts/contracts/state-transition/chain-interfaces/IZKChainBase.sol index 3cd646cc9..0338baa04 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncHyperchainBase.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IZKChainBase.sol @@ -5,7 +5,7 @@ pragma solidity ^0.8.21; /// @title The interface of the ZKsync contract, responsible for the main ZKsync logic. /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev -interface IZkSyncHyperchainBase { +interface IZKChainBase { /// @return Returns facet name. function getName() external view returns (string memory); } diff --git a/l1-contracts/contracts/state-transition/data-availability/RelayedSLDAValidator.sol b/l1-contracts/contracts/state-transition/data-availability/RelayedSLDAValidator.sol index a528d162d..d5f3473a7 100644 --- a/l1-contracts/contracts/state-transition/data-availability/RelayedSLDAValidator.sol +++ b/l1-contracts/contracts/state-transition/data-availability/RelayedSLDAValidator.sol @@ -22,7 +22,7 @@ contract RelayedSLDAValidator is IL1DAValidator, CalldataDAGateway { function _ensureOnlyChainSender(uint256 _chainId) internal view { // Note that this contract is only supposed to be deployed on L2, where the // bridgehub is predeployed at `L2_BRIDGEHUB_ADDR` address. - require(IBridgehub(L2_BRIDGEHUB_ADDR).getHyperchain(_chainId) == msg.sender, "l1-da-validator/invalid-sender"); + require(IBridgehub(L2_BRIDGEHUB_ADDR).getZKChain(_chainId) == msg.sender, "l1-da-validator/invalid-sender"); } /// @dev Relays the calldata to L1. diff --git a/l1-contracts/contracts/upgrades/BaseZkSyncUpgrade.sol b/l1-contracts/contracts/upgrades/BaseZkSyncUpgrade.sol index 4534884d5..edae3870b 100644 --- a/l1-contracts/contracts/upgrades/BaseZkSyncUpgrade.sol +++ b/l1-contracts/contracts/upgrades/BaseZkSyncUpgrade.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.24; import {SafeCast} from "@openzeppelin/contracts-v4/utils/math/SafeCast.sol"; -import {ZkSyncHyperchainBase} from "../state-transition/chain-deps/facets/ZkSyncHyperchainBase.sol"; +import {ZKChainBase} from "../state-transition/chain-deps/facets/ZKChainBase.sol"; import {VerifierParams} from "../state-transition/chain-interfaces/IVerifier.sol"; import {IVerifier} from "../state-transition/chain-interfaces/IVerifier.sol"; import {L2ContractHelper} from "../common/libraries/L2ContractHelper.sol"; @@ -44,7 +44,7 @@ struct ProposedUpgrade { /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev /// @notice Interface to which all the upgrade implementations should adhere -abstract contract BaseZkSyncUpgrade is ZkSyncHyperchainBase { +abstract contract BaseZkSyncUpgrade is ZKChainBase { /// @notice Changes the protocol version event NewProtocolVersion(uint256 indexed previousProtocolVersion, uint256 indexed newProtocolVersion); @@ -304,7 +304,7 @@ abstract contract BaseZkSyncUpgrade is ZkSyncHyperchainBase { // must be ensured in the other parts of the upgrade that the upgrade transaction is not overridden. if (!patchOnly) { // If the previous upgrade had an L2 system upgrade transaction, we require that it is finalized. - // Note it is important to keep this check, as otherwise hyperchains might skip upgrades by overwriting + // Note it is important to keep this check, as otherwise ZK chains might skip upgrades by overwriting if (s.l2SystemContractsUpgradeTxHash != bytes32(0)) { revert PreviousUpgradeNotFinalized(s.l2SystemContractsUpgradeTxHash); } diff --git a/l1-contracts/contracts/upgrades/BaseZkSyncUpgradeGenesis.sol b/l1-contracts/contracts/upgrades/BaseZkSyncUpgradeGenesis.sol index 561f25d23..49237ccfd 100644 --- a/l1-contracts/contracts/upgrades/BaseZkSyncUpgradeGenesis.sol +++ b/l1-contracts/contracts/upgrades/BaseZkSyncUpgradeGenesis.sol @@ -58,7 +58,7 @@ abstract contract BaseZkSyncUpgradeGenesis is BaseZkSyncUpgrade { // must be ensured in the other parts of the upgrade that the upgrade transaction is not overridden. if (!patchOnly) { // If the previous upgrade had an L2 system upgrade transaction, we require that it is finalized. - // Note it is important to keep this check, as otherwise hyperchains might skip upgrades by overwriting + // Note it is important to keep this check, as otherwise ZK chains might skip upgrades by overwriting if (s.l2SystemContractsUpgradeTxHash != bytes32(0)) { revert PreviousUpgradeNotFinalized(s.l2SystemContractsUpgradeTxHash); } diff --git a/l1-contracts/contracts/upgrades/GatewayUpgrade.sol b/l1-contracts/contracts/upgrades/GatewayUpgrade.sol index 62deced7d..9ce428f96 100644 --- a/l1-contracts/contracts/upgrades/GatewayUpgrade.sol +++ b/l1-contracts/contracts/upgrades/GatewayUpgrade.sol @@ -19,7 +19,7 @@ import {IBridgehub} from "../bridgehub/IBridgehub.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev -/// @notice This upgrade will be used to migrate Era to be part of the hyperchain ecosystem contracts. +/// @notice This upgrade will be used to migrate Era to be part of the ZK chain ecosystem contracts. contract GatewayUpgrade is BaseZkSyncUpgrade, Initializable { using PriorityQueue for PriorityQueue.Queue; using PriorityTree for PriorityTree.Tree; diff --git a/l1-contracts/contracts/upgrades/IL1GenesisUpgrade.sol b/l1-contracts/contracts/upgrades/IL1GenesisUpgrade.sol index 0c6f8fd41..57dd40131 100644 --- a/l1-contracts/contracts/upgrades/IL1GenesisUpgrade.sol +++ b/l1-contracts/contracts/upgrades/IL1GenesisUpgrade.sol @@ -7,7 +7,7 @@ import {L2CanonicalTransaction} from "../common/Messaging.sol"; interface IL1GenesisUpgrade { /// @dev emitted when a chain registers and a GenesisUpgrade happens event GenesisUpgrade( - address indexed _hyperchain, + address indexed _zkChain, L2CanonicalTransaction _l2Transaction, uint256 indexed _protocolVersion, bytes[] _factoryDeps diff --git a/l1-contracts/deploy-scripts/AcceptAdmin.s.sol b/l1-contracts/deploy-scripts/AcceptAdmin.s.sol index 3a40b4d78..2eff6dc07 100644 --- a/l1-contracts/deploy-scripts/AcceptAdmin.s.sol +++ b/l1-contracts/deploy-scripts/AcceptAdmin.s.sol @@ -4,7 +4,7 @@ pragma solidity ^0.8.21; import {Script} from "forge-std/Script.sol"; import {Ownable2Step} from "@openzeppelin/contracts-v4/access/Ownable2Step.sol"; -import {IZkSyncHyperchain} from "contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol"; +import {IZKChain} from "contracts/state-transition/chain-interfaces/IZKChain.sol"; import {ChainAdmin} from "contracts/governance/ChainAdmin.sol"; import {IChainAdmin} from "contracts/governance/IChainAdmin.sol"; import {Utils} from "./Utils.sol"; @@ -43,7 +43,7 @@ contract AcceptAdmin is Script { // This function should be called by the owner to accept the admin role function governanceAcceptAdmin(address governor, address target) public { - IZkSyncHyperchain adminContract = IZkSyncHyperchain(target); + IZKChain adminContract = IZKChain(target); Utils.executeUpgrade({ _governor: governor, _salt: bytes32(0), @@ -56,7 +56,7 @@ contract AcceptAdmin is Script { // This function should be called by the owner to accept the admin role function chainAdminAcceptAdmin(ChainAdmin chainAdmin, address target) public { - IZkSyncHyperchain adminContract = IZkSyncHyperchain(target); + IZKChain adminContract = IZKChain(target); IChainAdmin.Call[] memory calls = new IChainAdmin.Call[](1); calls[0] = IChainAdmin.Call({target: target, value: 0, data: abi.encodeCall(adminContract.acceptAdmin, ())}); diff --git a/l1-contracts/deploy-scripts/DeployL1.s.sol b/l1-contracts/deploy-scripts/DeployL1.s.sol index 427ab79e6..0db4fd35f 100644 --- a/l1-contracts/deploy-scripts/DeployL1.s.sol +++ b/l1-contracts/deploy-scripts/DeployL1.s.sol @@ -31,7 +31,7 @@ import {ChainTypeManagerInitializeData, ChainCreationParams} from "contracts/sta import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; import {InitializeDataNewChain as DiamondInitializeDataNewChain} from "contracts/state-transition/chain-interfaces/IDiamondInit.sol"; -import {FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; +import {FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; import {L1AssetRouter} from "contracts/bridge/L1AssetRouter.sol"; import {L1ERC20Bridge} from "contracts/bridge/L1ERC20Bridge.sol"; import {DiamondProxy} from "contracts/state-transition/chain-deps/DiamondProxy.sol"; diff --git a/l1-contracts/deploy-scripts/Gateway.s.sol b/l1-contracts/deploy-scripts/Gateway.s.sol index 210db8a70..81293a6ea 100644 --- a/l1-contracts/deploy-scripts/Gateway.s.sol +++ b/l1-contracts/deploy-scripts/Gateway.s.sol @@ -9,11 +9,11 @@ import {stdToml} from "forge-std/StdToml.sol"; import {Ownable} from "@openzeppelin/contracts-v4/access/Ownable.sol"; import {IBridgehub, BridgehubBurnCTMAssetData} from "contracts/bridgehub/IBridgehub.sol"; -import {IZkSyncHyperchain} from "contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol"; +import {IZKChain} from "contracts/state-transition/chain-interfaces/IZKChain.sol"; // import {ValidatorTimelock} from "contracts/state-transition/ValidatorTimelock.sol"; // import {Governance} from "contracts/governance/Governance.sol"; // import {Utils} from "./Utils.sol"; -// import {PubdataPricingMode} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; +// import {PubdataPricingMode} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; // import {IL1NativeTokenVault} from "contracts/bridge/interfaces/IL1NativeTokenVault.sol"; import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA} from "contracts/common/Config.sol"; import {L2TransactionRequestTwoBridgesOuter} from "contracts/bridgehub/IBridgehub.sol"; @@ -21,13 +21,13 @@ import {L2_BRIDGEHUB_ADDR} from "contracts/common/L2ContractAddresses.sol"; // import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; -import {IZkSyncHyperchain} from "contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol"; +import {IZKChain} from "contracts/state-transition/chain-interfaces/IZKChain.sol"; contract GatewayScript is Script { using stdToml for string; address internal constant ADDRESS_ONE = 0x0000000000000000000000000000000000000001; - bytes32 internal constant STATE_TRANSITION_NEW_CHAIN_HASH = keccak256("NewHyperchain(uint256,address)"); + bytes32 internal constant STATE_TRANSITION_NEW_CHAIN_HASH = keccak256("NewZKChain(uint256,address)"); // solhint-disable-next-line gas-struct-packing struct Config { @@ -67,7 +67,7 @@ contract GatewayScript is Script { function initializeConfig() internal { // Grab config from output of l1 deployment string memory root = vm.projectRoot(); - string memory path = string.concat(root, vm.envString("L1_OUTPUT")); //"/script-config/register-hyperchain.toml"); + string memory path = string.concat(root, vm.envString("L1_OUTPUT")); //"/script-config/register-zkChain.toml"); string memory toml = vm.readFile(path); config.deployerAddress = msg.sender; @@ -89,7 +89,7 @@ contract GatewayScript is Script { config.ctmDeploymentTracker = toml.readAddress( "$.deployed_addresses.bridgehub.ctm_deployment_tracker_proxy_addr" ); - path = string.concat(root, vm.envString("HYPERCHAIN_CONFIG")); + path = string.concat(root, vm.envString("ZK_CHAIN_CONFIG")); toml = vm.readFile(path); config.ownerAddress = toml.readAddress("$.owner_address"); @@ -149,8 +149,8 @@ contract GatewayScript is Script { address newAdmin = ownable.owner(); console.log("newAdmin", newAdmin); - IZkSyncHyperchain chain = IZkSyncHyperchain(bridgehub.getHyperchain(config.chainChainId)); - console.log("chainAdmin", bridgehub.getHyperchain(config.chainChainId), chain.getAdmin()); + IZKChain chain = IZKChain(bridgehub.getZKChain(config.chainChainId)); + console.log("chainAdmin", bridgehub.getZKChain(config.chainChainId), chain.getAdmin()); bytes32 ctmAssetId = bridgehub.ctmAssetIdFromChainId(config.chainChainId); bytes memory diamondCutData = config.diamondCutData; // todo replace with config.zkDiamondCutData; bytes memory ctmData = abi.encode(newAdmin, diamondCutData); diff --git a/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol index 9a0447d56..427263091 100644 --- a/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol +++ b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol @@ -118,7 +118,7 @@ contract PrepareZKChainRegistrationCalldataScript is Script { calls = new IGovernance.Call[](1); } - IGovernance.Call memory registerChainCall = prepareRegisterHyperchainCall(); + IGovernance.Call memory registerChainCall = prepareRegisterZKChainCall(); calls[cnt] = registerChainCall; ++cnt; @@ -267,7 +267,7 @@ contract PrepareZKChainRegistrationCalldataScript is Script { return proxyContractAddress; } - function prepareRegisterHyperchainCall() internal view returns (IGovernance.Call memory) { + function prepareRegisterZKChainCall() internal view returns (IGovernance.Call memory) { Bridgehub bridgehub = Bridgehub(ecosystem.bridgehub); bytes memory data = abi.encodeCall( diff --git a/l1-contracts/deploy-scripts/RegisterHyperchain.s.sol b/l1-contracts/deploy-scripts/RegisterZKChain.s.sol similarity index 91% rename from l1-contracts/deploy-scripts/RegisterHyperchain.s.sol rename to l1-contracts/deploy-scripts/RegisterZKChain.s.sol index 2adb256bd..8687f372f 100644 --- a/l1-contracts/deploy-scripts/RegisterHyperchain.s.sol +++ b/l1-contracts/deploy-scripts/RegisterZKChain.s.sol @@ -9,20 +9,20 @@ import {stdToml} from "forge-std/StdToml.sol"; import {Ownable} from "@openzeppelin/contracts-v4/access/Ownable.sol"; import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; -import {IZkSyncHyperchain} from "contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol"; +import {IZKChain} from "contracts/state-transition/chain-interfaces/IZKChain.sol"; import {ValidatorTimelock} from "contracts/state-transition/ValidatorTimelock.sol"; import {Governance} from "contracts/governance/Governance.sol"; import {ChainAdmin} from "contracts/governance/ChainAdmin.sol"; import {Utils} from "./Utils.sol"; -import {PubdataPricingMode} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; +import {PubdataPricingMode} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; import {IL1NativeTokenVault} from "contracts/bridge/interfaces/IL1NativeTokenVault.sol"; import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; -contract RegisterHyperchainScript is Script { +contract RegisterZKChainScript is Script { using stdToml for string; address internal constant ADDRESS_ONE = 0x0000000000000000000000000000000000000001; - bytes32 internal constant STATE_TRANSITION_NEW_CHAIN_HASH = keccak256("NewHyperchain(uint256,address)"); + bytes32 internal constant STATE_TRANSITION_NEW_CHAIN_HASH = keccak256("NewZKChain(uint256,address)"); // solhint-disable-next-line gas-struct-packing struct Config { @@ -53,7 +53,7 @@ contract RegisterHyperchainScript is Script { Config internal config; function run() public { - console.log("Deploying Hyperchain"); + console.log("Deploying ZKChain"); initializeConfig(); @@ -62,7 +62,7 @@ contract RegisterHyperchainScript is Script { checkTokenAddress(); registerAssetIdOnBridgehub(); registerTokenOnNTV(); - registerHyperchain(); + registerZKChain(); addValidators(); configureZkSyncStateTransition(); setPendingAdmin(); @@ -73,7 +73,7 @@ contract RegisterHyperchainScript is Script { function initializeConfig() internal { // Grab config from output of l1 deployment string memory root = vm.projectRoot(); - string memory path = string.concat(root, vm.envString("L1_OUTPUT")); //"/script-config/register-hyperchain.toml"); + string memory path = string.concat(root, vm.envString("L1_OUTPUT")); //"/script-config/register-zkChain.toml"); string memory toml = vm.readFile(path); config.deployerAddress = msg.sender; @@ -91,7 +91,7 @@ contract RegisterHyperchainScript is Script { config.nativeTokenVault = toml.readAddress("$.deployed_addresses.native_token_vault_addr"); config.diamondCutData = toml.readBytes("$.contracts_config.diamond_cut_data"); config.forceDeployments = toml.readBytes("$.contracts_config.force_deployments_data"); - path = string.concat(root, vm.envString("HYPERCHAIN_CONFIG")); + path = string.concat(root, vm.envString("ZK_CHAIN_CONFIG")); toml = vm.readFile(path); config.ownerAddress = toml.readAddress("$.owner_address"); @@ -182,7 +182,7 @@ contract RegisterHyperchainScript is Script { config.chainAdmin = address(chainAdmin); } - function registerHyperchain() internal { + function registerZKChain() internal { IBridgehub bridgehub = IBridgehub(config.bridgehub); Ownable ownable = Ownable(config.bridgehub); @@ -207,7 +207,7 @@ contract RegisterHyperchainScript is Script { _value: 0, _delay: 0 }); - console.log("Hyperchain registered"); + console.log("ZK chain registered"); // Get new diamond proxy address from emitted events Vm.Log[] memory logs = vm.getRecordedLogs(); @@ -223,7 +223,7 @@ contract RegisterHyperchainScript is Script { revert("Diamond proxy address not found"); } config.newDiamondProxy = diamondProxyAddress; - console.log("Hyperchain diamond proxy deployed at:", diamondProxyAddress); + console.log("ZKChain diamond proxy deployed at:", diamondProxyAddress); } function addValidators() internal { @@ -238,16 +238,16 @@ contract RegisterHyperchainScript is Script { } function configureZkSyncStateTransition() internal { - IZkSyncHyperchain hyperchain = IZkSyncHyperchain(config.newDiamondProxy); + IZKChain zkChain = IZKChain(config.newDiamondProxy); vm.startBroadcast(msg.sender); - hyperchain.setTokenMultiplier( + zkChain.setTokenMultiplier( config.baseTokenGasPriceMultiplierNominator, config.baseTokenGasPriceMultiplierDenominator ); if (config.validiumMode) { - hyperchain.setPubdataPricingMode(PubdataPricingMode.Validium); + zkChain.setPubdataPricingMode(PubdataPricingMode.Validium); } vm.stopBroadcast(); @@ -255,10 +255,10 @@ contract RegisterHyperchainScript is Script { } function setPendingAdmin() internal { - IZkSyncHyperchain hyperchain = IZkSyncHyperchain(config.newDiamondProxy); + IZKChain zkChain = IZKChain(config.newDiamondProxy); vm.startBroadcast(msg.sender); - hyperchain.setPendingAdmin(config.chainAdmin); + zkChain.setPendingAdmin(config.chainAdmin); vm.stopBroadcast(); console.log("Owner for ", config.newDiamondProxy, "set to", config.chainAdmin); } @@ -268,7 +268,7 @@ contract RegisterHyperchainScript is Script { vm.serializeAddress("root", "chain_admin_addr", config.chainAdmin); string memory toml = vm.serializeAddress("root", "governance_addr", config.governance); string memory root = vm.projectRoot(); - string memory path = string.concat(root, "/script-out/output-register-hyperchain.toml"); + string memory path = string.concat(root, "/script-out/output-register-zkChain.toml"); vm.writeToml(toml, path); console.log("Output saved at:", path); } diff --git a/l1-contracts/package.json b/l1-contracts/package.json index e7329a6bf..fab7c8cbf 100644 --- a/l1-contracts/package.json +++ b/l1-contracts/package.json @@ -62,7 +62,7 @@ "test:fork": "TEST_CONTRACTS_FORK=1 yarn run hardhat test test/unit_tests/*.fork.ts --network hardhat", "coverage:foundry": "forge coverage --ffi", "deploy-no-build": "ts-node scripts/deploy.ts", - "register-hyperchain": "ts-node scripts/register-hyperchain.ts", + "register-zk-chain": "ts-node scripts/register-zk-chain.ts", "deploy-weth-bridges": "ts-node scripts/deploy-weth-bridges.ts", "initialize-l2-weth-token": "ts-node scripts/initialize-l2-weth-token.ts", "deploy-erc20": "ts-node scripts/deploy-erc20.ts", diff --git a/l1-contracts/scripts/register-hyperchain.ts b/l1-contracts/scripts/register-hyperchain.ts index 605066bc7..13013a9d2 100644 --- a/l1-contracts/scripts/register-hyperchain.ts +++ b/l1-contracts/scripts/register-hyperchain.ts @@ -55,7 +55,7 @@ const chooseBaseTokenAddress = async (name?: string, address?: string) => { async function main() { const program = new Command(); - program.version("0.1.0").name("register-hyperchain").description("register hyperchains"); + program.version("0.1.0").name("register-zk-chain").description("register zk-chains"); program .option("--private-key ") @@ -104,7 +104,7 @@ async function main() { await deployer.registerTokenBridgehub(baseTokenAddress, cmd.useGovernance); } await deployer.registerTokenInNativeTokenVault(baseTokenAddress); - await deployer.registerHyperchain( + await deployer.registerZKChain( baseTokenAssetId, cmd.validiumMode, null, diff --git a/l1-contracts/scripts/revert-reason.ts b/l1-contracts/scripts/revert-reason.ts index 713587bc0..2cd8eae83 100644 --- a/l1-contracts/scripts/revert-reason.ts +++ b/l1-contracts/scripts/revert-reason.ts @@ -7,7 +7,7 @@ import { Interface } from "ethers/lib/utils"; import { web3Url } from "./utils"; const erc20BridgeInterface = new Interface(hardhat.artifacts.readArtifactSync("L1ERC20Bridge").abi); -const zkSyncInterface = new Interface(hardhat.artifacts.readArtifactSync("IZkSyncHyperchain").abi); +const zkSyncInterface = new Interface(hardhat.artifacts.readArtifactSync("IZKChain").abi); const verifierInterface = new Interface(hardhat.artifacts.readArtifactSync("Verifier").abi); const bridgehubInterface = new Interface(hardhat.artifacts.readArtifactSync("Bridgehub").abi); const sharedBridgeInterface = new Interface(hardhat.artifacts.readArtifactSync("L1SharedBridge").abi); diff --git a/l1-contracts/scripts/sync-layer.ts b/l1-contracts/scripts/sync-layer.ts index d05766d1c..f48af69ac 100644 --- a/l1-contracts/scripts/sync-layer.ts +++ b/l1-contracts/scripts/sync-layer.ts @@ -161,7 +161,7 @@ async function main() { const receipt = await deployer.moveChainToGateway(gatewayChainId, gasPrice); - const gatewayAddress = await ctm.getHyperchain(gatewayChainId); + const gatewayAddress = await ctm.getZKChain(gatewayChainId); const l2TxHash = zkUtils.getL2HashFromPriorityOp(receipt, gatewayAddress); @@ -177,8 +177,8 @@ async function main() { console.log("Finalized on SL with hash:", receiptOnSL.transactionHash); const ctmOnSL = IChainTypeManagerFactory.connect(counterPart, gatewayProvider); - const hyperchainAddress = await ctmOnSL.getHyperchain(currentChainId); - console.log(`CONTRACTS_DIAMOND_PROXY_ADDR=${hyperchainAddress}`); + const zkChainAddress = await ctmOnSL.getZKChain(currentChainId); + console.log(`CONTRACTS_DIAMOND_PROXY_ADDR=${zkChainAddress}`); console.log("Success!"); }); @@ -214,14 +214,14 @@ async function main() { verbose: true, }); - const hyperchain = deployer.stateTransitionContract(deployer.deployWallet); + const zkChain = deployer.stateTransitionContract(deployer.deployWallet); - console.log(await hyperchain.getAdmin()); + console.log(await zkChain.getAdmin()); console.log("Executing recovery..."); await ( - await hyperchain.recoverFromFailedMigrationToGateway( + await zkChain.recoverFromFailedMigrationToGateway( gatewayChainId, proof.l2BatchNumber, proof.l2MessageIndex, @@ -291,13 +291,13 @@ async function main() { ); deployer.addresses.Bridgehub.BridgehubProxy = getAddressFromEnv("GATEWAY_BRIDGEHUB_PROXY_ADDR"); - const hyperchain = deployer.stateTransitionContract(deployer.deployWallet); + const zkChain = deployer.stateTransitionContract(deployer.deployWallet); console.log("Setting SL DA validators"); // This logic should be distinctive between Validium and Rollup const l1DaValidator = getAddressFromEnv("GATEWAY_L1_RELAYED_SL_DA_VALIDATOR"); const l2DaValidator = getAddressFromEnv("CONTRACTS_L2_DA_VALIDATOR_ADDR"); - await (await hyperchain.setDAValidatorPair(l1DaValidator, l2DaValidator)).wait(); + await (await zkChain.setDAValidatorPair(l1DaValidator, l2DaValidator)).wait(); console.log("Success!"); }); @@ -316,7 +316,7 @@ async function registerSLContractsOnL1(deployer: Deployer) { const l1Bridgehub = deployer.bridgehubContract(deployer.deployWallet); const l1CTM = deployer.chainTypeManagerContract(deployer.deployWallet); console.log(deployer.addresses.StateTransition.StateTransitionProxy); - const gatewayAddress = await l1Bridgehub.getHyperchain(chainId); + const gatewayAddress = await l1Bridgehub.getZKChain(chainId); // this script only works when owner is the deployer console.log("Registering Gateway chain id on the CTM"); const receipt1 = await deployer.executeUpgrade( diff --git a/l1-contracts/scripts/upgrade-consistency-checker.ts b/l1-contracts/scripts/upgrade-consistency-checker.ts index 58a0f66e4..798f6f36a 100644 --- a/l1-contracts/scripts/upgrade-consistency-checker.ts +++ b/l1-contracts/scripts/upgrade-consistency-checker.ts @@ -20,7 +20,7 @@ import { encodeNTVAssetId } from "../src.ts/utils"; const genesisUpgrade = process.env.CONTRACTS_GENESIS_UPGRADE_ADDR!; const validatorTimelockDeployTx = "0xde4ef2b77241b605acaa1658ff8815df0911bf81555a80c9cbdde42fbcaaea30"; const validatorTimelock = process.env.CONTRACTS_VALIDATOR_TIMELOCK_ADDR!; -const upgradeHyperchains = process.env.CONTRACTS_HYPERCHAIN_UPGRADE_ADDR!; +const upgradeZKChains = process.env.CONTRACTS_ZK_CHAIN_UPGRADE_ADDR!; const verifier = process.env.CONTRACTS_VERIFIER_ADDR!; const proxyAdmin = process.env.CONTRACTS_TRANSPARENT_PROXY_ADMIN_ADDR!; @@ -55,8 +55,8 @@ const expectedDelay = "75600"; const eraChainId = process.env.CONTRACTS_ERA_CHAIN_ID!; const l1ChainId = process.env.CONTRACTS_L1_CHAIN_ID!; const expectedSalt = "0x0000000000000000000000000000000000000000000000000000000000000001"; -const expectedHyperchainAddr = "0x32400084c286cf3e17e7b677ea9583e60a000324"; -const maxNumberOfHyperchains = 100; +const expectedZKChainAddr = "0x32400084c286cf3e17e7b677ea9583e60a000324"; +const maxNumberOfZKChains = 100; const expectedStoredBatchHashZero = "0x1574fa776dec8da2071e5f20d71840bfcbd82c2bca9ad68680edfedde1710bc4"; const expectedL2BridgeAddress = "0x11f943b2c77b743AB90f4A0Ae7d5A4e7FCA3E102"; const expectedL1LegacyBridge = "0x57891966931Eb4Bb6FB81430E6cE0A03AAbDe063"; @@ -328,9 +328,9 @@ async function checkBridgehub() { throw new Error("Bridgehub baseToken is not correct"); } - const hyperchain = await contract.getHyperchain(eraChainId); - if (hyperchain.toLowerCase() != expectedHyperchainAddr.toLowerCase()) { - throw new Error("Bridgehub hyperchain is not correct"); + const zkChain = await contract.getZKChain(eraChainId); + if (zkChain.toLowerCase() != expectedZKChainAddr.toLowerCase()) { + throw new Error("Bridgehub zkChain is not correct"); } const sharedBridge = await contract.sharedBridge(); @@ -372,7 +372,7 @@ async function checkCTMImpl() { const artifact = await hardhat.artifacts.readArtifact("ChainTypeManager"); const contract = new ethers.Contract(ctmImpl, artifact.abi, l1Provider); - await checkCorrectInitCode(ctmImplDeployTx, contract, artifact.bytecode, [bridgeHub, maxNumberOfHyperchains]); + await checkCorrectInitCode(ctmImplDeployTx, contract, artifact.bytecode, [bridgeHub, maxNumberOfZKChains]); console.log("CTM impl correct!"); } @@ -386,9 +386,9 @@ async function checkCTM() { if (usedBH.toLowerCase() != bridgeHub.toLowerCase()) { throw new Error("CTM bridgeHub is not correct"); } - const usedMaxNumberOfHyperchains = (await contract.MAX_NUMBER_OF_HYPERCHAINS()).toNumber(); - if (usedMaxNumberOfHyperchains != maxNumberOfHyperchains) { - throw new Error("CTM maxNumberOfHyperchains is not correct"); + const usedMaxNumberOfZKChains = (await contract.MAX_NUMBER_OF_ZK_CHAINS()).toNumber(); + if (usedMaxNumberOfZKChains != maxNumberOfZKChains) { + throw new Error("CTM maxNumberOfZKChains is not correct"); } const genUpgrade = await contract.genesisUpgrade(); @@ -419,7 +419,7 @@ async function checkL1AssetRouterImpl() { expectedL1WethAddress, bridgeHub, eraChainId, - expectedHyperchainAddr, + expectedZKChainAddr, ]); console.log("L1 shared bridge impl correct!"); @@ -482,7 +482,7 @@ async function main() { program.action(async () => { await checkIdenticalBytecode(genesisUpgrade, "GenesisUpgrade"); - await checkIdenticalBytecode(upgradeHyperchains, "UpgradeHyperchains"); + await checkIdenticalBytecode(upgradeZKChains, "UpgradeZKChains"); await checkIdenticalBytecode(executorFacet, "ExecutorFacet"); await checkIdenticalBytecode(gettersFacet, "GettersFacet"); await checkIdenticalBytecode(adminFacet, "AdminFacet"); diff --git a/l1-contracts/scripts/verify.ts b/l1-contracts/scripts/verify.ts index 4d03357de..25255bad7 100644 --- a/l1-contracts/scripts/verify.ts +++ b/l1-contracts/scripts/verify.ts @@ -88,7 +88,7 @@ async function main() { const promise3 = verifyPromise(process.env.CONTRACTS_DEFAULT_UPGRADE_ADDR); promises.push(promise3); - const promise4 = verifyPromise(process.env.CONTRACTS_HYPERCHAIN_UPGRADE_ADDR); + const promise4 = verifyPromise(process.env.CONTRACTS_ZK_CHAIN_UPGRADE_ADDR); promises.push(promise4); const promise5 = verifyPromise(addresses.TransparentProxyAdmin); @@ -127,7 +127,7 @@ async function main() { const promise8 = verifyPromise(addresses.StateTransition.StateTransitionImplementation, [ addresses.Bridgehub.BridgehubProxy, - getNumberFromEnv("CONTRACTS_MAX_NUMBER_OF_HYPERCHAINS"), + getNumberFromEnv("CONTRACTS_MAX_NUMBER_OF_ZK_CHAINS"), ]); promises.push(promise8); @@ -135,7 +135,7 @@ async function main() { const genesisBatchHash = getHashFromEnv("CONTRACTS_GENESIS_ROOT"); // TODO: confusing name const genesisRollupLeafIndex = getNumberFromEnv("CONTRACTS_GENESIS_ROLLUP_LEAF_INDEX"); const genesisBatchCommitment = getHashFromEnv("CONTRACTS_GENESIS_BATCH_COMMITMENT"); - const diamondCut = await deployer.initialZkSyncHyperchainDiamondCut([]); + const diamondCut = await deployer.initialZkSyncZKChainDiamondCut([]); const protocolVersion = packSemver(...unpackStringSemVer(process.env.CONTRACTS_GENESIS_PROTOCOL_SEMANTIC_VERSION)); const initCalldata2 = chainTypeManager.encodeFunctionData("initialize", [ diff --git a/l1-contracts/src.ts/deploy-process.ts b/l1-contracts/src.ts/deploy-process.ts index 15aeda12d..905886fe7 100644 --- a/l1-contracts/src.ts/deploy-process.ts +++ b/l1-contracts/src.ts/deploy-process.ts @@ -98,7 +98,7 @@ export async function initialBridgehubDeployment( await deployer.setChainTypeManagerInValidatorTimelock({ gasPrice }); } -export async function registerHyperchain( +export async function registerZKChain( deployer: Deployer, validiumMode: boolean, extraFacets: FacetCut[], @@ -118,7 +118,7 @@ export async function registerHyperchain( await deployer.registerTokenBridgehub(baseTokenAddress, useGovernance); } await deployer.registerTokenInNativeTokenVault(baseTokenAddress); - await deployer.registerHyperchain( + await deployer.registerZKChain( encodeNTVAssetId(deployer.l1ChainId, ethers.utils.hexZeroPad(baseTokenAddress, 32)), validiumMode, extraFacets, diff --git a/l1-contracts/src.ts/deploy-test-process.ts b/l1-contracts/src.ts/deploy-test-process.ts index f54e74d16..e7bf6deef 100644 --- a/l1-contracts/src.ts/deploy-test-process.ts +++ b/l1-contracts/src.ts/deploy-test-process.ts @@ -15,7 +15,7 @@ import { L2_BOOTLOADER_BYTECODE_HASH, L2_DEFAULT_ACCOUNT_BYTECODE_HASH, initialBridgehubDeployment, - registerHyperchain, + registerZKChain, } from "./deploy-process"; import { deployTokens, getTokens } from "./deploy-token"; @@ -110,12 +110,12 @@ export async function initialTestnetDeploymentProcess( // deploy the verifier first await initialBridgehubDeployment(deployer, extraFacets, gasPrice, true); await initialBridgehubDeployment(deployer, extraFacets, gasPrice, false); - await registerHyperchainWithBridgeRegistration(deployer, false, extraFacets, gasPrice, baseTokenName); + await registerZKChainWithBridgeRegistration(deployer, false, extraFacets, gasPrice, baseTokenName); await registerTestDAValidators(deployer); return deployer; } -export async function registerHyperchainWithBridgeRegistration( +export async function registerZKChainWithBridgeRegistration( deployer: Deployer, onlyVerifier: boolean, extraFacets: FacetCut[], @@ -124,7 +124,7 @@ export async function registerHyperchainWithBridgeRegistration( chainId?: string ) { chainId = chainId ?? deployer.chainId.toString(); - await registerHyperchain(deployer, onlyVerifier, extraFacets, gasPrice, baseTokenName, chainId, true); + await registerZKChain(deployer, onlyVerifier, extraFacets, gasPrice, baseTokenName, chainId, true); await registerTestDAValidators(deployer); } @@ -139,7 +139,7 @@ async function registerTestDAValidators(deployer: Deployer) { ).wait(); } -// This is used to deploy the diamond and bridge such that they can be upgraded using UpgradeHyperchain.sol +// This is used to deploy the diamond and bridge such that they can be upgraded using UpgradeZKChain.sol // This should be deleted after the migration export async function initialPreUpgradeContractsDeployment( deployWallet: Wallet, @@ -196,7 +196,7 @@ export async function initialPreUpgradeContractsDeployment( ); await deployer.deployStateTransitionDiamondFacets(create2Salt); - await diamondAdminFacet.executeUpgradeNoOverlap(await deployer.upgradeZkSyncHyperchainDiamondCut()); + await diamondAdminFacet.executeUpgradeNoOverlap(await deployer.upgradeZKChainDiamondCut()); return deployer; } @@ -232,9 +232,9 @@ export async function initialEraTestnetDeploymentProcess( "DummyAdminFacetNoOverlap", deployer.addresses.StateTransition.DiamondProxy ); - await diamondAdminFacet.executeUpgradeNoOverlap(await deployer.upgradeZkSyncHyperchainDiamondCut()); + await diamondAdminFacet.executeUpgradeNoOverlap(await deployer.upgradeZKChainDiamondCut()); - await registerHyperchain(deployer, false, extraFacets, gasPrice, baseTokenName, deployer.chainId.toString(), true); + await registerZKChain(deployer, false, extraFacets, gasPrice, baseTokenName, deployer.chainId.toString(), true); return deployer; } @@ -277,7 +277,7 @@ export class EraDeployer extends Deployer { await tx.wait(); } - public async upgradeZkSyncHyperchainDiamondCut(extraFacets?: FacetCut[]) { + public async upgradeZKChainDiamondCut(extraFacets?: FacetCut[]) { let facetCuts: FacetCut[] = Object.values( await getCurrentFacetCutsForAdd( this.addresses.StateTransition.AdminFacet, diff --git a/l1-contracts/src.ts/deploy.ts b/l1-contracts/src.ts/deploy.ts index 9778dda1a..beb9f90c3 100644 --- a/l1-contracts/src.ts/deploy.ts +++ b/l1-contracts/src.ts/deploy.ts @@ -59,7 +59,7 @@ import { IGovernanceFactory } from "../typechain/IGovernanceFactory"; import { ITransparentUpgradeableProxyFactory } from "../typechain/ITransparentUpgradeableProxyFactory"; import { ProxyAdminFactory } from "../typechain/ProxyAdminFactory"; -import { IZkSyncHyperchainFactory } from "../typechain/IZkSyncHyperchainFactory"; +import { IZKChainFactory } from "../typechain/IZKChainFactory"; import { L1AssetRouterFactory } from "../typechain/L1AssetRouterFactory"; import { SingletonFactoryFactory } from "../typechain/SingletonFactoryFactory"; @@ -131,7 +131,7 @@ export class Deployer { this.deployedLogPrefix = config.deployedLogPrefix ?? "CONTRACTS"; } - public async initialZkSyncHyperchainDiamondCut(extraFacets?: FacetCut[], compareDiamondCutHash: boolean = false) { + public async initialZkSyncZKChainDiamondCut(extraFacets?: FacetCut[], compareDiamondCutHash: boolean = false) { let facetCuts: FacetCut[] = Object.values( await getCurrentFacetCutsForAdd( this.addresses.StateTransition.AdminFacet, @@ -209,7 +209,7 @@ export class Deployer { [ getNumberFromEnv("ETH_CLIENT_CHAIN_ID"), applyL1ToL2Alias(this.addresses.Governance), - getNumberFromEnv("CONTRACTS_MAX_NUMBER_OF_HYPERCHAINS"), + getNumberFromEnv("CONTRACTS_MAX_NUMBER_OF_ZK_CHAINS"), ] ), }; @@ -452,7 +452,7 @@ export class Deployer { public async deployBridgehubImplementation(create2Salt: string, ethTxOptions: ethers.providers.TransactionRequest) { const contractAddress = await this.deployViaCreate2( "Bridgehub", - [await this.getL1ChainId(), this.addresses.Governance, getNumberFromEnv("CONTRACTS_MAX_NUMBER_OF_HYPERCHAINS")], + [await this.getL1ChainId(), this.addresses.Governance, getNumberFromEnv("CONTRACTS_MAX_NUMBER_OF_ZK_CHAINS")], create2Salt, ethTxOptions ); @@ -546,7 +546,7 @@ export class Deployer { const genesisBatchHash = getHashFromEnv("CONTRACTS_GENESIS_ROOT"); // TODO: confusing name const genesisRollupLeafIndex = getNumberFromEnv("CONTRACTS_GENESIS_ROLLUP_LEAF_INDEX"); const genesisBatchCommitment = getHashFromEnv("CONTRACTS_GENESIS_BATCH_COMMITMENT"); - const diamondCut = await this.initialZkSyncHyperchainDiamondCut(extraFacets); + const diamondCut = await this.initialZkSyncZKChainDiamondCut(extraFacets); const protocolVersion = packSemver(...unpackStringSemVer(process.env.CONTRACTS_GENESIS_PROTOCOL_SEMANTIC_VERSION)); const chainTypeManager = new Interface(hardhat.artifacts.readArtifactSync("ChainTypeManager").abi); @@ -1044,11 +1044,11 @@ export class Deployer { this.addresses.StateTransition.DefaultUpgrade = contractAddress; } - public async deployHyperchainsUpgrade(create2Salt: string, ethTxOptions: ethers.providers.TransactionRequest) { - const contractAddress = await this.deployViaCreate2("UpgradeHyperchains", [], create2Salt, ethTxOptions); + public async deployZKChainsUpgrade(create2Salt: string, ethTxOptions: ethers.providers.TransactionRequest) { + const contractAddress = await this.deployViaCreate2("UpgradeZKChains", [], create2Salt, ethTxOptions); if (this.verbose) { - console.log(`CONTRACTS_HYPERCHAIN_UPGRADE_ADDR=${contractAddress}`); + console.log(`CONTRACTS_ZK_CHAIN_UPGRADE_ADDR=${contractAddress}`); } this.addresses.StateTransition.DefaultUpgrade = contractAddress; @@ -1165,7 +1165,7 @@ export class Deployer { // We are creating the new DiamondProxy for our chain, to be deployed on top of sync Layer. const newAdmin = this.deployWallet.address; - const diamondCutData = await this.initialZkSyncHyperchainDiamondCut(); + const diamondCutData = await this.initialZkSyncZKChainDiamondCut(); const initialDiamondCut = new ethers.utils.AbiCoder().encode([DIAMOND_CUT_DATA_ABI_STRING], [diamondCutData]); const ctmData = new ethers.utils.AbiCoder().encode(["uint256", "bytes"], [newAdmin, initialDiamondCut]); @@ -1246,7 +1246,7 @@ export class Deployer { } } - public async registerHyperchain( + public async registerZKChain( baseTokenAssetId: string, validiumMode: boolean, extraFacets?: FacetCut[], @@ -1267,10 +1267,10 @@ export class Deployer { const baseTokenAddress = await ntv.tokenAddress(baseTokenAssetId); const inputChainId = predefinedChainId || getNumberFromEnv("CHAIN_ETH_ZKSYNC_NETWORK_ID"); - const alreadyRegisteredInCTM = (await chainTypeManager.getHyperchain(inputChainId)) != ethers.constants.AddressZero; + const alreadyRegisteredInCTM = (await chainTypeManager.getZKChain(inputChainId)) != ethers.constants.AddressZero; const admin = process.env.CHAIN_ADMIN_ADDRESS || this.ownerAddress; - const diamondCutData = await this.initialZkSyncHyperchainDiamondCut(extraFacets, compareDiamondCutHash); + const diamondCutData = await this.initialZkSyncZKChainDiamondCut(extraFacets, compareDiamondCutHash); const initialDiamondCut = new ethers.utils.AbiCoder().encode([DIAMOND_CUT_DATA_ABI_STRING], [diamondCutData]); const forceDeploymentsData = await this.genesisForceDeploymentsData(); const initData = ethers.utils.defaultAbiCoder.encode(["bytes", "bytes"], [initialDiamondCut, forceDeploymentsData]); @@ -1315,8 +1315,8 @@ export class Deployer { this.addresses.BaseTokenAssetId = baseTokenAssetId; if (this.verbose) { - console.log(`Hyperchain registered, gas used: ${receipt.gasUsed.toString()} and ${receipt.gasUsed.toString()}`); - console.log(`Hyperchain registration tx hash: ${receipt.transactionHash}`); + console.log(`ZK chain registered, gas used: ${receipt.gasUsed.toString()} and ${receipt.gasUsed.toString()}`); + console.log(`ZK chain registration tx hash: ${receipt.transactionHash}`); console.log(`CHAIN_ETH_ZKSYNC_NETWORK_ID=${parseInt(chainId, 16)}`); @@ -1327,7 +1327,7 @@ export class Deployer { const diamondProxyAddress = "0x" + receipt.logs - .find((log) => log.topics[0] == chainTypeManager.interface.getEventTopic("NewHyperchain")) + .find((log) => log.topics[0] == chainTypeManager.interface.getEventTopic("NewZKChain")) .topics[2].slice(26); this.addresses.StateTransition.DiamondProxy = diamondProxyAddress; if (this.verbose) { @@ -1410,18 +1410,18 @@ export class Deployer { public async transferAdminFromDeployerToChainAdmin() { const ctm = this.chainTypeManagerContract(this.deployWallet); - const diamondProxyAddress = await ctm.getHyperchain(this.chainId); - const hyperchain = IZkSyncHyperchainFactory.connect(diamondProxyAddress, this.deployWallet); + const diamondProxyAddress = await ctm.getZKChain(this.chainId); + const zkChain = IZKChainFactory.connect(diamondProxyAddress, this.deployWallet); - const receipt = await (await hyperchain.setPendingAdmin(this.addresses.ChainAdmin)).wait(); + const receipt = await (await zkChain.setPendingAdmin(this.addresses.ChainAdmin)).wait(); if (this.verbose) { console.log(`ChainAdmin set as pending admin, gas used: ${receipt.gasUsed.toString()}`); } - const acceptAdminData = hyperchain.interface.encodeFunctionData("acceptAdmin"); + const acceptAdminData = zkChain.interface.encodeFunctionData("acceptAdmin"); await this.executeChainAdminMulticall([ { - target: hyperchain.address, + target: zkChain.address, value: 0, data: acceptAdminData, }, @@ -1569,7 +1569,7 @@ export class Deployer { } public stateTransitionContract(signerOrProvider: Signer | providers.Provider) { - return IZkSyncHyperchainFactory.connect(this.addresses.StateTransition.DiamondProxy, signerOrProvider); + return IZKChainFactory.connect(this.addresses.StateTransition.DiamondProxy, signerOrProvider); } public governanceContract(signerOrProvider: Signer | providers.Provider) { diff --git a/l1-contracts/src.ts/diamondCut.ts b/l1-contracts/src.ts/diamondCut.ts index c2a8e8728..ca44029bf 100644 --- a/l1-contracts/src.ts/diamondCut.ts +++ b/l1-contracts/src.ts/diamondCut.ts @@ -3,8 +3,8 @@ import type { Interface } from "ethers/lib/utils"; import "@nomiclabs/hardhat-ethers"; import type { Wallet, BigNumberish } from "ethers"; import { ethers } from "ethers"; -import { IZkSyncHyperchainFactory } from "../typechain/IZkSyncHyperchainFactory"; -import { IZkSyncHyperchainBaseFactory } from "../typechain/IZkSyncHyperchainBaseFactory"; +import { IZKChainFactory } from "../typechain/IZKChainFactory"; +import { IZKChainBaseFactory } from "../typechain/IZKChainBaseFactory"; export enum Action { Add = 0, @@ -98,12 +98,12 @@ export async function getCurrentFacetCutsForAdd( } export async function getDeployedFacetCutsForRemove(wallet: Wallet, zkSyncAddress: string, updatedFaceNames: string[]) { - const mainContract = IZkSyncHyperchainFactory.connect(zkSyncAddress, wallet); + const mainContract = IZKChainFactory.connect(zkSyncAddress, wallet); const diamondCutFacets = await mainContract.facets(); // We don't care about freezing, because we are removing the facets. const result = []; for (const { addr, selectors } of diamondCutFacets) { - const facet = IZkSyncHyperchainBaseFactory.connect(addr, wallet); + const facet = IZKChainBaseFactory.connect(addr, wallet); const facetName = await facet.getName(); if (updatedFaceNames.includes(facetName)) { result.push({ diff --git a/l1-contracts/test/foundry/integration/BridgeHubInvariantTests.t.sol b/l1-contracts/test/foundry/integration/BridgeHubInvariantTests.t.sol index 031060691..df97219f3 100644 --- a/l1-contracts/test/foundry/integration/BridgeHubInvariantTests.t.sol +++ b/l1-contracts/test/foundry/integration/BridgeHubInvariantTests.t.sol @@ -12,7 +12,7 @@ import {IMailbox} from "contracts/state-transition/chain-interfaces/IMailbox.sol import {IExecutor} from "contracts/state-transition/chain-interfaces/IExecutor.sol"; import {L1ContractDeployer} from "./_SharedL1ContractDeployer.t.sol"; import {TokenDeployer} from "./_SharedTokenDeployer.t.sol"; -import {HyperchainDeployer} from "./_SharedHyperchainDeployer.t.sol"; +import {ZKChainDeployer} from "./_SharedZKChainDeployer.t.sol"; import {L2TxMocker} from "./_SharedL2TxMocker.t.sol"; import {ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA, DEFAULT_L2_LOGS_TREE_ROOT_HASH, EMPTY_STRING_KECCAK} from "contracts/common/Config.sol"; @@ -23,7 +23,7 @@ import {L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR} from "contracts/common/L2ContractAdd import {IL1ERC20Bridge} from "contracts/bridge/interfaces/IL1ERC20Bridge.sol"; import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; -contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, TokenDeployer, L2TxMocker { +contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDeployer, L2TxMocker { uint256 constant TEST_USERS_COUNT = 10; bytes32 constant NEW_PRIORITY_REQUEST_HASH = @@ -55,7 +55,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke // Amounts deposited by each user, mapped by user address and token address mapping(address user => mapping(address token => uint256 deposited)) public depositsUsers; - // Amounts deposited into the bridge, mapped by hyperchain address and token address + // Amounts deposited into the bridge, mapped by ZK chain address and token address mapping(address chain => mapping(address token => uint256 deposited)) public depositsBridge; // Total sum of deposits into the bridge, mapped by token address mapping(address token => uint256 deposited) public tokenSumDeposit; @@ -63,7 +63,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke mapping(address token => uint256 deposited) public tokenSumWithdrawal; // Total sum of L2 values transferred to mock contracts, mapped by token address mapping(address token => uint256 deposited) public l2ValuesSum; - // Deposits into the hyperchains contract, mapped by L2 contract address and token address + // Deposits into the ZK chains contract, mapped by L2 contract address and token address mapping(address l2contract => mapping(address token => uint256 balance)) public contractDeposits; // Total sum of deposits into all L2 contracts, mapped by token address mapping(address token => uint256 deposited) public contractDepositsSum; @@ -76,10 +76,10 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke vm.stopPrank(); } - // gets random hyperchain from hyperchain ids, set contract variables - modifier useHyperchain(uint256 chainIndexSeed) { - currentChainId = hyperchainIds[bound(chainIndexSeed, 0, hyperchainIds.length - 1)]; - currentChainAddress = getHyperchainAddress(currentChainId); + // gets random ZK chain from ZK chain ids, set contract variables + modifier useZKChain(uint256 chainIndexSeed) { + currentChainId = zkChainIds[bound(chainIndexSeed, 0, zkChainIds.length - 1)]; + currentChainAddress = getZKChainAddress(currentChainId); _; } @@ -100,7 +100,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke // use base token as main token // watch out, do not use with ETH modifier useBaseToken() { - currentToken = TestnetERC20Token(getHyperchainBaseToken(currentChainId)); + currentToken = TestnetERC20Token(getZKChainBaseToken(currentChainId)); currentTokenAddress = address(currentToken); _; } @@ -135,7 +135,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke function _commitBatchInfo(uint256 _chainId) internal { //vm.warp(COMMIT_TIMESTAMP_NOT_OLDER + 1 + 1); - GettersFacet hyperchainGetters = GettersFacet(getHyperchainAddress(_chainId)); + GettersFacet zkChainGetters = GettersFacet(getZKChainAddress(_chainId)); IExecutor.StoredBatchInfo memory batchZero; @@ -149,7 +149,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke batchZero.commitment = vm.parseBytes32("0x0000000000000000000000000000000000000000000000000000000000000000"); bytes32 hashedZeroBatch = keccak256(abi.encode(batchZero)); - assertEq(hyperchainGetters.storedBatchHash(0), hashedZeroBatch); + assertEq(zkChainGetters.storedBatchHash(0), hashedZeroBatch); } // use mailbox interface to return exact amount to use as a gas on l2 side, @@ -160,7 +160,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke uint256 _l2GasLimit, uint256 _l2GasPerPubdataByteLimit ) public view returns (uint256) { - MailboxFacet chainMailBox = MailboxFacet(getHyperchainAddress(_chainId)); + MailboxFacet chainMailBox = MailboxFacet(getZKChainAddress(_chainId)); return chainMailBox.l2TransactionBaseCost(_gasPrice, _l2GasLimit, _l2GasPerPubdataByteLimit); } @@ -236,7 +236,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke } } - // deposits ERC20 token to the hyperchain where base token is ETH + // deposits ERC20 token to the ZK chain where base token is ETH // this function use requestL2TransactionTwoBridges function from shared bridge. // tokenAddress should be any ERC20 token, excluding ETH function depositERC20ToEthChain(uint256 l2Value, address tokenAddress) private useGivenToken(tokenAddress) { @@ -339,7 +339,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke } // deposits ERC20 to token with base being also ERC20 - // there are no modifiers so watch out, baseTokenAddress should be base of hyperchain + // there are no modifiers so watch out, baseTokenAddress should be base of ZK chain // currentToken should be different from base function depositERC20ToERC20Chain(uint256 l2Value, address baseTokenAddress) private { uint256 gasPrice = 10000000; @@ -393,7 +393,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke l2ValuesSum[currentTokenAddress] += l2Value; } - // deposits ETH to hyperchain where base is ETH + // deposits ETH to ZK chain where base is ETH function depositEthBase(uint256 l2Value) private { uint256 gasPrice = 10000000; vm.txGasPrice(gasPrice); @@ -601,7 +601,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke uint256 userIndexSeed, uint256 chainIndexSeed, uint256 l2Value - ) public virtual useUser(userIndexSeed) useHyperchain(chainIndexSeed) useBaseToken { + ) public virtual useUser(userIndexSeed) useZKChain(chainIndexSeed) useBaseToken { if (currentTokenAddress == ETH_TOKEN_ADDRESS) { depositEthBase(l2Value); } else { @@ -614,8 +614,8 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke uint256 chainIndexSeed, uint256 tokenIndexSeed, uint256 l2Value - ) public virtual useUser(userIndexSeed) useHyperchain(chainIndexSeed) useERC20Token(tokenIndexSeed) { - address chainBaseToken = getHyperchainBaseToken(currentChainId); + ) public virtual useUser(userIndexSeed) useZKChain(chainIndexSeed) useERC20Token(tokenIndexSeed) { + address chainBaseToken = getZKChainBaseToken(currentChainId); if (chainBaseToken == ETH_TOKEN_ADDRESS) { depositERC20ToEthChain(l2Value, currentTokenAddress); @@ -632,8 +632,8 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke uint256 userIndexSeed, uint256 chainIndexSeed, uint256 amountToWithdraw - ) public virtual useUser(userIndexSeed) useHyperchain(chainIndexSeed) { - address token = getHyperchainBaseToken(currentChainId); + ) public virtual useUser(userIndexSeed) useZKChain(chainIndexSeed) { + address token = getZKChainBaseToken(currentChainId); if (token != ETH_TOKEN_ADDRESS) { withdrawERC20Token(amountToWithdraw, token); @@ -654,8 +654,8 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke addressesToExclude.push(l2ContractAddresses[i]); } - for (uint256 i = 0; i < hyperchainIds.length; i++) { - addressesToExclude.push(getHyperchainAddress(hyperchainIds[i])); + for (uint256 i = 0; i < zkChainIds.length; i++) { + addressesToExclude.push(getZKChainAddress(zkChainIds[i])); } return addressesToExclude; @@ -669,18 +669,18 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke _registerNewTokens(tokens); _deployEra(); - _deployHyperchain(ETH_TOKEN_ADDRESS); - _deployHyperchain(ETH_TOKEN_ADDRESS); - _deployHyperchain(tokens[0]); - _deployHyperchain(tokens[0]); - _deployHyperchain(tokens[1]); - _deployHyperchain(tokens[1]); - - for (uint256 i = 0; i < hyperchainIds.length; i++) { + _deployZKChain(ETH_TOKEN_ADDRESS); + _deployZKChain(ETH_TOKEN_ADDRESS); + _deployZKChain(tokens[0]); + _deployZKChain(tokens[0]); + _deployZKChain(tokens[1]); + _deployZKChain(tokens[1]); + + for (uint256 i = 0; i < zkChainIds.length; i++) { address contractAddress = makeAddr(string(abi.encode("contract", i))); l2ContractAddresses.push(contractAddress); - _addL2ChainContract(hyperchainIds[i], contractAddress); + _addL2ChainContract(zkChainIds[i], contractAddress); } } @@ -722,7 +722,7 @@ contract BoundedBridgeHubInvariantTests is BridgeHubInvariantTests { function testBoundedBridgeHubInvariant() internal {} } -contract InvariantTesterHyperchains is Test { +contract InvariantTesterZKChains is Test { BoundedBridgeHubInvariantTests tests; function setUp() public { diff --git a/l1-contracts/test/foundry/integration/BridgehubTests.t.sol b/l1-contracts/test/foundry/integration/BridgehubTests.t.sol index a422b792a..fb1262ed4 100644 --- a/l1-contracts/test/foundry/integration/BridgehubTests.t.sol +++ b/l1-contracts/test/foundry/integration/BridgehubTests.t.sol @@ -12,7 +12,7 @@ import {IMailbox} from "contracts/state-transition/chain-interfaces/IMailbox.sol import {IExecutor} from "contracts/state-transition/chain-interfaces/IExecutor.sol"; import {L1ContractDeployer} from "./_SharedL1ContractDeployer.t.sol"; import {TokenDeployer} from "./_SharedTokenDeployer.t.sol"; -import {HyperchainDeployer} from "./_SharedHyperchainDeployer.t.sol"; +import {ZKChainDeployer} from "./_SharedZKChainDeployer.t.sol"; import {L2TxMocker} from "./_SharedL2TxMocker.t.sol"; import {ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA, DEFAULT_L2_LOGS_TREE_ROOT_HASH, EMPTY_STRING_KECCAK} from "contracts/common/Config.sol"; @@ -23,7 +23,7 @@ import {L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR} from "contracts/common/L2ContractAdd import {IL1ERC20Bridge} from "contracts/bridge/interfaces/IL1ERC20Bridge.sol"; import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; -contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, TokenDeployer, L2TxMocker { +contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDeployer, L2TxMocker { uint256 constant TEST_USERS_COUNT = 10; bytes32 constant NEW_PRIORITY_REQUEST_HASH = @@ -55,7 +55,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke // Amounts deposited by each user, mapped by user address and token address mapping(address user => mapping(address token => uint256 deposited)) public depositsUsers; - // Amounts deposited into the bridge, mapped by hyperchain address and token address + // Amounts deposited into the bridge, mapped by ZK chain address and token address mapping(address chain => mapping(address token => uint256 deposited)) public depositsBridge; // Total sum of deposits into the bridge, mapped by token address mapping(address token => uint256 deposited) public tokenSumDeposit; @@ -63,7 +63,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke mapping(address token => uint256 deposited) public tokenSumWithdrawal; // Total sum of L2 values transferred to mock contracts, mapped by token address mapping(address token => uint256 deposited) public l2ValuesSum; - // Deposits into the hyperchains contract, mapped by L2 contract address and token address + // Deposits into the ZK chains contract, mapped by L2 contract address and token address mapping(address l2contract => mapping(address token => uint256 balance)) public contractDeposits; // Total sum of deposits into all L2 contracts, mapped by token address mapping(address token => uint256 deposited) public contractDepositsSum; @@ -76,10 +76,10 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke vm.stopPrank(); } - // gets random hyperchain from hyperchain ids, set contract variables - modifier useHyperchain(uint256 chainIndexSeed) { - currentChainId = hyperchainIds[bound(chainIndexSeed, 0, hyperchainIds.length - 1)]; - currentChainAddress = getHyperchainAddress(currentChainId); + // gets random ZK chain from ZK chain ids, set contract variables + modifier useZKChain(uint256 chainIndexSeed) { + currentChainId = zkChainIds[bound(chainIndexSeed, 0, zkChainIds.length - 1)]; + currentChainAddress = getZKChainAddress(currentChainId); _; } @@ -100,7 +100,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke // use base token as main token // watch out, do not use with ETH modifier useBaseToken() { - currentToken = TestnetERC20Token(getHyperchainBaseToken(currentChainId)); + currentToken = TestnetERC20Token(getZKChainBaseToken(currentChainId)); currentTokenAddress = address(currentToken); _; } @@ -135,7 +135,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke function _commitBatchInfo(uint256 _chainId) internal { //vm.warp(COMMIT_TIMESTAMP_NOT_OLDER + 1 + 1); - GettersFacet hyperchainGetters = GettersFacet(getHyperchainAddress(_chainId)); + GettersFacet zkChainGetters = GettersFacet(getZKChainAddress(_chainId)); IExecutor.StoredBatchInfo memory batchZero; @@ -149,7 +149,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke batchZero.commitment = vm.parseBytes32("0x0000000000000000000000000000000000000000000000000000000000000000"); bytes32 hashedZeroBatch = keccak256(abi.encode(batchZero)); - assertEq(hyperchainGetters.storedBatchHash(0), hashedZeroBatch); + assertEq(zkChainGetters.storedBatchHash(0), hashedZeroBatch); } // use mailbox interface to return exact amount to use as a gas on l2 side, @@ -160,7 +160,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke uint256 _l2GasLimit, uint256 _l2GasPerPubdataByteLimit ) public view returns (uint256) { - MailboxFacet chainMailBox = MailboxFacet(getHyperchainAddress(_chainId)); + MailboxFacet chainMailBox = MailboxFacet(getZKChainAddress(_chainId)); return chainMailBox.l2TransactionBaseCost(_gasPrice, _l2GasLimit, _l2GasPerPubdataByteLimit); } @@ -236,7 +236,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke } } - // deposits ERC20 token to the hyperchain where base token is ETH + // deposits ERC20 token to the ZK chain where base token is ETH // this function use requestL2TransactionTwoBridges function from shared bridge. // tokenAddress should be any ERC20 token, excluding ETH function depositERC20ToEthChain(uint256 l2Value, address tokenAddress) private useGivenToken(tokenAddress) { @@ -339,7 +339,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke } // deposits ERC20 to token with base being also ERC20 - // there are no modifiers so watch out, baseTokenAddress should be base of hyperchain + // there are no modifiers so watch out, baseTokenAddress should be base of ZK chain // currentToken should be different from base function depositERC20ToERC20Chain(uint256 l2Value, address baseTokenAddress) private { uint256 gasPrice = 10000000; @@ -393,7 +393,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke l2ValuesSum[currentTokenAddress] += l2Value; } - // deposits ETH to hyperchain where base is ETH + // deposits ETH to ZK chain where base is ETH function depositEthBase(uint256 l2Value) private { uint256 gasPrice = 10000000; vm.txGasPrice(gasPrice); @@ -601,7 +601,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke uint256 userIndexSeed, uint256 chainIndexSeed, uint256 l2Value - ) public virtual useUser(userIndexSeed) useHyperchain(chainIndexSeed) useBaseToken { + ) public virtual useUser(userIndexSeed) useZKChain(chainIndexSeed) useBaseToken { if (currentTokenAddress == ETH_TOKEN_ADDRESS) { depositEthBase(l2Value); } else { @@ -614,8 +614,8 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke uint256 chainIndexSeed, uint256 tokenIndexSeed, uint256 l2Value - ) public virtual useUser(userIndexSeed) useHyperchain(chainIndexSeed) useERC20Token(tokenIndexSeed) { - address chainBaseToken = getHyperchainBaseToken(currentChainId); + ) public virtual useUser(userIndexSeed) useZKChain(chainIndexSeed) useERC20Token(tokenIndexSeed) { + address chainBaseToken = getZKChainBaseToken(currentChainId); if (chainBaseToken == ETH_TOKEN_ADDRESS) { depositERC20ToEthChain(l2Value, currentTokenAddress); @@ -632,8 +632,8 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke uint256 userIndexSeed, uint256 chainIndexSeed, uint256 amountToWithdraw - ) public virtual useUser(userIndexSeed) useHyperchain(chainIndexSeed) { - address token = getHyperchainBaseToken(currentChainId); + ) public virtual useUser(userIndexSeed) useZKChain(chainIndexSeed) { + address token = getZKChainBaseToken(currentChainId); if (token != ETH_TOKEN_ADDRESS) { withdrawERC20Token(amountToWithdraw, token); @@ -654,8 +654,8 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke addressesToExclude.push(l2ContractAddresses[i]); } - for (uint256 i = 0; i < hyperchainIds.length; i++) { - addressesToExclude.push(getHyperchainAddress(hyperchainIds[i])); + for (uint256 i = 0; i < zkChainIds.length; i++) { + addressesToExclude.push(getZKChainAddress(zkChainIds[i])); } return addressesToExclude; @@ -669,18 +669,18 @@ contract BridgeHubInvariantTests is L1ContractDeployer, HyperchainDeployer, Toke _registerNewTokens(tokens); _deployEra(); - _deployHyperchain(ETH_TOKEN_ADDRESS); - _deployHyperchain(ETH_TOKEN_ADDRESS); - _deployHyperchain(tokens[0]); - _deployHyperchain(tokens[0]); - _deployHyperchain(tokens[1]); - _deployHyperchain(tokens[1]); - - for (uint256 i = 0; i < hyperchainIds.length; i++) { + _deployZKChain(ETH_TOKEN_ADDRESS); + _deployZKChain(ETH_TOKEN_ADDRESS); + _deployZKChain(tokens[0]); + _deployZKChain(tokens[0]); + _deployZKChain(tokens[1]); + _deployZKChain(tokens[1]); + + for (uint256 i = 0; i < zkChainIds.length; i++) { address contractAddress = makeAddr(string(abi.encode("contract", i))); l2ContractAddresses.push(contractAddress); - _addL2ChainContract(hyperchainIds[i], contractAddress); + _addL2ChainContract(zkChainIds[i], contractAddress); } } @@ -722,7 +722,7 @@ contract BoundedBridgeHubInvariantTests is BridgeHubInvariantTests { function testBoundedBridgeHubInvariant() internal {} } -// contract InvariantTesterHyperchains is Test { +// contract InvariantTesterZKChains is Test { // BoundedBridgeHubInvariantTests tests; // function setUp() public { diff --git a/l1-contracts/test/foundry/integration/DeploymentTest.t.sol b/l1-contracts/test/foundry/integration/DeploymentTest.t.sol index 3b0c1638c..d072aa912 100644 --- a/l1-contracts/test/foundry/integration/DeploymentTest.t.sol +++ b/l1-contracts/test/foundry/integration/DeploymentTest.t.sol @@ -12,7 +12,7 @@ import {IMailbox} from "contracts/state-transition/chain-interfaces/IMailbox.sol import {IExecutor} from "contracts/state-transition/chain-interfaces/IExecutor.sol"; import {L1ContractDeployer} from "./_SharedL1ContractDeployer.t.sol"; import {TokenDeployer} from "./_SharedTokenDeployer.t.sol"; -import {HyperchainDeployer} from "./_SharedHyperchainDeployer.t.sol"; +import {ZKChainDeployer} from "./_SharedZKChainDeployer.t.sol"; import {L2TxMocker} from "./_SharedL2TxMocker.t.sol"; import {ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA, DEFAULT_L2_LOGS_TREE_ROOT_HASH, EMPTY_STRING_KECCAK} from "contracts/common/Config.sol"; @@ -20,10 +20,10 @@ import {L2CanonicalTransaction, L2Message} from "contracts/common/Messaging.sol" import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; import {L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR} from "contracts/common/L2ContractAddresses.sol"; import {IL1ERC20Bridge} from "contracts/bridge/interfaces/IL1ERC20Bridge.sol"; -import {IZkSyncHyperchain} from "contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol"; +import {IZKChain} from "contracts/state-transition/chain-interfaces/IZKChain.sol"; import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol"; -contract DeploymentTests is L1ContractDeployer, HyperchainDeployer, TokenDeployer, L2TxMocker { +contract DeploymentTests is L1ContractDeployer, ZKChainDeployer, TokenDeployer, L2TxMocker { uint256 constant TEST_USERS_COUNT = 10; address[] public users; address[] public l2ContractAddresses; @@ -46,18 +46,18 @@ contract DeploymentTests is L1ContractDeployer, HyperchainDeployer, TokenDeploye _registerNewTokens(tokens); _deployEra(); - // _deployHyperchain(ETH_TOKEN_ADDRESS); - // _deployHyperchain(ETH_TOKEN_ADDRESS); - // _deployHyperchain(tokens[0]); - // _deployHyperchain(tokens[0]); - // _deployHyperchain(tokens[1]); - // _deployHyperchain(tokens[1]); - - for (uint256 i = 0; i < hyperchainIds.length; i++) { + // _deployZKChain(ETH_TOKEN_ADDRESS); + // _deployZKChain(ETH_TOKEN_ADDRESS); + // _deployZKChain(tokens[0]); + // _deployZKChain(tokens[0]); + // _deployZKChain(tokens[1]); + // _deployZKChain(tokens[1]); + + for (uint256 i = 0; i < zkChainIds.length; i++) { address contractAddress = makeAddr(string(abi.encode("contract", i))); l2ContractAddresses.push(contractAddress); - _addL2ChainContract(hyperchainIds[i], contractAddress); + _addL2ChainContract(zkChainIds[i], contractAddress); } } @@ -68,20 +68,20 @@ contract DeploymentTests is L1ContractDeployer, HyperchainDeployer, TokenDeploye // Check whether the sum of ETH deposits from tests, updated on each deposit and withdrawal, // equals the balance of L1Shared bridge. function test_initialDeployment() public { - uint256 chainId = hyperchainIds[0]; + uint256 chainId = zkChainIds[0]; IBridgehub bridgehub = IBridgehub(l1Script.getBridgehubProxyAddress()); - address newChainAddress = bridgehub.getHyperchain(chainId); - address admin = IZkSyncHyperchain(bridgehub.getHyperchain(chainId)).getAdmin(); + address newChainAddress = bridgehub.getZKChain(chainId); + address admin = IZKChain(bridgehub.getZKChain(chainId)).getAdmin(); IChainTypeManager ctm = IChainTypeManager(bridgehub.chainTypeManager(chainId)); assertNotEq(admin, address(0)); assertNotEq(newChainAddress, address(0)); - address[] memory chainAddresses = bridgehub.getAllHyperchains(); + address[] memory chainAddresses = bridgehub.getAllZKChains(); assertEq(chainAddresses.length, 1); assertEq(chainAddresses[0], newChainAddress); - uint256[] memory chainIds = bridgehub.getAllHyperchainChainIDs(); + uint256[] memory chainIds = bridgehub.getAllZKChainChainIDs(); assertEq(chainIds.length, 1); assertEq(chainIds[0], chainId); diff --git a/l1-contracts/test/foundry/integration/GatewayTests.t.sol b/l1-contracts/test/foundry/integration/GatewayTests.t.sol index 86d3d65ff..842512695 100644 --- a/l1-contracts/test/foundry/integration/GatewayTests.t.sol +++ b/l1-contracts/test/foundry/integration/GatewayTests.t.sol @@ -13,7 +13,7 @@ import {IMailbox} from "contracts/state-transition/chain-interfaces/IMailbox.sol import {IExecutor} from "contracts/state-transition/chain-interfaces/IExecutor.sol"; import {L1ContractDeployer} from "./_SharedL1ContractDeployer.t.sol"; import {TokenDeployer} from "./_SharedTokenDeployer.t.sol"; -import {HyperchainDeployer} from "./_SharedHyperchainDeployer.t.sol"; +import {ZKChainDeployer} from "./_SharedZKChainDeployer.t.sol"; import {GatewayDeployer} from "./_SharedGatewayDeployer.t.sol"; import {L2TxMocker} from "./_SharedL2TxMocker.t.sol"; import {ETH_TOKEN_ADDRESS, SETTLEMENT_LAYER_RELAY_SENDER} from "contracts/common/Config.sol"; @@ -26,13 +26,13 @@ import {IL1ERC20Bridge} from "contracts/bridge/interfaces/IL1ERC20Bridge.sol"; import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; import {Ownable} from "@openzeppelin/contracts-v4/access/Ownable.sol"; -import {IZkSyncHyperchain} from "contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol"; +import {IZKChain} from "contracts/state-transition/chain-interfaces/IZKChain.sol"; import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol"; import {AdminFacet} from "contracts/state-transition/chain-deps/facets/Admin.sol"; import {AddressAliasHelper} from "contracts/vendor/AddressAliasHelper.sol"; import {TxStatus} from "contracts/common/Messaging.sol"; -contract GatewayTests is L1ContractDeployer, HyperchainDeployer, TokenDeployer, L2TxMocker, GatewayDeployer { +contract GatewayTests is L1ContractDeployer, ZKChainDeployer, TokenDeployer, L2TxMocker, GatewayDeployer { uint256 constant TEST_USERS_COUNT = 10; address[] public users; address[] public l2ContractAddresses; @@ -59,21 +59,21 @@ contract GatewayTests is L1ContractDeployer, HyperchainDeployer, TokenDeployer, _registerNewTokens(tokens); _deployEra(); - _deployHyperchain(ETH_TOKEN_ADDRESS); + _deployZKChain(ETH_TOKEN_ADDRESS); acceptPendingAdmin(); - _deployHyperchain(ETH_TOKEN_ADDRESS); + _deployZKChain(ETH_TOKEN_ADDRESS); acceptPendingAdmin(); - // _deployHyperchain(tokens[0]); - // _deployHyperchain(tokens[0]); - // _deployHyperchain(tokens[1]); - // _deployHyperchain(tokens[1]); + // _deployZKChain(tokens[0]); + // _deployZKChain(tokens[0]); + // _deployZKChain(tokens[1]); + // _deployZKChain(tokens[1]); - for (uint256 i = 0; i < hyperchainIds.length; i++) { + for (uint256 i = 0; i < zkChainIds.length; i++) { address contractAddress = makeAddr(string(abi.encode("contract", i))); l2ContractAddresses.push(contractAddress); - _addL2ChainContract(hyperchainIds[i], contractAddress); - // _registerL2SharedBridge(hyperchainIds[i], contractAddress); + _addL2ChainContract(zkChainIds[i], contractAddress); + // _registerL2SharedBridge(zkChainIds[i], contractAddress); } _initializeGatewayScript(); @@ -81,12 +81,8 @@ contract GatewayTests is L1ContractDeployer, HyperchainDeployer, TokenDeployer, // console.log("KL todo", Ownable(l1Script.getBridgehubProxyAddress()).owner(), l1Script.getBridgehubProxyAddress()); vm.deal(Ownable(l1Script.getBridgehubProxyAddress()).owner(), 100000000000000000000000000000000000); vm.deal(l1Script.getOwnerAddress(), 100000000000000000000000000000000000); - IZkSyncHyperchain chain = IZkSyncHyperchain( - IBridgehub(l1Script.getBridgehubProxyAddress()).getHyperchain(migratingChainId) - ); - IZkSyncHyperchain chain2 = IZkSyncHyperchain( - IBridgehub(l1Script.getBridgehubProxyAddress()).getHyperchain(gatewayChainId) - ); + IZKChain chain = IZKChain(IBridgehub(l1Script.getBridgehubProxyAddress()).getZKChain(migratingChainId)); + IZKChain chain2 = IZKChain(IBridgehub(l1Script.getBridgehubProxyAddress()).getZKChain(gatewayChainId)); vm.deal(chain.getAdmin(), 100000000000000000000000000000000000); vm.deal(chain2.getAdmin(), 100000000000000000000000000000000000); @@ -177,7 +173,7 @@ contract GatewayTests is L1ContractDeployer, HyperchainDeployer, TokenDeployer, bytes memory transferData; { - IZkSyncHyperchain chain = IZkSyncHyperchain(bridgehub.getHyperchain(migratingChainId)); + IZKChain chain = IZKChain(bridgehub.getZKChain(migratingChainId)); bytes memory initialDiamondCut = l1Script.getInitialDiamondCutData(); bytes memory chainData = abi.encode(chain.getProtocolVersion()); bytes memory ctmData = abi.encode(address(1), msg.sender, ctm.protocolVersion(), initialDiamondCut); @@ -189,7 +185,7 @@ contract GatewayTests is L1ContractDeployer, HyperchainDeployer, TokenDeployer, transferData = abi.encode(data); } - address chainAdmin = IZkSyncHyperchain(bridgehub.getHyperchain(migratingChainId)).getAdmin(); + address chainAdmin = IZKChain(bridgehub.getZKChain(migratingChainId)).getAdmin(); IL1AssetRouter assetRouter = bridgehub.sharedBridge(); bytes32 l2TxHash = keccak256("l2TxHash"); uint256 l2BatchNumber = 5; @@ -241,7 +237,7 @@ contract GatewayTests is L1ContractDeployer, HyperchainDeployer, TokenDeployer, function finishMoveChain() public { IBridgehub bridgehub = IBridgehub(l1Script.getBridgehubProxyAddress()); IChainTypeManager ctm = IChainTypeManager(l1Script.getCTM()); - IZkSyncHyperchain migratingChain = IZkSyncHyperchain(bridgehub.getHyperchain(migratingChainId)); + IZKChain migratingChain = IZKChain(bridgehub.getZKChain(migratingChainId)); bytes32 assetId = bridgehub.ctmAssetIdFromChainId(migratingChainId); vm.startBroadcast(Ownable(address(bridgehub)).owner()); @@ -267,8 +263,8 @@ contract GatewayTests is L1ContractDeployer, HyperchainDeployer, TokenDeployer, vm.chainId(currentChainId); assertEq(bridgehub.baseTokenAssetId(mintChainId), baseTokenAssetId); - IZkSyncHyperchain mintedHyperchain = IZkSyncHyperchain(bridgehub.getHyperchain(mintChainId)); - assertEq(mintedHyperchain.getBaseTokenAssetId(), baseTokenAssetId); + IZKChain mintedZKChain = IZKChain(bridgehub.getZKChain(mintChainId)); + assertEq(mintedZKChain.getBaseTokenAssetId(), baseTokenAssetId); } // add this to be excluded from coverage report diff --git a/l1-contracts/test/foundry/integration/_SharedGatewayDeployer.t.sol b/l1-contracts/test/foundry/integration/_SharedGatewayDeployer.t.sol index 2bc212671..6ebc81b2a 100644 --- a/l1-contracts/test/foundry/integration/_SharedGatewayDeployer.t.sol +++ b/l1-contracts/test/foundry/integration/_SharedGatewayDeployer.t.sol @@ -13,12 +13,12 @@ contract GatewayDeployer is L1ContractDeployer { vm.setEnv("L1_CONFIG", "/test/foundry/integration/deploy-scripts/script-config/config-deploy-l1.toml"); vm.setEnv("L1_OUTPUT", "/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml"); vm.setEnv( - "HYPERCHAIN_CONFIG", - "/test/foundry/integration/deploy-scripts/script-out/output-deploy-hyperchain-10.toml" + "ZK_CHAIN_CONFIG", + "/test/foundry/integration/deploy-scripts/script-out/output-deploy-zk-chain-10.toml" ); vm.setEnv( "GATEWAY_CONFIG", - "/test/foundry/integration/deploy-scripts/script-out/output-deploy-hyperchain-11.toml" + "/test/foundry/integration/deploy-scripts/script-out/output-deploy-zk-chain-11.toml" ); gatewayScript = new GatewayScript(); diff --git a/l1-contracts/test/foundry/integration/_SharedL1ContractDeployer.t.sol b/l1-contracts/test/foundry/integration/_SharedL1ContractDeployer.t.sol index 0029fd284..27c8f8bbe 100644 --- a/l1-contracts/test/foundry/integration/_SharedL1ContractDeployer.t.sol +++ b/l1-contracts/test/foundry/integration/_SharedL1ContractDeployer.t.sol @@ -27,8 +27,8 @@ contract L1ContractDeployer is Test { vm.setEnv("L1_CONFIG", "/test/foundry/integration/deploy-scripts/script-config/config-deploy-l1.toml"); vm.setEnv("L1_OUTPUT", "/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml"); vm.setEnv( - "HYPERCHAIN_CONFIG", - "/test/foundry/integration/deploy-scripts/script-out/output-deploy-hyperchain-era.toml" + "ZK_CHAIN_CONFIG", + "/test/foundry/integration/deploy-scripts/script-out/output-deploy-zk-chain-era.toml" ); vm.setEnv( "FORCE_DEPLOYMENTS_CONFIG", diff --git a/l1-contracts/test/foundry/integration/_SharedHyperchainDeployer.t.sol b/l1-contracts/test/foundry/integration/_SharedZKChainDeployer.t.sol similarity index 66% rename from l1-contracts/test/foundry/integration/_SharedHyperchainDeployer.t.sol rename to l1-contracts/test/foundry/integration/_SharedZKChainDeployer.t.sol index 0188edba6..96dc99c0a 100644 --- a/l1-contracts/test/foundry/integration/_SharedHyperchainDeployer.t.sol +++ b/l1-contracts/test/foundry/integration/_SharedZKChainDeployer.t.sol @@ -2,16 +2,16 @@ pragma solidity 0.8.24; import {L1ContractDeployer} from "./_SharedL1ContractDeployer.t.sol"; -import {RegisterHyperchainScript} from "deploy-scripts/RegisterHyperchain.s.sol"; +import {RegisterZKChainScript} from "deploy-scripts/RegisterZKChain.s.sol"; import {ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; import "@openzeppelin/contracts-v4/utils/Strings.sol"; -import {IZkSyncHyperchain} from "contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol"; +import {IZKChain} from "contracts/state-transition/chain-interfaces/IZKChain.sol"; -contract HyperchainDeployer is L1ContractDeployer { - RegisterHyperchainScript deployScript; +contract ZKChainDeployer is L1ContractDeployer { + RegisterZKChainScript deployScript; - struct HyperchainDescription { - uint256 hyperchainChainId; + struct ZKChainDescription { + uint256 zkChainChainId; address baseToken; uint256 bridgehubCreateNewChainSalt; bool validiumMode; @@ -21,35 +21,35 @@ contract HyperchainDeployer is L1ContractDeployer { uint128 baseTokenGasPriceMultiplierDenominator; } - uint256 currentHyperChainId = 10; - uint256 eraHyperchainId = 9; - uint256[] public hyperchainIds; + uint256 currentZKChainId = 10; + uint256 eraZKChainId = 9; + uint256[] public zkChainIds; function _deployEra() internal { vm.setEnv( - "HYPERCHAIN_CONFIG", - "/test/foundry/integration/deploy-scripts/script-out/output-deploy-hyperchain-era.toml" + "ZK_CHAIN_CONFIG", + "/test/foundry/integration/deploy-scripts/script-out/output-deploy-zk-chain-era.toml" ); - deployScript = new RegisterHyperchainScript(); - saveHyperchainConfig(_getDefaultDescription(eraHyperchainId, ETH_TOKEN_ADDRESS, eraHyperchainId)); + deployScript = new RegisterZKChainScript(); + saveZKChainConfig(_getDefaultDescription(eraZKChainId, ETH_TOKEN_ADDRESS, eraZKChainId)); vm.warp(100); deployScript.run(); - hyperchainIds.push(eraHyperchainId); + zkChainIds.push(eraZKChainId); } - function _deployHyperchain(address _baseToken) internal { + function _deployZKChain(address _baseToken) internal { vm.setEnv( - "HYPERCHAIN_CONFIG", + "ZK_CHAIN_CONFIG", string.concat( - "/test/foundry/integration/deploy-scripts/script-out/output-deploy-hyperchain-", - Strings.toString(currentHyperChainId), + "/test/foundry/integration/deploy-scripts/script-out/output-deploy-zk-chain-", + Strings.toString(currentZKChainId), ".toml" ) ); - hyperchainIds.push(currentHyperChainId); - saveHyperchainConfig(_getDefaultDescription(currentHyperChainId, _baseToken, currentHyperChainId)); - currentHyperChainId++; + zkChainIds.push(currentZKChainId); + saveZKChainConfig(_getDefaultDescription(currentZKChainId, _baseToken, currentZKChainId)); + currentZKChainId++; deployScript.run(); } @@ -57,9 +57,9 @@ contract HyperchainDeployer is L1ContractDeployer { uint256 __chainId, address __baseToken, uint256 __salt - ) internal returns (HyperchainDescription memory description) { - description = HyperchainDescription({ - hyperchainChainId: __chainId, + ) internal returns (ZKChainDescription memory description) { + description = ZKChainDescription({ + zkChainChainId: __chainId, baseToken: __baseToken, bridgehubCreateNewChainSalt: __salt, validiumMode: false, @@ -70,11 +70,11 @@ contract HyperchainDeployer is L1ContractDeployer { }); } - function saveHyperchainConfig(HyperchainDescription memory description) public { + function saveZKChainConfig(ZKChainDescription memory description) public { string memory serialized; vm.serializeAddress("toml1", "owner_address", 0x70997970C51812dc3A010C7d01b50e0d17dc79C8); - vm.serializeUint("chain", "chain_chain_id", description.hyperchainChainId); + vm.serializeUint("chain", "chain_chain_id", description.zkChainChainId); vm.serializeAddress("chain", "base_token_addr", description.baseToken); vm.serializeUint("chain", "bridgehub_create_new_chain_salt", description.bridgehubCreateNewChainSalt); @@ -110,20 +110,20 @@ contract HyperchainDeployer is L1ContractDeployer { ); string memory toml = vm.serializeString("toml1", "chain", single_serialized); - string memory path = string.concat(vm.projectRoot(), vm.envString("HYPERCHAIN_CONFIG")); + string memory path = string.concat(vm.projectRoot(), vm.envString("ZK_CHAIN_CONFIG")); vm.writeToml(toml, path); } - function getHyperchainAddress(uint256 _chainId) public view returns (address) { - return bridgeHub.getHyperchain(_chainId); + function getZKChainAddress(uint256 _chainId) public view returns (address) { + return bridgeHub.getZKChain(_chainId); } - function getHyperchainBaseToken(uint256 _chainId) public view returns (address) { + function getZKChainBaseToken(uint256 _chainId) public view returns (address) { return bridgeHub.baseToken(_chainId); } function acceptPendingAdmin() public { - IZkSyncHyperchain chain = IZkSyncHyperchain(bridgeHub.getHyperchain(currentHyperChainId - 1)); + IZKChain chain = IZKChain(bridgeHub.getZKChain(currentZKChainId - 1)); address admin = chain.getPendingAdmin(); vm.startBroadcast(admin); chain.acceptAdmin(); @@ -132,5 +132,5 @@ contract HyperchainDeployer is L1ContractDeployer { } // add this to be excluded from coverage report - function testHyperchainDeployer() internal {} + function testZKChainDeployer() internal {} } diff --git a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml index 1f55b1100..5ac5b8e20 100644 --- a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml +++ b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml @@ -2,13 +2,13 @@ create2_factory_addr = "0x4e59b44847b379578588920cA78FbF26c0B4956C" create2_factory_salt = "0x00000000000000000000000000000000000000000000000000000000000000ff" deployer_addr = "0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496" era_chain_id = 9 -force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000004405f28668a8b47a6fa4ad18152630edc34d2dd694790bb988c097bbfd13c53c48300000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9447bf69c0e623e1365f68b9682081c8aaf2005f3346a6bb9df35dc505c91cbbc00000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001542f9245b27fa8a082741b6727b86d24c07131b4afdfb66bba0b75c767bf668500000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9554b5e8820768894caf758e182b80205d2a55d217795c711cc044cf83539f66000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000009fe28704985138d9d23820fd13685161fcb5e7aab142bdc8c83b78879f75ddc500000000000000000000000000000000000000000000000000000000000100050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010002" +force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002c00000000000000000000000000000000000000000000000000000000000000440183cae2353509404496db198b9265cd9d8c0b4e5a69d8cc1b2eef77c57e6c0f900000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9447bf69c0e623e1365f68b9682081c8aaf2005f3346a6bb9df35dc505c91cbbc00000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001542f9245b27fa8a082741b6727b86d24c07131b4afdfb66bba0b75c767bf668500000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9554b5e8820768894caf758e182b80205d2a55d217795c711cc044cf83539f66000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c8000000000000000000000000000000000000000000000000000000000000000007da51dee260bbb29987e8a67d8ca58b2aff94c59668c8afb9712f6ba92401ba00000000000000000000000000000000000000000000000000000000000100050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010002" l1_chain_id = 31337 multicall3_addr = "0xd9c5dB4509ECD720deFD4c01bF0Fdb3D25B8d588" owner_address = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" [contracts_config] -diamond_cut_data = "0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000017679a7669b51bb527b1a373dc179aa2ce3c6ec80000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc0000000000000000000000000b96e881482f871091b7dda598a3c49639e87f9a200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db8650000000000000000000000000000000000000000000000000000000000000000000000000000000064a1280b1fe60edb12068555b4a7e8a36db859b8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000946ebad100000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c0000000000000000000000000000000000000000000000000000000000000000000000000000000004f981f9ee3e5e181506d81d84399da2993b153d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab7000000000000000000000000000000000000000000000000000000000000000000000000000000005d81a196afb4cd3fcf690e3d6457e48d4fae61b9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000d8a20fbb43f18dbe883c814ade727ddc2e0a3acd000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" +diamond_cut_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000001f2dde44835d8d2c25c67f0e7cbed212eda36a5d0000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc00000000000000000000000004efab4926387b85d484f51534f7b14a55a18efec00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000000000000000000000000000f13e03c68b33cc21d764bfc77729e1dc61249683000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000946ebad100000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000000000000000000000000000c5eb2654096be24394c93aa63119164f1cc12a2e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab7000000000000000000000000000000000000000000000000000000000000000000000000000000000872d718505336275b136b3ed69b5b79c8874e3b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c000000000000000000000000063c70c1f86a3e2c50463512da0263d9f83f53142000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" diamond_init_batch_overhead_l1_gas = 1000000 diamond_init_max_l2_gas_per_batch = 80000000 diamond_init_max_pubdata_per_batch = 120000 @@ -23,34 +23,34 @@ recursion_node_level_vk_hash = "0x0000000000000000000000000000000000000000000000 [deployed_addresses] blob_versioned_hash_retriever_addr = "0xA4cB26d6933D2c3E76718D30de8547bCDF8dD241" -governance_addr = "0xcCCD59eeB0aA38bFcb81C67F5807796673f9f956" -native_token_vault_addr = "0xF4c1E3602d46F59f205CAF5fE07408Db73d0a119" +governance_addr = "0xEcE86B6ECf29f9FC8cF1932A18950721868dDb42" +native_token_vault_addr = "0xE7BFaD4A85038E39edDbbfe75bB7B3e02F5789dE" transparent_proxy_admin_addr = "0xD718d5A27a29FF1cD22403426084bA0d479869a0" -validator_timelock_addr = "0x116DD7112bB0bAEBd69bBCA63684c8E12a33b215" +validator_timelock_addr = "0x9B7fd85a490cd9C46Fe8a0B38ca893B2E7BAA2B6" [deployed_addresses.bridgehub] -bridgehub_implementation_addr = "0x9E895e720E6D6800e05037Cc92fa83E5bFA0B5C9" -bridgehub_proxy_addr = "0x7967266eaf9877f2b710AE67bCeD486e9882D871" -ctm_deployment_tracker_implementation_addr = "0x0796495E33b578E3dCC7a24a9B296bF9b49DAe53" -ctm_deployment_tracker_proxy_addr = "0x3F8c006E70497390aB51e0b8045FfA02F5A98A81" -message_root_implementation_addr = "0xa6460AebD54f34853fC5E1aa497B48aCf2932110" -message_root_proxy_addr = "0x5039f9297f08B61a06859e928632fb7D8b86E366" +bridgehub_implementation_addr = "0x6a2ee3713d6ac16bF92d3727C6319Ce08B16742C" +bridgehub_proxy_addr = "0x86f22fDEC0d5Ca51AaF97c8A17D23EF81dB4C1F5" +ctm_deployment_tracker_implementation_addr = "0x154E6189EcA43145ad48027d5931f698F2E2322a" +ctm_deployment_tracker_proxy_addr = "0xF18f5e901Ab70A87d6d4E36F20aAcf616b6AD2Ac" +message_root_implementation_addr = "0x35D5dc1375453ec021A9c69c2d98ddc92Ef98fc3" +message_root_proxy_addr = "0xDD8AD5a5D5Ad9716c4ebb348286d9C1aD24F1913" [deployed_addresses.bridges] -erc20_bridge_implementation_addr = "0x13fCb6Ba80e8d8b8cDe7B404A1EadC15a755b20C" -erc20_bridge_proxy_addr = "0x6c35451413E6CcF0078d89FD4B45E2B6AE1dB560" -shared_bridge_implementation_addr = "0x37baD47Ebfe947CCdfaAA2ca5566342B125c55da" -shared_bridge_proxy_addr = "0x8BECd9b9C1C03B23F266764Efe541516efD9a6f2" +erc20_bridge_implementation_addr = "0x98Af24ee1aE1Af593D0Bea4C4E105a95e54a3396" +erc20_bridge_proxy_addr = "0xA944F9634241b8a5FA6Cd0a9f2Fd1a7E50c9C792" +shared_bridge_implementation_addr = "0x6EB98421e67696cf1357d453B95c5cC8eff71769" +shared_bridge_proxy_addr = "0x27632679E9416015d80A1D5543002F925C640181" [deployed_addresses.state_transition] -admin_facet_addr = "0xb96e881482F871091b7DDa598A3C49639E87f9A2" -default_upgrade_addr = "0xCF6DF2E4Af0700514442361f44480f31031685aE" -diamond_init_addr = "0x17679a7669B51bB527b1A373dc179aA2CE3c6eC8" +admin_facet_addr = "0x4EFab4926387B85d484F51534F7b14a55A18EfeC" +default_upgrade_addr = "0x9a487Aa537c5AeF8a7DC5010fF04757Bb5c3DDdA" +diamond_init_addr = "0x1F2dDe44835D8D2C25c67F0E7cbEd212EDA36A5d" diamond_proxy_addr = "0x0000000000000000000000000000000000000000" -executor_facet_addr = "0x5d81A196afB4cd3FCf690e3D6457E48d4fae61B9" -genesis_upgrade_addr = "0x0D07F57abc96117836E22Edf4CB6A00b79ec4Bee" -getters_facet_addr = "0x64a1280B1FE60edB12068555B4A7e8A36db859b8" -mailbox_facet_addr = "0x04F981F9eE3e5e181506d81d84399DA2993b153d" -state_transition_implementation_addr = "0xB0C4Bbd27Fd7B78474dD4aC035B7450598cc7659" -state_transition_proxy_addr = "0x0216a9A5210BEC49c3b2C855378DB45e619Db4d4" -verifier_addr = "0xD8A20Fbb43F18dBe883c814adE727ddC2E0A3AcD" +executor_facet_addr = "0x0872d718505336275b136B3ED69b5B79c8874E3b" +genesis_upgrade_addr = "0x748A21baCeAe6c5E8E6CaE16FbE0433581a8AA19" +getters_facet_addr = "0xF13E03C68b33cc21d764bfc77729e1dC61249683" +mailbox_facet_addr = "0xC5Eb2654096Be24394c93Aa63119164F1Cc12A2e" +state_transition_implementation_addr = "0x270Cf7b1D58582dB13604E2bBcAfbdf5456A638D" +state_transition_proxy_addr = "0xf189818B48847aC86964335e8880a9E586aA3062" +verifier_addr = "0x63C70C1F86a3E2c50463512DA0263D9F83F53142" diff --git a/l1-contracts/test/foundry/unit/concrete/Bridgehub/MessageRoot.t.sol b/l1-contracts/test/foundry/unit/concrete/Bridgehub/MessageRoot.t.sol index eb01a35d2..34ca5f9d2 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridgehub/MessageRoot.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Bridgehub/MessageRoot.t.sol @@ -66,7 +66,7 @@ contract MessageRootTest is Test { uint256 alphaChainId = uint256(uint160(makeAddr("alphaChainId"))); vm.mockCall( bridgeHub, - abi.encodeWithSelector(IBridgehub.getHyperchain.selector, alphaChainId), + abi.encodeWithSelector(IBridgehub.getZKChain.selector, alphaChainId), abi.encode(alphaChainSender) ); @@ -80,7 +80,7 @@ contract MessageRootTest is Test { uint256 alphaChainId = uint256(uint160(makeAddr("alphaChainId"))); vm.mockCall( bridgeHub, - abi.encodeWithSelector(IBridgehub.getHyperchain.selector, alphaChainId), + abi.encodeWithSelector(IBridgehub.getZKChain.selector, alphaChainId), abi.encode(alphaChainSender) ); @@ -100,7 +100,7 @@ contract MessageRootTest is Test { uint256 alphaChainId = uint256(uint160(makeAddr("alphaChainId"))); vm.mockCall( bridgeHub, - abi.encodeWithSelector(IBridgehub.getHyperchain.selector, alphaChainId), + abi.encodeWithSelector(IBridgehub.getZKChain.selector, alphaChainId), abi.encode(alphaChainSender) ); diff --git a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol b/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol index daf863eb6..ca92a4ba1 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol @@ -11,7 +11,7 @@ import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; import {ChainCreationParams} from "contracts/state-transition/IChainTypeManager.sol"; import {L2TransactionRequestDirect, L2TransactionRequestTwoBridgesOuter} from "contracts/bridgehub/IBridgehub.sol"; import {DummyChainTypeManagerWBH} from "contracts/dev-contracts/test/DummyChainTypeManagerWithBridgeHubAddress.sol"; -import {DummyHyperchain} from "contracts/dev-contracts/test/DummyHyperchain.sol"; +import {DummyZKChain} from "contracts/dev-contracts/test/DummyZKChain.sol"; import {DummySharedBridge} from "contracts/dev-contracts/test/DummySharedBridge.sol"; import {DummyBridgehubSetter} from "contracts/dev-contracts/test/DummyBridgehubSetter.sol"; import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; @@ -37,7 +37,7 @@ contract ExperimentalBridgeTest is Test { address public bridgeOwner; address public testTokenAddress; DummyChainTypeManagerWBH mockCTM; - DummyHyperchain mockChainContract; + DummyZKChain mockChainContract; DummySharedBridge mockSharedBridge; DummySharedBridge mockSecondSharedBridge; L1AssetRouter sharedBridge; @@ -90,7 +90,7 @@ contract ExperimentalBridgeTest is Test { bridgeHub = Bridgehub(address(dummyBridgehub)); address weth = makeAddr("WETH"); mockCTM = new DummyChainTypeManagerWBH(address(bridgeHub)); - mockChainContract = new DummyHyperchain(address(bridgeHub), eraChainId, block.chainid); + mockChainContract = new DummyZKChain(address(bridgeHub), eraChainId, block.chainid); mockL2Contract = makeAddr("mockL2Contract"); // mocks to use in bridges instead of using a dummy one @@ -703,8 +703,8 @@ contract ExperimentalBridgeTest is Test { // // bridgeHub.createNewChain => chainTypeManager.createNewChain => this function sets the stateTransition mapping // // of `chainId`, let's emulate that using foundry cheatcodes or let's just use the extra function we introduced in our mockCTM - // mockCTM.setHyperchain(chainId, address(mockChainContract)); - // assertTrue(mockCTM.getHyperchain(chainId) == address(mockChainContract)); + // mockCTM.setZKChain(chainId, address(mockChainContract)); + // assertTrue(mockCTM.getZKChain(chainId) == address(mockChainContract)); // vm.startPrank(deployerAddress); // vm.mockCall( @@ -740,14 +740,14 @@ contract ExperimentalBridgeTest is Test { // assertTrue(bridgeHub.baseToken(newChainId) == testTokenAddress); // } - // function test_getHyperchain(uint256 mockChainId) public { - // mockChainId = _setUpHyperchainForChainId(mockChainId); + // function test_getZKChain(uint256 mockChainId) public { + // mockChainId = _setUpZKChainForChainId(mockChainId); // // Now the following statements should be true as well: // assertTrue(bridgeHub.chainTypeManager(mockChainId) == address(mockCTM)); - // address returnedHyperchain = bridgeHub.getHyperchain(mockChainId); + // address returnedZKChain = bridgeHub.getZKChain(mockChainId); - // assertEq(returnedHyperchain, address(mockChainContract)); + // assertEq(returnedZKChain, address(mockChainContract)); // } // function test_proveL2MessageInclusion( @@ -759,11 +759,11 @@ contract ExperimentalBridgeTest is Test { // address randomSender, // bytes memory randomData // ) public { - // mockChainId = _setUpHyperchainForChainId(mockChainId); + // mockChainId = _setUpZKChainForChainId(mockChainId); // // Now the following statements should be true as well: // assertTrue(bridgeHub.chainTypeManager(mockChainId) == address(mockCTM)); - // assertTrue(bridgeHub.getHyperchain(mockChainId) == address(mockChainContract)); + // assertTrue(bridgeHub.getZKChain(mockChainId) == address(mockChainContract)); // // Creating a random L2Message::l2Message so that we pass the correct parameters to `proveL2MessageInclusion` // L2Message memory l2Message = _createMockL2Message(randomTxNumInBatch, randomSender, randomData); @@ -807,11 +807,11 @@ contract ExperimentalBridgeTest is Test { bytes32 randomKey, bytes32 randomValue ) public { - mockChainId = _setUpHyperchainForChainId(mockChainId); + mockChainId = _setUpZKChainForChainId(mockChainId); // Now the following statements should be true as well: assertTrue(bridgeHub.chainTypeManager(mockChainId) == address(mockCTM)); - assertTrue(bridgeHub.getHyperchain(mockChainId) == address(mockChainContract)); + assertTrue(bridgeHub.getZKChain(mockChainId) == address(mockChainContract)); // Creating a random L2Log::l2Log so that we pass the correct parameters to `proveL2LogInclusion` L2Log memory l2Log = _createMockL2Log({ @@ -860,7 +860,7 @@ contract ExperimentalBridgeTest is Test { bool randomResultantBool, bool txStatusBool ) public { - randomChainId = _setUpHyperchainForChainId(randomChainId); + randomChainId = _setUpZKChainForChainId(randomChainId); TxStatus txStatus; @@ -905,7 +905,7 @@ contract ExperimentalBridgeTest is Test { uint256 mockL2GasPerPubdataByteLimit, uint256 mockL2TxnCost ) public { - mockChainId = _setUpHyperchainForChainId(mockChainId); + mockChainId = _setUpZKChainForChainId(mockChainId); vm.mockCall( address(mockChainContract), @@ -953,7 +953,7 @@ contract ExperimentalBridgeTest is Test { // mockRefundRecipient: address(0) // }); - // l2TxnReqDirect.chainId = _setUpHyperchainForChainId(l2TxnReqDirect.chainId); + // l2TxnReqDirect.chainId = _setUpZKChainForChainId(l2TxnReqDirect.chainId); // assertTrue(!(bridgeHub.baseToken(l2TxnReqDirect.chainId) == ETH_TOKEN_ADDRESS)); // _setUpBaseTokenForChainId(l2TxnReqDirect.chainId, true, address(0)); @@ -962,7 +962,7 @@ contract ExperimentalBridgeTest is Test { // _setUpSharedBridge(); // _setUpSharedBridgeL2(mockChainId); - // assertTrue(bridgeHub.getHyperchain(l2TxnReqDirect.chainId) == address(mockChainContract)); + // assertTrue(bridgeHub.getZKChain(l2TxnReqDirect.chainId) == address(mockChainContract)); // bytes32 canonicalHash = keccak256(abi.encode("CANONICAL_TX_HASH")); // vm.mockCall( @@ -1076,13 +1076,13 @@ contract ExperimentalBridgeTest is Test { // mockRefundRecipient: address(0) // }); - // l2TxnReqDirect.chainId = _setUpHyperchainForChainId(l2TxnReqDirect.chainId); + // l2TxnReqDirect.chainId = _setUpZKChainForChainId(l2TxnReqDirect.chainId); // _setUpBaseTokenForChainId(l2TxnReqDirect.chainId, false, address(testToken)); // _setUpSharedBridge(); // _setUpSharedBridgeL2(mockChainId); - // assertTrue(bridgeHub.getHyperchain(l2TxnReqDirect.chainId) == address(mockChainContract)); + // assertTrue(bridgeHub.getZKChain(l2TxnReqDirect.chainId) == address(mockChainContract)); // bytes32 canonicalHash = keccak256(abi.encode("CANONICAL_TX_HASH")); // vm.mockCall( @@ -1142,7 +1142,7 @@ contract ExperimentalBridgeTest is Test { // secondBridgeCalldata: secondBridgeCalldata // }); - // l2TxnReq2BridgeOut.chainId = _setUpHyperchainForChainId(l2TxnReq2BridgeOut.chainId); + // l2TxnReq2BridgeOut.chainId = _setUpZKChainForChainId(l2TxnReq2BridgeOut.chainId); // _setUpBaseTokenForChainId(l2TxnReq2BridgeOut.chainId, true, address(0)); // assertTrue(bridgeHub.baseToken(l2TxnReq2BridgeOut.chainId) == ETH_TOKEN_ADDRESS); @@ -1150,7 +1150,7 @@ contract ExperimentalBridgeTest is Test { // _setUpSharedBridge(); // _setUpSharedBridgeL2(chainId); - // assertTrue(bridgeHub.getHyperchain(l2TxnReq2BridgeOut.chainId) == address(mockChainContract)); + // assertTrue(bridgeHub.getZKChain(l2TxnReq2BridgeOut.chainId) == address(mockChainContract)); // uint256 callerMsgValue = l2TxnReq2BridgeOut.mintValue + l2TxnReq2BridgeOut.secondBridgeValue; // address randomCaller = makeAddr("RANDOM_CALLER"); @@ -1202,7 +1202,7 @@ contract ExperimentalBridgeTest is Test { // secondBridgeCalldata: secondBridgeCalldata // }); - // l2TxnReq2BridgeOut.chainId = _setUpHyperchainForChainId(l2TxnReq2BridgeOut.chainId); + // l2TxnReq2BridgeOut.chainId = _setUpZKChainForChainId(l2TxnReq2BridgeOut.chainId); // _setUpBaseTokenForChainId(l2TxnReq2BridgeOut.chainId, true, address(0)); // assertTrue(bridgeHub.baseToken(l2TxnReq2BridgeOut.chainId) == ETH_TOKEN_ADDRESS); @@ -1210,7 +1210,7 @@ contract ExperimentalBridgeTest is Test { // _setUpSharedBridge(); // _setUpSharedBridgeL2(chainId); - // assertTrue(bridgeHub.getHyperchain(l2TxnReq2BridgeOut.chainId) == address(mockChainContract)); + // assertTrue(bridgeHub.getZKChain(l2TxnReq2BridgeOut.chainId) == address(mockChainContract)); // uint256 callerMsgValue = l2TxnReq2BridgeOut.mintValue + l2TxnReq2BridgeOut.secondBridgeValue; // address randomCaller = makeAddr("RANDOM_CALLER"); @@ -1270,7 +1270,7 @@ contract ExperimentalBridgeTest is Test { // l2Value = bound(l2Value, 1, type(uint256).max); // bytes memory secondBridgeCalldata = abi.encode(erc20TokenAddress, l2Value, l2Receiver); - // chainId = _setUpHyperchainForChainId(chainId); + // chainId = _setUpZKChainForChainId(chainId); // L2TransactionRequestTwoBridgesOuter memory l2TxnReq2BridgeOut = _createMockL2TransactionRequestTwoBridgesOuter({ // chainId: chainId, @@ -1291,7 +1291,7 @@ contract ExperimentalBridgeTest is Test { // _setUpSharedBridge(); // _setUpSharedBridgeL2(chainId); - // assertTrue(bridgeHub.getHyperchain(l2TxnReq2BridgeOut.chainId) == address(mockChainContract)); + // assertTrue(bridgeHub.getZKChain(l2TxnReq2BridgeOut.chainId) == address(mockChainContract)); // mockChainContract.setBridgeHubAddress(address(bridgeHub)); // vm.mockCall( @@ -1343,7 +1343,7 @@ contract ExperimentalBridgeTest is Test { // secondBridgeValue = bound(secondBridgeValue, 1, type(uint256).max); // bytes memory secondBridgeCalldata = abi.encode(ETH_TOKEN_ADDRESS, 0, l2Receiver); - // chainId = _setUpHyperchainForChainId(chainId); + // chainId = _setUpZKChainForChainId(chainId); // L2TransactionRequestTwoBridgesOuter memory l2TxnReq2BridgeOut = _createMockL2TransactionRequestTwoBridgesOuter({ // chainId: chainId, @@ -1361,7 +1361,7 @@ contract ExperimentalBridgeTest is Test { // _setUpSharedBridge(); // _setUpSharedBridgeL2(chainId); - // assertTrue(bridgeHub.getHyperchain(l2TxnReq2BridgeOut.chainId) == address(mockChainContract)); + // assertTrue(bridgeHub.getZKChain(l2TxnReq2BridgeOut.chainId) == address(mockChainContract)); // address randomCaller = makeAddr("RANDOM_CALLER"); @@ -1506,7 +1506,7 @@ contract ExperimentalBridgeTest is Test { return abi.encode(abi.encode(diamondCutData), bytes("")); } - function _setUpHyperchainForChainId(uint256 mockChainId) internal returns (uint256 mockChainIdInRange) { + function _setUpZKChainForChainId(uint256 mockChainId) internal returns (uint256 mockChainIdInRange) { mockChainId = bound(mockChainId, 1, type(uint48).max); mockChainIdInRange = mockChainId; vm.prank(bridgeOwner); @@ -1518,7 +1518,7 @@ contract ExperimentalBridgeTest is Test { assertTrue(!(bridgeHub.chainTypeManager(mockChainId) == address(mockCTM))); dummyBridgehub.setCTM(mockChainId, address(mockCTM)); - dummyBridgehub.setHyperchain(mockChainId, address(mockChainContract)); + dummyBridgehub.setZKChain(mockChainId, address(mockChainContract)); } function _setUpBaseTokenForChainId(uint256 mockChainId, bool tokenIsETH, address token) internal { diff --git a/l1-contracts/test/foundry/unit/concrete/DiamondCut/UpgradeLogic.t.sol b/l1-contracts/test/foundry/unit/concrete/DiamondCut/UpgradeLogic.t.sol index 43e09c130..4645bcb2b 100644 --- a/l1-contracts/test/foundry/unit/concrete/DiamondCut/UpgradeLogic.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/DiamondCut/UpgradeLogic.t.sol @@ -6,7 +6,7 @@ import {DiamondCutTest} from "./_DiamondCut_Shared.t.sol"; import {DiamondCutTestContract} from "contracts/dev-contracts/test/DiamondCutTestContract.sol"; import {DiamondInit} from "contracts/state-transition/chain-deps/DiamondInit.sol"; import {DiamondProxy} from "contracts/state-transition/chain-deps/DiamondProxy.sol"; -import {VerifierParams, FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; +import {VerifierParams, FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; import {AdminFacet} from "contracts/state-transition/chain-deps/facets/Admin.sol"; import {GettersFacet} from "contracts/state-transition/chain-deps/facets/Getters.sol"; import {IVerifier} from "contracts/state-transition/chain-interfaces/IVerifier.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol b/l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol index 42d518acd..821cbf8fe 100644 --- a/l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol @@ -10,7 +10,7 @@ import {DummyChainTypeManager} from "contracts/dev-contracts/test/DummyChainType import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol"; import {DiamondInit} from "contracts/state-transition/chain-deps/DiamondInit.sol"; import {DiamondProxy} from "contracts/state-transition/chain-deps/DiamondProxy.sol"; -import {VerifierParams, FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; +import {VerifierParams, FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; import {TestExecutor} from "contracts/dev-contracts/test/TestExecutor.sol"; import {ExecutorFacet} from "contracts/state-transition/chain-deps/facets/Executor.sol"; import {GettersFacet} from "contracts/state-transition/chain-deps/facets/Getters.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol b/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol index 8a48e00a0..29565561d 100644 --- a/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol +++ b/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol @@ -12,8 +12,8 @@ import {AdminFacet} from "contracts/state-transition/chain-deps/facets/Admin.sol import {ExecutorFacet} from "contracts/state-transition/chain-deps/facets/Executor.sol"; import {GettersFacet} from "contracts/state-transition/chain-deps/facets/Getters.sol"; import {MailboxFacet} from "contracts/state-transition/chain-deps/facets/Mailbox.sol"; -import {IVerifier, VerifierParams} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; -import {FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; +import {IVerifier, VerifierParams} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; +import {FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; import {InitializeData, InitializeDataNewChain} from "contracts/state-transition/chain-interfaces/IDiamondInit.sol"; import {IExecutor, SystemLogKey} from "contracts/state-transition/chain-interfaces/IExecutor.sol"; import {L2CanonicalTransaction} from "contracts/common/Messaging.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/Utils/UtilsFacet.sol b/l1-contracts/test/foundry/unit/concrete/Utils/UtilsFacet.sol index 0d4469071..0d141ce1f 100644 --- a/l1-contracts/test/foundry/unit/concrete/Utils/UtilsFacet.sol +++ b/l1-contracts/test/foundry/unit/concrete/Utils/UtilsFacet.sol @@ -2,12 +2,12 @@ pragma solidity 0.8.24; -import {IVerifier, VerifierParams} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; -import {FeeParams} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; -import {ZkSyncHyperchainBase} from "contracts/state-transition/chain-deps/facets/ZkSyncHyperchainBase.sol"; +import {IVerifier, VerifierParams} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; +import {FeeParams} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; +import {ZKChainBase} from "contracts/state-transition/chain-deps/facets/ZKChainBase.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; -contract UtilsFacet is ZkSyncHyperchainBase { +contract UtilsFacet is ZKChainBase { function util_setChainId(uint256 _chainId) external { s.chainId = _chainId; } diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/FreezeChain.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/FreezeChain.t.sol index da0c71358..d92349a61 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/FreezeChain.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/FreezeChain.t.sol @@ -9,7 +9,7 @@ import {FacetIsFrozen} from "contracts/common/L1ContractErrors.sol"; contract freezeChainTest is ChainTypeManagerTest { // function test_FreezingChain() public { // createNewChain(getDiamondCutData(diamondInit)); - // address newChainAddress = chainContractAddress.getHyperchain(chainId); + // address newChainAddress = chainContractAddress.getZKChain(chainId); // GettersFacet gettersFacet = GettersFacet(newChainAddress); // bool isChainFrozen = gettersFacet.isDiamondStorageFrozen(); // assertEq(isChainFrozen, false); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol index 6f53cec5c..71eab393f 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol @@ -29,7 +29,7 @@ contract revertBatchesTest is ChainTypeManagerTest { // function test_SuccessfulBatchReverting() public { // createNewChain(getDiamondCutData(diamondInit)); - // address newChainAddress = chainContractAddress.getHyperchain(chainId); + // address newChainAddress = chainContractAddress.getZKChain(chainId); // executorFacet = ExecutorFacet(address(newChainAddress)); // gettersFacet = GettersFacet(address(newChainAddress)); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondProxy/DiamondProxy.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondProxy/DiamondProxy.t.sol index 4637faabd..3b73c990a 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondProxy/DiamondProxy.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondProxy/DiamondProxy.t.sol @@ -10,11 +10,11 @@ import {InitializeData} from "contracts/state-transition/chain-interfaces/IDiamo import {DiamondInit} from "contracts/state-transition/chain-deps/DiamondInit.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; import {DiamondProxy} from "contracts/state-transition/chain-deps/DiamondProxy.sol"; -import {ZkSyncHyperchainBase} from "contracts/state-transition/chain-deps/facets/ZkSyncHyperchainBase.sol"; +import {ZKChainBase} from "contracts/state-transition/chain-deps/facets/ZKChainBase.sol"; import {TestnetVerifier} from "contracts/state-transition/TestnetVerifier.sol"; import {FacetIsFrozen, ValueMismatch, InvalidSelector} from "contracts/common/L1ContractErrors.sol"; -contract TestFacet is ZkSyncHyperchainBase { +contract TestFacet is ZKChainBase { function func() public pure returns (bool) { return true; } diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol index f7a546924..5a1f4cbb0 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.24; import {AdminTest} from "./_Admin_Shared.t.sol"; -import {FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; +import {FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; import {Unauthorized, PriorityTxPubdataExceedsMaxPubDataPerBatch} from "contracts/common/L1ContractErrors.sol"; contract ChangeFeeParamsTest is AdminTest { diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyBridgehub.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyBridgehub.t.sol index af92cde5f..459e71b47 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyBridgehub.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyBridgehub.t.sol @@ -2,10 +2,10 @@ pragma solidity 0.8.24; -import {ZkSyncHyperchainBaseTest} from "./_Base_Shared.t.sol"; +import {ZKChainBaseTest} from "./_Base_Shared.t.sol"; import {Unauthorized} from "contracts/common/L1ContractErrors.sol"; -contract OnlyBridgehubTest is ZkSyncHyperchainBaseTest { +contract OnlyBridgehubTest is ZKChainBaseTest { function test_revertWhen_calledByNonBridgehub() public { address nonBridgehub = makeAddr("nonBridgehub"); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernor.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernor.t.sol index 44c397c85..478372df9 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernor.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernor.t.sol @@ -2,10 +2,10 @@ pragma solidity 0.8.24; -import {ZkSyncHyperchainBaseTest} from "./_Base_Shared.t.sol"; +import {ZKChainBaseTest} from "./_Base_Shared.t.sol"; import {Unauthorized} from "contracts/common/L1ContractErrors.sol"; -contract OnlyAdminTest is ZkSyncHyperchainBaseTest { +contract OnlyAdminTest is ZKChainBaseTest { function test_revertWhen_calledByNonAdmin() public { address nonAdmin = makeAddr("nonAdmin"); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernorOrStateTransitionManager.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernorOrStateTransitionManager.t.sol index edda66f4d..67cfe3d32 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernorOrStateTransitionManager.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernorOrStateTransitionManager.t.sol @@ -2,10 +2,10 @@ pragma solidity 0.8.24; -import {ZkSyncHyperchainBaseTest} from "./_Base_Shared.t.sol"; +import {ZKChainBaseTest} from "./_Base_Shared.t.sol"; import {Unauthorized} from "contracts/common/L1ContractErrors.sol"; -contract OnlyAdminOrChainTypeManagerTest is ZkSyncHyperchainBaseTest { +contract OnlyAdminOrChainTypeManagerTest is ZKChainBaseTest { function test_revertWhen_calledByNonAdmin() public { address nonAdmin = makeAddr("nonAdmin"); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyStateTransitionManager.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyStateTransitionManager.t.sol index e02208201..b7f7ec5a3 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyStateTransitionManager.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyStateTransitionManager.t.sol @@ -2,10 +2,10 @@ pragma solidity 0.8.24; -import {ZkSyncHyperchainBaseTest} from "./_Base_Shared.t.sol"; +import {ZKChainBaseTest} from "./_Base_Shared.t.sol"; import {Unauthorized} from "contracts/common/L1ContractErrors.sol"; -contract OnlyChainTypeManagerTest is ZkSyncHyperchainBaseTest { +contract OnlyChainTypeManagerTest is ZKChainBaseTest { function test_revertWhen_calledByNonChainTypeManager() public { address nonChainTypeManager = makeAddr("nonChainTypeManager"); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyValidator.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyValidator.t.sol index c002fec59..5997976ac 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyValidator.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyValidator.t.sol @@ -2,10 +2,10 @@ pragma solidity 0.8.24; -import {ZkSyncHyperchainBaseTest} from "./_Base_Shared.t.sol"; +import {ZKChainBaseTest} from "./_Base_Shared.t.sol"; import {Unauthorized} from "contracts/common/L1ContractErrors.sol"; -contract OnlyValidatorTest is ZkSyncHyperchainBaseTest { +contract OnlyValidatorTest is ZKChainBaseTest { function test_revertWhen_calledByNonValidator() public { address nonValidator = makeAddr("nonValidator"); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol index bcf162669..b486875fa 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol @@ -7,10 +7,10 @@ import {Utils} from "foundry-test/unit/concrete/Utils/Utils.sol"; import {UtilsFacet} from "foundry-test/unit/concrete/Utils/UtilsFacet.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; -import {ZkSyncHyperchainBase} from "contracts/state-transition/chain-deps/facets/Admin.sol"; +import {ZKChainBase} from "contracts/state-transition/chain-deps/facets/Admin.sol"; import {TestnetVerifier} from "contracts/state-transition/TestnetVerifier.sol"; -contract TestBaseFacet is ZkSyncHyperchainBase { +contract TestBaseFacet is ZKChainBase { function functionWithOnlyAdminModifier() external onlyAdmin {} function functionWithOnlyValidatorModifier() external onlyValidator {} @@ -27,14 +27,14 @@ contract TestBaseFacet is ZkSyncHyperchainBase { function test() internal virtual {} } -bytes constant ERROR_ONLY_ADMIN = "Hyperchain: not admin"; -bytes constant ERROR_ONLY_VALIDATOR = "Hyperchain: not validator"; -bytes constant ERROR_ONLY_STATE_TRANSITION_MANAGER = "Hyperchain: not state transition manager"; -bytes constant ERROR_ONLY_BRIDGEHUB = "Hyperchain: not bridgehub"; -bytes constant ERROR_ONLY_ADMIN_OR_STATE_TRANSITION_MANAGER = "Hyperchain: Only by admin or state transition manager"; -bytes constant ERROR_ONLY_VALIDATOR_OR_STATE_TRANSITION_MANAGER = "Hyperchain: Only by validator or state transition manager"; +bytes constant ERROR_ONLY_ADMIN = "ZKChain: not admin"; +bytes constant ERROR_ONLY_VALIDATOR = "ZKChain: not validator"; +bytes constant ERROR_ONLY_STATE_TRANSITION_MANAGER = "ZKChain: not state transition manager"; +bytes constant ERROR_ONLY_BRIDGEHUB = "ZKChain: not bridgehub"; +bytes constant ERROR_ONLY_ADMIN_OR_STATE_TRANSITION_MANAGER = "ZKChain: Only by admin or state transition manager"; +bytes constant ERROR_ONLY_VALIDATOR_OR_STATE_TRANSITION_MANAGER = "ZKChain: Only by validator or state transition manager"; -contract ZkSyncHyperchainBaseTest is Test { +contract ZKChainBaseTest is Test { TestBaseFacet internal testBaseFacet; UtilsFacet internal utilsFacet; address internal testnetVerifier = address(new TestnetVerifier()); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/BaseMailboxTests.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/BaseMailboxTests.t.sol index 92210cc16..230828ae7 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/BaseMailboxTests.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/BaseMailboxTests.t.sol @@ -3,9 +3,9 @@ pragma solidity 0.8.24; import {MailboxTest} from "./_Mailbox_Shared.t.sol"; -import {FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; +import {FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA} from "contracts/common/Config.sol"; -import {DummyHyperchain} from "contracts/dev-contracts/test/DummyHyperchain.sol"; +import {DummyZKChain} from "contracts/dev-contracts/test/DummyZKChain.sol"; import {BaseTokenGasPriceDenominatorNotSet} from "contracts/common/L1ContractErrors.sol"; contract MailboxBaseTests is MailboxTest { @@ -16,7 +16,7 @@ contract MailboxBaseTests is MailboxTest { } function test_mailboxConstructor() public { - DummyHyperchain h = new DummyHyperchain(address(0), eraChainId, block.chainid); + DummyZKChain h = new DummyZKChain(address(0), eraChainId, block.chainid); assertEq(h.getEraChainId(), eraChainId); } diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/RequestL2Transaction.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/RequestL2Transaction.t.sol index 24e4eb49d..29e3cbefa 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/RequestL2Transaction.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/RequestL2Transaction.t.sol @@ -7,7 +7,7 @@ import {BridgehubL2TransactionRequest} from "contracts/common/Messaging.sol"; import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA, MAX_NEW_FACTORY_DEPS, ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; import {TransactionFiltererTrue} from "contracts/dev-contracts/test/DummyTransactionFiltererTrue.sol"; import {TransactionFiltererFalse} from "contracts/dev-contracts/test/DummyTransactionFiltererFalse.sol"; -import {FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; +import {FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; import {DummySharedBridge} from "contracts/dev-contracts/test/DummySharedBridge.sol"; import {OnlyEraSupported, TooManyFactoryDeps, MsgValueTooLow, GasPerPubdataMismatch} from "contracts/common/L1ContractErrors.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/data-availability/RelayedSLDAValidator.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/data-availability/RelayedSLDAValidator.t.sol index a6fb8e570..9d896cf08 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/data-availability/RelayedSLDAValidator.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/data-availability/RelayedSLDAValidator.t.sol @@ -26,7 +26,7 @@ contract RelayedSLDAValidatorTest is Test { ); vm.mockCall( L2_BRIDGEHUB_ADDR, - abi.encodeWithSelector(IBridgehub.getHyperchain.selector, (CHAIN_ID)), + abi.encodeWithSelector(IBridgehub.getZKChain.selector, (CHAIN_ID)), abi.encode(CHAIN_ADDRESS) ); } diff --git a/l1-contracts/test/unit_tests/gateway.spec.ts b/l1-contracts/test/unit_tests/gateway.spec.ts index 8d905397f..37460e02a 100644 --- a/l1-contracts/test/unit_tests/gateway.spec.ts +++ b/l1-contracts/test/unit_tests/gateway.spec.ts @@ -9,7 +9,7 @@ import { BridgehubFactory } from "../../typechain"; import { initialTestnetDeploymentProcess, defaultDeployerForTests, - registerHyperchainWithBridgeRegistration, + registerZKChainWithBridgeRegistration, } from "../../src.ts/deploy-test-process"; import { ethTestConfig, @@ -62,7 +62,7 @@ describe("Gateway", function () { gatewayDeployer = await defaultDeployerForTests(deployWallet, ownerAddress); gatewayDeployer.chainId = 10; - await registerHyperchainWithBridgeRegistration( + await registerZKChainWithBridgeRegistration( gatewayDeployer, false, [], diff --git a/l1-contracts/test/unit_tests/initial_deployment_test.spec.ts b/l1-contracts/test/unit_tests/initial_deployment_test.spec.ts index 4905daac0..9fb6089a1 100644 --- a/l1-contracts/test/unit_tests/initial_deployment_test.spec.ts +++ b/l1-contracts/test/unit_tests/initial_deployment_test.spec.ts @@ -59,10 +59,10 @@ describe("Initial deployment test", function () { expect(chainTypeManagerAddress1.toLowerCase()).equal(chainTypeManagerAddress2.toLowerCase()); const stateTransitionAddress1 = deployer.addresses.StateTransition.DiamondProxy; - const stateTransitionAddress2 = await stateTransition.getHyperchain(chainId); + const stateTransitionAddress2 = await stateTransition.getZKChain(chainId); expect(stateTransitionAddress1.toLowerCase()).equal(stateTransitionAddress2.toLowerCase()); - const stateTransitionAddress3 = await bridgehub.getHyperchain(chainId); + const stateTransitionAddress3 = await bridgehub.getZKChain(chainId); expect(stateTransitionAddress1.toLowerCase()).equal(stateTransitionAddress3.toLowerCase()); }); }); diff --git a/l1-contracts/test/unit_tests/validator_timelock_test.spec.ts b/l1-contracts/test/unit_tests/validator_timelock_test.spec.ts index fbd7edb42..5093c2573 100644 --- a/l1-contracts/test/unit_tests/validator_timelock_test.spec.ts +++ b/l1-contracts/test/unit_tests/validator_timelock_test.spec.ts @@ -82,7 +82,7 @@ describe("ValidatorTimelock tests", function () { expect(await validatorTimelock.executionDelay()).equal(0); expect(await validatorTimelock.validators(chainId, ethers.constants.AddressZero)).equal(false); expect(await validatorTimelock.chainTypeManager()).equal(dummyChainTypeManager.address); - expect(await dummyChainTypeManager.getHyperchain(chainId)).equal(dummyExecutor.address); + expect(await dummyChainTypeManager.getZKChain(chainId)).equal(dummyExecutor.address); expect(await dummyChainTypeManager.getChainAdmin(chainId)).equal(await owner.getAddress()); expect(await dummyExecutor.getAdmin()).equal(await owner.getAddress()); }); diff --git a/l2-contracts/contracts/verifier/Verifier.sol b/l2-contracts/contracts/verifier/Verifier.sol index 07f0cc268..54d9b00be 100644 --- a/l2-contracts/contracts/verifier/Verifier.sol +++ b/l2-contracts/contracts/verifier/Verifier.sol @@ -8,7 +8,7 @@ import {IVerifier} from "./chain-interfaces/IVerifier.sol"; /// @author Matter Labs /// @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 ZKsync hyperchain circuits. +/// 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 0x14f97b81e54b35fe673d8708cc1a19e1ea5b5e348e12d31e39824ed4f42bbca2 /// @dev It uses a custom memory layout inside the inline assembly block. Each reserved memory cell is declared in the /// constants below. diff --git a/tools/data/verifier_contract_template.txt b/tools/data/verifier_contract_template.txt index b9290f83c..314e92dc3 100644 --- a/tools/data/verifier_contract_template.txt +++ b/tools/data/verifier_contract_template.txt @@ -8,7 +8,7 @@ import {IVerifier} from "./chain-interfaces/IVerifier.sol"; /// @author Matter Labs /// @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 ZKsync hyperchain circuits. +/// 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 0x{{vk_hash}} /// @dev It uses a custom memory layout inside the inline assembly block. Each reserved memory cell is declared in the /// constants below. From 8b5b2964fc78cd94ebea48b172647489f39b1ae3 Mon Sep 17 00:00:00 2001 From: Stanislav Bezkorovainyi Date: Thu, 5 Sep 2024 18:38:38 +0200 Subject: [PATCH 25/53] Implement restriction to allow limiting chain admin in power (#699) Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com> Co-authored-by: Yberjon <106954795+Yberjon@users.noreply.github.com> --- .solhintignore | 1 + .../contracts/common/L1ContractErrors.sol | 22 ++ .../dev-contracts/test/ReenterGovernance.sol | 5 +- .../governance/AccessControlRestriction.sol | 72 ++++++ .../contracts/governance/ChainAdmin.sol | 114 +++++++--- l1-contracts/contracts/governance/Common.sol | 13 ++ .../contracts/governance/Governance.sol | 1 + .../governance/IAccessControlRestriction.sol | 14 ++ .../contracts/governance/IChainAdmin.sol | 39 ++-- .../contracts/governance/IGovernance.sol | 12 +- .../governance/IPermanentRestriction.sol | 17 ++ .../contracts/governance/IRestriction.sol | 15 ++ .../governance/PermanentRestriction.sol | 186 ++++++++++++++++ .../chain-deps/facets/Getters.sol | 5 + .../chain-interfaces/IGetters.sol | 3 + l1-contracts/deploy-scripts/DeployL1.s.sol | 11 +- .../deploy-scripts/RegisterHyperchain.s.sol | 10 +- l1-contracts/deploy-scripts/Utils.sol | 7 +- l1-contracts/src.ts/deploy-process.ts | 3 +- l1-contracts/src.ts/deploy.ts | 14 +- .../foundry/unit/concrete/Utils/Utils.sol | 3 +- .../Governance/AccessControlRestriction.t.sol | 186 ++++++++++++++++ .../Governance/Authorization.t.sol | 0 .../governance/Governance/ChainAdmin.t.sol | 177 +++++++++++++++ .../Governance/Executing.t.sol | 2 +- .../Governance/Fallback.t.sol | 0 .../Governance/OperationStatus.t.sol | 2 +- .../Governance/PermanentRestriction.t.sol | 209 ++++++++++++++++++ .../Governance/Reentrancy.t.sol | 0 .../Governance/SelfUpgrades.t.sol | 2 +- .../Governance/_Governance_Shared.t.sol | 5 +- .../CreateNewChain.t.sol | 4 + .../StateTransitionManager/FreezeChain.t.sol | 4 + .../RevertBatches.t.sol | 4 + .../SetChainCreationParams.t.sol | 4 + .../SetNewVersionUpgrade.t.sol | 4 + .../SetUpgradeDiamondCut.t.sol | 4 + .../SetValidatorTimelock.t.sol | 4 + .../StateTransitionOwnerZero.t.sol | 4 + .../_StateTransitionManager_Shared.t.sol | 13 +- 40 files changed, 1106 insertions(+), 89 deletions(-) create mode 100644 l1-contracts/contracts/governance/AccessControlRestriction.sol create mode 100644 l1-contracts/contracts/governance/Common.sol create mode 100644 l1-contracts/contracts/governance/IAccessControlRestriction.sol create mode 100644 l1-contracts/contracts/governance/IPermanentRestriction.sol create mode 100644 l1-contracts/contracts/governance/IRestriction.sol create mode 100644 l1-contracts/contracts/governance/PermanentRestriction.sol create mode 100644 l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol rename l1-contracts/test/foundry/unit/concrete/{ => governance}/Governance/Authorization.t.sol (100%) create mode 100644 l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol rename l1-contracts/test/foundry/unit/concrete/{ => governance}/Governance/Executing.t.sol (99%) rename l1-contracts/test/foundry/unit/concrete/{ => governance}/Governance/Fallback.t.sol (100%) rename l1-contracts/test/foundry/unit/concrete/{ => governance}/Governance/OperationStatus.t.sol (99%) create mode 100644 l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol rename l1-contracts/test/foundry/unit/concrete/{ => governance}/Governance/Reentrancy.t.sol (100%) rename l1-contracts/test/foundry/unit/concrete/{ => governance}/Governance/SelfUpgrades.t.sol (97%) rename l1-contracts/test/foundry/unit/concrete/{ => governance}/Governance/_Governance_Shared.t.sol (93%) diff --git a/.solhintignore b/.solhintignore index abcb64f98..2371ed166 100644 --- a/.solhintignore +++ b/.solhintignore @@ -8,6 +8,7 @@ l1-contracts/lib l1-contracts/node_modules l1-contracts/contracts/dev-contracts l1-contracts/test +l1-contracts/deploy-scripts # l1-contracts-foundry l1-contracts-foundry/cache diff --git a/l1-contracts/contracts/common/L1ContractErrors.sol b/l1-contracts/contracts/common/L1ContractErrors.sol index 73ff72cc9..bec5a56cd 100644 --- a/l1-contracts/contracts/common/L1ContractErrors.sol +++ b/l1-contracts/contracts/common/L1ContractErrors.sol @@ -1,6 +1,28 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.21; +// 0x5ecf2d7a +error AccessToFallbackDenied(address target, address invoker); +// 0x3995f750 +error AccessToFunctionDenied(address target, bytes4 selector, address invoker); +// 0x6c167909 +error OnlySelfAllowed(); +// 0x52e22c98 +error RestrictionWasNotPresent(address restriction); +// 0xf126e113 +error RestrictionWasAlreadyPresent(address restriction); +// 0x3331e9c0 +error CallNotAllowed(bytes call); +// 0x59e1b0d2 +error ChainZeroAddress(); +// 0xff4bbdf1 +error NotAHyperchain(address chainAddress); +// 0xa3decdf3 +error NotAnAdmin(address expected, address actual); +// 0xf6fd7071 +error RemovingPermanentRestriction(); +// 0xfcb9b2e1 +error UnallowedImplementation(bytes32 implementationHash); // 0x1ff9d522 error AddressAlreadyUsed(address addr); // 0x86bb51b8 diff --git a/l1-contracts/contracts/dev-contracts/test/ReenterGovernance.sol b/l1-contracts/contracts/dev-contracts/test/ReenterGovernance.sol index 0d619c5ba..193f8085f 100644 --- a/l1-contracts/contracts/dev-contracts/test/ReenterGovernance.sol +++ b/l1-contracts/contracts/dev-contracts/test/ReenterGovernance.sol @@ -3,6 +3,7 @@ pragma solidity 0.8.24; import {IGovernance} from "../../governance/IGovernance.sol"; +import {Call} from "../../governance/Common.sol"; contract ReenterGovernance { // add this to be excluded from coverage report @@ -12,7 +13,7 @@ contract ReenterGovernance { // Store call, predecessor and salt separately, // because Operation struct can't be stored on storage. - IGovernance.Call call; + Call call; bytes32 predecessor; bytes32 salt; @@ -45,7 +46,7 @@ contract ReenterGovernance { fallback() external payable { if (!alreadyReentered) { alreadyReentered = true; - IGovernance.Call[] memory calls = new IGovernance.Call[](1); + Call[] memory calls = new Call[](1); calls[0] = call; IGovernance.Operation memory op = IGovernance.Operation({ calls: calls, diff --git a/l1-contracts/contracts/governance/AccessControlRestriction.sol b/l1-contracts/contracts/governance/AccessControlRestriction.sol new file mode 100644 index 000000000..3fc67f875 --- /dev/null +++ b/l1-contracts/contracts/governance/AccessControlRestriction.sol @@ -0,0 +1,72 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +import {AccessToFallbackDenied, AccessToFunctionDenied} from "../common/L1ContractErrors.sol"; +import {IAccessControlRestriction} from "./IAccessControlRestriction.sol"; +import {AccessControlDefaultAdminRules} from "@openzeppelin/contracts-v4/access/AccessControlDefaultAdminRules.sol"; +import {IRestriction} from "./IRestriction.sol"; +import {Call} from "./Common.sol"; + +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +/// @notice The Restriction that is designed to provide the access control logic for the `ChainAdmin` contract. +/// @dev It inherits from `AccessControlDefaultAdminRules` without overriding `_setRoleAdmin` functionaity. In other +/// words, the `DEFAULT_ADMIN_ROLE` is the only role that can manage roles. This is done for simplicity. +/// @dev An instance of this restriction should be deployed separately for each `ChainAdmin` contract. +/// @dev IMPORTANT: this function does not validate the ability of the invoker to use `msg.value`. Thus, +/// either all callers with access to functions should be trusted to not steal ETH from the `ChainAdmin` account +/// or not ETH should be passively stored in `ChainAdmin` account. +contract AccessControlRestriction is IRestriction, IAccessControlRestriction, AccessControlDefaultAdminRules { + /// @notice Required roles to call a specific functions. + /// @dev Note, that the role 0 means the `DEFAULT_ADMIN_ROLE` from the `AccessControlDefaultAdminRules` contract. + mapping(address target => mapping(bytes4 selector => bytes32 requiredRole)) public requiredRoles; + + /// @notice Required roles to call a fallback function. + mapping(address target => bytes32 requiredRole) public requiredRolesForFallback; + + constructor( + uint48 initialDelay, + address initialDefaultAdmin + ) AccessControlDefaultAdminRules(initialDelay, initialDefaultAdmin) {} + + /// @notice Sets the required role for a specific function call. + /// @param _target The address of the contract. + /// @param _selector The selector of the function. + /// @param _requiredRole The required role. + function setRequiredRoleForCall( + address _target, + bytes4 _selector, + bytes32 _requiredRole + ) external onlyRole(DEFAULT_ADMIN_ROLE) { + requiredRoles[_target][_selector] = _requiredRole; + + emit RoleSet(_target, _selector, _requiredRole); + } + + /// @notice Sets the required role for a fallback function call. + /// @param _target The address of the contract. + /// @param _requiredRole The required role. + function setRequiredRoleForFallback(address _target, bytes32 _requiredRole) external onlyRole(DEFAULT_ADMIN_ROLE) { + requiredRolesForFallback[_target] = _requiredRole; + + emit FallbackRoleSet(_target, _requiredRole); + } + + /// @inheritdoc IRestriction + function validateCall(Call calldata _call, address _invoker) external view { + // Note, that since `DEFAULT_ADMIN_ROLE` is 0 and the default storage value for the + // `requiredRoles` and `requiredRolesForFallback` is 0, the default admin is by default a required + // role for all the functions. + if (_call.data.length < 4) { + if (!hasRole(requiredRolesForFallback[_call.target], _invoker)) { + revert AccessToFallbackDenied(_call.target, _invoker); + } + } else { + bytes4 selector = bytes4(_call.data[:4]); + if (!hasRole(requiredRoles[_call.target][selector], _invoker)) { + revert AccessToFunctionDenied(_call.target, selector, _invoker); + } + } + } +} diff --git a/l1-contracts/contracts/governance/ChainAdmin.sol b/l1-contracts/contracts/governance/ChainAdmin.sol index 4d9ff858f..f6a93146f 100644 --- a/l1-contracts/contracts/governance/ChainAdmin.sol +++ b/l1-contracts/contracts/governance/ChainAdmin.sol @@ -2,48 +2,76 @@ pragma solidity 0.8.24; -import {Ownable2Step} from "@openzeppelin/contracts-v4/access/Ownable2Step.sol"; +// solhint-disable gas-length-in-loops + +import {NoCallsProvided, OnlySelfAllowed, RestrictionWasNotPresent, RestrictionWasAlreadyPresent} from "../common/L1ContractErrors.sol"; import {IChainAdmin} from "./IChainAdmin.sol"; -import {IAdmin} from "../state-transition/chain-interfaces/IAdmin.sol"; -import {NoCallsProvided, Unauthorized, ZeroAddress} from "../common/L1ContractErrors.sol"; +import {IRestriction} from "./IRestriction.sol"; +import {Call} from "./Common.sol"; + +import {EnumerableSet} from "@openzeppelin/contracts-v4/utils/structs/EnumerableSet.sol"; +import {ReentrancyGuard} from "../common/ReentrancyGuard.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev /// @notice The contract is designed to hold the `admin` role in ZKSync Chain (State Transition) contracts. /// The owner of the contract can perform any external calls and also save the information needed for -/// the blockchain node to accept the protocol upgrade. Another role - `tokenMultiplierSetter` can be used in the contract -/// to change the base token gas price in the Chain contract. -contract ChainAdmin is IChainAdmin, Ownable2Step { +/// the blockchain node to accept the protocol upgrade. +contract ChainAdmin is IChainAdmin, ReentrancyGuard { + using EnumerableSet for EnumerableSet.AddressSet; + + /// @notice Ensures that only the `ChainAdmin` contract itself can call the function. + /// @dev All functions that require access-control should use `onlySelf` modifier, while the access control logic + /// should be implemented in the restriction contracts. + modifier onlySelf() { + if (msg.sender != address(this)) { + revert OnlySelfAllowed(); + } + _; + } + + constructor(address[] memory _initialRestrictions) reentrancyGuardInitializer { + unchecked { + for (uint256 i = 0; i < _initialRestrictions.length; ++i) { + _addRestriction(_initialRestrictions[i]); + } + } + } + /// @notice Mapping of protocol versions to their expected upgrade timestamps. /// @dev Needed for the offchain node administration to know when to start building batches with the new protocol version. mapping(uint256 protocolVersion => uint256 upgradeTimestamp) public protocolVersionToUpgradeTimestamp; - /// @notice The address which can call `setTokenMultiplier` function to change the base token gas price in the Chain contract. - /// @dev The token base price can be changed quite often, so the private key for this role is supposed to be stored in the node - /// and used by the automated service in a way similar to the sequencer workflow. - address public tokenMultiplierSetter; + /// @notice The set of active restrictions. + EnumerableSet.AddressSet internal activeRestrictions; - constructor(address _initialOwner, address _initialTokenMultiplierSetter) { - if (_initialOwner == address(0)) { - revert ZeroAddress(); - } - _transferOwnership(_initialOwner); - // Can be zero if no one has this permission. - tokenMultiplierSetter = _initialTokenMultiplierSetter; - emit NewTokenMultiplierSetter(address(0), _initialTokenMultiplierSetter); + /// @notice Returns the list of active restrictions. + function getRestrictions() public view returns (address[] memory) { + return activeRestrictions.values(); + } + + /// @inheritdoc IChainAdmin + function isRestrictionActive(address _restriction) external view returns (bool) { + return activeRestrictions.contains(_restriction); } - /// @notice Updates the address responsible for setting token multipliers on the Chain contract . - /// @param _tokenMultiplierSetter The new address to be set as the token multiplier setter. - function setTokenMultiplierSetter(address _tokenMultiplierSetter) external onlyOwner { - emit NewTokenMultiplierSetter(tokenMultiplierSetter, _tokenMultiplierSetter); - tokenMultiplierSetter = _tokenMultiplierSetter; + /// @inheritdoc IChainAdmin + function addRestriction(address _restriction) external onlySelf { + _addRestriction(_restriction); + } + + /// @inheritdoc IChainAdmin + function removeRestriction(address _restriction) external onlySelf { + if (!activeRestrictions.remove(_restriction)) { + revert RestrictionWasNotPresent(_restriction); + } + emit RestrictionRemoved(_restriction); } /// @notice Set the expected upgrade timestamp for a specific protocol version. /// @param _protocolVersion The ZKsync chain protocol version. /// @param _upgradeTimestamp The timestamp at which the chain node should expect the upgrade to happen. - function setUpgradeTimestamp(uint256 _protocolVersion, uint256 _upgradeTimestamp) external onlyOwner { + function setUpgradeTimestamp(uint256 _protocolVersion, uint256 _upgradeTimestamp) external onlySelf { protocolVersionToUpgradeTimestamp[_protocolVersion] = _upgradeTimestamp; emit UpdateUpgradeTimestamp(_protocolVersion, _upgradeTimestamp); } @@ -52,12 +80,16 @@ contract ChainAdmin is IChainAdmin, Ownable2Step { /// @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. - function multicall(Call[] calldata _calls, bool _requireSuccess) external payable onlyOwner { + /// @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 nonReentrant { if (_calls.length == 0) { revert NoCallsProvided(); } - // solhint-disable-next-line gas-length-in-loops for (uint256 i = 0; i < _calls.length; ++i) { + _validateCall(_calls[i]); + // slither-disable-next-line arbitrary-send-eth (bool success, bytes memory returnData) = _calls[i].target.call{value: _calls[i].value}(_calls[i].data); if (_requireSuccess && !success) { @@ -70,17 +102,27 @@ contract ChainAdmin is IChainAdmin, Ownable2Step { } } - /// @notice Sets the token multiplier in the specified Chain contract. - /// @param _chainContract The chain contract address where the token multiplier will be set. - /// @param _nominator The numerator part of the token multiplier. - /// @param _denominator The denominator part of the token multiplier. - function setTokenMultiplier(IAdmin _chainContract, uint128 _nominator, uint128 _denominator) external { - if (msg.sender != tokenMultiplierSetter) { - revert Unauthorized(msg.sender); + /// @dev Contract might receive/hold ETH as part of the maintenance process. + receive() external payable {} + + /// @notice Function that returns the current admin can perform the call. + /// @dev By default it always returns true, but can be overridden in derived contracts. + function _validateCall(Call calldata _call) internal view { + address[] memory restrictions = getRestrictions(); + + unchecked { + for (uint256 i = 0; i < restrictions.length; ++i) { + IRestriction(restrictions[i]).validateCall(_call, msg.sender); + } } - _chainContract.setTokenMultiplier(_nominator, _denominator); } - /// @dev Contract might receive/hold ETH as part of the maintenance process. - receive() external payable {} + /// @notice Adds a new restriction to the active restrictions set. + /// @param _restriction The address of the restriction contract to be added. + function _addRestriction(address _restriction) internal { + if (!activeRestrictions.add(_restriction)) { + revert RestrictionWasAlreadyPresent(_restriction); + } + emit RestrictionAdded(_restriction); + } } diff --git a/l1-contracts/contracts/governance/Common.sol b/l1-contracts/contracts/governance/Common.sol new file mode 100644 index 000000000..fd73dd793 --- /dev/null +++ b/l1-contracts/contracts/governance/Common.sol @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +/// @dev Represents a call to be made during multicall. +/// @param target The address to which the call will be made. +/// @param value The amount of Ether (in wei) to be sent along with the call. +/// @param data The calldata to be executed on the `target` address. +struct Call { + address target; + uint256 value; + bytes data; +} diff --git a/l1-contracts/contracts/governance/Governance.sol b/l1-contracts/contracts/governance/Governance.sol index 790b79a26..d6e9d9b44 100644 --- a/l1-contracts/contracts/governance/Governance.sol +++ b/l1-contracts/contracts/governance/Governance.sol @@ -4,6 +4,7 @@ pragma solidity 0.8.24; import {Ownable2Step} from "@openzeppelin/contracts-v4/access/Ownable2Step.sol"; import {IGovernance} from "./IGovernance.sol"; +import {Call} from "./Common.sol"; import {ZeroAddress, Unauthorized, OperationMustBeReady, OperationMustBePending, OperationExists, InvalidDelay, PreviousOperationNotExecuted} from "../common/L1ContractErrors.sol"; /// @author Matter Labs diff --git a/l1-contracts/contracts/governance/IAccessControlRestriction.sol b/l1-contracts/contracts/governance/IAccessControlRestriction.sol new file mode 100644 index 000000000..3c9cfb5c5 --- /dev/null +++ b/l1-contracts/contracts/governance/IAccessControlRestriction.sol @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +/// @title AccessControlRestriction contract interface +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +interface IAccessControlRestriction { + /// @notice Emitted when the required role for a specific function is set. + event RoleSet(address indexed target, bytes4 indexed selector, bytes32 requiredRole); + + /// @notice Emitted when the required role for a fallback function is set. + event FallbackRoleSet(address indexed target, bytes32 requiredRole); +} diff --git a/l1-contracts/contracts/governance/IChainAdmin.sol b/l1-contracts/contracts/governance/IChainAdmin.sol index d5d8f117c..1ef3144c2 100644 --- a/l1-contracts/contracts/governance/IChainAdmin.sol +++ b/l1-contracts/contracts/governance/IChainAdmin.sol @@ -2,36 +2,37 @@ pragma solidity 0.8.24; -import {IAdmin} from "../state-transition/chain-interfaces/IAdmin.sol"; +import {Call} from "./Common.sol"; /// @title ChainAdmin contract interface /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev interface IChainAdmin { - /// @dev Represents a call to be made during multicall. - /// @param target The address to which the call will be made. - /// @param value The amount of Ether (in wei) to be sent along with the call. - /// @param data The calldata to be executed on the `target` address. - struct Call { - address target; - uint256 value; - bytes data; - } - /// @notice Emitted when the expected upgrade timestamp for a specific protocol version is set. - event UpdateUpgradeTimestamp(uint256 indexed _protocolVersion, uint256 _upgradeTimestamp); + event UpdateUpgradeTimestamp(uint256 indexed protocolVersion, uint256 upgradeTimestamp); /// @notice Emitted when the call is executed from the contract. - event CallExecuted(Call _call, bool _success, bytes _returnData); + event CallExecuted(Call call, bool success, bytes returnData); + + /// @notice Emitted when a new restriction is added. + event RestrictionAdded(address indexed restriction); - /// @notice Emitted when the new token multiplier address is set. - event NewTokenMultiplierSetter(address _oldTokenMultiplierSetter, address _newTokenMultiplierSetter); + /// @notice Emitted when a restriction is removed. + event RestrictionRemoved(address indexed restriction); - function setTokenMultiplierSetter(address _tokenMultiplierSetter) external; + /// @notice Returns the list of active restrictions. + function getRestrictions() external view returns (address[] memory); - function setUpgradeTimestamp(uint256 _protocolVersion, uint256 _upgradeTimestamp) external; + /// @notice Checks if the restriction is active. + /// @param _restriction The address of the restriction contract. + function isRestrictionActive(address _restriction) external view returns (bool); - function multicall(Call[] calldata _calls, bool _requireSuccess) external payable; + /// @notice Adds a new restriction to the active restrictions set. + /// @param _restriction The address of the restriction contract. + function addRestriction(address _restriction) external; - function setTokenMultiplier(IAdmin _chainContract, uint128 _nominator, uint128 _denominator) external; + /// @notice Removes a restriction from the active restrictions set. + /// @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; } diff --git a/l1-contracts/contracts/governance/IGovernance.sol b/l1-contracts/contracts/governance/IGovernance.sol index 2b03ed4c9..0cb478573 100644 --- a/l1-contracts/contracts/governance/IGovernance.sol +++ b/l1-contracts/contracts/governance/IGovernance.sol @@ -2,6 +2,8 @@ // We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; +import {Call} from "./Common.sol"; + /// @title Governance contract interface /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev @@ -18,16 +20,6 @@ interface IGovernance { Done } - /// @dev Represents a call to be made during an operation. - /// @param target The address to which the call will be made. - /// @param value The amount of Ether (in wei) to be sent along with the call. - /// @param data The calldata to be executed on the `target` address. - struct Call { - address target; - uint256 value; - bytes data; - } - /// @dev Defines the structure of an operation that Governance executes. /// @param calls An array of `Call` structs, each representing a call to be made during the operation. /// @param predecessor The hash of the predecessor operation, that should be executed before this operation. diff --git a/l1-contracts/contracts/governance/IPermanentRestriction.sol b/l1-contracts/contracts/governance/IPermanentRestriction.sol new file mode 100644 index 000000000..548866b9f --- /dev/null +++ b/l1-contracts/contracts/governance/IPermanentRestriction.sol @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +/// @notice The interface for the permanent restriction contract. +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +interface IPermanentRestriction { + /// @notice Emitted when the implementation is allowed or disallowed. + event AdminImplementationAllowed(bytes32 indexed implementationHash, bool isAllowed); + + /// @notice Emitted when a certain calldata is allowed or disallowed. + event AllowedDataChanged(bytes data, bool isAllowed); + + /// @notice Emitted when the selector is labeled as validated or not. + event SelectorValidationChanged(bytes4 indexed selector, bool isValidated); +} diff --git a/l1-contracts/contracts/governance/IRestriction.sol b/l1-contracts/contracts/governance/IRestriction.sol new file mode 100644 index 000000000..b2cc79428 --- /dev/null +++ b/l1-contracts/contracts/governance/IRestriction.sol @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +import {Call} from "./Common.sol"; + +/// @title Restriction contract interface +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +interface IRestriction { + /// @notice Ensures that the invoker has the required role to call the function. + /// @param _call The call data. + /// @param _invoker The address of the invoker. + function validateCall(Call calldata _call, address _invoker) external view; +} diff --git a/l1-contracts/contracts/governance/PermanentRestriction.sol b/l1-contracts/contracts/governance/PermanentRestriction.sol new file mode 100644 index 000000000..acf75a67f --- /dev/null +++ b/l1-contracts/contracts/governance/PermanentRestriction.sol @@ -0,0 +1,186 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +import {CallNotAllowed, ChainZeroAddress, NotAHyperchain, NotAnAdmin, RemovingPermanentRestriction, ZeroAddress, UnallowedImplementation} from "../common/L1ContractErrors.sol"; + +import {Ownable2Step} from "@openzeppelin/contracts-v4/access/Ownable2Step.sol"; + +import {Call} from "./Common.sol"; +import {IRestriction} from "./IRestriction.sol"; +import {IChainAdmin} from "./IChainAdmin.sol"; +import {IBridgehub} from "../bridgehub/IBridgehub.sol"; +import {IZkSyncHyperchain} from "../state-transition/chain-interfaces/IZkSyncHyperchain.sol"; +import {IAdmin} from "../state-transition/chain-interfaces/IAdmin.sol"; + +import {IPermanentRestriction} from "./IPermanentRestriction.sol"; + +/// @title PermanentRestriction contract +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +/// @notice This contract should be used by chains that wish to guarantee that certain security +/// properties are preserved forever. +/// @dev To be deployed as a transparent upgradable proxy, owned by a trusted decentralized governance. +/// @dev Once of the instances of such contract is to ensure that a ZkSyncHyperchain is a rollup forever. +contract PermanentRestriction is IRestriction, IPermanentRestriction, Ownable2Step { + /// @notice The address of the Bridgehub contract. + IBridgehub public immutable BRIDGE_HUB; + + /// @notice The mapping of the allowed admin implementations. + mapping(bytes32 implementationCodeHash => bool isAllowed) public allowedAdminImplementations; + + /// @notice The mapping of the allowed calls. + mapping(bytes allowedCalldata => bool isAllowed) public allowedCalls; + + /// @notice The mapping of the validated selectors. + mapping(bytes4 selector => bool isValidated) public validatedSelectors; + + constructor(address _initialOwner, IBridgehub _bridgehub) { + BRIDGE_HUB = _bridgehub; + + // solhint-disable-next-line gas-custom-errors, reason-string + if (_initialOwner == address(0)) { + revert ZeroAddress(); + } + _transferOwnership(_initialOwner); + } + + /// @notice Allows a certain `ChainAdmin` implementation to be used as an admin. + /// @param _implementationHash The hash of the implementation code. + /// @param _isAllowed The flag that indicates if the implementation is allowed. + function allowAdminImplementation(bytes32 _implementationHash, bool _isAllowed) external onlyOwner { + allowedAdminImplementations[_implementationHash] = _isAllowed; + + emit AdminImplementationAllowed(_implementationHash, _isAllowed); + } + + /// @notice Allows a certain calldata for a selector to be used. + /// @param _data The calldata for the function. + /// @param _isAllowed The flag that indicates if the calldata is allowed. + function setAllowedData(bytes calldata _data, bool _isAllowed) external onlyOwner { + allowedCalls[_data] = _isAllowed; + + emit AllowedDataChanged(_data, _isAllowed); + } + + /// @notice Allows a certain selector to be validated. + /// @param _selector The selector of the function. + /// @param _isValidated The flag that indicates if the selector is validated. + function setSelectorIsValidated(bytes4 _selector, bool _isValidated) external onlyOwner { + validatedSelectors[_selector] = _isValidated; + + emit SelectorValidationChanged(_selector, _isValidated); + } + + /// @inheritdoc IRestriction + function validateCall( + Call calldata _call, + address // _invoker + ) external view override { + _validateAsChainAdmin(_call); + _validateRemoveRestriction(_call); + } + + /// @notice Validates the call as the chain admin + /// @param _call The call data. + function _validateAsChainAdmin(Call calldata _call) internal view { + if (!_isAdminOfAChain(_call.target)) { + // We only validate calls related to being an admin of a chain + return; + } + + // All calls with the length of the data below 4 will get into `receive`/`fallback` functions, + // we consider it to always be allowed. + if (_call.data.length < 4) { + return; + } + + bytes4 selector = bytes4(_call.data[:4]); + + if (selector == IAdmin.setPendingAdmin.selector) { + _validateNewAdmin(_call); + return; + } + + if (!validatedSelectors[selector]) { + // The selector is not validated, any data is allowed. + return; + } + + if (!allowedCalls[_call.data]) { + revert CallNotAllowed(_call.data); + } + } + + /// @notice Validates the correctness of the new admin. + /// @param _call The call data. + /// @dev Ensures that the admin has a whitelisted implementation and does not remove this restriction. + function _validateNewAdmin(Call calldata _call) internal view { + address newChainAdmin = abi.decode(_call.data[4:], (address)); + + bytes32 implementationCodeHash = newChainAdmin.codehash; + + if (!allowedAdminImplementations[implementationCodeHash]) { + revert UnallowedImplementation(implementationCodeHash); + } + + // Since the implementation is known to be correct (from the checks above), we + // can safely trust the returned value from the call below + if (!IChainAdmin(newChainAdmin).isRestrictionActive(address(this))) { + revert RemovingPermanentRestriction(); + } + } + + /// @notice Validates the removal of the restriction. + /// @param _call The call data. + /// @dev Ensures that this restriction is not removed. + function _validateRemoveRestriction(Call calldata _call) internal view { + if (_call.target != msg.sender) { + return; + } + + if (bytes4(_call.data[:4]) != IChainAdmin.removeRestriction.selector) { + return; + } + + address removedRestriction = abi.decode(_call.data[4:], (address)); + + if (removedRestriction == address(this)) { + revert RemovingPermanentRestriction(); + } + } + + /// @notice Checks if the `msg.sender` is an admin of a certain ZkSyncHyperchain. + /// @param _chain The address of the chain. + function _isAdminOfAChain(address _chain) internal view returns (bool) { + (bool success, ) = address(this).staticcall(abi.encodeCall(this.tryCompareAdminOfAChain, (_chain, msg.sender))); + return success; + } + + /// @notice Tries to compare the admin of a chain with the potential admin. + /// @param _chain The address of the chain. + /// @param _potentialAdmin The address of the potential admin. + /// @dev This function reverts if the `_chain` is not a ZkSyncHyperchain or the `_potentialAdmin` is not the + /// admin of the chain. + function tryCompareAdminOfAChain(address _chain, address _potentialAdmin) external view { + if (_chain == address(0)) { + revert ChainZeroAddress(); + } + + // Unfortunately there is no easy way to double check that indeed the `_chain` is a ZkSyncHyperchain. + // So we do the following: + // - Query it for `chainId`. If it reverts, it is not a ZkSyncHyperchain. + // - Query the Bridgehub for the Hyperchain with the given `chainId`. + // - We compare the corresponding addresses + uint256 chainId = IZkSyncHyperchain(_chain).getChainId(); + if (BRIDGE_HUB.getHyperchain(chainId) != _chain) { + revert NotAHyperchain(_chain); + } + + // Now, the chain is known to be a hyperchain, so it should implement the corresponding interface + address admin = IZkSyncHyperchain(_chain).getAdmin(); + if (admin != _potentialAdmin) { + revert NotAnAdmin(admin, _potentialAdmin); + } + } +} diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol index 9cb2a2da8..604eeef2e 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol @@ -52,6 +52,11 @@ contract GettersFacet is ZkSyncHyperchainBase, IGetters, ILegacyGetters { return s.bridgehub; } + /// @inheritdoc IGetters + function getChainId() external view returns (uint256) { + return s.chainId; + } + /// @inheritdoc IGetters function getStateTransitionManager() external view returns (address) { return s.stateTransitionManager; diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol index 4d06f9e8e..5da8cc748 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol @@ -33,6 +33,9 @@ interface IGetters is IZkSyncHyperchainBase { /// @return The address of the base token function getBaseToken() external view returns (address); + /// @return The chain id of the ZK Chain. + function getChainId() external view returns (uint256); + /// @return The address of the base token bridge function getBaseTokenBridge() external view returns (address); diff --git a/l1-contracts/deploy-scripts/DeployL1.s.sol b/l1-contracts/deploy-scripts/DeployL1.s.sol index 098aee5bc..cef851957 100644 --- a/l1-contracts/deploy-scripts/DeployL1.s.sol +++ b/l1-contracts/deploy-scripts/DeployL1.s.sol @@ -302,10 +302,17 @@ contract DeployL1Script is Script { } function deployChainAdmin() internal { - bytes memory bytecode = abi.encodePacked( + bytes memory accessControlRestrictionBytecode = abi.encodePacked( type(ChainAdmin).creationCode, - abi.encode(config.ownerAddress, address(0)) + abi.encode(uint256(0), config.ownerAddress) ); + + address accessControlRestriction = deployViaCreate2(accessControlRestrictionBytecode); + console.log("Access control restriction deployed at:", accessControlRestriction); + address[] memory restrictions = new address[](1); + restrictions[0] = accessControlRestriction; + + bytes memory bytecode = abi.encodePacked(type(ChainAdmin).creationCode, abi.encode(restrictions)); address contractAddress = deployViaCreate2(bytecode); console.log("ChainAdmin deployed at:", contractAddress); addresses.chainAdmin = contractAddress; diff --git a/l1-contracts/deploy-scripts/RegisterHyperchain.s.sol b/l1-contracts/deploy-scripts/RegisterHyperchain.s.sol index e0039b969..94acb2f02 100644 --- a/l1-contracts/deploy-scripts/RegisterHyperchain.s.sol +++ b/l1-contracts/deploy-scripts/RegisterHyperchain.s.sol @@ -13,6 +13,7 @@ import {IZkSyncHyperchain} from "contracts/state-transition/chain-interfaces/IZk import {ValidatorTimelock} from "contracts/state-transition/ValidatorTimelock.sol"; import {Governance} from "contracts/governance/Governance.sol"; import {ChainAdmin} from "contracts/governance/ChainAdmin.sol"; +import {AccessControlRestriction} from "contracts/governance/AccessControlRestriction.sol"; import {Utils} from "./Utils.sol"; import {PubdataPricingMode} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; @@ -151,8 +152,13 @@ contract RegisterHyperchainScript is Script { function deployChainAdmin() internal { vm.broadcast(); - ChainAdmin chainAdmin = new ChainAdmin(config.ownerAddress, address(0)); - console.log("ChainAdmin deployed at:", address(chainAdmin)); + AccessControlRestriction restriction = new AccessControlRestriction(0, config.ownerAddress); + + address[] memory restrictions = new address[](1); + restrictions[0] = address(restriction); + + vm.broadcast(); + ChainAdmin chainAdmin = new ChainAdmin(restrictions); config.chainAdmin = address(chainAdmin); } diff --git a/l1-contracts/deploy-scripts/Utils.sol b/l1-contracts/deploy-scripts/Utils.sol index 17449da7e..440eadcac 100644 --- a/l1-contracts/deploy-scripts/Utils.sol +++ b/l1-contracts/deploy-scripts/Utils.sol @@ -8,7 +8,8 @@ import {Vm} from "forge-std/Vm.sol"; import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; import {L2TransactionRequestDirect} from "contracts/bridgehub/IBridgehub.sol"; import {IGovernance} from "contracts/governance/IGovernance.sol"; -import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; +import {Call} from "contracts/governance/Common.sol"; +import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA} from "contracts/common/Config.sol"; import {L2_DEPLOYER_SYSTEM_CONTRACT_ADDR} from "contracts/common/L2ContractAddresses.sol"; import {L2ContractHelper} from "contracts/common/libraries/L2ContractHelper.sol"; @@ -316,8 +317,8 @@ library Utils { ) internal { IGovernance governance = IGovernance(_governor); - IGovernance.Call[] memory calls = new IGovernance.Call[](1); - calls[0] = IGovernance.Call({target: _target, value: _value, data: _data}); + Call[] memory calls = new Call[](1); + calls[0] = Call({target: _target, value: _value, data: _data}); IGovernance.Operation memory operation = IGovernance.Operation({ calls: calls, diff --git a/l1-contracts/src.ts/deploy-process.ts b/l1-contracts/src.ts/deploy-process.ts index d30762a15..285dd9e0e 100644 --- a/l1-contracts/src.ts/deploy-process.ts +++ b/l1-contracts/src.ts/deploy-process.ts @@ -58,9 +58,8 @@ export async function initialBridgehubDeployment( nonce++; await deployer.deployGovernance(create2Salt, { gasPrice, nonce }); - nonce++; - await deployer.deployChainAdmin(create2Salt, { gasPrice, nonce }); + await deployer.deployChainAdmin(create2Salt, { gasPrice }); await deployer.deployTransparentProxyAdmin(create2Salt, { gasPrice }); await deployer.deployBridgehubContract(create2Salt, gasPrice); await deployer.deployBlobVersionedHashRetriever(create2Salt, { gasPrice }); diff --git a/l1-contracts/src.ts/deploy.ts b/l1-contracts/src.ts/deploy.ts index 3ee3bb07b..d131d269c 100644 --- a/l1-contracts/src.ts/deploy.ts +++ b/l1-contracts/src.ts/deploy.ts @@ -212,9 +212,21 @@ export class Deployer { public async deployChainAdmin(create2Salt: string, ethTxOptions: ethers.providers.TransactionRequest) { ethTxOptions.gasLimit ??= 10_000_000; + // Firstly, we deploy the access control restriction for the chain admin + const accessControlRestriction = await this.deployViaCreate2( + "AccessControlRestriction", + [0, this.ownerAddress], + create2Salt, + ethTxOptions + ); + if (this.verbose) { + console.log(`CONTRACTS_ACCESS_CONTROL_RESTRICTION_ADDR=${accessControlRestriction}`); + } + + // Then we deploy the ChainAdmin contract itself const contractAddress = await this.deployViaCreate2( "ChainAdmin", - [this.ownerAddress, ethers.constants.AddressZero], + [[accessControlRestriction]], create2Salt, ethTxOptions ); diff --git a/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol b/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol index 1260334fd..3b46d212a 100644 --- a/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol +++ b/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol @@ -210,7 +210,7 @@ library Utils { } function getGettersSelectors() public pure returns (bytes4[] memory) { - bytes4[] memory selectors = new bytes4[](29); + bytes4[] memory selectors = new bytes4[](30); selectors[0] = GettersFacet.getVerifier.selector; selectors[1] = GettersFacet.getAdmin.selector; selectors[2] = GettersFacet.getPendingAdmin.selector; @@ -240,6 +240,7 @@ library Utils { selectors[26] = GettersFacet.getTotalBatchesVerified.selector; selectors[27] = GettersFacet.getTotalBatchesExecuted.selector; selectors[28] = GettersFacet.getL2SystemContractsUpgradeTxHash.selector; + selectors[29] = GettersFacet.getChainId.selector; return selectors; } diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol new file mode 100644 index 000000000..e5b45975f --- /dev/null +++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol @@ -0,0 +1,186 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.8.24; + +import {Test} from "forge-std/Test.sol"; + +import "openzeppelin-contracts/contracts/utils/Strings.sol"; +import "forge-std/console.sol"; +import {IChainAdmin} from "contracts/governance/IChainAdmin.sol"; +import {ChainAdmin} from "contracts/governance/ChainAdmin.sol"; +import {AccessControlRestriction} from "contracts/governance/AccessControlRestriction.sol"; +import {IAccessControlRestriction} from "contracts/governance/IAccessControlRestriction.sol"; +import {Utils} from "test/foundry/unit/concrete/Utils/Utils.sol"; +import {NoCallsProvided, AccessToFallbackDenied, AccessToFunctionDenied} from "contracts/common/L1ContractErrors.sol"; +import {Call} from "contracts/governance/Common.sol"; + +contract AccessRestrictionTest is Test { + AccessControlRestriction internal restriction; + ChainAdmin internal chainAdmin; + address owner; + address randomCaller; + bytes32 public constant DEFAULT_ADMIN_ROLE = 0x00; + + function getChainAdminSelectors() public pure returns (bytes4[] memory) { + bytes4[] memory selectors = new bytes4[](12); + selectors[0] = IChainAdmin.getRestrictions.selector; + selectors[1] = IChainAdmin.isRestrictionActive.selector; + selectors[2] = IChainAdmin.addRestriction.selector; + selectors[3] = IChainAdmin.removeRestriction.selector; + + return selectors; + } + + function setUp() public { + owner = makeAddr("random address"); + randomCaller = makeAddr("random caller"); + + restriction = new AccessControlRestriction(0, owner); + address[] memory restrictions = new address[](1); + restrictions[0] = address(restriction); + + chainAdmin = new ChainAdmin(restrictions); + } + + function test_adminAsAddressZero() public { + vm.expectRevert("AccessControl: 0 default admin"); + new AccessControlRestriction(0, address(0)); + } + + function test_setRequiredRoleForCallByNotDefaultAdmin(bytes32 role) public { + vm.assume(role != DEFAULT_ADMIN_ROLE); + + bytes4[] memory chainAdminSelectors = getChainAdminSelectors(); + string memory revertMsg = string( + abi.encodePacked( + "AccessControl: account ", + Strings.toHexString(uint160(randomCaller), 20), + " is missing role ", + Strings.toHexString(uint256(DEFAULT_ADMIN_ROLE), 32) + ) + ); + + vm.expectRevert(bytes(revertMsg)); + vm.prank(randomCaller); + restriction.setRequiredRoleForCall(address(chainAdmin), chainAdminSelectors[0], role); + } + + function test_setRequiredRoleForCallAccessToFunctionDenied(bytes32 role) public { + vm.assume(role != DEFAULT_ADMIN_ROLE); + + bytes4[] memory chainAdminSelectors = getChainAdminSelectors(); + + vm.startPrank(owner); + restriction.setRequiredRoleForCall(address(chainAdmin), chainAdminSelectors[0], role); + vm.stopPrank(); + + Call memory call = Call({ + target: address(chainAdmin), + value: 0, + data: abi.encodeCall(IChainAdmin.getRestrictions, ()) + }); + + vm.expectRevert( + abi.encodeWithSelector( + AccessToFunctionDenied.selector, + address(chainAdmin), + chainAdminSelectors[0], + randomCaller + ) + ); + restriction.validateCall(call, randomCaller); + } + + function test_setRequiredRoleForCall(bytes32 role) public { + vm.assume(role != DEFAULT_ADMIN_ROLE); + + bytes4[] memory chainAdminSelectors = getChainAdminSelectors(); + + vm.expectEmit(true, true, false, true); + emit IAccessControlRestriction.RoleSet(address(chainAdmin), chainAdminSelectors[0], role); + + vm.startPrank(owner); + restriction.setRequiredRoleForCall(address(chainAdmin), chainAdminSelectors[0], role); + restriction.grantRole(role, randomCaller); + vm.stopPrank(); + + Call memory call = Call({ + target: address(chainAdmin), + value: 0, + data: abi.encodeCall(IChainAdmin.getRestrictions, ()) + }); + restriction.validateCall(call, randomCaller); + } + + function test_setRequiredRoleForFallbackByNotDefaultAdmin(bytes32 role) public { + vm.assume(role != DEFAULT_ADMIN_ROLE); + + string memory revertMsg = string( + abi.encodePacked( + "AccessControl: account ", + Strings.toHexString(uint160(randomCaller), 20), + " is missing role ", + Strings.toHexString(uint256(DEFAULT_ADMIN_ROLE), 32) + ) + ); + + vm.expectRevert(bytes(revertMsg)); + vm.prank(randomCaller); + restriction.setRequiredRoleForFallback(address(chainAdmin), role); + } + + function test_setRequiredRoleForFallbackAccessToFallbackDenied(bytes32 role) public { + vm.assume(role != DEFAULT_ADMIN_ROLE); + + vm.startPrank(owner); + restriction.setRequiredRoleForFallback(address(chainAdmin), role); + vm.stopPrank(); + + Call memory call = Call({target: address(chainAdmin), value: 0, data: ""}); + + vm.expectRevert(abi.encodeWithSelector(AccessToFallbackDenied.selector, address(chainAdmin), randomCaller)); + restriction.validateCall(call, randomCaller); + } + + function test_setRequiredRoleForFallback(bytes32 role) public { + vm.assume(role != DEFAULT_ADMIN_ROLE); + + vm.expectEmit(true, false, false, true); + emit IAccessControlRestriction.FallbackRoleSet(address(chainAdmin), role); + + vm.startPrank(owner); + restriction.setRequiredRoleForFallback(address(chainAdmin), role); + restriction.grantRole(role, randomCaller); + vm.stopPrank(); + + Call memory call = Call({target: address(chainAdmin), value: 0, data: ""}); + restriction.validateCall(call, randomCaller); + } + + function test_validateCallFunction(bytes32 role) public { + vm.assume(role != DEFAULT_ADMIN_ROLE); + + bytes4[] memory chainAdminSelectors = getChainAdminSelectors(); + vm.startPrank(owner); + restriction.setRequiredRoleForCall(address(chainAdmin), chainAdminSelectors[0], role); + restriction.grantRole(role, randomCaller); + vm.stopPrank(); + + Call memory call = Call({ + target: address(chainAdmin), + value: 0, + data: abi.encodeCall(IChainAdmin.getRestrictions, ()) + }); + restriction.validateCall(call, randomCaller); + } + + function test_validateCallFallback(bytes32 role) public { + vm.assume(role != DEFAULT_ADMIN_ROLE); + vm.startPrank(owner); + restriction.setRequiredRoleForFallback(address(chainAdmin), role); + restriction.grantRole(role, randomCaller); + vm.stopPrank(); + + Call memory call = Call({target: address(chainAdmin), value: 0, data: ""}); + restriction.validateCall(call, randomCaller); + } +} diff --git a/l1-contracts/test/foundry/unit/concrete/Governance/Authorization.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/Authorization.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Governance/Authorization.t.sol rename to l1-contracts/test/foundry/unit/concrete/governance/Governance/Authorization.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol new file mode 100644 index 000000000..01a3c7dfd --- /dev/null +++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol @@ -0,0 +1,177 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.8.24; + +import {Test} from "forge-std/Test.sol"; + +import "openzeppelin-contracts/contracts/utils/Strings.sol"; +import {AccessControlRestriction} from "contracts/governance/AccessControlRestriction.sol"; +import {IChainAdmin} from "contracts/governance/IChainAdmin.sol"; +import {ChainAdmin} from "contracts/governance/ChainAdmin.sol"; +import {GettersFacet} from "contracts/state-transition/chain-deps/facets/Getters.sol"; +import {Call} from "contracts/governance/Common.sol"; +import {NoCallsProvided, RestrictionWasAlreadyPresent, RestrictionWasNotPresent, AccessToFallbackDenied, AccessToFunctionDenied} from "contracts/common/L1ContractErrors.sol"; +import {Utils} from "test/foundry/unit/concrete/Utils/Utils.sol"; + +contract ChainAdminTest is Test { + ChainAdmin internal chainAdmin; + AccessControlRestriction internal restriction; + GettersFacet internal gettersFacet; + + address internal owner; + uint32 internal major; + uint32 internal minor; + uint32 internal patch; + bytes32 public constant DEFAULT_ADMIN_ROLE = 0x00; + + function setUp() public { + owner = makeAddr("random address"); + + restriction = new AccessControlRestriction(0, owner); + address[] memory restrictions = new address[](1); + restrictions[0] = address(restriction); + + chainAdmin = new ChainAdmin(restrictions); + + gettersFacet = new GettersFacet(); + } + + function test_getRestrictions() public { + address[] memory restrictions = chainAdmin.getRestrictions(); + assertEq(restrictions[0], address(restriction)); + } + + function test_isRestrictionActive() public { + bool isActive = chainAdmin.isRestrictionActive(address(restriction)); + assertEq(isActive, true); + } + + function test_addRestriction() public { + address[] memory restrictions = chainAdmin.getRestrictions(); + + vm.expectEmit(true, false, false, true); + emit IChainAdmin.RestrictionAdded(owner); + + vm.prank(address(chainAdmin)); + chainAdmin.addRestriction(owner); + } + + function test_addRestrictionRevert() public { + vm.startPrank(address(chainAdmin)); + chainAdmin.addRestriction(owner); + + vm.expectRevert(abi.encodeWithSelector(RestrictionWasAlreadyPresent.selector, owner)); + chainAdmin.addRestriction(owner); + vm.stopPrank(); + } + + function test_removeRestriction() public { + address[] memory restrictions = chainAdmin.getRestrictions(); + + vm.startPrank(address(chainAdmin)); + chainAdmin.addRestriction(owner); + + vm.expectEmit(true, false, false, true); + emit IChainAdmin.RestrictionRemoved(owner); + + chainAdmin.removeRestriction(owner); + vm.stopPrank(); + } + + function test_removeRestrictionRevert() public { + address[] memory restrictions = chainAdmin.getRestrictions(); + + vm.startPrank(address(chainAdmin)); + chainAdmin.addRestriction(owner); + chainAdmin.removeRestriction(owner); + + vm.expectRevert(abi.encodeWithSelector(RestrictionWasNotPresent.selector, owner)); + chainAdmin.removeRestriction(owner); + vm.stopPrank(); + } + + function test_setUpgradeTimestamp(uint256 semverMinorVersionMultiplier, uint256 timestamp) public { + (major, minor, patch) = gettersFacet.getSemverProtocolVersion(); + uint256 protocolVersion = packSemver(major, minor, patch + 1, semverMinorVersionMultiplier); + + vm.expectEmit(true, false, false, true); + emit IChainAdmin.UpdateUpgradeTimestamp(protocolVersion, timestamp); + + vm.prank(address(chainAdmin)); + chainAdmin.setUpgradeTimestamp(protocolVersion, timestamp); + } + + function test_multicallRevertNoCalls() public { + Call[] memory calls = new Call[](0); + + vm.expectRevert(NoCallsProvided.selector); + chainAdmin.multicall(calls, false); + } + + function test_multicallRevertFailedCall() public { + Call[] memory calls = new Call[](1); + calls[0] = Call({target: address(chainAdmin), value: 0, data: abi.encodeCall(gettersFacet.getAdmin, ())}); + + vm.expectRevert(); + vm.prank(owner); + chainAdmin.multicall(calls, true); + } + + function test_validateCallAccessToFunctionDenied(bytes32 role) public { + vm.assume(role != DEFAULT_ADMIN_ROLE); + + Call[] memory calls = new Call[](2); + calls[0] = Call({target: address(gettersFacet), value: 0, data: abi.encodeCall(gettersFacet.getAdmin, ())}); + calls[1] = Call({target: address(gettersFacet), value: 0, data: abi.encodeCall(gettersFacet.getVerifier, ())}); + + vm.prank(owner); + restriction.setRequiredRoleForCall(address(gettersFacet), gettersFacet.getAdmin.selector, role); + + vm.expectRevert( + abi.encodeWithSelector( + AccessToFunctionDenied.selector, + address(gettersFacet), + gettersFacet.getAdmin.selector, + owner + ) + ); + vm.prank(owner); + chainAdmin.multicall(calls, true); + } + + function test_validateCallAccessToFallbackDenied(bytes32 role) public { + vm.assume(role != DEFAULT_ADMIN_ROLE); + + Call[] memory calls = new Call[](2); + calls[0] = Call({target: address(gettersFacet), value: 0, data: ""}); + calls[1] = Call({target: address(gettersFacet), value: 0, data: abi.encodeCall(gettersFacet.getVerifier, ())}); + + vm.prank(owner); + restriction.setRequiredRoleForFallback(address(gettersFacet), role); + + vm.expectRevert(abi.encodeWithSelector(AccessToFallbackDenied.selector, address(gettersFacet), owner)); + vm.prank(owner); + chainAdmin.multicall(calls, true); + } + + function test_multicall() public { + Call[] memory calls = new Call[](2); + calls[0] = Call({target: address(gettersFacet), value: 0, data: abi.encodeCall(gettersFacet.getAdmin, ())}); + calls[1] = Call({target: address(gettersFacet), value: 0, data: abi.encodeCall(gettersFacet.getVerifier, ())}); + + vm.prank(owner); + chainAdmin.multicall(calls, true); + } + + function packSemver( + uint32 major, + uint32 minor, + uint32 patch, + uint256 semverMinorVersionMultiplier + ) public returns (uint256) { + if (major != 0) { + revert("Major version must be 0"); + } + + return minor * semverMinorVersionMultiplier + patch; + } +} diff --git a/l1-contracts/test/foundry/unit/concrete/Governance/Executing.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/Executing.t.sol similarity index 99% rename from l1-contracts/test/foundry/unit/concrete/Governance/Executing.t.sol rename to l1-contracts/test/foundry/unit/concrete/governance/Governance/Executing.t.sol index 9a1e5eeb2..09d6c0267 100644 --- a/l1-contracts/test/foundry/unit/concrete/Governance/Executing.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/Executing.t.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.24; import {StdStorage, stdStorage} from "forge-std/Test.sol"; -import {Utils} from "../Utils/Utils.sol"; +import {Utils} from "../../Utils/Utils.sol"; import {GovernanceTest} from "./_Governance_Shared.t.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/Governance/Fallback.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/Fallback.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Governance/Fallback.t.sol rename to l1-contracts/test/foundry/unit/concrete/governance/Governance/Fallback.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Governance/OperationStatus.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/OperationStatus.t.sol similarity index 99% rename from l1-contracts/test/foundry/unit/concrete/Governance/OperationStatus.t.sol rename to l1-contracts/test/foundry/unit/concrete/governance/Governance/OperationStatus.t.sol index 131bb6465..9b4ee36e9 100644 --- a/l1-contracts/test/foundry/unit/concrete/Governance/OperationStatus.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/OperationStatus.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import {Utils} from "../Utils/Utils.sol"; +import {Utils} from "../../Utils/Utils.sol"; import {GovernanceTest} from "./_Governance_Shared.t.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol new file mode 100644 index 000000000..0e9dc0bce --- /dev/null +++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol @@ -0,0 +1,209 @@ +pragma solidity 0.8.24; + +import "openzeppelin-contracts/contracts/utils/Strings.sol"; +import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; +import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; +import {StateTransitionManager} from "contracts/state-transition/StateTransitionManager.sol"; +import {DiamondInit} from "contracts/state-transition/chain-deps/DiamondInit.sol"; +import {PermanentRestriction} from "contracts/governance/PermanentRestriction.sol"; +import {IPermanentRestriction} from "contracts/governance/IPermanentRestriction.sol"; +import {ZeroAddress, ChainZeroAddress, NotAnAdmin, UnallowedImplementation, RemovingPermanentRestriction, CallNotAllowed} from "contracts/common/L1ContractErrors.sol"; +import {Call} from "contracts/governance/Common.sol"; +import {IZkSyncHyperchain} from "contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol"; +import {VerifierParams, FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; +import {IAdmin} from "contracts/state-transition/chain-interfaces/IAdmin.sol"; +import {AccessControlRestriction} from "contracts/governance/AccessControlRestriction.sol"; +import {ChainAdmin} from "contracts/governance/ChainAdmin.sol"; +import {IChainAdmin} from "contracts/governance/IChainAdmin.sol"; +import {StateTransitionManagerTest} from "test/foundry/unit/concrete/state-transition/StateTransitionManager/_StateTransitionManager_Shared.t.sol"; + +contract PermanentRestrictionTest is StateTransitionManagerTest { + ChainAdmin internal chainAdmin; + AccessControlRestriction internal restriction; + PermanentRestriction internal permRestriction; + + address internal owner; + address internal hyperchain; + + function setUp() public { + deploy(); + + createNewChainBridgehub(getDiamondCutData(address(diamondInit))); + + vm.stopPrank(); + + owner = makeAddr("owner"); + hyperchain = chainContractAddress.getHyperchain(chainId); + permRestriction = new PermanentRestriction(owner, bridgehub); + restriction = new AccessControlRestriction(0, owner); + address[] memory restrictions = new address[](1); + restrictions[0] = address(restriction); + chainAdmin = new ChainAdmin(restrictions); + } + + function test_ownerAsAddressZero() public { + vm.expectRevert(ZeroAddress.selector); + permRestriction = new PermanentRestriction(address(0), bridgehub); + } + + function test_allowAdminImplementation(bytes32 implementationHash) public { + vm.expectEmit(true, false, false, true); + emit IPermanentRestriction.AdminImplementationAllowed(implementationHash, true); + + vm.prank(owner); + permRestriction.allowAdminImplementation(implementationHash, true); + } + + function test_setAllowedData(bytes memory data) public { + vm.expectEmit(false, false, false, true); + emit IPermanentRestriction.AllowedDataChanged(data, true); + + vm.prank(owner); + permRestriction.setAllowedData(data, true); + } + + function test_setSelectorIsValidated(bytes4 selector) public { + vm.expectEmit(true, false, false, true); + emit IPermanentRestriction.SelectorValidationChanged(selector, true); + + vm.prank(owner); + permRestriction.setSelectorIsValidated(selector, true); + } + + function test_tryCompareAdminOfAChainIsAddressZero() public { + vm.expectRevert(ChainZeroAddress.selector); + permRestriction.tryCompareAdminOfAChain(address(0), owner); + } + + function test_tryCompareAdminOfAChainNotAHyperchain() public { + vm.expectRevert(); + permRestriction.tryCompareAdminOfAChain(makeAddr("random"), owner); + } + + function test_tryCompareAdminOfAChainNotAnAdmin() public { + vm.expectRevert(abi.encodeWithSelector(NotAnAdmin.selector, IZkSyncHyperchain(hyperchain).getAdmin(), owner)); + permRestriction.tryCompareAdminOfAChain(hyperchain, owner); + } + + function test_tryCompareAdminOfAChain() public { + permRestriction.tryCompareAdminOfAChain(hyperchain, newChainAdmin); + } + + function test_validateCallTooShortData() public { + Call memory call = Call({target: hyperchain, value: 0, data: ""}); + + vm.startPrank(newChainAdmin); + permRestriction.validateCall(call, owner); + vm.stopPrank(); + } + + function test_validateCallSetPendingAdminUnallowedImplementation() public { + Call memory call = Call({ + target: hyperchain, + value: 0, + data: abi.encodeWithSelector(IAdmin.setPendingAdmin.selector, owner) + }); + + vm.expectRevert(abi.encodeWithSelector(UnallowedImplementation.selector, owner.codehash)); + + vm.startPrank(newChainAdmin); + permRestriction.validateCall(call, owner); + vm.stopPrank(); + } + + function test_validateCallSetPendingAdminRemovingPermanentRestriction() public { + vm.prank(owner); + permRestriction.allowAdminImplementation(address(chainAdmin).codehash, true); + + Call memory call = Call({ + target: hyperchain, + value: 0, + data: abi.encodeWithSelector(IAdmin.setPendingAdmin.selector, address(chainAdmin)) + }); + + vm.expectRevert(RemovingPermanentRestriction.selector); + + vm.startPrank(newChainAdmin); + permRestriction.validateCall(call, owner); + vm.stopPrank(); + } + + function test_validateCallSetPendingAdmin() public { + vm.prank(owner); + permRestriction.allowAdminImplementation(address(chainAdmin).codehash, true); + + vm.prank(address(chainAdmin)); + chainAdmin.addRestriction(address(permRestriction)); + + Call memory call = Call({ + target: hyperchain, + value: 0, + data: abi.encodeWithSelector(IAdmin.setPendingAdmin.selector, address(chainAdmin)) + }); + + vm.startPrank(newChainAdmin); + permRestriction.validateCall(call, owner); + vm.stopPrank(); + } + + function test_validateCallNotValidatedSelector() public { + Call memory call = Call({ + target: hyperchain, + value: 0, + data: abi.encodeWithSelector(IAdmin.acceptAdmin.selector) + }); + + vm.startPrank(newChainAdmin); + permRestriction.validateCall(call, owner); + vm.stopPrank(); + } + + function test_validateCallCallNotAllowed() public { + vm.prank(owner); + permRestriction.setSelectorIsValidated(IAdmin.acceptAdmin.selector, true); + Call memory call = Call({ + target: hyperchain, + value: 0, + data: abi.encodeWithSelector(IAdmin.acceptAdmin.selector) + }); + + vm.expectRevert(abi.encodeWithSelector(CallNotAllowed.selector, call.data)); + + vm.startPrank(newChainAdmin); + permRestriction.validateCall(call, owner); + vm.stopPrank(); + } + + function test_validateCall() public { + vm.prank(owner); + permRestriction.setSelectorIsValidated(IAdmin.acceptAdmin.selector, true); + Call memory call = Call({ + target: hyperchain, + value: 0, + data: abi.encodeWithSelector(IAdmin.acceptAdmin.selector) + }); + + vm.prank(owner); + permRestriction.setAllowedData(call.data, true); + + vm.startPrank(newChainAdmin); + permRestriction.validateCall(call, owner); + vm.stopPrank(); + } + + function createNewChainBridgehub(Diamond.DiamondCutData memory _diamondCut) internal { + vm.stopPrank(); + vm.startPrank(address(0)); + bridgehub.addStateTransitionManager(address(chainContractAddress)); + bridgehub.addToken(baseToken); + bridgehub.setSharedBridge(sharedBridge); + bridgehub.createNewChain({ + _chainId: chainId, + _stateTransitionManager: address(chainContractAddress), + _baseToken: baseToken, + _salt: 0, + _admin: newChainAdmin, + _initData: abi.encode(_diamondCut) + }); + } +} diff --git a/l1-contracts/test/foundry/unit/concrete/Governance/Reentrancy.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/Reentrancy.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Governance/Reentrancy.t.sol rename to l1-contracts/test/foundry/unit/concrete/governance/Governance/Reentrancy.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Governance/SelfUpgrades.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/SelfUpgrades.t.sol similarity index 97% rename from l1-contracts/test/foundry/unit/concrete/Governance/SelfUpgrades.t.sol rename to l1-contracts/test/foundry/unit/concrete/governance/Governance/SelfUpgrades.t.sol index 04a909f57..a37acf150 100644 --- a/l1-contracts/test/foundry/unit/concrete/Governance/SelfUpgrades.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/SelfUpgrades.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import {Utils} from "../Utils/Utils.sol"; +import {Utils} from "../../Utils/Utils.sol"; import {GovernanceTest} from "./_Governance_Shared.t.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/Governance/_Governance_Shared.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/_Governance_Shared.t.sol similarity index 93% rename from l1-contracts/test/foundry/unit/concrete/Governance/_Governance_Shared.t.sol rename to l1-contracts/test/foundry/unit/concrete/governance/Governance/_Governance_Shared.t.sol index e7f499254..2a34bc2ff 100644 --- a/l1-contracts/test/foundry/unit/concrete/Governance/_Governance_Shared.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/_Governance_Shared.t.sol @@ -6,6 +6,7 @@ import {Test} from "forge-std/Test.sol"; import {Governance} from "contracts/governance/Governance.sol"; import {IGovernance} from "contracts/governance/IGovernance.sol"; +import {Call} from "contracts/governance/Common.sol"; import {EventOnFallback} from "contracts/dev-contracts/EventOnFallback.sol"; import {Forwarder} from "contracts/dev-contracts/Forwarder.sol"; import {RevertFallback} from "contracts/dev-contracts/RevertFallback.sol"; @@ -58,8 +59,8 @@ contract GovernanceTest is Test, EventOnFallback { uint256 _value, bytes memory _data ) internal pure returns (IGovernance.Operation memory) { - IGovernance.Call[] memory calls = new IGovernance.Call[](1); - calls[0] = IGovernance.Call({target: _target, value: _value, data: _data}); + Call[] memory calls = new Call[](1); + calls[0] = Call({target: _target, value: _value, data: _data}); return IGovernance.Operation({calls: calls, salt: bytes32(0), predecessor: bytes32(0)}); } diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/CreateNewChain.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/CreateNewChain.t.sol index ba69c6bd7..0598779a4 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/CreateNewChain.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/CreateNewChain.t.sol @@ -6,6 +6,10 @@ import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; import {Unauthorized, HashMismatch} from "contracts/common/L1ContractErrors.sol"; contract createNewChainTest is StateTransitionManagerTest { + function setUp() public { + deploy(); + } + function test_RevertWhen_InitialDiamondCutHashMismatch() public { Diamond.DiamondCutData memory initialDiamondCutData = getDiamondCutData(sharedBridge); Diamond.DiamondCutData memory correctDiamondCutData = getDiamondCutData(address(diamondInit)); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/FreezeChain.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/FreezeChain.t.sol index 1bf8c8a40..98dc2661e 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/FreezeChain.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/FreezeChain.t.sol @@ -7,6 +7,10 @@ import {IAdmin} from "contracts/state-transition/chain-interfaces/IAdmin.sol"; import {FacetIsFrozen} from "contracts/common/L1ContractErrors.sol"; contract freezeChainTest is StateTransitionManagerTest { + function setUp() public { + deploy(); + } + function test_FreezingChain() public { createNewChain(getDiamondCutData(diamondInit)); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/RevertBatches.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/RevertBatches.t.sol index 2113f3467..78aef87c3 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/RevertBatches.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/RevertBatches.t.sol @@ -26,6 +26,10 @@ contract revertBatchesTest is StateTransitionManagerTest { ExecutorFacet internal executorFacet; GettersFacet internal gettersFacet; + function setUp() public { + deploy(); + } + function test_SuccessfulBatchReverting() public { createNewChain(getDiamondCutData(diamondInit)); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetChainCreationParams.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetChainCreationParams.t.sol index 85fa1a316..eeee06beb 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetChainCreationParams.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetChainCreationParams.t.sol @@ -8,6 +8,10 @@ import {IExecutor} from "contracts/state-transition/chain-interfaces/IExecutor.s import {EMPTY_STRING_KECCAK, DEFAULT_L2_LOGS_TREE_ROOT_HASH} from "contracts/common/Config.sol"; contract SetChainCreationParamsTest is StateTransitionManagerTest { + function setUp() public { + deploy(); + } + function test_SettingInitialCutHash() public { bytes32 initialCutHash = keccak256(abi.encode(getDiamondCutData(address(diamondInit)))); address randomDiamondInit = address(0x303030303030303030303); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetNewVersionUpgrade.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetNewVersionUpgrade.t.sol index ced7e3f7d..ceac175df 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetNewVersionUpgrade.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetNewVersionUpgrade.t.sol @@ -5,6 +5,10 @@ import {StateTransitionManagerTest} from "./_StateTransitionManager_Shared.t.sol import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; contract setNewVersionUpgradeTest is StateTransitionManagerTest { + function setUp() public { + deploy(); + } + function test_SettingNewVersionUpgrade() public { assertEq(chainContractAddress.protocolVersion(), 0, "Initial protocol version is not correct"); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetUpgradeDiamondCut.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetUpgradeDiamondCut.t.sol index a71f35d2e..32d7614b5 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetUpgradeDiamondCut.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetUpgradeDiamondCut.t.sol @@ -5,6 +5,10 @@ import {StateTransitionManagerTest} from "./_StateTransitionManager_Shared.t.sol import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; contract setUpgradeDiamondCutTest is StateTransitionManagerTest { + function setUp() public { + deploy(); + } + function test_SettingUpgradeDiamondCut() public { assertEq(chainContractAddress.protocolVersion(), 0, "Initial protocol version is not correct"); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetValidatorTimelock.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetValidatorTimelock.t.sol index d290a8767..2741b3f72 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetValidatorTimelock.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetValidatorTimelock.t.sol @@ -4,6 +4,10 @@ pragma solidity 0.8.24; import {StateTransitionManagerTest} from "./_StateTransitionManager_Shared.t.sol"; contract setValidatorTimelockTest is StateTransitionManagerTest { + function setUp() public { + deploy(); + } + function test_SettingValidatorTimelock() public { assertEq( chainContractAddress.validatorTimelock(), diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/StateTransitionOwnerZero.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/StateTransitionOwnerZero.t.sol index d8fb6e187..8b0e0ce09 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/StateTransitionOwnerZero.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/StateTransitionOwnerZero.t.sol @@ -8,6 +8,10 @@ import {StateTransitionManagerInitializeData, ChainCreationParams} from "contrac import {ZeroAddress} from "contracts/common/L1ContractErrors.sol"; contract initializingSTMOwnerZeroTest is StateTransitionManagerTest { + function setUp() public { + deploy(); + } + function test_InitializingSTMWithGovernorZeroShouldRevert() public { ChainCreationParams memory chainCreationParams = ChainCreationParams({ genesisUpgrade: address(genesisUpgradeContract), diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/_StateTransitionManager_Shared.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/_StateTransitionManager_Shared.t.sol index 999336642..918cfa476 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/_StateTransitionManager_Shared.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/_StateTransitionManager_Shared.t.sol @@ -7,6 +7,7 @@ import {Test} from "forge-std/Test.sol"; import {TransparentUpgradeableProxy} from "@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol"; import {Utils} from "foundry-test/unit/concrete/Utils/Utils.sol"; +import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; import {UtilsFacet} from "foundry-test/unit/concrete/Utils/UtilsFacet.sol"; import {AdminFacet} from "contracts/state-transition/chain-deps/facets/Admin.sol"; import {ExecutorFacet} from "contracts/state-transition/chain-deps/facets/Executor.sol"; @@ -24,7 +25,7 @@ contract StateTransitionManagerTest is Test { StateTransitionManager internal stateTransitionManager; StateTransitionManager internal chainContractAddress; GenesisUpgrade internal genesisUpgradeContract; - address internal bridgehub; + Bridgehub internal bridgehub; address internal diamondInit; address internal constant governor = address(0x1010101); address internal constant admin = address(0x2020202); @@ -37,12 +38,12 @@ contract StateTransitionManagerTest is Test { Diamond.FacetCut[] internal facetCuts; - function setUp() public { - bridgehub = makeAddr("bridgehub"); + function deploy() public { + bridgehub = new Bridgehub(); newChainAdmin = makeAddr("chainadmin"); - vm.startPrank(bridgehub); - stateTransitionManager = new StateTransitionManager(bridgehub, type(uint256).max); + vm.startPrank(address(bridgehub)); + stateTransitionManager = new StateTransitionManager(address(bridgehub), type(uint256).max); diamondInit = address(new DiamondInit()); genesisUpgradeContract = new GenesisUpgrade(); @@ -129,7 +130,7 @@ contract StateTransitionManagerTest is Test { function createNewChain(Diamond.DiamondCutData memory _diamondCut) internal { vm.stopPrank(); - vm.startPrank(bridgehub); + vm.startPrank(address(bridgehub)); chainContractAddress.createNewChain({ _chainId: chainId, From 93ed4dc0e7dd99645744f25319781a66751a4c87 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Fri, 6 Sep 2024 11:03:36 +0200 Subject: [PATCH 26/53] fix l1 compile --- .../contracts/bridge/L1ERC20Bridge.sol | 44 +- .../contracts/bridge/L1SharedBridge.sol | 918 ------------------ .../governance/PermanentRestriction.sol | 8 +- .../PrepareZKChainRegistrationCalldata.s.sol | 4 +- .../Governance/PermanentRestriction.t.sol | 4 +- 5 files changed, 43 insertions(+), 935 deletions(-) delete mode 100644 l1-contracts/contracts/bridge/L1SharedBridge.sol diff --git a/l1-contracts/contracts/bridge/L1ERC20Bridge.sol b/l1-contracts/contracts/bridge/L1ERC20Bridge.sol index 98e52d411..bfe68882c 100644 --- a/l1-contracts/contracts/bridge/L1ERC20Bridge.sol +++ b/l1-contracts/contracts/bridge/L1ERC20Bridge.sol @@ -78,16 +78,42 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { /// @dev Initializes the reentrancy guard. Expected to be used in the proxy. function initialize() external reentrancyGuardInitializer {} - /*////////////////////////////////////////////////////////////// - ERA LEGACY GETTERS - //////////////////////////////////////////////////////////////*/ - - /// @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, "")); - bytes32 salt = bytes32(uint256(uint160(_l1Token))); + /// @dev Withdraw funds from the initiated deposit, that failed when finalizing on L2. + /// @param _depositSender The address of the deposit initiator + /// @param _l1Token The address of the deposited L1 ERC20 token + /// @param _l2TxHash The L2 transaction hash of the failed deposit finalization + /// @param _l2BatchNumber The L2 batch number where the deposit finalization was processed + /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message + /// @param _l2TxNumberInBatch The L2 transaction number in a batch, in which the log was sent + /// @param _merkleProof The Merkle proof of the processing L1 -> L2 transaction with deposit finalization + function claimFailedDeposit( + address _depositSender, + address _l1Token, + bytes32 _l2TxHash, + uint256 _l2BatchNumber, + uint256 _l2MessageIndex, + uint16 _l2TxNumberInBatch, + bytes32[] calldata _merkleProof + ) external nonReentrant { + uint256 amount = depositAmount[_depositSender][_l1Token][_l2TxHash]; + // empty deposit + if (amount == 0) { + revert EmptyDeposit(); + } + delete depositAmount[_depositSender][_l1Token][_l2TxHash]; - return L2ContractHelper.computeCreate2Address(l2Bridge, salt, l2TokenProxyBytecodeHash, constructorInputHash); + SHARED_BRIDGE.claimFailedDeposit({ + _chainId: ERA_CHAIN_ID, + _depositSender: _depositSender, + _l1Token: _l1Token, + _amount: amount, + _l2TxHash: _l2TxHash, + _l2BatchNumber: _l2BatchNumber, + _l2MessageIndex: _l2MessageIndex, + _l2TxNumberInBatch: _l2TxNumberInBatch, + _merkleProof: _merkleProof + }); + emit ClaimedFailedDeposit(_depositSender, _l1Token, amount); } /*////////////////////////////////////////////////////////////// diff --git a/l1-contracts/contracts/bridge/L1SharedBridge.sol b/l1-contracts/contracts/bridge/L1SharedBridge.sol deleted file mode 100644 index 56b621c18..000000000 --- a/l1-contracts/contracts/bridge/L1SharedBridge.sol +++ /dev/null @@ -1,918 +0,0 @@ -// SPDX-License-Identifier: MIT - -pragma solidity 0.8.24; - -import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/access/Ownable2StepUpgradeable.sol"; -import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/security/PausableUpgradeable.sol"; - -import {IERC20Metadata} from "@openzeppelin/contracts-v4/token/ERC20/extensions/IERC20Metadata.sol"; -import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; -import {SafeERC20} from "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol"; - -import {IL1ERC20Bridge} from "./interfaces/IL1ERC20Bridge.sol"; -import {IL1SharedBridge} from "./interfaces/IL1SharedBridge.sol"; -import {IL2Bridge} from "./interfaces/IL2Bridge.sol"; - -import {IMailbox} from "../state-transition/chain-interfaces/IMailbox.sol"; -import {L2Message, TxStatus} from "../common/Messaging.sol"; -import {UnsafeBytes} from "../common/libraries/UnsafeBytes.sol"; -import {ReentrancyGuard} from "../common/ReentrancyGuard.sol"; -import {AddressAliasHelper} from "../vendor/AddressAliasHelper.sol"; -import {ETH_TOKEN_ADDRESS, TWO_BRIDGES_MAGIC_VALUE} from "../common/Config.sol"; -import {IBridgehub, L2TransactionRequestTwoBridgesInner, L2TransactionRequestDirect} from "../bridgehub/IBridgehub.sol"; -import {IGetters} from "../state-transition/chain-interfaces/IGetters.sol"; -import {L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR} from "../common/L2ContractAddresses.sol"; -import {Unauthorized, ZeroAddress, SharedBridgeValueAlreadySet, SharedBridgeKey, NoFundsTransferred, ZeroBalance, ValueMismatch, TokensWithFeesNotSupported, NonEmptyMsgValue, L2BridgeNotSet, TokenNotSupported, DepositIncorrectAmount, EmptyDeposit, DepositExists, AddressAlreadyUsed, InvalidProof, DepositDoesNotExist, InsufficientChainBalance, SharedBridgeValueNotSet, WithdrawalAlreadyFinalized, WithdrawFailed, L2WithdrawalMessageWrongLength, InvalidSelector, SharedBridgeBalanceMismatch, SharedBridgeValueNotSet} from "../common/L1ContractErrors.sol"; - -/// @author Matter Labs -/// @custom:security-contact security@matterlabs.dev -/// @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, Ownable2StepUpgradeable, PausableUpgradeable { - using SafeERC20 for IERC20; - - /// @dev The address of the WETH token on L1. - address public immutable override L1_WETH_TOKEN; - - /// @dev Bridgehub smart contract that is used to operate with L2 via asynchronous L2 <-> L1 communication. - IBridgehub public immutable override BRIDGE_HUB; - - /// @dev Era's chainID - uint256 internal immutable ERA_CHAIN_ID; - - /// @dev The address of ZKsync Era diamond proxy contract. - address internal immutable ERA_DIAMOND_PROXY; - - /// @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. - uint256 internal eraPostDiamondUpgradeFirstBatch; - - /// @dev Stores the first batch number on the ZKsync Era Diamond Proxy that was settled after L1ERC20 Bridge upgrade. - /// This variable is used to differentiate between pre-upgrade and post-upgrade ERC20 withdrawals. Withdrawals from batches older - /// than this value are considered to have been finalized prior to the upgrade and handled separately. - uint256 internal eraPostLegacyBridgeUpgradeFirstBatch; - - /// @dev Stores the ZKsync Era batch number that processes the last deposit tx initiated by the legacy bridge - /// This variable (together with eraLegacyBridgeLastDepositTxNumber) is used to differentiate between pre-upgrade and post-upgrade deposits. Deposits processed in older batches - /// than this value are considered to have been processed prior to the upgrade and handled separately. - /// We use this both for Eth and erc20 token deposits, so we need to update the diamond and bridge simultaneously. - uint256 internal eraLegacyBridgeLastDepositBatch; - - /// @dev The tx number in the _eraLegacyBridgeLastDepositBatch of the last deposit tx initiated by the legacy bridge - /// This variable (together with eraLegacyBridgeLastDepositBatch) is used to differentiate between pre-upgrade and post-upgrade deposits. Deposits processed in older txs - /// than this value are considered to have been processed prior to the upgrade and handled separately. - /// We use this both for Eth and erc20 token deposits, so we need to update the diamond and bridge simultaneously. - uint256 internal eraLegacyBridgeLastDepositTxNumber; - - /// @dev Legacy bridge smart contract that used to hold ERC20 tokens. - IL1ERC20Bridge public override legacyBridge; - - /// @dev A mapping chainId => bridgeProxy. Used to store the bridge proxy's address, and to see if it has been deployed yet. - mapping(uint256 chainId => address l2Bridge) public override l2BridgeAddress; - - /// @dev A mapping chainId => L2 deposit transaction hash => keccak256(abi.encode(account, tokenAddress, amount)) - /// @dev Tracks deposit transactions from L2 to enable users to claim their funds if a deposit fails. - mapping(uint256 chainId => mapping(bytes32 l2DepositTxHash => bytes32 depositDataHash)) - public - override depositHappened; - - /// @dev Tracks the processing status of L2 to L1 messages, indicating whether a message has already been finalized. - mapping(uint256 chainId => mapping(uint256 l2BatchNumber => mapping(uint256 l2ToL1MessageNumber => bool isFinalized))) - public isWithdrawalFinalized; - - /// @dev Indicates whether the hyperbridging is enabled for a given chain. - // slither-disable-next-line uninitialized-state - mapping(uint256 chainId => bool enabled) internal hyperbridgingEnabled; - - /// @dev Maps token balances for each chain to prevent unauthorized spending across hyperchains. - /// This serves as a security measure until hyperbridging is implemented. - /// NOTE: this function may be removed in the future, don't rely on it! - mapping(uint256 chainId => mapping(address l1Token => uint256 balance)) public chainBalance; - - /// @notice Checks that the message sender is the bridgehub. - modifier onlyBridgehub() { - if (msg.sender != address(BRIDGE_HUB)) { - revert Unauthorized(msg.sender); - } - _; - } - - /// @notice Checks that the message sender is the bridgehub or ZKsync Era Diamond Proxy. - modifier onlyBridgehubOrEra(uint256 _chainId) { - if (msg.sender != address(BRIDGE_HUB) && (_chainId != ERA_CHAIN_ID || msg.sender != ERA_DIAMOND_PROXY)) { - revert Unauthorized(msg.sender); - } - _; - } - - /// @notice Checks that the message sender is the legacy bridge. - modifier onlyLegacyBridge() { - if (msg.sender != address(legacyBridge)) { - revert Unauthorized(msg.sender); - } - _; - } - - /// @notice Checks that the message sender is the shared bridge itself. - modifier onlySelf() { - if (msg.sender != address(this)) { - revert Unauthorized(msg.sender); - } - _; - } - - /// @dev Contract is expected to be used as proxy implementation. - /// @dev Initialize the implementation to prevent Parity hack. - constructor( - address _l1WethAddress, - IBridgehub _bridgehub, - uint256 _eraChainId, - address _eraDiamondProxy - ) reentrancyGuardInitializer { - _disableInitializers(); - L1_WETH_TOKEN = _l1WethAddress; - BRIDGE_HUB = _bridgehub; - ERA_CHAIN_ID = _eraChainId; - ERA_DIAMOND_PROXY = _eraDiamondProxy; - } - - /// @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) external reentrancyGuardInitializer initializer { - if (_owner == address(0)) { - revert ZeroAddress(); - } - _transferOwnership(_owner); - } - - /// @dev This sets the first post diamond upgrade batch for era, used to check old eth withdrawals - /// @param _eraPostDiamondUpgradeFirstBatch The first batch number on the ZKsync Era Diamond Proxy that was settled after diamond proxy upgrade. - function setEraPostDiamondUpgradeFirstBatch(uint256 _eraPostDiamondUpgradeFirstBatch) external onlyOwner { - if (eraPostDiamondUpgradeFirstBatch != 0) { - revert SharedBridgeValueAlreadySet(SharedBridgeKey.PostUpgradeFirstBatch); - } - eraPostDiamondUpgradeFirstBatch = _eraPostDiamondUpgradeFirstBatch; - } - - /// @dev This sets the first post upgrade batch for era, used to check old token withdrawals - /// @param _eraPostLegacyBridgeUpgradeFirstBatch The first batch number on the ZKsync Era Diamond Proxy that was settled after legacy bridge upgrade. - function setEraPostLegacyBridgeUpgradeFirstBatch(uint256 _eraPostLegacyBridgeUpgradeFirstBatch) external onlyOwner { - if (eraPostLegacyBridgeUpgradeFirstBatch != 0) { - revert SharedBridgeValueAlreadySet(SharedBridgeKey.LegacyBridgeFirstBatch); - } - eraPostLegacyBridgeUpgradeFirstBatch = _eraPostLegacyBridgeUpgradeFirstBatch; - } - - /// @dev This sets the first post upgrade batch for era, used to check old withdrawals - /// @param _eraLegacyBridgeLastDepositBatch The the ZKsync Era batch number that processes the last deposit tx initiated by the legacy bridge - /// @param _eraLegacyBridgeLastDepositTxNumber The tx number in the _eraLegacyBridgeLastDepositBatch of the last deposit tx initiated by the legacy bridge - function setEraLegacyBridgeLastDepositTime( - uint256 _eraLegacyBridgeLastDepositBatch, - uint256 _eraLegacyBridgeLastDepositTxNumber - ) external onlyOwner { - if (eraLegacyBridgeLastDepositBatch != 0) { - revert SharedBridgeValueAlreadySet(SharedBridgeKey.LegacyBridgeLastDepositBatch); - } - if (eraLegacyBridgeLastDepositTxNumber != 0) { - revert SharedBridgeValueAlreadySet(SharedBridgeKey.LegacyBridgeLastDepositTxn); - } - eraLegacyBridgeLastDepositBatch = _eraLegacyBridgeLastDepositBatch; - eraLegacyBridgeLastDepositTxNumber = _eraLegacyBridgeLastDepositTxNumber; - } - - /// @dev Transfer tokens from legacy erc20 bridge or mailbox and set chainBalance as part of migration process. - /// @param _token The address of token to be transferred (address(1) for ether and contract address for ERC20). - /// @param _target The hyperchain or bridge contract address from where to transfer funds. - /// @param _targetChainId The chain ID of the corresponding hyperchain. - function transferFundsFromLegacy(address _token, address _target, uint256 _targetChainId) external onlySelf { - if (_token == ETH_TOKEN_ADDRESS) { - uint256 balanceBefore = address(this).balance; - IMailbox(_target).transferEthToSharedBridge(); - uint256 balanceAfter = address(this).balance; - if (balanceAfter <= balanceBefore) { - revert NoFundsTransferred(); - } - chainBalance[_targetChainId][ETH_TOKEN_ADDRESS] = - chainBalance[_targetChainId][ETH_TOKEN_ADDRESS] + - balanceAfter - - balanceBefore; - } else { - uint256 balanceBefore = IERC20(_token).balanceOf(address(this)); - uint256 legacyBridgeBalance = IERC20(_token).balanceOf(address(legacyBridge)); - if (legacyBridgeBalance == 0) { - revert ZeroBalance(); - } - IL1ERC20Bridge(_target).transferTokenToSharedBridge(_token); - uint256 balanceAfter = IERC20(_token).balanceOf(address(this)); - if (balanceAfter - balanceBefore < legacyBridgeBalance) { - revert SharedBridgeBalanceMismatch(); - } - chainBalance[_targetChainId][_token] = chainBalance[_targetChainId][_token] + legacyBridgeBalance; - } - } - - /// @dev transfer tokens from legacy erc20 bridge or mailbox and set chainBalance as part of migration process. - /// @dev Unlike `transferFundsFromLegacy` is provides a concrete limit on the gas used for the transfer and even if it will fail, it will not revert the whole transaction. - function safeTransferFundsFromLegacy( - address _token, - address _target, - uint256 _targetChainId, - uint256 _gasPerToken - ) external onlyOwner { - try this.transferFundsFromLegacy{gas: _gasPerToken}(_token, _target, _targetChainId) {} catch { - // A reasonable amount of gas will be provided to transfer the token. - // If the transfer fails, we don't want to revert the whole transaction. - } - } - - /// @dev Accepts ether only from the hyperchain associated with the specified chain ID. - /// @param _chainId The chain ID corresponding to the hyperchain allowed to send ether. - function receiveEth(uint256 _chainId) external payable { - if (BRIDGE_HUB.getHyperchain(_chainId) != msg.sender) { - revert Unauthorized(msg.sender); - } - } - - /// @dev Initializes the l2Bridge address by governance for a specific chain. - function initializeChainGovernance(uint256 _chainId, address _l2BridgeAddress) external onlyOwner { - l2BridgeAddress[_chainId] = _l2BridgeAddress; - } - - /// @notice Allows bridgehub to acquire mintValue for L1->L2 transactions. - /// @dev If the corresponding L2 transaction fails, refunds are issued to a refund recipient on L2. - /// @param _chainId The chain ID of the hyperchain to which deposit. - /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. - /// @param _l1Token The L1 token address which is deposited. - /// @param _amount The total amount of tokens to be bridged. - function bridgehubDepositBaseToken( - uint256 _chainId, - address _prevMsgSender, - address _l1Token, - uint256 _amount - ) external payable virtual onlyBridgehubOrEra(_chainId) whenNotPaused { - if (_l1Token == ETH_TOKEN_ADDRESS) { - if (msg.value != _amount) { - revert ValueMismatch(_amount, msg.value); - } - } else { - // The Bridgehub also checks this, but we want to be sure - if (msg.value != 0) { - revert NonEmptyMsgValue(); - } - - uint256 amount = _depositFunds(_prevMsgSender, IERC20(_l1Token), _amount); // note if _prevMsgSender is this contract, this will return 0. This does not happen. - // The token has non-standard transfer logic - if (amount != _amount) { - revert TokensWithFeesNotSupported(); - } - } - - if (!hyperbridgingEnabled[_chainId]) { - chainBalance[_chainId][_l1Token] += _amount; - } - // Note that we don't save the deposited amount, as this is for the base token, which gets sent to the refundRecipient if the tx fails - emit BridgehubDepositBaseTokenInitiated(_chainId, _prevMsgSender, _l1Token, _amount); - } - - /// @dev Transfers tokens from the depositor address to the smart contract address. - /// @return The difference between the contract balance before and after the transferring of funds. - function _depositFunds(address _from, IERC20 _token, uint256 _amount) internal returns (uint256) { - uint256 balanceBefore = _token.balanceOf(address(this)); - // slither-disable-next-line arbitrary-send-erc20 - _token.safeTransferFrom(_from, address(this), _amount); - uint256 balanceAfter = _token.balanceOf(address(this)); - - return balanceAfter - balanceBefore; - } - - /// @notice Initiates a deposit transaction within Bridgehub, used by `requestL2TransactionTwoBridges`. - /// @param _chainId The chain ID of the hyperchain to which deposit. - /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. - /// @param _l2Value The L2 `msg.value` from the L1 -> L2 deposit transaction. - /// @param _data The calldata for the second bridge deposit. - function bridgehubDeposit( - uint256 _chainId, - address _prevMsgSender, - // solhint-disable-next-line no-unused-vars - uint256 _l2Value, - bytes calldata _data - ) - external - payable - override - onlyBridgehub - whenNotPaused - returns (L2TransactionRequestTwoBridgesInner memory request) - { - if (l2BridgeAddress[_chainId] == address(0)) { - revert L2BridgeNotSet(_chainId); - } - - (address _l1Token, uint256 _depositAmount, address _l2Receiver) = abi.decode( - _data, - (address, uint256, address) - ); - if (_l1Token == L1_WETH_TOKEN) { - revert TokenNotSupported(L1_WETH_TOKEN); - } - if (BRIDGE_HUB.baseToken(_chainId) == _l1Token) { - revert TokenNotSupported(_l1Token); - } - - uint256 amount; - if (_l1Token == ETH_TOKEN_ADDRESS) { - amount = msg.value; - if (_depositAmount != 0) { - revert DepositIncorrectAmount(0, _depositAmount); - } - } else { - if (msg.value != 0) { - revert NonEmptyMsgValue(); - } - amount = _depositAmount; - - uint256 depAmount = _depositFunds(_prevMsgSender, IERC20(_l1Token), _depositAmount); - // The token has non-standard transfer logic - if (depAmount != _depositAmount) { - revert DepositIncorrectAmount(depAmount, _depositAmount); - } - } - // empty deposit amount - if (amount == 0) { - revert EmptyDeposit(); - } - - bytes32 txDataHash = keccak256(abi.encode(_prevMsgSender, _l1Token, amount)); - if (!hyperbridgingEnabled[_chainId]) { - chainBalance[_chainId][_l1Token] += amount; - } - - { - // Request the finalization of the deposit on the L2 side - bytes memory l2TxCalldata = _getDepositL2Calldata(_prevMsgSender, _l2Receiver, _l1Token, amount); - - request = L2TransactionRequestTwoBridgesInner({ - magicValue: TWO_BRIDGES_MAGIC_VALUE, - l2Contract: l2BridgeAddress[_chainId], - l2Calldata: l2TxCalldata, - factoryDeps: new bytes[](0), - txDataHash: txDataHash - }); - } - emit BridgehubDepositInitiated({ - chainId: _chainId, - txDataHash: txDataHash, - from: _prevMsgSender, - to: _l2Receiver, - l1Token: _l1Token, - amount: amount - }); - } - - /// @notice Confirms the acceptance of a transaction by the Mailbox, as part of the L2 transaction process within Bridgehub. - /// This function is utilized by `requestL2TransactionTwoBridges` to validate the execution of a transaction. - /// @param _chainId The chain ID of the hyperchain to which confirm the deposit. - /// @param _txDataHash The keccak256 hash of abi.encode(msgSender, l1Token, amount) - /// @param _txHash The hash of the L1->L2 transaction to confirm the deposit. - function bridgehubConfirmL2Transaction( - uint256 _chainId, - bytes32 _txDataHash, - bytes32 _txHash - ) external override onlyBridgehub whenNotPaused { - if (depositHappened[_chainId][_txHash] != 0x00) { - revert DepositExists(); - } - depositHappened[_chainId][_txHash] = _txDataHash; - emit BridgehubDepositFinalized(_chainId, _txDataHash, _txHash); - } - - /// @dev Sets the L1ERC20Bridge contract address. Should be called only once. - function setL1Erc20Bridge(address _legacyBridge) external onlyOwner { - if (address(legacyBridge) != address(0)) { - revert AddressAlreadyUsed(address(legacyBridge)); - } - if (_legacyBridge == address(0)) { - revert ZeroAddress(); - } - legacyBridge = IL1ERC20Bridge(_legacyBridge); - } - - /// @dev Generate a calldata for calling the deposit finalization on the L2 bridge contract - function _getDepositL2Calldata( - address _l1Sender, - address _l2Receiver, - address _l1Token, - uint256 _amount - ) internal view returns (bytes memory) { - bytes memory gettersData = _getERC20Getters(_l1Token); - return abi.encodeCall(IL2Bridge.finalizeDeposit, (_l1Sender, _l2Receiver, _l1Token, _amount, gettersData)); - } - - /// @dev Receives and parses (name, symbol, decimals) from the token contract - function _getERC20Getters(address _token) internal view returns (bytes memory) { - if (_token == ETH_TOKEN_ADDRESS) { - bytes memory name = abi.encode("Ether"); - bytes memory symbol = abi.encode("ETH"); - bytes memory decimals = abi.encode(uint8(18)); - return abi.encode(name, symbol, decimals); // when depositing eth to a non-eth based chain it is an ERC20 - } - - (, bytes memory data1) = _token.staticcall(abi.encodeCall(IERC20Metadata.name, ())); - (, bytes memory data2) = _token.staticcall(abi.encodeCall(IERC20Metadata.symbol, ())); - (, bytes memory data3) = _token.staticcall(abi.encodeCall(IERC20Metadata.decimals, ())); - return abi.encode(data1, data2, data3); - } - - /// @dev Withdraw funds from the initiated deposit, that failed when finalizing on L2 - /// @param _depositSender The address of the deposit initiator - /// @param _l1Token The address of the deposited L1 ERC20 token - /// @param _amount The amount of the deposit that failed. - /// @param _l2TxHash The L2 transaction hash of the failed deposit finalization - /// @param _l2BatchNumber The L2 batch number where the deposit finalization was processed - /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message - /// @param _l2TxNumberInBatch The L2 transaction number in a batch, in which the log was sent - /// @param _merkleProof The Merkle proof of the processing L1 -> L2 transaction with deposit finalization - function claimFailedDeposit( - uint256 _chainId, - address _depositSender, - address _l1Token, - uint256 _amount, - bytes32 _l2TxHash, - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes32[] calldata _merkleProof - ) external override { - _claimFailedDeposit({ - _checkedInLegacyBridge: false, - _chainId: _chainId, - _depositSender: _depositSender, - _l1Token: _l1Token, - _amount: _amount, - _l2TxHash: _l2TxHash, - _l2BatchNumber: _l2BatchNumber, - _l2MessageIndex: _l2MessageIndex, - _l2TxNumberInBatch: _l2TxNumberInBatch, - _merkleProof: _merkleProof - }); - } - - /// @dev Processes claims of failed deposit, whether they originated from the legacy bridge or the current system. - function _claimFailedDeposit( - bool _checkedInLegacyBridge, - uint256 _chainId, - address _depositSender, - address _l1Token, - uint256 _amount, - bytes32 _l2TxHash, - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes32[] calldata _merkleProof - ) internal nonReentrant whenNotPaused { - { - bool proofValid = BRIDGE_HUB.proveL1ToL2TransactionStatus({ - _chainId: _chainId, - _l2TxHash: _l2TxHash, - _l2BatchNumber: _l2BatchNumber, - _l2MessageIndex: _l2MessageIndex, - _l2TxNumberInBatch: _l2TxNumberInBatch, - _merkleProof: _merkleProof, - _status: TxStatus.Failure - }); - if (!proofValid) { - revert InvalidProof(); - } - } - if (_amount == 0) { - revert NoFundsTransferred(); - } - - { - bool notCheckedInLegacyBridgeOrWeCanCheckDeposit; - { - // Deposits that happened before the upgrade cannot be checked here, they have to be claimed and checked in the legacyBridge - bool weCanCheckDepositHere = !_isEraLegacyDeposit(_chainId, _l2BatchNumber, _l2TxNumberInBatch); - // Double claims are not possible, as depositHappened is checked here for all except legacy deposits (which have to happen through the legacy bridge) - // Funds claimed before the update will still be recorded in the legacy bridge - // Note we double check NEW deposits if they are called from the legacy bridge - notCheckedInLegacyBridgeOrWeCanCheckDeposit = (!_checkedInLegacyBridge) || weCanCheckDepositHere; - } - if (notCheckedInLegacyBridgeOrWeCanCheckDeposit) { - bytes32 dataHash = depositHappened[_chainId][_l2TxHash]; - bytes32 txDataHash = keccak256(abi.encode(_depositSender, _l1Token, _amount)); - if (dataHash != txDataHash) { - revert DepositDoesNotExist(); - } - delete depositHappened[_chainId][_l2TxHash]; - } - } - - if (!hyperbridgingEnabled[_chainId]) { - // check that the chain has sufficient balance - if (chainBalance[_chainId][_l1Token] < _amount) { - revert InsufficientChainBalance(); - } - chainBalance[_chainId][_l1Token] -= _amount; - } - - // Withdraw funds - if (_l1Token == ETH_TOKEN_ADDRESS) { - bool callSuccess; - // Low-level assembly call, to avoid any memory copying (save gas) - assembly { - callSuccess := call(gas(), _depositSender, _amount, 0, 0, 0, 0) - } - if (!callSuccess) { - revert WithdrawFailed(); - } - } else { - IERC20(_l1Token).safeTransfer(_depositSender, _amount); - // Note we don't allow weth deposits anymore, but there might be legacy weth deposits. - // until we add Weth bridging capabilities, we don't wrap/unwrap weth to ether. - } - - emit ClaimedFailedDepositSharedBridge(_chainId, _depositSender, _l1Token, _amount); - } - - /// @dev Determines if an eth withdrawal was initiated on ZKsync Era before the upgrade to the Shared Bridge. - /// @param _chainId The chain ID of the transaction to check. - /// @param _l2BatchNumber The L2 batch number for the withdrawal. - /// @return Whether withdrawal was initiated on ZKsync Era before diamond proxy upgrade. - function _isEraLegacyEthWithdrawal(uint256 _chainId, uint256 _l2BatchNumber) internal view returns (bool) { - if ((_chainId == ERA_CHAIN_ID) && eraPostDiamondUpgradeFirstBatch == 0) { - revert SharedBridgeValueNotSet(SharedBridgeKey.PostUpgradeFirstBatch); - } - return (_chainId == ERA_CHAIN_ID) && (_l2BatchNumber < eraPostDiamondUpgradeFirstBatch); - } - - /// @dev Determines if a token withdrawal was initiated on ZKsync Era before the upgrade to the Shared Bridge. - /// @param _chainId The chain ID of the transaction to check. - /// @param _l2BatchNumber The L2 batch number for the withdrawal. - /// @return Whether withdrawal was initiated on ZKsync Era before Legacy Bridge upgrade. - function _isEraLegacyTokenWithdrawal(uint256 _chainId, uint256 _l2BatchNumber) internal view returns (bool) { - if ((_chainId == ERA_CHAIN_ID) && eraPostLegacyBridgeUpgradeFirstBatch == 0) { - revert SharedBridgeValueNotSet(SharedBridgeKey.LegacyBridgeFirstBatch); - } - return (_chainId == ERA_CHAIN_ID) && (_l2BatchNumber < eraPostLegacyBridgeUpgradeFirstBatch); - } - - /// @dev Determines if a deposit was initiated on ZKsync Era before the upgrade to the Shared Bridge. - /// @param _chainId The chain ID of the transaction to check. - /// @param _l2BatchNumber The L2 batch number for the deposit where it was processed. - /// @param _l2TxNumberInBatch The L2 transaction number in the batch, in which the deposit was processed. - /// @return Whether deposit was initiated on ZKsync Era before Shared Bridge upgrade. - function _isEraLegacyDeposit( - uint256 _chainId, - uint256 _l2BatchNumber, - uint256 _l2TxNumberInBatch - ) internal view returns (bool) { - if ((_chainId == ERA_CHAIN_ID) && (eraLegacyBridgeLastDepositBatch == 0)) { - revert SharedBridgeValueNotSet(SharedBridgeKey.LegacyBridgeLastDepositBatch); - } - return - (_chainId == ERA_CHAIN_ID) && - (_l2BatchNumber < eraLegacyBridgeLastDepositBatch || - (_l2TxNumberInBatch < eraLegacyBridgeLastDepositTxNumber && - _l2BatchNumber == eraLegacyBridgeLastDepositBatch)); - } - - /// @notice Finalize the withdrawal and release funds - /// @param _chainId The chain ID of the transaction to check - /// @param _l2BatchNumber The L2 batch number where the withdrawal was processed - /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message - /// @param _l2TxNumberInBatch The L2 transaction number in the batch, in which the log was sent - /// @param _message The L2 withdraw data, stored in an L2 -> L1 message - /// @param _merkleProof The Merkle proof of the inclusion L2 -> L1 message about withdrawal initialization - function finalizeWithdrawal( - uint256 _chainId, - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes calldata _message, - bytes32[] calldata _merkleProof - ) external override { - // To avoid rewithdrawing txs that have already happened on the legacy bridge. - // Note: new withdraws are all recorded here, so double withdrawing them is not possible. - if (_isEraLegacyTokenWithdrawal(_chainId, _l2BatchNumber)) { - if (legacyBridge.isWithdrawalFinalized(_l2BatchNumber, _l2MessageIndex)) { - revert WithdrawalAlreadyFinalized(); - } - } - _finalizeWithdrawal({ - _chainId: _chainId, - _l2BatchNumber: _l2BatchNumber, - _l2MessageIndex: _l2MessageIndex, - _l2TxNumberInBatch: _l2TxNumberInBatch, - _message: _message, - _merkleProof: _merkleProof - }); - } - - struct MessageParams { - uint256 l2BatchNumber; - uint256 l2MessageIndex; - uint16 l2TxNumberInBatch; - } - - /// @dev Internal function that handles the logic for finalizing withdrawals, - /// serving both the current bridge system and the legacy ERC20 bridge. - function _finalizeWithdrawal( - uint256 _chainId, - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes calldata _message, - bytes32[] calldata _merkleProof - ) internal nonReentrant whenNotPaused returns (address l1Receiver, address l1Token, uint256 amount) { - if (isWithdrawalFinalized[_chainId][_l2BatchNumber][_l2MessageIndex]) { - revert WithdrawalAlreadyFinalized(); - } - isWithdrawalFinalized[_chainId][_l2BatchNumber][_l2MessageIndex] = true; - - // Handling special case for withdrawal from ZKsync Era initiated before Shared Bridge. - if (_isEraLegacyEthWithdrawal(_chainId, _l2BatchNumber)) { - // Checks that the withdrawal wasn't finalized already. - bool alreadyFinalized = IGetters(ERA_DIAMOND_PROXY).isEthWithdrawalFinalized( - _l2BatchNumber, - _l2MessageIndex - ); - if (alreadyFinalized) { - revert WithdrawalAlreadyFinalized(); - } - } - - MessageParams memory messageParams = MessageParams({ - l2BatchNumber: _l2BatchNumber, - l2MessageIndex: _l2MessageIndex, - l2TxNumberInBatch: _l2TxNumberInBatch - }); - (l1Receiver, l1Token, amount) = _checkWithdrawal(_chainId, messageParams, _message, _merkleProof); - - if (!hyperbridgingEnabled[_chainId]) { - // Check that the chain has sufficient balance - if (chainBalance[_chainId][l1Token] < amount) { - // not enough funds - revert InsufficientChainBalance(); - } - chainBalance[_chainId][l1Token] -= amount; - } - - if (l1Token == ETH_TOKEN_ADDRESS) { - bool callSuccess; - // Low-level assembly call, to avoid any memory copying (save gas) - assembly { - callSuccess := call(gas(), l1Receiver, amount, 0, 0, 0, 0) - } - if (!callSuccess) { - revert WithdrawFailed(); - } - } else { - // Withdraw funds - IERC20(l1Token).safeTransfer(l1Receiver, amount); - } - emit WithdrawalFinalizedSharedBridge(_chainId, l1Receiver, l1Token, amount); - } - - /// @dev Verifies the validity of a withdrawal message from L2 and returns details of the withdrawal. - function _checkWithdrawal( - uint256 _chainId, - MessageParams memory _messageParams, - bytes calldata _message, - bytes32[] calldata _merkleProof - ) internal view returns (address l1Receiver, address l1Token, uint256 amount) { - (l1Receiver, l1Token, amount) = _parseL2WithdrawalMessage(_chainId, _message); - L2Message memory l2ToL1Message; - { - bool baseTokenWithdrawal = (l1Token == BRIDGE_HUB.baseToken(_chainId)); - address l2Sender = baseTokenWithdrawal ? L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR : l2BridgeAddress[_chainId]; - - l2ToL1Message = L2Message({ - txNumberInBatch: _messageParams.l2TxNumberInBatch, - sender: l2Sender, - data: _message - }); - } - - bool success = BRIDGE_HUB.proveL2MessageInclusion({ - _chainId: _chainId, - _batchNumber: _messageParams.l2BatchNumber, - _index: _messageParams.l2MessageIndex, - _message: l2ToL1Message, - _proof: _merkleProof - }); - // withdrawal wrong proof - if (!success) { - revert InvalidProof(); - } - } - - function _parseL2WithdrawalMessage( - uint256 _chainId, - bytes memory _l2ToL1message - ) internal view returns (address l1Receiver, address l1Token, uint256 amount) { - // We check that the message is long enough to read the data. - // Please note that there are two versions of the message: - // 1. The message that is sent by `withdraw(address _l1Receiver)` - // It should be equal to the length of the bytes4 function signature + address l1Receiver + uint256 amount = 4 + 20 + 32 = 56 (bytes). - // 2. The message that is sent by `withdrawWithMessage(address _l1Receiver, bytes calldata _additionalData)` - // It should be equal to the length of the following: - // bytes4 function signature + address l1Receiver + uint256 amount + address l2Sender + bytes _additionalData = - // = 4 + 20 + 32 + 32 + _additionalData.length >= 68 (bytes). - - // So the data is expected to be at least 56 bytes long. - // wrong message length - if (_l2ToL1message.length < 56) { - revert L2WithdrawalMessageWrongLength(_l2ToL1message.length); - } - - (uint32 functionSignature, uint256 offset) = UnsafeBytes.readUint32(_l2ToL1message, 0); - if (bytes4(functionSignature) == IMailbox.finalizeEthWithdrawal.selector) { - // this message is a base token withdrawal - (l1Receiver, offset) = UnsafeBytes.readAddress(_l2ToL1message, offset); - (amount, offset) = UnsafeBytes.readUint256(_l2ToL1message, offset); - l1Token = BRIDGE_HUB.baseToken(_chainId); - } else if (bytes4(functionSignature) == IL1ERC20Bridge.finalizeWithdrawal.selector) { - // We use the IL1ERC20Bridge for backward compatibility with old withdrawals. - - // this message is a token withdrawal - - // Check that the message length is correct. - // It should be equal to the length of the function signature + address + address + uint256 = 4 + 20 + 20 + 32 = - // 76 (bytes). - if (_l2ToL1message.length != 76) { - revert L2WithdrawalMessageWrongLength(_l2ToL1message.length); - } - (l1Receiver, offset) = UnsafeBytes.readAddress(_l2ToL1message, offset); - (l1Token, offset) = UnsafeBytes.readAddress(_l2ToL1message, offset); - (amount, offset) = UnsafeBytes.readUint256(_l2ToL1message, offset); - } else { - revert InvalidSelector(bytes4(functionSignature)); - } - } - - /*////////////////////////////////////////////////////////////// - ERA LEGACY FUNCTIONS - //////////////////////////////////////////////////////////////*/ - - /// @notice 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. - /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. - /// @param _l2Receiver The account address that should receive funds on L2 - /// @param _l1Token The L1 token address which is deposited - /// @param _amount The total amount of tokens to be bridged - /// @param _l2TxGasLimit The L2 gas limit to be used in the corresponding L2 transaction - /// @param _l2TxGasPerPubdataByte The gasPerPubdataByteLimit to be used in the corresponding L2 transaction - /// @param _refundRecipient The address on L2 that will receive the refund for the transaction. - /// @dev If the L2 deposit finalization transaction fails, the `_refundRecipient` will receive the `_l2Value`. - /// Please note, the contract may change the refund recipient's address to eliminate sending funds to addresses - /// out of control. - /// - If `_refundRecipient` is a contract on L1, the refund will be sent to the aliased `_refundRecipient`. - /// - If `_refundRecipient` is set to `address(0)` and the sender has NO deployed bytecode on L1, the refund will - /// be sent to the `msg.sender` address. - /// - If `_refundRecipient` is set to `address(0)` and the sender has deployed bytecode on L1, the refund will be - /// sent to the aliased `msg.sender` address. - /// @dev The address aliasing of L1 contracts as refund recipient on L2 is necessary to guarantee that the funds - /// are controllable through the Mailbox, since the Mailbox applies address aliasing to the from address for the - /// L2 tx if the L1 msg.sender is a contract. Without address aliasing for L1 contracts as refund recipients they - /// would not be able to make proper L2 tx requests through the Mailbox to use or withdraw the funds from L2, and - /// the funds would be lost. - /// @return l2TxHash The L2 transaction hash of deposit finalization. - function depositLegacyErc20Bridge( - address _prevMsgSender, - address _l2Receiver, - address _l1Token, - uint256 _amount, - uint256 _l2TxGasLimit, - uint256 _l2TxGasPerPubdataByte, - address _refundRecipient - ) external payable override onlyLegacyBridge nonReentrant whenNotPaused returns (bytes32 l2TxHash) { - if (l2BridgeAddress[ERA_CHAIN_ID] == address(0)) { - revert L2BridgeNotSet(ERA_CHAIN_ID); - } - if (_l1Token == L1_WETH_TOKEN) { - revert TokenNotSupported(L1_WETH_TOKEN); - } - - // Note that funds have been transferred to this contract in the legacy ERC20 bridge. - if (!hyperbridgingEnabled[ERA_CHAIN_ID]) { - chainBalance[ERA_CHAIN_ID][_l1Token] += _amount; - } - - bytes memory l2TxCalldata = _getDepositL2Calldata(_prevMsgSender, _l2Receiver, _l1Token, _amount); - - { - // If the refund recipient is not specified, the refund will be sent to the sender of the transaction. - // Otherwise, the refund will be sent to the specified address. - // If the recipient is a contract on L1, the address alias will be applied. - address refundRecipient = AddressAliasHelper.actualRefundRecipient(_refundRecipient, _prevMsgSender); - - L2TransactionRequestDirect memory request = L2TransactionRequestDirect({ - chainId: ERA_CHAIN_ID, - l2Contract: l2BridgeAddress[ERA_CHAIN_ID], - mintValue: msg.value, // l2 gas + l2 msg.Value the bridgehub will withdraw the mintValue from the base token bridge for gas - l2Value: 0, // L2 msg.value, this contract doesn't support base token deposits or wrapping functionality, for direct deposits use bridgehub - l2Calldata: l2TxCalldata, - l2GasLimit: _l2TxGasLimit, - l2GasPerPubdataByteLimit: _l2TxGasPerPubdataByte, - factoryDeps: new bytes[](0), - refundRecipient: refundRecipient - }); - l2TxHash = BRIDGE_HUB.requestL2TransactionDirect{value: msg.value}(request); - } - - bytes32 txDataHash = keccak256(abi.encode(_prevMsgSender, _l1Token, _amount)); - // Save the deposited amount to claim funds on L1 if the deposit failed on L2 - depositHappened[ERA_CHAIN_ID][l2TxHash] = txDataHash; - - emit LegacyDepositInitiated({ - chainId: ERA_CHAIN_ID, - l2DepositTxHash: l2TxHash, - from: _prevMsgSender, - to: _l2Receiver, - l1Token: _l1Token, - amount: _amount - }); - } - - /// @notice Finalizes the withdrawal for transactions initiated via the legacy ERC20 bridge. - /// @param _l2BatchNumber The L2 batch number where the withdrawal was processed - /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message - /// @param _l2TxNumberInBatch The L2 transaction number in the batch, in which the log was sent - /// @param _message The L2 withdraw data, stored in an L2 -> L1 message - /// @param _merkleProof The Merkle proof of the inclusion L2 -> L1 message about withdrawal initialization - /// - /// @return l1Receiver The address on L1 that will receive the withdrawn funds - /// @return l1Token The address of the L1 token being withdrawn - /// @return amount The amount of the token being withdrawn - function finalizeWithdrawalLegacyErc20Bridge( - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes calldata _message, - bytes32[] calldata _merkleProof - ) external override onlyLegacyBridge returns (address l1Receiver, address l1Token, uint256 amount) { - (l1Receiver, l1Token, amount) = _finalizeWithdrawal({ - _chainId: ERA_CHAIN_ID, - _l2BatchNumber: _l2BatchNumber, - _l2MessageIndex: _l2MessageIndex, - _l2TxNumberInBatch: _l2TxNumberInBatch, - _message: _message, - _merkleProof: _merkleProof - }); - } - - /// @notice Withdraw funds from the initiated deposit, that failed when finalizing on ZKsync Era chain. - /// This function is specifically designed for maintaining backward-compatibility with legacy `claimFailedDeposit` - /// method in `L1ERC20Bridge`. - /// - /// @param _depositSender The address of the deposit initiator - /// @param _l1Token The address of the deposited L1 ERC20 token - /// @param _amount The amount of the deposit that failed. - /// @param _l2TxHash The L2 transaction hash of the failed deposit finalization - /// @param _l2BatchNumber The L2 batch number where the deposit finalization was processed - /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message - /// @param _l2TxNumberInBatch The L2 transaction number in a batch, in which the log was sent - /// @param _merkleProof The Merkle proof of the processing L1 -> L2 transaction with deposit finalization - function claimFailedDepositLegacyErc20Bridge( - address _depositSender, - address _l1Token, - uint256 _amount, - bytes32 _l2TxHash, - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes32[] calldata _merkleProof - ) external override onlyLegacyBridge { - _claimFailedDeposit({ - _checkedInLegacyBridge: true, - _chainId: ERA_CHAIN_ID, - _depositSender: _depositSender, - _l1Token: _l1Token, - _amount: _amount, - _l2TxHash: _l2TxHash, - _l2BatchNumber: _l2BatchNumber, - _l2MessageIndex: _l2MessageIndex, - _l2TxNumberInBatch: _l2TxNumberInBatch, - _merkleProof: _merkleProof - }); - } - - /*////////////////////////////////////////////////////////////// - PAUSE - //////////////////////////////////////////////////////////////*/ - - /// @notice Pauses all functions marked with the `whenNotPaused` modifier. - function pause() external onlyOwner { - _pause(); - } - - /// @notice Unpauses the contract, allowing all functions marked with the `whenNotPaused` modifier to be called again. - function unpause() external onlyOwner { - _unpause(); - } -} diff --git a/l1-contracts/contracts/governance/PermanentRestriction.sol b/l1-contracts/contracts/governance/PermanentRestriction.sol index acf75a67f..d013a4de6 100644 --- a/l1-contracts/contracts/governance/PermanentRestriction.sol +++ b/l1-contracts/contracts/governance/PermanentRestriction.sol @@ -10,7 +10,7 @@ import {Call} from "./Common.sol"; import {IRestriction} from "./IRestriction.sol"; import {IChainAdmin} from "./IChainAdmin.sol"; import {IBridgehub} from "../bridgehub/IBridgehub.sol"; -import {IZkSyncHyperchain} from "../state-transition/chain-interfaces/IZkSyncHyperchain.sol"; +import {IZKChain} from "../state-transition/chain-interfaces/IZKChain.sol"; import {IAdmin} from "../state-transition/chain-interfaces/IAdmin.sol"; import {IPermanentRestriction} from "./IPermanentRestriction.sol"; @@ -172,13 +172,13 @@ contract PermanentRestriction is IRestriction, IPermanentRestriction, Ownable2St // - Query it for `chainId`. If it reverts, it is not a ZkSyncHyperchain. // - Query the Bridgehub for the Hyperchain with the given `chainId`. // - We compare the corresponding addresses - uint256 chainId = IZkSyncHyperchain(_chain).getChainId(); - if (BRIDGE_HUB.getHyperchain(chainId) != _chain) { + uint256 chainId = IZKChain(_chain).getChainId(); + if (BRIDGE_HUB.getZKChain(chainId) != _chain) { revert NotAHyperchain(_chain); } // Now, the chain is known to be a hyperchain, so it should implement the corresponding interface - address admin = IZkSyncHyperchain(_chain).getAdmin(); + address admin = IZKChain(_chain).getAdmin(); if (admin != _potentialAdmin) { revert NotAnAdmin(admin, _potentialAdmin); } diff --git a/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol index 427263091..8e49443b6 100644 --- a/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol +++ b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol @@ -10,7 +10,7 @@ import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; import {L2ContractHelper} from "contracts/common/libraries/L2ContractHelper.sol"; import {AddressAliasHelper} from "contracts/vendor/AddressAliasHelper.sol"; -import {L1SharedBridge} from "contracts/bridge/L1SharedBridge.sol"; +import {L1AssetRouter} from "contracts/bridge/L1AssetRouter.sol"; import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol"; import {IGovernance} from "contracts/governance/IGovernance.sol"; import {Utils} from "./Utils.sol"; @@ -288,7 +288,7 @@ contract PrepareZKChainRegistrationCalldataScript is Script { function prepareInitializeChainGovernanceCall( address l2SharedBridgeProxy ) internal view returns (IGovernance.Call memory) { - L1SharedBridge bridge = L1SharedBridge(ecosystem.l1SharedBridgeProxy); + L1AssetRouter bridge = L1AssetRouter(ecosystem.l1SharedBridgeProxy); bytes memory data = abi.encodeCall(bridge.initializeChainGovernance, (config.chainId, l2SharedBridgeProxy)); diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol index 0e9dc0bce..f7156edea 100644 --- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol @@ -9,7 +9,7 @@ import {PermanentRestriction} from "contracts/governance/PermanentRestriction.so import {IPermanentRestriction} from "contracts/governance/IPermanentRestriction.sol"; import {ZeroAddress, ChainZeroAddress, NotAnAdmin, UnallowedImplementation, RemovingPermanentRestriction, CallNotAllowed} from "contracts/common/L1ContractErrors.sol"; import {Call} from "contracts/governance/Common.sol"; -import {IZkSyncHyperchain} from "contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol"; +import {IZKChain} from "contracts/state-transition/chain-interfaces/IZKChain.sol"; import {VerifierParams, FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; import {IAdmin} from "contracts/state-transition/chain-interfaces/IAdmin.sol"; import {AccessControlRestriction} from "contracts/governance/AccessControlRestriction.sol"; @@ -81,7 +81,7 @@ contract PermanentRestrictionTest is StateTransitionManagerTest { } function test_tryCompareAdminOfAChainNotAnAdmin() public { - vm.expectRevert(abi.encodeWithSelector(NotAnAdmin.selector, IZkSyncHyperchain(hyperchain).getAdmin(), owner)); + vm.expectRevert(abi.encodeWithSelector(NotAnAdmin.selector, IZKChain(hyperchain).getAdmin(), owner)); permRestriction.tryCompareAdminOfAChain(hyperchain, owner); } From 265166b060201f0ee758c076696bdd2b122aeb7c Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Fri, 6 Sep 2024 11:54:56 +0200 Subject: [PATCH 27/53] fix l1 foundry tests --- .../PrepareZKChainRegistrationCalldata.s.sol | 3 +- .../script-out/output-deploy-l1.toml | 54 +++---- .../foundry/unit/concrete/Utils/Utils.sol | 5 +- .../Governance/PermanentRestriction.t.sol | 36 +++-- .../ChainTypeManager/Admin.t.sol | 4 + .../SetUpgradeDiamondCut.t.sol | 4 - .../SetValidatorTimelock.t.sol | 4 + .../_ChainTypeManager_Shared.t.sol | 19 ++- .../StateTransitionManager/FreezeChain.t.sol | 35 ---- .../RevertBatches.t.sol | 152 ------------------ .../SetValidatorTimelock.t.sol | 27 ---- 11 files changed, 76 insertions(+), 267 deletions(-) delete mode 100644 l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/FreezeChain.t.sol delete mode 100644 l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/RevertBatches.t.sol delete mode 100644 l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetValidatorTimelock.t.sol diff --git a/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol index 8e49443b6..f8a6b7955 100644 --- a/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol +++ b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol @@ -13,6 +13,7 @@ import {AddressAliasHelper} from "contracts/vendor/AddressAliasHelper.sol"; import {L1AssetRouter} from "contracts/bridge/L1AssetRouter.sol"; import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol"; import {IGovernance} from "contracts/governance/IGovernance.sol"; +import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; import {Utils} from "./Utils.sol"; /** @@ -181,7 +182,7 @@ contract PrepareZKChainRegistrationCalldataScript is Script { function prepareRegisterBaseTokenCall() internal view returns (IGovernance.Call memory) { Bridgehub bridgehub = Bridgehub(ecosystem.bridgehub); - bytes memory data = abi.encodeCall(bridgehub.addToken, (config.baseToken)); + bytes memory data = abi.encodeCall(bridgehub.addTokenAssetId, (DataEncoding.encodeNTVAssetId(block.chainid, config.baseToken))); return IGovernance.Call({target: ecosystem.bridgehub, value: 0, data: data}); } diff --git a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml index 5ac5b8e20..39bab32e2 100644 --- a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml +++ b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml @@ -2,13 +2,13 @@ create2_factory_addr = "0x4e59b44847b379578588920cA78FbF26c0B4956C" create2_factory_salt = "0x00000000000000000000000000000000000000000000000000000000000000ff" deployer_addr = "0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496" era_chain_id = 9 -force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002c00000000000000000000000000000000000000000000000000000000000000440183cae2353509404496db198b9265cd9d8c0b4e5a69d8cc1b2eef77c57e6c0f900000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9447bf69c0e623e1365f68b9682081c8aaf2005f3346a6bb9df35dc505c91cbbc00000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001542f9245b27fa8a082741b6727b86d24c07131b4afdfb66bba0b75c767bf668500000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9554b5e8820768894caf758e182b80205d2a55d217795c711cc044cf83539f66000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c8000000000000000000000000000000000000000000000000000000000000000007da51dee260bbb29987e8a67d8ca58b2aff94c59668c8afb9712f6ba92401ba00000000000000000000000000000000000000000000000000000000000100050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010002" +force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000000000000000000000000000000000000000044016be2c4df653dc16d4f32b0da783b6ffcb4b9f102604d126f3ce7927d739f36c00000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9447bf69c0e623e1365f68b9682081c8aaf2005f3346a6bb9df35dc505c91cbbc00000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001542f9245b27fa8a082741b6727b86d24c07131b4afdfb66bba0b75c767bf668500000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9554b5e8820768894caf758e182b80205d2a55d217795c711cc044cf83539f66000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000001fc36471c3e2b43168f0632490d41dc71e347fcc2b3068bbf03276e9dd6cbb5b00000000000000000000000000000000000000000000000000000000000100050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010002" l1_chain_id = 31337 -multicall3_addr = "0xd9c5dB4509ECD720deFD4c01bF0Fdb3D25B8d588" +multicall3_addr = "0x8104449AfB19B799b84A1355B866FcfB6a3482c9" owner_address = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" [contracts_config] -diamond_cut_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000001f2dde44835d8d2c25c67f0e7cbed212eda36a5d0000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc00000000000000000000000004efab4926387b85d484f51534f7b14a55a18efec00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000000000000000000000000000f13e03c68b33cc21d764bfc77729e1dc61249683000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000946ebad100000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000000000000000000000000000c5eb2654096be24394c93aa63119164f1cc12a2e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab7000000000000000000000000000000000000000000000000000000000000000000000000000000000872d718505336275b136b3ed69b5b79c8874e3b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c000000000000000000000000063c70c1f86a3e2c50463512da0263d9f83f53142000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" +diamond_cut_data = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000651bc2096869af5bf1fc577e597951657ede916b0000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc00000000000000000000000007cae28f41cb79cc7f841adce0af49c24f7dcdb5100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db865000000000000000000000000000000000000000000000000000000000000000000000000000000005b4d0d51c1adcfdc69fae6a0872acf9bdb0039fc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000946ebad100000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000000000000000000000000000007df73fcdc41ee1668fc2ff9737ec4da17c50e14f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab700000000000000000000000000000000000000000000000000000000000000000000000000000000830bba67e7aea3ef4c1657bbb0895986f1117c9a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000e1beb08050bdbe3efdd92ab8e9679129bc245cfe000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" diamond_init_batch_overhead_l1_gas = 1000000 diamond_init_max_l2_gas_per_batch = 80000000 diamond_init_max_pubdata_per_batch = 120000 @@ -23,34 +23,34 @@ recursion_node_level_vk_hash = "0x0000000000000000000000000000000000000000000000 [deployed_addresses] blob_versioned_hash_retriever_addr = "0xA4cB26d6933D2c3E76718D30de8547bCDF8dD241" -governance_addr = "0xEcE86B6ECf29f9FC8cF1932A18950721868dDb42" -native_token_vault_addr = "0xE7BFaD4A85038E39edDbbfe75bB7B3e02F5789dE" -transparent_proxy_admin_addr = "0xD718d5A27a29FF1cD22403426084bA0d479869a0" -validator_timelock_addr = "0x9B7fd85a490cd9C46Fe8a0B38ca893B2E7BAA2B6" +governance_addr = "0xa8b67e5b6057AB84a9Ce90bce823b878b784C879" +native_token_vault_addr = "0xC57952fa081Ba70555C265DA8ffdEc237618c223" +transparent_proxy_admin_addr = "0x4f559F30f5eB88D635FDe1548C4267DB8FaB0351" +validator_timelock_addr = "0xda258d9e22d6eF08EE1581F1Eb716f583AFb3423" [deployed_addresses.bridgehub] -bridgehub_implementation_addr = "0x6a2ee3713d6ac16bF92d3727C6319Ce08B16742C" -bridgehub_proxy_addr = "0x86f22fDEC0d5Ca51AaF97c8A17D23EF81dB4C1F5" -ctm_deployment_tracker_implementation_addr = "0x154E6189EcA43145ad48027d5931f698F2E2322a" -ctm_deployment_tracker_proxy_addr = "0xF18f5e901Ab70A87d6d4E36F20aAcf616b6AD2Ac" -message_root_implementation_addr = "0x35D5dc1375453ec021A9c69c2d98ddc92Ef98fc3" -message_root_proxy_addr = "0xDD8AD5a5D5Ad9716c4ebb348286d9C1aD24F1913" +bridgehub_implementation_addr = "0x67DE4c766899518ddE0f11443E4e40C4796f6498" +bridgehub_proxy_addr = "0xA939C53cB66E4F85f9A9D6f2E2A8712abDEfA25c" +ctm_deployment_tracker_implementation_addr = "0x1E1d045A215d46f2a4e2Da94C672232479DCa485" +ctm_deployment_tracker_proxy_addr = "0x118D2781A259EE14e37b876F4A5c0498912F9127" +message_root_implementation_addr = "0xbE1e2Ea6Ea4399B4F1Ec5a9718950312D600fb08" +message_root_proxy_addr = "0x10062969347aCC9B6dd8fB7c89De9B082aCf17CF" [deployed_addresses.bridges] -erc20_bridge_implementation_addr = "0x98Af24ee1aE1Af593D0Bea4C4E105a95e54a3396" -erc20_bridge_proxy_addr = "0xA944F9634241b8a5FA6Cd0a9f2Fd1a7E50c9C792" -shared_bridge_implementation_addr = "0x6EB98421e67696cf1357d453B95c5cC8eff71769" -shared_bridge_proxy_addr = "0x27632679E9416015d80A1D5543002F925C640181" +erc20_bridge_implementation_addr = "0x40021F838987715e71625e05eDB94f402f3d4786" +erc20_bridge_proxy_addr = "0x47bBC633dadbCEDE4DAf68751483F5c7C263a278" +shared_bridge_implementation_addr = "0xeB6C162983c4B8681316FB7d5b34D3fF9352Bb53" +shared_bridge_proxy_addr = "0xeD2507CFF9e5690CDb44d1Cd1949305Ca8b458b9" [deployed_addresses.state_transition] -admin_facet_addr = "0x4EFab4926387B85d484F51534F7b14a55A18EfeC" -default_upgrade_addr = "0x9a487Aa537c5AeF8a7DC5010fF04757Bb5c3DDdA" -diamond_init_addr = "0x1F2dDe44835D8D2C25c67F0E7cbEd212EDA36A5d" +admin_facet_addr = "0x7cAe28F41CB79CC7F841adCE0aF49c24F7DCDB51" +default_upgrade_addr = "0xb4E9746a837B35D1ddA4164Ec72452De644fB278" +diamond_init_addr = "0x651bC2096869af5bf1FC577e597951657edE916B" diamond_proxy_addr = "0x0000000000000000000000000000000000000000" -executor_facet_addr = "0x0872d718505336275b136B3ED69b5B79c8874E3b" -genesis_upgrade_addr = "0x748A21baCeAe6c5E8E6CaE16FbE0433581a8AA19" -getters_facet_addr = "0xF13E03C68b33cc21d764bfc77729e1dC61249683" -mailbox_facet_addr = "0xC5Eb2654096Be24394c93Aa63119164F1Cc12A2e" -state_transition_implementation_addr = "0x270Cf7b1D58582dB13604E2bBcAfbdf5456A638D" -state_transition_proxy_addr = "0xf189818B48847aC86964335e8880a9E586aA3062" -verifier_addr = "0x63C70C1F86a3E2c50463512DA0263D9F83F53142" +executor_facet_addr = "0x830BbA67e7aea3eF4c1657BBb0895986F1117c9A" +genesis_upgrade_addr = "0x00b65597C31CFe4476f7A1615052Ff8957a14fE0" +getters_facet_addr = "0x5B4d0d51c1aDcFdc69faE6a0872ACF9Bdb0039FC" +mailbox_facet_addr = "0x7DF73fcdC41EE1668FC2FF9737ec4da17C50e14f" +state_transition_implementation_addr = "0x65b859991966F0626Ee813cb0e877c6e6C47a8F8" +state_transition_proxy_addr = "0x1D22ED3CC52FF42a1DcD5579e08745C5216170b3" +verifier_addr = "0xe1Beb08050bdBE3EFdD92Ab8E9679129bC245cfE" diff --git a/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol b/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol index 33b9774bb..2cb954e9c 100644 --- a/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol +++ b/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol @@ -201,7 +201,7 @@ library Utils { } function getGettersSelectors() public pure returns (bytes4[] memory) { - bytes4[] memory selectors = new bytes4[](32); + bytes4[] memory selectors = new bytes4[](31); selectors[0] = GettersFacet.getVerifier.selector; selectors[1] = GettersFacet.getAdmin.selector; selectors[2] = GettersFacet.getPendingAdmin.selector; @@ -232,8 +232,7 @@ library Utils { selectors[27] = GettersFacet.getTotalBatchesExecuted.selector; selectors[28] = GettersFacet.getProtocolVersion.selector; selectors[29] = GettersFacet.getPriorityTreeRoot.selector; - selectors[30] = GettersFacet.getL2SystemContractsUpgradeTxHash.selector; - selectors[31] = GettersFacet.getChainId.selector; + selectors[30] = GettersFacet.getChainId.selector; return selectors; } diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol index f7156edea..22736e850 100644 --- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol @@ -3,21 +3,25 @@ pragma solidity 0.8.24; import "openzeppelin-contracts/contracts/utils/Strings.sol"; import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; -import {StateTransitionManager} from "contracts/state-transition/StateTransitionManager.sol"; +import {ChainTypeManager} from "contracts/state-transition/ChainTypeManager.sol"; import {DiamondInit} from "contracts/state-transition/chain-deps/DiamondInit.sol"; import {PermanentRestriction} from "contracts/governance/PermanentRestriction.sol"; import {IPermanentRestriction} from "contracts/governance/IPermanentRestriction.sol"; import {ZeroAddress, ChainZeroAddress, NotAnAdmin, UnallowedImplementation, RemovingPermanentRestriction, CallNotAllowed} from "contracts/common/L1ContractErrors.sol"; import {Call} from "contracts/governance/Common.sol"; import {IZKChain} from "contracts/state-transition/chain-interfaces/IZKChain.sol"; -import {VerifierParams, FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZkSyncHyperchainStorage.sol"; +import {VerifierParams, FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; import {IAdmin} from "contracts/state-transition/chain-interfaces/IAdmin.sol"; import {AccessControlRestriction} from "contracts/governance/AccessControlRestriction.sol"; import {ChainAdmin} from "contracts/governance/ChainAdmin.sol"; import {IChainAdmin} from "contracts/governance/IChainAdmin.sol"; -import {StateTransitionManagerTest} from "test/foundry/unit/concrete/state-transition/StateTransitionManager/_StateTransitionManager_Shared.t.sol"; +import {ChainTypeManagerTest} from "test/foundry/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol"; +import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; +import {ICTMDeploymentTracker} from "contracts/bridgehub/ICTMDeploymentTracker.sol"; +import {IMessageRoot} from "contracts/bridgehub/IMessageRoot.sol"; +import {MessageRoot} from "contracts/bridgehub/MessageRoot.sol"; -contract PermanentRestrictionTest is StateTransitionManagerTest { +contract PermanentRestrictionTest is ChainTypeManagerTest { ChainAdmin internal chainAdmin; AccessControlRestriction internal restriction; PermanentRestriction internal permRestriction; @@ -28,7 +32,7 @@ contract PermanentRestrictionTest is StateTransitionManagerTest { function setUp() public { deploy(); - createNewChainBridgehub(getDiamondCutData(address(diamondInit))); + createNewChainBridgehub(); vm.stopPrank(); @@ -191,19 +195,25 @@ contract PermanentRestrictionTest is StateTransitionManagerTest { vm.stopPrank(); } - function createNewChainBridgehub(Diamond.DiamondCutData memory _diamondCut) internal { + function createNewChainBridgehub() internal { + bytes[] memory factoryDeps = new bytes[](0); vm.stopPrank(); - vm.startPrank(address(0)); - bridgehub.addStateTransitionManager(address(chainContractAddress)); - bridgehub.addToken(baseToken); - bridgehub.setSharedBridge(sharedBridge); + vm.startPrank(governor); + bridgehub.addChainTypeManager(address(chainContractAddress)); + bridgehub.addTokenAssetId(DataEncoding.encodeNTVAssetId(block.chainid, baseToken)); + bridgehub.setAddresses( + sharedBridge, + ICTMDeploymentTracker(address(0)), + new MessageRoot(bridgehub) + ); bridgehub.createNewChain({ _chainId: chainId, - _stateTransitionManager: address(chainContractAddress), - _baseToken: baseToken, + _chainTypeManager: address(chainContractAddress), + _baseTokenAssetId: DataEncoding.encodeNTVAssetId(block.chainid, baseToken), _salt: 0, _admin: newChainAdmin, - _initData: abi.encode(_diamondCut) + _initData: getCTMInitData(), + _factoryDeps: factoryDeps }); } } diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/Admin.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/Admin.t.sol index 6c3c27b89..5194b1da5 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/Admin.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/Admin.t.sol @@ -5,6 +5,10 @@ import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.so import {ChainTypeManagerTest} from "./_ChainTypeManager_Shared.t.sol"; contract AdminTest is ChainTypeManagerTest { + function setUp() public { + deploy(); + } + function test_setPendingAdmin() public { address newAdmin = makeAddr("newAdmin"); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetUpgradeDiamondCut.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetUpgradeDiamondCut.t.sol index a20f76391..d5ca40d50 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetUpgradeDiamondCut.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetUpgradeDiamondCut.t.sol @@ -4,15 +4,11 @@ pragma solidity 0.8.24; import {ChainTypeManagerTest} from "./_ChainTypeManager_Shared.t.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; -<<<<<<< HEAD:l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetUpgradeDiamondCut.t.sol -contract setUpgradeDiamondCutTest is ChainTypeManagerTest { -======= contract setUpgradeDiamondCutTest is ChainTypeManagerTest { function setUp() public { deploy(); } ->>>>>>> dev:l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetUpgradeDiamondCut.t.sol function test_SettingUpgradeDiamondCut() public { assertEq(chainContractAddress.protocolVersion(), 0, "Initial protocol version is not correct"); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetValidatorTimelock.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetValidatorTimelock.t.sol index 790064aec..6838ce5f8 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetValidatorTimelock.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetValidatorTimelock.t.sol @@ -6,6 +6,10 @@ import {ChainTypeManagerTest} from "./_ChainTypeManager_Shared.t.sol"; import {Unauthorized} from "contracts/common/L1ContractErrors.sol"; contract setValidatorTimelockTest is ChainTypeManagerTest { + function setUp() public { + deploy(); + } + function test_SettingValidatorTimelock() public { assertEq( chainContractAddress.validatorTimelock(), diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol index 548d1ced2..b38105db9 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol @@ -36,16 +36,21 @@ contract ChainTypeManagerTest is Test { address internal constant sharedBridge = address(0x4040404); address internal constant validator = address(0x5050505); address internal newChainAdmin; - uint256 chainId = block.chainid; + uint256 chainId = 112; address internal testnetVerifier = address(new TestnetVerifier()); + bytes internal forceDeploymentsData = hex""; Diamond.FacetCut[] internal facetCuts; - function setUp() public { - bridgehub = new Bridgehub(); + function deploy() public { + bridgehub = new Bridgehub( + block.chainid, + governor, + type(uint256).max + ); newChainAdmin = makeAddr("chainadmin"); - vm.startPrank(bridgehub); + vm.startPrank(address(bridgehub)); chainTypeManager = new ChainTypeManager(address(IBridgehub(address(bridgehub)))); diamondInit = address(new DiamondInit()); genesisUpgradeContract = new GenesisUpgrade(); @@ -89,7 +94,7 @@ contract ChainTypeManagerTest is Test { genesisIndexRepeatedStorageChanges: 0x01, genesisBatchCommitment: bytes32(uint256(0x01)), diamondCut: getDiamondCutData(address(diamondInit)), - forceDeploymentsData: bytes("") + forceDeploymentsData: forceDeploymentsData }); ChainTypeManagerInitializeData memory ctmInitializeDataNoGovernor = ChainTypeManagerInitializeData({ @@ -132,6 +137,10 @@ contract ChainTypeManagerTest is Test { return Diamond.DiamondCutData({facetCuts: facetCuts, initAddress: _diamondInit, initCalldata: initCalldata}); } + function getCTMInitData() internal view returns (bytes memory) { + return abi.encode(abi.encode(getDiamondCutData(diamondInit)), forceDeploymentsData); + } + function createNewChain(Diamond.DiamondCutData memory _diamondCut) internal returns (address) { vm.stopPrank(); vm.startPrank(address(bridgehub)); diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/FreezeChain.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/FreezeChain.t.sol deleted file mode 100644 index 98dc2661e..000000000 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/FreezeChain.t.sol +++ /dev/null @@ -1,35 +0,0 @@ -// // SPDX-License-Identifier: MIT -pragma solidity 0.8.24; - -import {StateTransitionManagerTest} from "./_StateTransitionManager_Shared.t.sol"; -import {GettersFacet} from "contracts/state-transition/chain-deps/facets/Getters.sol"; -import {IAdmin} from "contracts/state-transition/chain-interfaces/IAdmin.sol"; -import {FacetIsFrozen} from "contracts/common/L1ContractErrors.sol"; - -contract freezeChainTest is StateTransitionManagerTest { - function setUp() public { - deploy(); - } - - function test_FreezingChain() public { - createNewChain(getDiamondCutData(diamondInit)); - - address newChainAddress = chainContractAddress.getHyperchain(chainId); - GettersFacet gettersFacet = GettersFacet(newChainAddress); - bool isChainFrozen = gettersFacet.isDiamondStorageFrozen(); - assertEq(isChainFrozen, false); - - vm.stopPrank(); - vm.startPrank(governor); - - chainContractAddress.freezeChain(block.chainid); - - // Repeated call should revert - vm.expectRevert(bytes("q1")); // storage frozen - chainContractAddress.freezeChain(block.chainid); - - // Call fails as storage is frozen - vm.expectRevert(bytes("q1")); - isChainFrozen = gettersFacet.isDiamondStorageFrozen(); - } -} diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/RevertBatches.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/RevertBatches.t.sol deleted file mode 100644 index 78aef87c3..000000000 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/RevertBatches.t.sol +++ /dev/null @@ -1,152 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity 0.8.24; - -import {Vm} from "forge-std/Test.sol"; - -import {Utils, L2_SYSTEM_CONTEXT_ADDRESS} from "../../Utils/Utils.sol"; -import {StateTransitionManagerTest} from "./_StateTransitionManager_Shared.t.sol"; - -import {COMMIT_TIMESTAMP_NOT_OLDER, DEFAULT_L2_LOGS_TREE_ROOT_HASH, EMPTY_STRING_KECCAK} from "contracts/common/Config.sol"; -import {IExecutor, SystemLogKey} from "contracts/state-transition/chain-interfaces/IExecutor.sol"; -import {GettersFacet} from "contracts/state-transition/chain-deps/facets/Getters.sol"; -import {AdminFacet} from "contracts/state-transition/chain-deps/facets/Admin.sol"; -import {ExecutorFacet} from "contracts/state-transition/chain-deps/facets/Executor.sol"; -import {IExecutor} from "contracts/state-transition/chain-interfaces/IExecutor.sol"; - -contract revertBatchesTest is StateTransitionManagerTest { - // Items for logs & commits - uint256 internal currentTimestamp; - IExecutor.CommitBatchInfo internal newCommitBatchInfo; - IExecutor.StoredBatchInfo internal newStoredBatchInfo; - IExecutor.StoredBatchInfo internal genesisStoredBatchInfo; - IExecutor.ProofInput internal proofInput; - - // Facets exposing the diamond - AdminFacet internal adminFacet; - ExecutorFacet internal executorFacet; - GettersFacet internal gettersFacet; - - function setUp() public { - deploy(); - } - - function test_SuccessfulBatchReverting() public { - createNewChain(getDiamondCutData(diamondInit)); - - address newChainAddress = chainContractAddress.getHyperchain(chainId); - - executorFacet = ExecutorFacet(address(newChainAddress)); - gettersFacet = GettersFacet(address(newChainAddress)); - adminFacet = AdminFacet(address(newChainAddress)); - - // Initial setup for logs & commits - vm.stopPrank(); - vm.startPrank(newChainAdmin); - - genesisStoredBatchInfo = IExecutor.StoredBatchInfo({ - batchNumber: 0, - batchHash: bytes32(uint256(0x01)), - indexRepeatedStorageChanges: 1, - numberOfLayer1Txs: 0, - priorityOperationsHash: EMPTY_STRING_KECCAK, - l2LogsTreeRoot: DEFAULT_L2_LOGS_TREE_ROOT_HASH, - timestamp: 0, - commitment: bytes32(uint256(0x01)) - }); - - adminFacet.setTokenMultiplier(1, 1); - - uint256[] memory recursiveAggregationInput; - uint256[] memory serializedProof; - proofInput = IExecutor.ProofInput(recursiveAggregationInput, serializedProof); - - // foundry's default value is 1 for the block's timestamp, it is expected - // that block.timestamp > COMMIT_TIMESTAMP_NOT_OLDER + 1 - vm.warp(COMMIT_TIMESTAMP_NOT_OLDER + 1 + 1); - currentTimestamp = block.timestamp; - - bytes memory l2Logs = Utils.encodePacked(Utils.createSystemLogs()); - newCommitBatchInfo = IExecutor.CommitBatchInfo({ - batchNumber: 1, - timestamp: uint64(currentTimestamp), - indexRepeatedStorageChanges: 1, - newStateRoot: Utils.randomBytes32("newStateRoot"), - numberOfLayer1Txs: 0, - priorityOperationsHash: keccak256(""), - bootloaderHeapInitialContentsHash: Utils.randomBytes32("bootloaderHeapInitialContentsHash"), - eventsQueueStateHash: Utils.randomBytes32("eventsQueueStateHash"), - systemLogs: l2Logs, - pubdataCommitments: "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00" - }); - - // Commit & prove batches - vm.warp(COMMIT_TIMESTAMP_NOT_OLDER + 1); - currentTimestamp = block.timestamp; - - bytes32 expectedSystemContractUpgradeTxHash = gettersFacet.getL2SystemContractsUpgradeTxHash(); - bytes[] memory correctL2Logs = Utils.createSystemLogsWithUpgradeTransaction( - expectedSystemContractUpgradeTxHash - ); - - correctL2Logs[uint256(uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY))] = Utils.constructL2Log( - true, - L2_SYSTEM_CONTEXT_ADDRESS, - uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY), - Utils.packBatchTimestampAndBlockTimestamp(currentTimestamp, currentTimestamp) - ); - - correctL2Logs[uint256(uint256(SystemLogKey.PREV_BATCH_HASH_KEY))] = Utils.constructL2Log( - true, - L2_SYSTEM_CONTEXT_ADDRESS, - uint256(SystemLogKey.PREV_BATCH_HASH_KEY), - bytes32(uint256(0x01)) - ); - - l2Logs = Utils.encodePacked(correctL2Logs); - newCommitBatchInfo.timestamp = uint64(currentTimestamp); - newCommitBatchInfo.systemLogs = l2Logs; - - IExecutor.CommitBatchInfo[] memory commitBatchInfoArray = new IExecutor.CommitBatchInfo[](1); - commitBatchInfoArray[0] = newCommitBatchInfo; - - vm.stopPrank(); - vm.startPrank(validator); - vm.recordLogs(); - executorFacet.commitBatches(genesisStoredBatchInfo, commitBatchInfoArray); - Vm.Log[] memory entries = vm.getRecordedLogs(); - - newStoredBatchInfo = IExecutor.StoredBatchInfo({ - batchNumber: 1, - batchHash: entries[0].topics[2], - indexRepeatedStorageChanges: 1, - numberOfLayer1Txs: 0, - priorityOperationsHash: keccak256(""), - l2LogsTreeRoot: 0, - timestamp: currentTimestamp, - commitment: entries[0].topics[3] - }); - - IExecutor.StoredBatchInfo[] memory storedBatchInfoArray = new IExecutor.StoredBatchInfo[](1); - storedBatchInfoArray[0] = newStoredBatchInfo; - - executorFacet.proveBatches(genesisStoredBatchInfo, storedBatchInfoArray, proofInput); - - // Test batch revert triggered from STM - vm.stopPrank(); - vm.startPrank(governor); - - uint256 totalBlocksCommittedBefore = gettersFacet.getTotalBlocksCommitted(); - assertEq(totalBlocksCommittedBefore, 1, "totalBlocksCommittedBefore"); - - uint256 totalBlocksVerifiedBefore = gettersFacet.getTotalBlocksVerified(); - assertEq(totalBlocksVerifiedBefore, 1, "totalBlocksVerifiedBefore"); - - chainContractAddress.revertBatches(chainId, 0); - - uint256 totalBlocksCommitted = gettersFacet.getTotalBlocksCommitted(); - assertEq(totalBlocksCommitted, 0, "totalBlocksCommitted"); - - uint256 totalBlocksVerified = gettersFacet.getTotalBlocksVerified(); - assertEq(totalBlocksVerified, 0, "totalBlocksVerified"); - } -} diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetValidatorTimelock.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetValidatorTimelock.t.sol deleted file mode 100644 index 2741b3f72..000000000 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/StateTransitionManager/SetValidatorTimelock.t.sol +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity 0.8.24; - -import {StateTransitionManagerTest} from "./_StateTransitionManager_Shared.t.sol"; - -contract setValidatorTimelockTest is StateTransitionManagerTest { - function setUp() public { - deploy(); - } - - function test_SettingValidatorTimelock() public { - assertEq( - chainContractAddress.validatorTimelock(), - validator, - "Initial validator timelock address is not correct" - ); - - address newValidatorTimelock = address(0x0000000000000000000000000000000000004235); - chainContractAddress.setValidatorTimelock(newValidatorTimelock); - - assertEq( - chainContractAddress.validatorTimelock(), - newValidatorTimelock, - "Validator timelock update was not successful" - ); - } -} From 1a23102771a3727e262075d98f9c4c41bd7a9156 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Fri, 6 Sep 2024 11:58:59 +0200 Subject: [PATCH 28/53] fix l2 compile --- l1-contracts/scripts/display-governance.ts | 2 +- l1-contracts/scripts/migrate-governance.ts | 2 +- .../dev-contracts/DevL2SharedBridge.sol | 33 ------------------- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 l2-contracts/contracts/dev-contracts/DevL2SharedBridge.sol diff --git a/l1-contracts/scripts/display-governance.ts b/l1-contracts/scripts/display-governance.ts index 0593d580e..4b6741386 100644 --- a/l1-contracts/scripts/display-governance.ts +++ b/l1-contracts/scripts/display-governance.ts @@ -13,7 +13,7 @@ import { UpgradeableBeaconFactory } from "../../l2-contracts/typechain/Upgradeab import { Provider } from "zksync-ethers"; const l2SharedBridgeABI = JSON.parse( - fs.readFileSync("../zksync/artifacts-zk/contracts/bridge/L2SharedBridge.sol/L2SharedBridge.json").toString() + fs.readFileSync("../zksync/artifacts-zk/contracts/bridge/L2AssetRouter.sol/L2SharedBridge.json").toString() ).abi; async function getERC20BeaconAddress(l2SharedBridgeAddress: string) { diff --git a/l1-contracts/scripts/migrate-governance.ts b/l1-contracts/scripts/migrate-governance.ts index f8f44a8b6..0c04a79c5 100644 --- a/l1-contracts/scripts/migrate-governance.ts +++ b/l1-contracts/scripts/migrate-governance.ts @@ -23,7 +23,7 @@ const priorityTxMaxGasLimit = BigNumber.from(getNumberFromEnv("CONTRACTS_PRIORIT const l2SharedBridgeABI = JSON.parse( fs - .readFileSync("../l2-contracts/artifacts-zk/contracts-preprocessed/bridge/L2SharedBridge.sol/L2SharedBridge.json") + .readFileSync("../l2-contracts/artifacts-zk/contracts-preprocessed/bridge/L2AssetRouter.sol/L2SharedBridge.json") .toString() ).abi; diff --git a/l2-contracts/contracts/dev-contracts/DevL2SharedBridge.sol b/l2-contracts/contracts/dev-contracts/DevL2SharedBridge.sol deleted file mode 100644 index e93d5c987..000000000 --- a/l2-contracts/contracts/dev-contracts/DevL2SharedBridge.sol +++ /dev/null @@ -1,33 +0,0 @@ -// SPDX-License-Identifier: MIT - -pragma solidity 0.8.24; - -import {L2SharedBridge} from "../bridge/L2SharedBridge.sol"; -import {L2StandardERC20} from "../bridge/L2StandardERC20.sol"; -import {UpgradeableBeacon} from "@openzeppelin/contracts-v4/proxy/beacon/UpgradeableBeacon.sol"; - -/// @author Matter Labs -/// @notice The implementation of the shared bridge that allows setting legacy bridge. Must only be used in local testing environments. -contract DevL2SharedBridge is L2SharedBridge { - constructor(uint256 _eraChainId) L2SharedBridge(_eraChainId) {} - - function initializeDevBridge( - address _l1SharedBridge, - address _l1Bridge, - bytes32 _l2TokenProxyBytecodeHash, - address _aliasedOwner - ) external reinitializer(2) { - l1SharedBridge = _l1SharedBridge; - - address l2StandardToken = address(new L2StandardERC20{salt: bytes32(0)}()); - l2TokenBeacon = new UpgradeableBeacon{salt: bytes32(0)}(l2StandardToken); - l2TokenProxyBytecodeHash = _l2TokenProxyBytecodeHash; - l2TokenBeacon.transferOwnership(_aliasedOwner); - - // Unfortunately the `l1Bridge` is not an internal variable in the parent contract. - // To keep the changes to the production code minimal, we'll just manually set the variable here. - assembly { - sstore(4, _l1Bridge) - } - } -} From bd438c5eb7d69da0d9d5701c369bd9b7cb8c1871 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Fri, 6 Sep 2024 12:09:31 +0200 Subject: [PATCH 29/53] fix lint --- .../deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol | 5 ++++- .../governance/Governance/PermanentRestriction.t.sol | 6 +----- .../ChainTypeManager/SetValidatorTimelock.t.sol | 2 +- .../ChainTypeManager/_ChainTypeManager_Shared.t.sol | 6 +----- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol index f8a6b7955..618ee3c64 100644 --- a/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol +++ b/l1-contracts/deploy-scripts/PrepareZKChainRegistrationCalldata.s.sol @@ -182,7 +182,10 @@ contract PrepareZKChainRegistrationCalldataScript is Script { function prepareRegisterBaseTokenCall() internal view returns (IGovernance.Call memory) { Bridgehub bridgehub = Bridgehub(ecosystem.bridgehub); - bytes memory data = abi.encodeCall(bridgehub.addTokenAssetId, (DataEncoding.encodeNTVAssetId(block.chainid, config.baseToken))); + bytes memory data = abi.encodeCall( + bridgehub.addTokenAssetId, + (DataEncoding.encodeNTVAssetId(block.chainid, config.baseToken)) + ); return IGovernance.Call({target: ecosystem.bridgehub, value: 0, data: data}); } diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol index 22736e850..e0ace79eb 100644 --- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol @@ -201,11 +201,7 @@ contract PermanentRestrictionTest is ChainTypeManagerTest { vm.startPrank(governor); bridgehub.addChainTypeManager(address(chainContractAddress)); bridgehub.addTokenAssetId(DataEncoding.encodeNTVAssetId(block.chainid, baseToken)); - bridgehub.setAddresses( - sharedBridge, - ICTMDeploymentTracker(address(0)), - new MessageRoot(bridgehub) - ); + bridgehub.setAddresses(sharedBridge, ICTMDeploymentTracker(address(0)), new MessageRoot(bridgehub)); bridgehub.createNewChain({ _chainId: chainId, _chainTypeManager: address(chainContractAddress), diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetValidatorTimelock.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetValidatorTimelock.t.sol index 6838ce5f8..cbe0f1c6d 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetValidatorTimelock.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetValidatorTimelock.t.sol @@ -9,7 +9,7 @@ contract setValidatorTimelockTest is ChainTypeManagerTest { function setUp() public { deploy(); } - + function test_SettingValidatorTimelock() public { assertEq( chainContractAddress.validatorTimelock(), diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol index b38105db9..90cc6efc0 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol @@ -43,11 +43,7 @@ contract ChainTypeManagerTest is Test { Diamond.FacetCut[] internal facetCuts; function deploy() public { - bridgehub = new Bridgehub( - block.chainid, - governor, - type(uint256).max - ); + bridgehub = new Bridgehub(block.chainid, governor, type(uint256).max); newChainAdmin = makeAddr("chainadmin"); vm.startPrank(address(bridgehub)); From 99e9a0a32a290427bc72d71dd569596e787d7ff7 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Fri, 6 Sep 2024 12:43:29 +0200 Subject: [PATCH 30/53] hopefully fix ci --- .../governance/Governance/AccessControlRestriction.t.sol | 2 +- .../unit/concrete/governance/Governance/ChainAdmin.t.sol | 2 +- .../concrete/governance/Governance/PermanentRestriction.t.sol | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol index e5b45975f..f2f1b645e 100644 --- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.24; import {Test} from "forge-std/Test.sol"; -import "openzeppelin-contracts/contracts/utils/Strings.sol"; +import "openzeppelin-contracts/contracts-v4/utils/Strings.sol"; import "forge-std/console.sol"; import {IChainAdmin} from "contracts/governance/IChainAdmin.sol"; import {ChainAdmin} from "contracts/governance/ChainAdmin.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol index 01a3c7dfd..1c0f929d1 100644 --- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.24; import {Test} from "forge-std/Test.sol"; -import "openzeppelin-contracts/contracts/utils/Strings.sol"; +import "openzeppelin-contracts/contracts-v4/utils/Strings.sol"; import {AccessControlRestriction} from "contracts/governance/AccessControlRestriction.sol"; import {IChainAdmin} from "contracts/governance/IChainAdmin.sol"; import {ChainAdmin} from "contracts/governance/ChainAdmin.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol index e0ace79eb..de9c6611b 100644 --- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol @@ -1,6 +1,6 @@ pragma solidity 0.8.24; -import "openzeppelin-contracts/contracts/utils/Strings.sol"; +import "openzeppelin-contracts/contracts-v4/utils/Strings.sol"; import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; import {ChainTypeManager} from "contracts/state-transition/ChainTypeManager.sol"; From 29294831484691405c1dc03c9686b684aa6744e8 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Fri, 6 Sep 2024 12:57:03 +0200 Subject: [PATCH 31/53] hopefully fix ci 2 --- .../script-out/output-deploy-l1.toml | 50 +++++++++---------- .../Governance/AccessControlRestriction.t.sol | 2 +- .../governance/Governance/ChainAdmin.t.sol | 2 +- .../Governance/PermanentRestriction.t.sol | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml index 39bab32e2..9bd08b1fc 100644 --- a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml +++ b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml @@ -4,11 +4,11 @@ deployer_addr = "0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496" era_chain_id = 9 force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000000000000000000000000000000000000000044016be2c4df653dc16d4f32b0da783b6ffcb4b9f102604d126f3ce7927d739f36c00000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9447bf69c0e623e1365f68b9682081c8aaf2005f3346a6bb9df35dc505c91cbbc00000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001542f9245b27fa8a082741b6727b86d24c07131b4afdfb66bba0b75c767bf668500000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9554b5e8820768894caf758e182b80205d2a55d217795c711cc044cf83539f66000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000001fc36471c3e2b43168f0632490d41dc71e347fcc2b3068bbf03276e9dd6cbb5b00000000000000000000000000000000000000000000000000000000000100050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010002" l1_chain_id = 31337 -multicall3_addr = "0x8104449AfB19B799b84A1355B866FcfB6a3482c9" +multicall3_addr = "0x0cbaE56294C5e394648A323238F6428bD0D0Bc35" owner_address = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" [contracts_config] -diamond_cut_data = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000651bc2096869af5bf1fc577e597951657ede916b0000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc00000000000000000000000007cae28f41cb79cc7f841adce0af49c24f7dcdb5100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db865000000000000000000000000000000000000000000000000000000000000000000000000000000005b4d0d51c1adcfdc69fae6a0872acf9bdb0039fc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000946ebad100000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000000000000000000000000000007df73fcdc41ee1668fc2ff9737ec4da17c50e14f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab700000000000000000000000000000000000000000000000000000000000000000000000000000000830bba67e7aea3ef4c1657bbb0895986f1117c9a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000e1beb08050bdbe3efdd92ab8e9679129bc245cfe000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" +diamond_cut_data = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000dea634df59ae14b62f4e9875196b4ff86f1f90fd0000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc0000000000000000000000000207d7fa7b533ec0b9f64e66b04756b90bbfa869400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000000000000000000000000000ccbff7e1593e966d85ad89954f5e3ee8dfff97ad000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000946ebad100000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000000000000000000000000000ffc625196eaa62687256cf61a60dfff06ac5083d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab700000000000000000000000000000000000000000000000000000000000000000000000000000000fb1829d7c11028b7b8e56ba684ad928ec7812c17000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c00000000000000000000000008f3c4d76725e03f1fff1c53f88bb685b447143d8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" diamond_init_batch_overhead_l1_gas = 1000000 diamond_init_max_l2_gas_per_batch = 80000000 diamond_init_max_pubdata_per_batch = 120000 @@ -23,34 +23,34 @@ recursion_node_level_vk_hash = "0x0000000000000000000000000000000000000000000000 [deployed_addresses] blob_versioned_hash_retriever_addr = "0xA4cB26d6933D2c3E76718D30de8547bCDF8dD241" -governance_addr = "0xa8b67e5b6057AB84a9Ce90bce823b878b784C879" -native_token_vault_addr = "0xC57952fa081Ba70555C265DA8ffdEc237618c223" +governance_addr = "0x9F9E84e66a6604D489478Abb441fA29EE00d6b3c" +native_token_vault_addr = "0x8edF0E9de19042FB9106618Ea14959D54A422729" transparent_proxy_admin_addr = "0x4f559F30f5eB88D635FDe1548C4267DB8FaB0351" -validator_timelock_addr = "0xda258d9e22d6eF08EE1581F1Eb716f583AFb3423" +validator_timelock_addr = "0xF1E54EFa3ddad166A15a71746E81674790B25E78" [deployed_addresses.bridgehub] -bridgehub_implementation_addr = "0x67DE4c766899518ddE0f11443E4e40C4796f6498" -bridgehub_proxy_addr = "0xA939C53cB66E4F85f9A9D6f2E2A8712abDEfA25c" -ctm_deployment_tracker_implementation_addr = "0x1E1d045A215d46f2a4e2Da94C672232479DCa485" -ctm_deployment_tracker_proxy_addr = "0x118D2781A259EE14e37b876F4A5c0498912F9127" -message_root_implementation_addr = "0xbE1e2Ea6Ea4399B4F1Ec5a9718950312D600fb08" -message_root_proxy_addr = "0x10062969347aCC9B6dd8fB7c89De9B082aCf17CF" +bridgehub_implementation_addr = "0xf6bE6Dd45254b1Cd91d0Ca773c47E3a19eC5383a" +bridgehub_proxy_addr = "0xae3175922eA3D3e1f63698b9DEeCC9a24dCCd30d" +ctm_deployment_tracker_implementation_addr = "0xB5Cf80879f9B2dC1F000E2E8D75afBd5b6cbFA19" +ctm_deployment_tracker_proxy_addr = "0x6306C2F2d254c965E8E32CCEFdC8D0E5E97D1920" +message_root_implementation_addr = "0xCA3359AC26749d07F3Db2D124e12CF25B380E0Cd" +message_root_proxy_addr = "0xC018530eE9aa956Cc3F3cc943a27Bf0AAb0286Cf" [deployed_addresses.bridges] -erc20_bridge_implementation_addr = "0x40021F838987715e71625e05eDB94f402f3d4786" -erc20_bridge_proxy_addr = "0x47bBC633dadbCEDE4DAf68751483F5c7C263a278" -shared_bridge_implementation_addr = "0xeB6C162983c4B8681316FB7d5b34D3fF9352Bb53" -shared_bridge_proxy_addr = "0xeD2507CFF9e5690CDb44d1Cd1949305Ca8b458b9" +erc20_bridge_implementation_addr = "0xD32fc9de19Aa3cCf41d48934d4375F03397F2438" +erc20_bridge_proxy_addr = "0xeA108c45022Ac85f3be36eE16d7280AD273Ec4bD" +shared_bridge_implementation_addr = "0x4A44383DbDD11EcdBC89e1eD1AA73Fa650acFab6" +shared_bridge_proxy_addr = "0xaE93f79B59BF1CA684F8C4F4aC58F790a68bdF5e" [deployed_addresses.state_transition] -admin_facet_addr = "0x7cAe28F41CB79CC7F841adCE0aF49c24F7DCDB51" -default_upgrade_addr = "0xb4E9746a837B35D1ddA4164Ec72452De644fB278" -diamond_init_addr = "0x651bC2096869af5bf1FC577e597951657edE916B" +admin_facet_addr = "0x207D7fA7b533Ec0b9f64e66B04756B90Bbfa8694" +default_upgrade_addr = "0x6D26D095d92f6AE10E43A0bd6aba1fa4A6146a75" +diamond_init_addr = "0xDeA634df59ae14b62F4e9875196b4Ff86F1F90FD" diamond_proxy_addr = "0x0000000000000000000000000000000000000000" -executor_facet_addr = "0x830BbA67e7aea3eF4c1657BBb0895986F1117c9A" -genesis_upgrade_addr = "0x00b65597C31CFe4476f7A1615052Ff8957a14fE0" -getters_facet_addr = "0x5B4d0d51c1aDcFdc69faE6a0872ACF9Bdb0039FC" -mailbox_facet_addr = "0x7DF73fcdC41EE1668FC2FF9737ec4da17C50e14f" -state_transition_implementation_addr = "0x65b859991966F0626Ee813cb0e877c6e6C47a8F8" -state_transition_proxy_addr = "0x1D22ED3CC52FF42a1DcD5579e08745C5216170b3" -verifier_addr = "0xe1Beb08050bdBE3EFdD92Ab8E9679129bC245cfE" +executor_facet_addr = "0xFB1829d7c11028b7B8e56bA684ad928EC7812C17" +genesis_upgrade_addr = "0x57b697a6Dc1fFDAc922710B6D7F8f8953C336988" +getters_facet_addr = "0xcCbfF7E1593e966d85AD89954f5e3ee8dffF97ad" +mailbox_facet_addr = "0xfFc625196eAA62687256cF61a60DFFf06ac5083d" +state_transition_implementation_addr = "0xA43901D5d901239E6B18b579379d906769778beD" +state_transition_proxy_addr = "0x4E567C2165d04893932d4E3E8B51C67a00C8Cbf4" +verifier_addr = "0x8F3c4D76725e03F1FFf1C53f88BB685b447143D8" diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol index f2f1b645e..645f2ae5f 100644 --- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.24; import {Test} from "forge-std/Test.sol"; -import "openzeppelin-contracts/contracts-v4/utils/Strings.sol"; +import "@openzeppelin/contracts-v4/utils/Strings.sol"; import "forge-std/console.sol"; import {IChainAdmin} from "contracts/governance/IChainAdmin.sol"; import {ChainAdmin} from "contracts/governance/ChainAdmin.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol index 1c0f929d1..567c6d999 100644 --- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.24; import {Test} from "forge-std/Test.sol"; -import "openzeppelin-contracts/contracts-v4/utils/Strings.sol"; +import "@openzeppelin/contracts-v4/utils/Strings.sol"; import {AccessControlRestriction} from "contracts/governance/AccessControlRestriction.sol"; import {IChainAdmin} from "contracts/governance/IChainAdmin.sol"; import {ChainAdmin} from "contracts/governance/ChainAdmin.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol b/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol index de9c6611b..9d16611d1 100644 --- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol @@ -1,6 +1,6 @@ pragma solidity 0.8.24; -import "openzeppelin-contracts/contracts-v4/utils/Strings.sol"; +import "@openzeppelin/contracts-v4/utils/Strings.sol"; import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; import {ChainTypeManager} from "contracts/state-transition/ChainTypeManager.sol"; From a1705abdb0de9d35cd3f14696155567309192475 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Fri, 6 Sep 2024 13:14:28 +0200 Subject: [PATCH 32/53] delete duplicated contract --- .../state-transition/libraries/Merkle.sol | 54 ------------------- 1 file changed, 54 deletions(-) delete mode 100644 l1-contracts/contracts/state-transition/libraries/Merkle.sol diff --git a/l1-contracts/contracts/state-transition/libraries/Merkle.sol b/l1-contracts/contracts/state-transition/libraries/Merkle.sol deleted file mode 100644 index 57701f338..000000000 --- a/l1-contracts/contracts/state-transition/libraries/Merkle.sol +++ /dev/null @@ -1,54 +0,0 @@ -// SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. -pragma solidity ^0.8.21; - -import {UncheckedMath} from "../../common/libraries/UncheckedMath.sol"; -import {MerklePathEmpty, MerklePathOutOfBounds, MerkleIndexOutOfBounds} from "../../common/L1ContractErrors.sol"; - -/// @author Matter Labs -/// @custom:security-contact security@matterlabs.dev -library Merkle { - using UncheckedMath for uint256; - - /// @dev Calculate Merkle root by the provided Merkle proof. - /// NOTE: When using this function, check that the _path length is equal to the tree height to prevent shorter/longer paths attack - /// @param _path Merkle path from the leaf to the root - /// @param _index Leaf index in the tree - /// @param _itemHash Hash of leaf content - /// @return The Merkle root - function calculateRoot( - bytes32[] calldata _path, - uint256 _index, - bytes32 _itemHash - ) internal pure returns (bytes32) { - uint256 pathLength = _path.length; - if (pathLength == 0) { - revert MerklePathEmpty(); - } - if (pathLength >= 256) { - revert MerklePathOutOfBounds(); - } - if (_index >= (1 << pathLength)) { - revert MerkleIndexOutOfBounds(); - } - - bytes32 currentHash = _itemHash; - for (uint256 i; i < pathLength; i = i.uncheckedInc()) { - currentHash = (_index % 2 == 0) - ? _efficientHash(currentHash, _path[i]) - : _efficientHash(_path[i], currentHash); - _index /= 2; - } - - return currentHash; - } - - /// @dev Keccak hash of the concatenation of two 32-byte words - function _efficientHash(bytes32 _lhs, bytes32 _rhs) private pure returns (bytes32 result) { - assembly { - mstore(0x00, _lhs) - mstore(0x20, _rhs) - result := keccak256(0x00, 0x40) - } - } -} From 6892ccc93bfbc36686809fd80d20fa6afabfc169 Mon Sep 17 00:00:00 2001 From: Vlad Bochok <41153528+vladbochok@users.noreply.github.com> Date: Fri, 6 Sep 2024 13:24:21 +0200 Subject: [PATCH 33/53] Add admin permission to add custom base tokens (#776) Co-authored-by: Stanislav Breadless --- l1-contracts/contracts/bridgehub/Bridgehub.sol | 2 +- .../unit/concrete/Bridgehub/experimental_bridge.t.sol | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/l1-contracts/contracts/bridgehub/Bridgehub.sol b/l1-contracts/contracts/bridgehub/Bridgehub.sol index 539af6a0c..7b9ecf43b 100644 --- a/l1-contracts/contracts/bridgehub/Bridgehub.sol +++ b/l1-contracts/contracts/bridgehub/Bridgehub.sol @@ -101,7 +101,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus } /// @notice token can be any contract with the appropriate interface/functionality - function addToken(address _token) external onlyOwner { + function addToken(address _token) external onlyOwnerOrAdmin { require(!tokenIsRegistered[_token], "Bridgehub: token already registered"); tokenIsRegistered[_token] = true; } diff --git a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol b/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol index 9ef3ae0fb..ff747ddac 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol @@ -249,11 +249,12 @@ contract ExperimentalBridgeTest is Test { } function test_addToken_cannotBeCalledByRandomAddress(address randomAddress, address randomCaller) public { - if (randomCaller != bridgeOwner) { - vm.prank(randomCaller); - vm.expectRevert(bytes("Ownable: caller is not the owner")); - bridgeHub.addToken(randomAddress); - } + vm.assume(randomAddress != bridgeOwner); + vm.assume(randomAddress != bridgeHub.admin()); + + vm.prank(randomCaller); + vm.expectRevert(bytes("Bridgehub: not owner or admin")); + bridgeHub.addToken(randomAddress); assertTrue(!bridgeHub.tokenIsRegistered(randomAddress), "This random address is not registered as a token"); From 0fa0fa21edaeba5c4ab382debfef26a45a7fc052 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Fri, 6 Sep 2024 13:39:48 +0200 Subject: [PATCH 34/53] foundry tests pass --- .../unit/concrete/Bridgehub/experimental_bridge.t.sol | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol b/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol index a3867021c..a636b2033 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol @@ -340,11 +340,11 @@ contract ExperimentalBridgeTest is Test { } function test_addToken_cannotBeCalledByRandomAddress(address randomAddress, address randomCaller, uint256 randomValue) public useRandomToken(randomValue) { - vm.assume(randomAddress != bridgeOwner); - vm.assume(randomAddress != bridgeHub.admin()); + vm.assume(randomCaller != bridgeOwner); + vm.assume(randomCaller != bridgeHub.admin()); vm.prank(randomCaller); - vm.expectRevert(bytes("Bridgehub: not owner or admin")); + vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, randomCaller)); bridgeHub.addToken(randomAddress); assertTrue(!bridgeHub.tokenIsRegistered(randomAddress), "This random address is not registered as a token"); From 00ddc066bb4c1e06e188745866fc7b11dc86cd03 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Fri, 6 Sep 2024 13:41:50 +0200 Subject: [PATCH 35/53] fix compile for registry --- l2-contracts/contracts/ConsensusRegistry.sol | 2 +- l2-contracts/contracts/interfaces/IConsensusRegistry.sol | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/l2-contracts/contracts/ConsensusRegistry.sol b/l2-contracts/contracts/ConsensusRegistry.sol index 6a4a67bde..de5af6340 100644 --- a/l2-contracts/contracts/ConsensusRegistry.sol +++ b/l2-contracts/contracts/ConsensusRegistry.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.20; +pragma solidity 0.8.24; import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/access/Ownable2StepUpgradeable.sol"; import {Initializable} from "@openzeppelin/contracts-upgradeable-v4/proxy/utils/Initializable.sol"; diff --git a/l2-contracts/contracts/interfaces/IConsensusRegistry.sol b/l2-contracts/contracts/interfaces/IConsensusRegistry.sol index e3ddd118a..a5e017484 100644 --- a/l2-contracts/contracts/interfaces/IConsensusRegistry.sol +++ b/l2-contracts/contracts/interfaces/IConsensusRegistry.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT - -pragma solidity 0.8.20; +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. +pragma solidity ^0.8.20; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev From ef3353982c5bec076d0812a53649f19da76720ed Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Fri, 6 Sep 2024 13:44:44 +0200 Subject: [PATCH 36/53] lint --- .../unit/concrete/Bridgehub/experimental_bridge.t.sol | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol b/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol index a636b2033..910350041 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol @@ -339,7 +339,11 @@ contract ExperimentalBridgeTest is Test { bridgeHub.addToken(randomAddress); } - function test_addToken_cannotBeCalledByRandomAddress(address randomAddress, address randomCaller, uint256 randomValue) public useRandomToken(randomValue) { + function test_addToken_cannotBeCalledByRandomAddress( + address randomAddress, + address randomCaller, + uint256 randomValue + ) public useRandomToken(randomValue) { vm.assume(randomCaller != bridgeOwner); vm.assume(randomCaller != bridgeHub.admin()); From 23f5e3c142d174245758f92edbdecf97aec32ebf Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Fri, 6 Sep 2024 14:11:56 +0200 Subject: [PATCH 37/53] fmt --- l1-contracts/contracts/bridgehub/Bridgehub.sol | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/l1-contracts/contracts/bridgehub/Bridgehub.sol b/l1-contracts/contracts/bridgehub/Bridgehub.sol index ea9ef1500..262d4c148 100644 --- a/l1-contracts/contracts/bridgehub/Bridgehub.sol +++ b/l1-contracts/contracts/bridgehub/Bridgehub.sol @@ -577,10 +577,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus ) external override onlySettlementLayerRelayedSender { require(L1_CHAIN_ID != block.chainid, "BH: not in sync layer mode"); address zkChain = zkChainMap.get(_chainId); - IZKChain(zkChain).bridgehubRequestL2TransactionOnGateway( - _canonicalTxHash, - _expirationTimestamp - ); + IZKChain(zkChain).bridgehubRequestL2TransactionOnGateway(_canonicalTxHash, _expirationTimestamp); } /// @notice forwards function call to Mailbox based on ChainId From 49868afc8590c3d09daf4d5fc73dcc31587f487d Mon Sep 17 00:00:00 2001 From: Vlad Bochok <41153528+vladbochok@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:17:24 +0200 Subject: [PATCH 38/53] Change Executor.sol interface (#780) --- .../contracts/common/L1ContractErrors.sol | 21 +- .../contracts/common/libraries/Merkle.sol | 6 +- .../common/libraries/UnsafeBytes.sol | 7 + .../dev-contracts/test/DummyExecutor.sol | 143 --------- .../state-transition/TestnetVerifier.sol | 8 +- .../state-transition/ValidatorTimelock.sol | 46 ++- .../contracts/state-transition/Verifier.sol | 35 ++- .../chain-deps/facets/Executor.sol | 132 ++++---- .../chain-interfaces/IExecutor.sol | 39 ++- .../chain-interfaces/IVerifier.sol | 6 +- .../libraries/BatchDecoder.sol | 219 +++++++++++++ .../libraries/PriorityTree.sol | 2 +- l1-contracts/src.ts/utils.ts | 6 + .../concrete/Executor/Authorization.t.sol | 19 +- .../unit/concrete/Executor/Committing.t.sol | 141 +++++++-- .../unit/concrete/Executor/Executing.t.sol | 106 ++++--- .../unit/concrete/Executor/Proving.t.sol | 35 ++- .../unit/concrete/Executor/Reverting.t.sol | 14 +- .../concrete/Executor/_Executor_Shared.t.sol | 6 +- .../foundry/unit/concrete/Utils/Utils.sol | 45 ++- .../ValidatorTimelock/ValidatorTimelock.t.sol | 72 ++++- .../unit/concrete/Verifier/Verifier.t.sol | 31 +- .../concrete/Verifier/VerifierRecursive.t.sol | 39 +-- .../ChainTypeManager/RevertBatches.t.sol | 2 +- .../test/unit_tests/l2-upgrade.test.spec.ts | 47 ++- l1-contracts/test/unit_tests/utils.ts | 63 +++- .../validator_timelock_test.spec.ts | 290 ------------------ l2-contracts/contracts/verifier/Verifier.sol | 35 ++- .../verifier/chain-interfaces/IVerifier.sol | 6 +- .../test/foundry/unit/verifier/Verifier.t.sol | 38 +-- .../unit/verifier/VerifierRecursive.t.sol | 39 +-- tools/data/verifier_contract_template.txt | 35 ++- 32 files changed, 915 insertions(+), 818 deletions(-) delete mode 100644 l1-contracts/contracts/dev-contracts/test/DummyExecutor.sol create mode 100644 l1-contracts/contracts/state-transition/libraries/BatchDecoder.sol delete mode 100644 l1-contracts/test/unit_tests/validator_timelock_test.spec.ts diff --git a/l1-contracts/contracts/common/L1ContractErrors.sol b/l1-contracts/contracts/common/L1ContractErrors.sol index 21483fb91..c265a4804 100644 --- a/l1-contracts/contracts/common/L1ContractErrors.sol +++ b/l1-contracts/contracts/common/L1ContractErrors.sol @@ -327,9 +327,26 @@ error ZeroAddress(); error ZeroBalance(); // 0xc84885d4 error ZeroChainId(); - +// 0x520aa59c +error PubdataIsEmpty(); +// 0x99d8fec9 +error EmptyData(); +// 0xc99a8360 +error UnsupportedCommitBatchEncoding(uint8 version); +// 0xe167e4a6 +error UnsupportedProofBatchEncoding(uint8 version); +// 0xe8e3f6f4 +error UnsupportedExecuteBatchEncoding(uint8 version); +// 0xd7d93e1f +error IncorrectBatchBounds( + uint256 processFromExpected, + uint256 processToExpected, + uint256 processFromProvided, + uint256 processToProvided +); +// 0x04a0b7e9 error AssetIdNotSupported(bytes32 assetId); - +// 0x64107968 error AssetHandlerNotRegistered(bytes32 assetId); enum SharedBridgeKey { diff --git a/l1-contracts/contracts/common/libraries/Merkle.sol b/l1-contracts/contracts/common/libraries/Merkle.sol index 560bfc7bc..66db8ea75 100644 --- a/l1-contracts/contracts/common/libraries/Merkle.sol +++ b/l1-contracts/contracts/common/libraries/Merkle.sol @@ -70,10 +70,10 @@ library Merkle { /// @param _itemHashes Hashes of the elements in the range /// @return The Merkle root function calculateRootPaths( - bytes32[] calldata _startPath, - bytes32[] calldata _endPath, + bytes32[] memory _startPath, + bytes32[] memory _endPath, uint256 _startIndex, - bytes32[] calldata _itemHashes + bytes32[] memory _itemHashes ) internal pure returns (bytes32) { uint256 pathLength = _startPath.length; require(pathLength == _endPath.length, "Merkle: path length mismatch"); diff --git a/l1-contracts/contracts/common/libraries/UnsafeBytes.sol b/l1-contracts/contracts/common/libraries/UnsafeBytes.sol index e2680d9e0..4edf94004 100644 --- a/l1-contracts/contracts/common/libraries/UnsafeBytes.sol +++ b/l1-contracts/contracts/common/libraries/UnsafeBytes.sol @@ -30,6 +30,13 @@ library UnsafeBytes { } } + function readUint128(bytes memory _bytes, uint256 _start) internal pure returns (uint128 result, uint256 offset) { + assembly { + offset := add(_start, 16) + result := mload(add(_bytes, offset)) + } + } + function readUint256(bytes memory _bytes, uint256 _start) internal pure returns (uint256 result, uint256 offset) { assembly { offset := add(_start, 32) diff --git a/l1-contracts/contracts/dev-contracts/test/DummyExecutor.sol b/l1-contracts/contracts/dev-contracts/test/DummyExecutor.sol deleted file mode 100644 index e661cdaa1..000000000 --- a/l1-contracts/contracts/dev-contracts/test/DummyExecutor.sol +++ /dev/null @@ -1,143 +0,0 @@ -// SPDX-License-Identifier: MIT - -pragma solidity 0.8.24; - -import {IExecutor} from "../../state-transition/chain-interfaces/IExecutor.sol"; -import {PriorityOpsBatchInfo} from "../../state-transition/libraries/PriorityTree.sol"; - -/// @title DummyExecutor -/// @notice A test smart contract implementing the IExecutor interface to simulate Executor behavior for testing purposes. -contract DummyExecutor is IExecutor { - // add this to be excluded from coverage report - function test() internal virtual {} - - address owner; - - // Flags to control if the contract should revert during commit, prove, and execute batch operations - bool shouldRevertOnCommitBatches; - bool shouldRevertOnProveBatches; - bool shouldRevertOnExecuteBatches; - - // Counters to track the total number of committed, verified, and executed batches - uint256 public getTotalBatchesCommitted; - uint256 public getTotalBatchesVerified; - uint256 public getTotalBatchesExecuted; - string public constant override getName = "DummyExecutor"; - - /// @notice Constructor sets the contract owner to the message sender - constructor() { - owner = msg.sender; - } - - /// @notice Modifier that only allows the owner to call certain functions - modifier onlyOwner() { - require(msg.sender == owner); - _; - } - - function getAdmin() external view returns (address) { - return owner; - } - - /// @notice Removing txs from the priority queue - function removePriorityQueueFront(uint256 _index) external {} - - /// @notice Allows the owner to set whether the contract should revert during commit blocks operation - function setShouldRevertOnCommitBatches(bool _shouldRevert) external onlyOwner { - shouldRevertOnCommitBatches = _shouldRevert; - } - - /// @notice Allows the owner to set whether the contract should revert during prove batches operation - function setShouldRevertOnProveBatches(bool _shouldRevert) external onlyOwner { - shouldRevertOnProveBatches = _shouldRevert; - } - - /// @notice Allows the owner to set whether the contract should revert during execute batches operation - function setShouldRevertOnExecuteBatches(bool _shouldRevert) external onlyOwner { - shouldRevertOnExecuteBatches = _shouldRevert; - } - - function commitBatchesSharedBridge( - uint256, - StoredBatchInfo calldata _lastCommittedBatchData, - CommitBatchInfo[] calldata _newBatchesData - ) external { - require(!shouldRevertOnCommitBatches, "DummyExecutor: shouldRevertOnCommitBatches"); - require( - _lastCommittedBatchData.batchNumber == getTotalBatchesCommitted, - "DummyExecutor: Invalid last committed batch number" - ); - - uint256 batchesLength = _newBatchesData.length; - for (uint256 i = 0; i < batchesLength; ++i) { - require(getTotalBatchesCommitted + i + 1 == _newBatchesData[i].batchNumber); - } - - getTotalBatchesCommitted += batchesLength; - } - - function proveBatchesSharedBridge( - uint256, - StoredBatchInfo calldata _prevBatch, - StoredBatchInfo[] calldata _committedBatches, - ProofInput calldata _proof - ) external { - require(!shouldRevertOnProveBatches, "DummyExecutor: shouldRevertOnProveBatches"); - require(_prevBatch.batchNumber == getTotalBatchesVerified, "DummyExecutor: Invalid previous batch number"); - - require(_committedBatches.length == 1, "DummyExecutor: Can prove only one batch"); - require( - _committedBatches[0].batchNumber == _prevBatch.batchNumber + 1, - "DummyExecutor 1: Can't prove batch out of order" - ); - - getTotalBatchesVerified += 1; - require( - getTotalBatchesVerified <= getTotalBatchesCommitted, - "DummyExecutor: prove more batches than were committed" - ); - } - - function executeBatches(StoredBatchInfo[] calldata _batchesData) public { - require(!shouldRevertOnExecuteBatches, "DummyExecutor: shouldRevertOnExecuteBatches"); - uint256 nBatches = _batchesData.length; - for (uint256 i = 0; i < nBatches; ++i) { - require(_batchesData[i].batchNumber == getTotalBatchesExecuted + i + 1); - } - getTotalBatchesExecuted += nBatches; - require( - getTotalBatchesExecuted <= getTotalBatchesVerified, - "DummyExecutor 2: Can't execute batches more than committed and proven currently" - ); - } - - function executeBatchesSharedBridge(uint256, StoredBatchInfo[] calldata _batchesData) external { - executeBatches(_batchesData); - } - - function executeBatchesSharedBridge( - uint256, - StoredBatchInfo[] calldata _batchesData, - PriorityOpsBatchInfo[] calldata - ) external { - executeBatches(_batchesData); - } - - function revertBatchesSharedBridge(uint256, uint256 _newLastBatch) external { - require( - getTotalBatchesCommitted > _newLastBatch, - "DummyExecutor: The last committed batch is less than new last batch" - ); - uint256 newTotalBatchesCommitted = _maxU256(_newLastBatch, getTotalBatchesExecuted); - - if (newTotalBatchesCommitted < getTotalBatchesVerified) { - getTotalBatchesVerified = newTotalBatchesCommitted; - } - getTotalBatchesCommitted = newTotalBatchesCommitted; - } - - /// @notice Returns larger of two values - function _maxU256(uint256 a, uint256 b) internal pure returns (uint256) { - return a < b ? b : a; - } -} diff --git a/l1-contracts/contracts/state-transition/TestnetVerifier.sol b/l1-contracts/contracts/state-transition/TestnetVerifier.sol index 6e97fed05..a347c3537 100644 --- a/l1-contracts/contracts/state-transition/TestnetVerifier.sol +++ b/l1-contracts/contracts/state-transition/TestnetVerifier.sol @@ -18,17 +18,13 @@ contract TestnetVerifier is Verifier { /// @dev Verifies a zk-SNARK proof, skipping the verification if the proof is empty. /// @inheritdoc IVerifier - function verify( - uint256[] calldata _publicInputs, - uint256[] calldata _proof, - uint256[] calldata _recursiveAggregationInput - ) public view override returns (bool) { + function verify(uint256[] calldata _publicInputs, uint256[] calldata _proof) public view override returns (bool) { // We allow skipping the zkp verification for the test(net) environment // If the proof is not empty, verify it, otherwise, skip the verification if (_proof.length == 0) { return true; } - return super.verify(_publicInputs, _proof, _recursiveAggregationInput); + return super.verify(_publicInputs, _proof); } } diff --git a/l1-contracts/contracts/state-transition/ValidatorTimelock.sol b/l1-contracts/contracts/state-transition/ValidatorTimelock.sol index c59b04a01..64cc0bc20 100644 --- a/l1-contracts/contracts/state-transition/ValidatorTimelock.sol +++ b/l1-contracts/contracts/state-transition/ValidatorTimelock.sol @@ -6,7 +6,6 @@ import {Ownable2Step} from "@openzeppelin/contracts-v4/access/Ownable2Step.sol"; import {LibMap} from "./libraries/LibMap.sol"; import {IExecutor} from "./chain-interfaces/IExecutor.sol"; import {IChainTypeManager} from "./IChainTypeManager.sol"; -import {PriorityOpsBatchInfo} from "./libraries/PriorityTree.sol"; import {Unauthorized, TimeNotReached, ZeroAddress} from "../common/L1ContractErrors.sol"; /// @author Matter Labs @@ -119,32 +118,27 @@ contract ValidatorTimelock is IExecutor, Ownable2Step { /// a call to the zkChain diamond contract with the same calldata. function commitBatchesSharedBridge( uint256 _chainId, - StoredBatchInfo calldata, - CommitBatchInfo[] calldata _newBatchesData + uint256 _processBatchFrom, + uint256 _processBatchTo, + bytes calldata ) external onlyValidator(_chainId) { - _commitBatchesInner(_chainId, _newBatchesData); - } - - function _commitBatchesInner(uint256 _chainId, CommitBatchInfo[] calldata _newBatchesData) internal { unchecked { // This contract is only a temporary solution, that hopefully will be disabled until 2106 year, so... // It is safe to cast. uint32 timestamp = uint32(block.timestamp); // We disable this check because calldata array length is cheap. - // solhint-disable-next-line gas-length-in-loops - for (uint256 i = 0; i < _newBatchesData.length; ++i) { - committedBatchTimestamp[_chainId].set(_newBatchesData[i].batchNumber, timestamp); + for (uint256 i = _processBatchFrom; i <= _processBatchTo; ++i) { + committedBatchTimestamp[_chainId].set(i, timestamp); } } - - _propagateToZkSyncZKChain(_chainId); + _propagateToZKChain(_chainId); } /// @dev Make a call to the zkChain diamond contract with the same calldata. /// Note: If the batch is reverted, it needs to be committed first before the execution. /// So it's safe to not override the committed batches. function revertBatchesSharedBridge(uint256 _chainId, uint256) external onlyValidator(_chainId) { - _propagateToZkSyncZKChain(_chainId); + _propagateToZKChain(_chainId); } /// @dev Make a call to the zkChain diamond contract with the same calldata. @@ -152,30 +146,26 @@ contract ValidatorTimelock is IExecutor, Ownable2Step { /// the batch is known on the commit stage and the proved is not finalized (may be reverted). function proveBatchesSharedBridge( uint256 _chainId, - StoredBatchInfo calldata, - StoredBatchInfo[] calldata, - ProofInput calldata + uint256, // _processBatchFrom + uint256, // _processBatchTo + bytes calldata ) external onlyValidator(_chainId) { - _propagateToZkSyncZKChain(_chainId); + _propagateToZKChain(_chainId); } /// @dev Check that batches were committed at least X time ago and /// make a call to the zkChain diamond contract with the same calldata. function executeBatchesSharedBridge( uint256 _chainId, - StoredBatchInfo[] calldata _newBatchesData, - PriorityOpsBatchInfo[] calldata + uint256 _processBatchFrom, + uint256 _processBatchTo, + bytes calldata ) external onlyValidator(_chainId) { - _executeBatchesInner(_chainId, _newBatchesData); - } - - function _executeBatchesInner(uint256 _chainId, StoredBatchInfo[] calldata _newBatchesData) internal { uint256 delay = executionDelay; // uint32 unchecked { // We disable this check because calldata array length is cheap. - // solhint-disable-next-line gas-length-in-loops - for (uint256 i = 0; i < _newBatchesData.length; ++i) { - uint256 commitBatchTimestamp = committedBatchTimestamp[_chainId].get(_newBatchesData[i].batchNumber); + for (uint256 i = _processBatchFrom; i <= _processBatchTo; ++i) { + uint256 commitBatchTimestamp = committedBatchTimestamp[_chainId].get(i); // Note: if the `commitBatchTimestamp` is zero, that means either: // * The batch was committed, but not through this contract. @@ -187,12 +177,12 @@ contract ValidatorTimelock is IExecutor, Ownable2Step { } } } - _propagateToZkSyncZKChain(_chainId); + _propagateToZKChain(_chainId); } /// @dev Call the zkChain diamond contract with the same calldata as this contract was called. /// Note: it is called the zkChain diamond contract, not delegatecalled! - function _propagateToZkSyncZKChain(uint256 _chainId) internal { + function _propagateToZKChain(uint256 _chainId) internal { address contractAddress = chainTypeManager.getZKChain(_chainId); assembly { // Copy function signature and arguments from calldata at zero position into memory at pointer position diff --git a/l1-contracts/contracts/state-transition/Verifier.sol b/l1-contracts/contracts/state-transition/Verifier.sol index cb90bf472..3072c2c5a 100644 --- a/l1-contracts/contracts/state-transition/Verifier.sol +++ b/l1-contracts/contracts/state-transition/Verifier.sol @@ -343,8 +343,7 @@ contract Verifier is IVerifier { /// @inheritdoc IVerifier function verify( uint256[] calldata, // _publicInputs - uint256[] calldata, // _proof - uint256[] calldata // _recursiveAggregationInput + uint256[] calldata // _proof ) public view virtual returns (bool) { // No memory was accessed yet, so keys can be loaded into the right place and not corrupt any other memory. _loadVerificationKey(); @@ -523,7 +522,17 @@ contract Verifier is IVerifier { // 2. Load the proof (except for the recursive part) offset := calldataload(0x24) let proofLengthInWords := calldataload(add(offset, 0x04)) - isValid := and(eq(proofLengthInWords, 44), isValid) + + // Check the proof length depending on whether the recursive part is present + let expectedProofLength + switch mload(VK_RECURSIVE_FLAG_SLOT) + case 0 { + expectedProofLength := 44 + } + default { + expectedProofLength := 48 + } + isValid := and(eq(proofLengthInWords, expectedProofLength), isValid) // PROOF_STATE_POLYS_0 { @@ -670,21 +679,13 @@ contract Verifier is IVerifier { } // 3. Load the recursive part of the proof - offset := calldataload(0x44) - let recursiveProofLengthInWords := calldataload(add(offset, 0x04)) - - switch mload(VK_RECURSIVE_FLAG_SLOT) - case 0 { - // recursive part should be empty - isValid := and(iszero(recursiveProofLengthInWords), isValid) - } - default { + if mload(VK_RECURSIVE_FLAG_SLOT) { // recursive part should be consist of 2 points - isValid := and(eq(recursiveProofLengthInWords, 4), isValid) + // PROOF_RECURSIVE_PART_P1 { - let x := mod(calldataload(add(offset, 0x024)), Q_MOD) - let y := mod(calldataload(add(offset, 0x044)), Q_MOD) + let x := mod(calldataload(add(offset, 0x5a4)), Q_MOD) + let y := mod(calldataload(add(offset, 0x5c4)), Q_MOD) let xx := mulmod(x, x, Q_MOD) isValid := and(eq(mulmod(y, y, Q_MOD), addmod(mulmod(x, xx, Q_MOD), 3, Q_MOD)), isValid) mstore(PROOF_RECURSIVE_PART_P1_X_SLOT, x) @@ -692,8 +693,8 @@ contract Verifier is IVerifier { } // PROOF_RECURSIVE_PART_P2 { - let x := mod(calldataload(add(offset, 0x064)), Q_MOD) - let y := mod(calldataload(add(offset, 0x084)), Q_MOD) + let x := mod(calldataload(add(offset, 0x5e4)), Q_MOD) + let y := mod(calldataload(add(offset, 0x604)), Q_MOD) let xx := mulmod(x, x, Q_MOD) isValid := and(eq(mulmod(y, y, Q_MOD), addmod(mulmod(x, xx, Q_MOD), 3, Q_MOD)), isValid) mstore(PROOF_RECURSIVE_PART_P2_X_SLOT, x) diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol index 9a76108ad..0875d2e95 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Executor.sol @@ -10,6 +10,7 @@ import {IMessageRoot} from "../../../bridgehub/IMessageRoot.sol"; import {COMMIT_TIMESTAMP_NOT_OLDER, COMMIT_TIMESTAMP_APPROXIMATION_DELTA, EMPTY_STRING_KECCAK, L2_TO_L1_LOG_SERIALIZE_SIZE, MAX_L2_TO_L1_LOGS_COMMITMENT_BYTES, PACKED_L2_BLOCK_TIMESTAMP_MASK, PUBLIC_INPUT_SHIFT} from "../../../common/Config.sol"; import {IExecutor, L2_LOG_ADDRESS_OFFSET, L2_LOG_KEY_OFFSET, L2_LOG_VALUE_OFFSET, SystemLogKey, LogProcessingOutput, TOTAL_BLOBS_IN_COMMITMENT} from "../../chain-interfaces/IExecutor.sol"; import {PriorityQueue, PriorityOperation} from "../../libraries/PriorityQueue.sol"; +import {BatchDecoder} from "../../libraries/BatchDecoder.sol"; import {UncheckedMath} from "../../../common/libraries/UncheckedMath.sol"; import {UnsafeBytes} from "../../../common/libraries/UnsafeBytes.sol"; import {L2_BOOTLOADER_ADDRESS, L2_TO_L1_MESSENGER_SYSTEM_CONTRACT_ADDR, L2_SYSTEM_CONTEXT_SYSTEM_CONTRACT_ADDR} from "../../../common/L2ContractAddresses.sol"; @@ -43,7 +44,7 @@ contract ExecutorFacet is ZKChainBase, IExecutor { /// @notice Does not change storage function _commitOneBatch( StoredBatchInfo memory _previousBatch, - CommitBatchInfo calldata _newBatch, + CommitBatchInfo memory _newBatch, bytes32 _expectedSystemContractUpgradeTxHash ) internal returns (StoredBatchInfo memory) { // only commit next batch @@ -141,7 +142,7 @@ contract ExecutorFacet is ZKChainBase, IExecutor { /// SystemLogKey enum in Constants.sol is processed per new batch. /// @dev Data returned from here will be used to form the batch commitment. function _processL2Logs( - CommitBatchInfo calldata _newBatch, + CommitBatchInfo memory _newBatch, bytes32 _expectedSystemContractUpgradeTxHash ) internal view returns (LogProcessingOutput memory logOutput) { // Copy L2 to L1 logs into memory. @@ -231,16 +232,10 @@ contract ExecutorFacet is ZKChainBase, IExecutor { /// @inheritdoc IExecutor function commitBatchesSharedBridge( uint256, // _chainId - StoredBatchInfo calldata _lastCommittedBatchData, - CommitBatchInfo[] calldata _newBatchesData - ) external nonReentrant onlyValidator { - _commitBatches(_lastCommittedBatchData, _newBatchesData); - } - - function _commitBatches( - StoredBatchInfo memory _lastCommittedBatchData, - CommitBatchInfo[] calldata _newBatchesData - ) internal chainOnCurrentBridgehub { + uint256 _processFrom, + uint256 _processTo, + bytes calldata _commitData + ) external nonReentrant onlyValidator chainOnCurrentBridgehub { // check that we have the right protocol version // three comments: // 1. A chain has to keep their protocol version up to date, as processing a block requires the latest or previous protocol version @@ -251,32 +246,36 @@ contract ExecutorFacet is ZKChainBase, IExecutor { if (!IChainTypeManager(s.chainTypeManager).protocolVersionIsActive(s.protocolVersion)) { revert InvalidProtocolVersion(); } + (StoredBatchInfo memory lastCommittedBatchData, CommitBatchInfo[] memory newBatchesData) = BatchDecoder + .decodeAndCheckCommitData(_commitData, _processFrom, _processTo); // With the new changes for EIP-4844, namely the restriction on number of blobs per block, we only allow for a single batch to be committed at a time. - if (_newBatchesData.length != 1) { + // Note: Don't need to check that `_processFrom` == `_processTo` because there is only one batch, + // and so the range checked in the `decodeAndCheckCommitData` is enough. + if (newBatchesData.length != 1) { revert CanOnlyProcessOneBatch(); } // Check that we commit batches after last committed batch - if (s.storedBatchHashes[s.totalBatchesCommitted] != _hashStoredBatchInfo(_lastCommittedBatchData)) { + if (s.storedBatchHashes[s.totalBatchesCommitted] != _hashStoredBatchInfo(lastCommittedBatchData)) { // incorrect previous batch data revert BatchHashMismatch( s.storedBatchHashes[s.totalBatchesCommitted], - _hashStoredBatchInfo(_lastCommittedBatchData) + _hashStoredBatchInfo(lastCommittedBatchData) ); } bytes32 systemContractsUpgradeTxHash = s.l2SystemContractsUpgradeTxHash; // Upgrades are rarely done so we optimize a case with no active system contracts upgrade. if (systemContractsUpgradeTxHash == bytes32(0) || s.l2SystemContractsUpgradeBatchNumber != 0) { - _commitBatchesWithoutSystemContractsUpgrade(_lastCommittedBatchData, _newBatchesData); + _commitBatchesWithoutSystemContractsUpgrade(lastCommittedBatchData, newBatchesData); } else { _commitBatchesWithSystemContractsUpgrade( - _lastCommittedBatchData, - _newBatchesData, + lastCommittedBatchData, + newBatchesData, systemContractsUpgradeTxHash ); } - s.totalBatchesCommitted = s.totalBatchesCommitted + _newBatchesData.length; + s.totalBatchesCommitted = s.totalBatchesCommitted + newBatchesData.length; } /// @dev Commits new batches without any system contracts upgrade. @@ -284,7 +283,7 @@ contract ExecutorFacet is ZKChainBase, IExecutor { /// @param _newBatchesData An array of batch data that needs to be committed. function _commitBatchesWithoutSystemContractsUpgrade( StoredBatchInfo memory _lastCommittedBatchData, - CommitBatchInfo[] calldata _newBatchesData + CommitBatchInfo[] memory _newBatchesData ) internal { // We disable this check because calldata array length is cheap. // solhint-disable-next-line gas-length-in-loops @@ -306,7 +305,7 @@ contract ExecutorFacet is ZKChainBase, IExecutor { /// @param _systemContractUpgradeTxHash The transaction hash of the system contract upgrade. function _commitBatchesWithSystemContractsUpgrade( StoredBatchInfo memory _lastCommittedBatchData, - CommitBatchInfo[] calldata _newBatchesData, + CommitBatchInfo[] memory _newBatchesData, bytes32 _systemContractUpgradeTxHash ) internal { // The system contract upgrade is designed to be executed atomically with the new bootloader, a default account, @@ -352,7 +351,7 @@ contract ExecutorFacet is ZKChainBase, IExecutor { } } - function _rollingHash(bytes32[] calldata _hashes) internal pure returns (bytes32) { + function _rollingHash(bytes32[] memory _hashes) internal pure returns (bytes32) { bytes32 hash = EMPTY_STRING_KECCAK; uint256 nHashes = _hashes.length; for (uint256 i = 0; i < nHashes; i = i.uncheckedInc()) { @@ -411,7 +410,7 @@ contract ExecutorFacet is ZKChainBase, IExecutor { /// @dev _executedBatchIdx is an index in the array of the batches that we want to execute together function _executeOneBatch( StoredBatchInfo memory _storedBatch, - PriorityOpsBatchInfo calldata _priorityOpsData, + PriorityOpsBatchInfo memory _priorityOpsData, uint256 _executedBatchIdx ) internal { require(_priorityOpsData.itemHashes.length == _storedBatch.numberOfLayer1Txs, "zxc"); @@ -431,30 +430,26 @@ contract ExecutorFacet is ZKChainBase, IExecutor { /// @inheritdoc IExecutor function executeBatchesSharedBridge( - uint256, - StoredBatchInfo[] calldata _batchesData, - PriorityOpsBatchInfo[] calldata _priorityOpsData - ) external nonReentrant onlyValidator { - _executeBatches(_batchesData, _priorityOpsData); - } - - function _executeBatches( - StoredBatchInfo[] calldata _batchesData, - PriorityOpsBatchInfo[] calldata _priorityOpsData - ) internal chainOnCurrentBridgehub { - uint256 nBatches = _batchesData.length; - require(_batchesData.length == _priorityOpsData.length, "bp"); + uint256, // _chainId + uint256 _processFrom, + uint256 _processTo, + bytes calldata _executeData + ) external nonReentrant onlyValidator chainOnCurrentBridgehub { + (StoredBatchInfo[] memory batchesData, PriorityOpsBatchInfo[] memory priorityOpsData) = BatchDecoder + .decodeAndCheckExecuteData(_executeData, _processFrom, _processTo); + uint256 nBatches = batchesData.length; + require(batchesData.length == priorityOpsData.length, "bp"); for (uint256 i = 0; i < nBatches; i = i.uncheckedInc()) { if (s.priorityTree.startIndex <= s.priorityQueue.getFirstUnprocessedPriorityTx()) { - _executeOneBatch(_batchesData[i], _priorityOpsData[i], i); + _executeOneBatch(batchesData[i], priorityOpsData[i], i); } else { - require(_priorityOpsData[i].leftPath.length == 0, "le"); - require(_priorityOpsData[i].rightPath.length == 0, "re"); - require(_priorityOpsData[i].itemHashes.length == 0, "ih"); - _executeOneBatch(_batchesData[i], i); + require(priorityOpsData[i].leftPath.length == 0, "le"); + require(priorityOpsData[i].rightPath.length == 0, "re"); + require(priorityOpsData[i].itemHashes.length == 0, "ih"); + _executeOneBatch(batchesData[i], i); } - emit BlockExecution(_batchesData[i].batchNumber, _batchesData[i].batchHash, _batchesData[i].commitment); + emit BlockExecution(batchesData[i].batchNumber, batchesData[i].batchHash, batchesData[i].commitment); } uint256 newTotalBatchesExecuted = s.totalBatchesExecuted + nBatches; @@ -473,44 +468,39 @@ contract ExecutorFacet is ZKChainBase, IExecutor { /// @inheritdoc IExecutor function proveBatchesSharedBridge( uint256, // _chainId - StoredBatchInfo calldata _prevBatch, - StoredBatchInfo[] calldata _committedBatches, - ProofInput calldata _proof - ) external nonReentrant onlyValidator { - _proveBatches(_prevBatch, _committedBatches, _proof); - } + uint256 _processBatchFrom, + uint256 _processBatchTo, + bytes calldata _proofData + ) external nonReentrant onlyValidator chainOnCurrentBridgehub { + ( + StoredBatchInfo memory prevBatch, + StoredBatchInfo[] memory committedBatches, + uint256[] memory proof + ) = BatchDecoder.decodeAndCheckProofData(_proofData, _processBatchFrom, _processBatchTo); - function _proveBatches( - StoredBatchInfo calldata _prevBatch, - StoredBatchInfo[] calldata _committedBatches, - ProofInput calldata _proof - ) internal chainOnCurrentBridgehub { // Save the variables into the stack to save gas on reading them later uint256 currentTotalBatchesVerified = s.totalBatchesVerified; - uint256 committedBatchesLength = _committedBatches.length; + uint256 committedBatchesLength = committedBatches.length; // Initialize the array, that will be used as public input to the ZKP uint256[] memory proofPublicInput = new uint256[](committedBatchesLength); // Check that the batch passed by the validator is indeed the first unverified batch - if (_hashStoredBatchInfo(_prevBatch) != s.storedBatchHashes[currentTotalBatchesVerified]) { - revert BatchHashMismatch( - s.storedBatchHashes[currentTotalBatchesVerified], - _hashStoredBatchInfo(_prevBatch) - ); + if (_hashStoredBatchInfo(prevBatch) != s.storedBatchHashes[currentTotalBatchesVerified]) { + revert BatchHashMismatch(s.storedBatchHashes[currentTotalBatchesVerified], _hashStoredBatchInfo(prevBatch)); } - bytes32 prevBatchCommitment = _prevBatch.commitment; + bytes32 prevBatchCommitment = prevBatch.commitment; for (uint256 i = 0; i < committedBatchesLength; i = i.uncheckedInc()) { currentTotalBatchesVerified = currentTotalBatchesVerified.uncheckedInc(); - if (_hashStoredBatchInfo(_committedBatches[i]) != s.storedBatchHashes[currentTotalBatchesVerified]) { + if (_hashStoredBatchInfo(committedBatches[i]) != s.storedBatchHashes[currentTotalBatchesVerified]) { revert BatchHashMismatch( s.storedBatchHashes[currentTotalBatchesVerified], - _hashStoredBatchInfo(_committedBatches[i]) + _hashStoredBatchInfo(committedBatches[i]) ); } - bytes32 currentBatchCommitment = _committedBatches[i].commitment; + bytes32 currentBatchCommitment = committedBatches[i].commitment; proofPublicInput[i] = _getBatchProofPublicInput(prevBatchCommitment, currentBatchCommitment); prevBatchCommitment = currentBatchCommitment; @@ -519,23 +509,19 @@ contract ExecutorFacet is ZKChainBase, IExecutor { revert VerifiedBatchesExceedsCommittedBatches(); } - _verifyProof(proofPublicInput, _proof); + _verifyProof(proofPublicInput, proof); emit BlocksVerification(s.totalBatchesVerified, currentTotalBatchesVerified); s.totalBatchesVerified = currentTotalBatchesVerified; } - function _verifyProof(uint256[] memory proofPublicInput, ProofInput calldata _proof) internal view { + function _verifyProof(uint256[] memory proofPublicInput, uint256[] memory _proof) internal view { // We can only process 1 batch proof at a time. if (proofPublicInput.length != 1) { revert CanOnlyProcessOneBatch(); } - bool successVerifyProof = s.verifier.verify( - proofPublicInput, - _proof.serializedProof, - _proof.recursiveAggregationInput - ); + bool successVerifyProof = s.verifier.verify(proofPublicInput, _proof); if (!successVerifyProof) { revert InvalidProof(); } @@ -579,7 +565,7 @@ contract ExecutorFacet is ZKChainBase, IExecutor { /// @dev Creates batch commitment from its data function _createBatchCommitment( - CommitBatchInfo calldata _newBatchData, + CommitBatchInfo memory _newBatchData, bytes32 _stateDiffHash, bytes32[] memory _blobCommitments, bytes32[] memory _blobHashes @@ -593,7 +579,7 @@ contract ExecutorFacet is ZKChainBase, IExecutor { return keccak256(abi.encode(passThroughDataHash, metadataHash, auxiliaryOutputHash)); } - function _batchPassThroughData(CommitBatchInfo calldata _batch) internal pure returns (bytes memory) { + function _batchPassThroughData(CommitBatchInfo memory _batch) internal pure returns (bytes memory) { return abi.encodePacked( // solhint-disable-next-line func-named-parameters @@ -617,7 +603,7 @@ contract ExecutorFacet is ZKChainBase, IExecutor { } function _batchAuxiliaryOutput( - CommitBatchInfo calldata _batch, + CommitBatchInfo memory _batch, bytes32 _stateDiffHash, bytes32[] memory _blobCommitments, bytes32[] memory _blobHashes diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol index 299b7118b..0877dcbf9 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IExecutor.sol @@ -3,7 +3,6 @@ pragma solidity ^0.8.21; import {IZKChainBase} from "./IZKChainBase.sol"; -import {PriorityOpsBatchInfo} from "../libraries/PriorityTree.sol"; /// @dev Enum used by L2 System Contracts to differentiate logs. enum SystemLogKey { @@ -101,48 +100,46 @@ interface IExecutor is IZKChainBase { bytes operatorDAInput; } - /// @notice Recursive proof input data (individual commitments are constructed onchain) - struct ProofInput { - uint256[] recursiveAggregationInput; - uint256[] serializedProof; - } - /// @notice Function called by the operator to commit new batches. It is responsible for: /// - Verifying the correctness of their timestamps. /// - Processing their L2->L1 logs. /// - Storing batch commitments. /// @param _chainId Chain ID of the chain. - /// @param _lastCommittedBatchData Stored data of the last committed batch. - /// @param _newBatchesData Data of the new batches to be committed. + /// @param _processFrom The batch number from which the processing starts. + /// @param _processTo The batch number at which the processing ends. + /// @param _commitData The encoded data of the new batches to be committed. function commitBatchesSharedBridge( uint256 _chainId, - StoredBatchInfo calldata _lastCommittedBatchData, - CommitBatchInfo[] calldata _newBatchesData + uint256 _processFrom, + uint256 _processTo, + bytes calldata _commitData ) external; /// @notice Batches commitment verification. /// @dev Only verifies batch commitments without any other processing. /// @param _chainId Chain ID of the chain. - /// @param _prevBatch Stored data of the last committed batch. - /// @param _committedBatches Stored data of the committed batches. - /// @param _proof The zero knowledge proof. + /// @param _processBatchFrom The batch number from which the verification starts. + /// @param _processBatchTo The batch number at which the verification ends. + /// @param _proofData The encoded data of the new batches to be verified. function proveBatchesSharedBridge( uint256 _chainId, - StoredBatchInfo calldata _prevBatch, - StoredBatchInfo[] calldata _committedBatches, - ProofInput calldata _proof + uint256 _processBatchFrom, + uint256 _processBatchTo, + bytes calldata _proofData ) external; /// @notice The function called by the operator to finalize (execute) batches. It is responsible for: /// - Processing all pending operations (commpleting priority requests). /// - Finalizing this batch (i.e. allowing to withdraw funds from the system) /// @param _chainId Chain ID of the chain. - /// @param _batchesData Data of the batches to be executed. - /// @param _priorityOpsData Merkle proofs of the priority operations for each batch. + /// @param _processFrom The batch number from which the execution starts. + /// @param _processTo The batch number at which the execution ends. + /// @param _executeData The encoded data of the new batches to be executed. function executeBatchesSharedBridge( uint256 _chainId, - StoredBatchInfo[] calldata _batchesData, - PriorityOpsBatchInfo[] calldata _priorityOpsData + uint256 _processFrom, + uint256 _processTo, + bytes calldata _executeData ) external; /// @notice Reverts unexecuted batches diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IVerifier.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IVerifier.sol index 97872c370..fe5e2af2c 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IVerifier.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IVerifier.sol @@ -16,11 +16,7 @@ interface IVerifier { /// @dev Verifies a zk-SNARK proof. /// @return A boolean value indicating whether the zk-SNARK proof is valid. /// Note: The function may revert execution instead of returning false in some cases. - function verify( - uint256[] calldata _publicInputs, - uint256[] calldata _proof, - uint256[] calldata _recursiveAggregationInput - ) external view returns (bool); + function verify(uint256[] calldata _publicInputs, uint256[] calldata _proof) external view returns (bool); /// @notice Calculates a keccak256 hash of the runtime loaded verification keys. /// @return vkHash The keccak256 hash of the loaded verification keys. diff --git a/l1-contracts/contracts/state-transition/libraries/BatchDecoder.sol b/l1-contracts/contracts/state-transition/libraries/BatchDecoder.sol new file mode 100644 index 000000000..05b16537b --- /dev/null +++ b/l1-contracts/contracts/state-transition/libraries/BatchDecoder.sol @@ -0,0 +1,219 @@ +// SPDX-License-Identifier: MIT +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. +pragma solidity ^0.8.21; + +import {IExecutor} from "../chain-interfaces/IExecutor.sol"; +import {PriorityOpsBatchInfo} from "./PriorityTree.sol"; +import {IncorrectBatchBounds, EmptyData, UnsupportedCommitBatchEncoding, UnsupportedProofBatchEncoding, UnsupportedExecuteBatchEncoding} from "../../common/L1ContractErrors.sol"; + +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +/// @notice Utility library for decoding and validating batch data. +/// @dev This library decodes commit, proof, and execution batch data and verifies batch number bounds. +/// It reverts with custom errors when the data is invalid or unsupported encoding is used. +library BatchDecoder { + /// @notice The currently supported encoding version. + uint8 internal constant SUPPORTED_ENCODING_VERSION = 0; + + /// @notice Decodes commit data from a calldata bytes into the last committed batch data and an array of new batch data. + /// @param _commitData The calldata byte array containing the data for committing batches. + /// @return lastCommittedBatchData The data for the batch before newly committed batches. + /// @return newBatchesData An array containing the newly committed batches. + function _decodeCommitData( + bytes calldata _commitData + ) + private + pure + returns ( + IExecutor.StoredBatchInfo memory lastCommittedBatchData, + IExecutor.CommitBatchInfo[] memory newBatchesData + ) + { + if (_commitData.length == 0) { + revert EmptyData(); + } + + uint8 encodingVersion = uint8(_commitData[0]); + if (encodingVersion == SUPPORTED_ENCODING_VERSION) { + (lastCommittedBatchData, newBatchesData) = abi.decode( + _commitData[1:], + (IExecutor.StoredBatchInfo, IExecutor.CommitBatchInfo[]) + ); + } else { + revert UnsupportedCommitBatchEncoding(encodingVersion); + } + } + + /// @notice Decodes the commit data and checks that the provided batch bounds are correct. + /// @dev Note that it only checks that the last and the first batches in the array correspond to the provided bounds. + /// The fact that the batches inside the array are provided in the correct order should be checked by the caller. + /// @param _commitData The calldata byte array containing the data for committing batches. + /// @param _processBatchFrom The expected batch number of the first commit batch in the array. + /// @param _processBatchTo The expected batch number of the last commit batch in the array. + /// @return lastCommittedBatchData The data for the batch before newly committed batches. + /// @return newBatchesData An array containing the newly committed batches. + function decodeAndCheckCommitData( + bytes calldata _commitData, + uint256 _processBatchFrom, + uint256 _processBatchTo + ) + internal + pure + returns ( + IExecutor.StoredBatchInfo memory lastCommittedBatchData, + IExecutor.CommitBatchInfo[] memory newBatchesData + ) + { + (lastCommittedBatchData, newBatchesData) = _decodeCommitData(_commitData); + + if (newBatchesData.length == 0) { + revert EmptyData(); + } + + if ( + newBatchesData[0].batchNumber != _processBatchFrom || + newBatchesData[newBatchesData.length - 1].batchNumber != _processBatchTo + ) { + revert IncorrectBatchBounds( + _processBatchFrom, + _processBatchTo, + newBatchesData[0].batchNumber, + newBatchesData[newBatchesData.length - 1].batchNumber + ); + } + } + + /// @notice Decodes proof data from a calldata byte array into the previous batch, an array of proved batches, and a proof array. + /// @param _proofData The calldata byte array containing the data for proving batches. + /// @return prevBatch The batch information before the batches to be verified. + /// @return provedBatches An array containing the the batches to be verified. + /// @return proof An array containing the proof for the verifier. + function _decodeProofData( + bytes calldata _proofData + ) + private + pure + returns ( + IExecutor.StoredBatchInfo memory prevBatch, + IExecutor.StoredBatchInfo[] memory provedBatches, + uint256[] memory proof + ) + { + if (_proofData.length == 0) { + revert EmptyData(); + } + + uint8 encodingVersion = uint8(_proofData[0]); + if (encodingVersion == SUPPORTED_ENCODING_VERSION) { + (prevBatch, provedBatches, proof) = abi.decode( + _proofData[1:], + (IExecutor.StoredBatchInfo, IExecutor.StoredBatchInfo[], uint256[]) + ); + } else { + revert UnsupportedProofBatchEncoding(encodingVersion); + } + } + + /// @notice Decodes the commit data and checks that the provided batch bounds are correct. + /// @dev Note that it only checks that the last and the first batches in the array correspond to the provided bounds. + /// The fact that the batches inside the array are provided in the correct order should be checked by the caller. + /// @param _proofData The commit data to decode. + /// @param _processBatchFrom The expected batch number of the first batch in the array. + /// @param _processBatchTo The expected batch number of the last batch in the array. + /// @return prevBatch The batch information before the batches to be verified. + /// @return provedBatches An array containing the the batches to be verified. + /// @return proof An array containing the proof for the verifier. + function decodeAndCheckProofData( + bytes calldata _proofData, + uint256 _processBatchFrom, + uint256 _processBatchTo + ) + internal + pure + returns ( + IExecutor.StoredBatchInfo memory prevBatch, + IExecutor.StoredBatchInfo[] memory provedBatches, + uint256[] memory proof + ) + { + (prevBatch, provedBatches, proof) = _decodeProofData(_proofData); + + if (provedBatches.length == 0) { + revert EmptyData(); + } + + if ( + provedBatches[0].batchNumber != _processBatchFrom || + provedBatches[provedBatches.length - 1].batchNumber != _processBatchTo + ) { + revert IncorrectBatchBounds( + _processBatchFrom, + _processBatchTo, + provedBatches[0].batchNumber, + provedBatches[provedBatches.length - 1].batchNumber + ); + } + } + + /// @notice Decodes execution data from a calldata byte array into an array of stored batch information. + /// @param _executeData The calldata byte array containing the execution data to decode. + /// @return executeData An array containing the stored batch information for execution. + /// @return priorityOpsData Merkle proofs of the priority operations for each batch. + function _decodeExecuteData( + bytes calldata _executeData + ) + private + pure + returns (IExecutor.StoredBatchInfo[] memory executeData, PriorityOpsBatchInfo[] memory priorityOpsData) + { + if (_executeData.length == 0) { + revert EmptyData(); + } + + uint8 encodingVersion = uint8(_executeData[0]); + if (encodingVersion == 0) { + (executeData, priorityOpsData) = abi.decode( + _executeData[1:], + (IExecutor.StoredBatchInfo[], PriorityOpsBatchInfo[]) + ); + } else { + revert UnsupportedExecuteBatchEncoding(encodingVersion); + } + } + + /// @notice Decodes the execute data and checks that the provided batch bounds are correct. + /// @dev Note that it only checks that the last and the first batches in the array correspond to the provided bounds. + /// The fact that the batches inside the array are provided in the correct order should be checked by the caller. + /// @param _executeData The calldata byte array containing the execution data to decode. + /// @param _processBatchFrom The expected batch number of the first batch in the array. + /// @param _processBatchTo The expected batch number of the last batch in the array. + /// @return executeData An array containing the stored batch information for execution. + /// @return priorityOpsData Merkle proofs of the priority operations for each batch. + function decodeAndCheckExecuteData( + bytes calldata _executeData, + uint256 _processBatchFrom, + uint256 _processBatchTo + ) + internal + pure + returns (IExecutor.StoredBatchInfo[] memory executeData, PriorityOpsBatchInfo[] memory priorityOpsData) + { + (executeData, priorityOpsData) = _decodeExecuteData(_executeData); + + if (executeData.length == 0) { + revert EmptyData(); + } + + if ( + executeData[0].batchNumber != _processBatchFrom || + executeData[executeData.length - 1].batchNumber != _processBatchTo + ) { + revert IncorrectBatchBounds( + _processBatchFrom, + _processBatchTo, + executeData[0].batchNumber, + executeData[executeData.length - 1].batchNumber + ); + } + } +} diff --git a/l1-contracts/contracts/state-transition/libraries/PriorityTree.sol b/l1-contracts/contracts/state-transition/libraries/PriorityTree.sol index 7fdf713f2..809850804 100644 --- a/l1-contracts/contracts/state-transition/libraries/PriorityTree.sol +++ b/l1-contracts/contracts/state-transition/libraries/PriorityTree.sol @@ -67,7 +67,7 @@ library PriorityTree { } /// @notice Process the priority operations of a batch. - function processBatch(Tree storage _tree, PriorityOpsBatchInfo calldata _priorityOpsData) internal { + function processBatch(Tree storage _tree, PriorityOpsBatchInfo memory _priorityOpsData) internal { if (_priorityOpsData.itemHashes.length > 0) { bytes32 expectedRoot = Merkle.calculateRootPaths( _priorityOpsData.leftPath, diff --git a/l1-contracts/src.ts/utils.ts b/l1-contracts/src.ts/utils.ts index 3f048dc5d..92f38244f 100644 --- a/l1-contracts/src.ts/utils.ts +++ b/l1-contracts/src.ts/utils.ts @@ -34,6 +34,12 @@ const CREATE2_PREFIX = ethers.utils.solidityKeccak256(["string"], ["zksyncCreate export const priorityTxMaxGasLimit = getNumberFromEnv("CONTRACTS_PRIORITY_TX_MAX_GAS_LIMIT"); const ADDRESS_MODULO = ethers.BigNumber.from(2).pow(160); +export const STORED_BATCH_INFO_ABI_STRING = + "tuple(uint64 batchNumber, bytes32 batchHash, uint64 indexRepeatedStorageChanges, uint256 numberOfLayer1Txs, bytes32 priorityOperationsHash, bytes32 l2LogsTreeRoot, uint256 timestamp, bytes32 commitment)"; +export const COMMIT_BATCH_INFO_ABI_STRING = + "tuple(uint64 batchNumber, uint64 timestamp, uint64 indexRepeatedStorageChanges, bytes32 newStateRoot, uint256 numberOfLayer1Txs, bytes32 priorityOperationsHash, bytes32 bootloaderHeapInitialContentsHash, bytes32 eventsQueueStateHash, bytes systemLogs, bytes operatorDAInput)"; +export const PRIORITY_OPS_BATCH_INFO_ABI_STRING = + "tuple(bytes32[] leftPath, bytes32[] rightPath, bytes32[] itemHashes)"; export const DIAMOND_CUT_DATA_ABI_STRING = "tuple(tuple(address facet, uint8 action, bool isFreezable, bytes4[] selectors)[] facetCuts, address initAddress, bytes initCalldata)"; export const FORCE_DEPLOYMENT_ABI_STRING = diff --git a/l1-contracts/test/foundry/unit/concrete/Executor/Authorization.t.sol b/l1-contracts/test/foundry/unit/concrete/Executor/Authorization.t.sol index 4d818e6bf..59869620b 100644 --- a/l1-contracts/test/foundry/unit/concrete/Executor/Authorization.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Executor/Authorization.t.sol @@ -45,7 +45,11 @@ contract AuthorizationTest is ExecutorTest { vm.prank(randomSigner); vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, randomSigner)); - executor.commitBatchesSharedBridge(uint256(0), storedBatchInfo, commitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + storedBatchInfo, + commitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } function test_RevertWhen_ProvingByUnauthorisedAddress() public { @@ -55,7 +59,12 @@ contract AuthorizationTest is ExecutorTest { vm.prank(owner); vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, owner)); - executor.proveBatchesSharedBridge(uint256(0), storedBatchInfo, storedBatchInfoArray, proofInput); + (uint256 proveBatchFrom, uint256 proveBatchTo, bytes memory proveData) = Utils.encodeProveBatchesData( + storedBatchInfo, + storedBatchInfoArray, + proofInput + ); + executor.proveBatchesSharedBridge(uint256(0), proveBatchFrom, proveBatchTo, proveData); } function test_RevertWhen_ExecutingByUnauthorizedAddress() public { @@ -65,6 +74,10 @@ contract AuthorizationTest is ExecutorTest { vm.prank(randomSigner); vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, randomSigner)); - executor.executeBatchesSharedBridge(uint256(0), storedBatchInfoArray, Utils.emptyData()); + (uint256 executeBatchFrom, uint256 executeBatchTo, bytes memory executeData) = Utils.encodeExecuteBatchesData( + storedBatchInfoArray, + Utils.emptyData() + ); + executor.executeBatchesSharedBridge(uint256(0), executeBatchFrom, executeBatchTo, executeData); } } diff --git a/l1-contracts/test/foundry/unit/concrete/Executor/Committing.t.sol b/l1-contracts/test/foundry/unit/concrete/Executor/Committing.t.sol index e7bfa5fc0..8ba961ed2 100644 --- a/l1-contracts/test/foundry/unit/concrete/Executor/Committing.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Executor/Committing.t.sol @@ -72,7 +72,11 @@ contract CommittingTest is ExecutorTest { keccak256(abi.encode(wrongGenesisStoredBatchInfo)) ) ); - executor.commitBatchesSharedBridge(uint256(0), wrongGenesisStoredBatchInfo, newCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + wrongGenesisStoredBatchInfo, + newCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } function test_RevertWhen_CommittingWithWrongOrderOfBatches() public { @@ -85,7 +89,11 @@ contract CommittingTest is ExecutorTest { vm.prank(validator); vm.expectRevert(abi.encodeWithSelector(BatchNumberMismatch.selector, uint256(1), uint256(2))); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + wrongNewCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } function test_RevertWhen_CommittingWithWrongNewBatchTimestamp() public { @@ -110,7 +118,11 @@ contract CommittingTest is ExecutorTest { vm.blobhashes(defaultBlobVersionedHashes); vm.expectRevert(TimestampError.selector); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + wrongNewCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } function test_RevertWhen_CommittingWithTooSmallNewBatchTimestamp() public { @@ -135,7 +147,11 @@ contract CommittingTest is ExecutorTest { vm.blobhashes(defaultBlobVersionedHashes); vm.expectRevert(abi.encodeWithSelector(TimeNotReached.selector, 1, 2)); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + wrongNewCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } function test_RevertWhen_CommittingTooBigLastL2BatchTimestamp() public { @@ -160,7 +176,11 @@ contract CommittingTest is ExecutorTest { vm.blobhashes(defaultBlobVersionedHashes); vm.expectRevert(abi.encodeWithSelector(L2TimestampTooBig.selector)); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + wrongNewCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } function test_RevertWhen_CommittingWithWrongPreviousBatchHash() public { @@ -184,7 +204,11 @@ contract CommittingTest is ExecutorTest { vm.blobhashes(defaultBlobVersionedHashes); vm.expectRevert(abi.encodeWithSelector(HashMismatch.selector, wrongPreviousBatchHash, bytes32(0))); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + wrongNewCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } // function test_RevertWhen_CommittingWithoutProcessingSystemContextLog() public { @@ -202,7 +226,9 @@ contract CommittingTest is ExecutorTest { // vm.blobhashes(defaultBlobVersionedHashes); // vm.expectRevert(abi.encodeWithSelector(MissingSystemLogs.selector, 8191, 8183)); - // executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); + // (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = + // Utils.encodeCommitBatchesData(genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); + // executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); // } function test_RevertWhen_CommittingWithProcessingSystemContextLogTwice() public { @@ -230,7 +256,11 @@ contract CommittingTest is ExecutorTest { vm.blobhashes(defaultBlobVersionedHashes); vm.expectRevert(abi.encodeWithSelector(LogAlreadyProcessed.selector, 1)); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + wrongNewCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } function test_RevertWhen_UnexpectedL2ToL1Log() public { @@ -258,7 +288,11 @@ contract CommittingTest is ExecutorTest { uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY) ) ); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + wrongNewCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } function test_RevertWhen_CommittingWithWrongCanonicalTxHash() public { @@ -282,7 +316,11 @@ contract CommittingTest is ExecutorTest { vm.prank(validator); vm.expectRevert(abi.encodeWithSelector(HashMismatch.selector, wrongChainedPriorityHash, keccak256(""))); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + wrongNewCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } function test_RevertWhen_CommittingWithWrongNumberOfLayer1txs() public { @@ -306,7 +344,11 @@ contract CommittingTest is ExecutorTest { vm.prank(validator); vm.expectRevert(abi.encodeWithSelector(ValueMismatch.selector, uint256(bytes32(bytes1(0x01))), uint256(2))); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + wrongNewCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } function test_RevertWhen_CommittingWithUnknownSystemLogKey() public { @@ -326,7 +368,11 @@ contract CommittingTest is ExecutorTest { vm.prank(validator); vm.expectRevert(abi.encodeWithSelector(UnexpectedSystemLog.selector, uint256(119))); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + wrongNewCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } function test_RevertWhen_SystemLogIsFromIncorrectAddress() public { @@ -354,7 +400,11 @@ contract CommittingTest is ExecutorTest { vm.prank(validator); vm.expectRevert(abi.encodeWithSelector(InvalidLogSender.selector, wrongAddress, i)); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + wrongNewCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } } @@ -374,7 +424,9 @@ contract CommittingTest is ExecutorTest { // uint256 allLogsProcessed = uint256(8191); // vm.expectRevert(abi.encodeWithSelector(MissingSystemLogs.selector, 8191, allLogsProcessed ^ (1 << i))); - // executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); + // (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = + // Utils.encodeCommitBatchesData(genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); + // executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); // } // } @@ -439,8 +491,11 @@ contract CommittingTest is ExecutorTest { vm.prank(validator); vm.blobhashes(defaultBlobVersionedHashes); vm.recordLogs(); - - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, correctCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + correctCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); Vm.Log[] memory entries = vm.getRecordedLogs(); @@ -476,7 +531,11 @@ contract CommittingTest is ExecutorTest { vm.recordLogs(); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, correctCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + correctCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); Vm.Log[] memory entries = vm.getRecordedLogs(); @@ -541,7 +600,11 @@ contract CommittingTest is ExecutorTest { vm.recordLogs(); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, correctCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + correctCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); Vm.Log[] memory entries = vm.getRecordedLogs(); @@ -565,7 +628,11 @@ contract CommittingTest is ExecutorTest { vm.prank(validator); vm.expectRevert(abi.encodeWithSelector(CanOnlyProcessOneBatch.selector)); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, correctCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + correctCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } // function test_RevertWhen_EmptyPubdataCommitments() public { @@ -589,7 +656,9 @@ contract CommittingTest is ExecutorTest { // vm.prank(validator); // vm.expectRevert(PubdataCommitmentsEmpty.selector); - // executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, correctCommitBatchInfoArray); + // (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = + // Utils.encodeCommitBatchesData(genesisStoredBatchInfo, correctCommitBatchInfoArray); + // executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); // } // function test_RevertWhen_PartialPubdataCommitment() public { @@ -625,7 +694,9 @@ contract CommittingTest is ExecutorTest { // vm.blobhashes(defaultBlobVersionedHashes); // vm.expectRevert(InvalidPubdataCommitmentsSize.selector); - // executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, correctCommitBatchInfoArray); + // (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = + // Utils.encodeCommitBatchesData(genesisStoredBatchInfo, correctCommitBatchInfoArray); + // executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); // } function test_RevertWhen_TooManyPubdataCommitments() public { @@ -662,7 +733,11 @@ contract CommittingTest is ExecutorTest { vm.prank(validator); vm.expectRevert(InvalidPubdataCommitmentsSize.selector); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, correctCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + correctCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } function test_RevertWhen_NotEnoughPubdataCommitments() public { @@ -689,7 +764,11 @@ contract CommittingTest is ExecutorTest { vm.blobhashes(versionedHashes); vm.expectRevert(abi.encodeWithSelector(NonEmptyBlobVersionHash.selector, uint256(1))); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, correctCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + correctCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); vm.clearMockedCalls(); } @@ -715,7 +794,11 @@ contract CommittingTest is ExecutorTest { vm.prank(validator); vm.expectRevert(abi.encodeWithSelector(EmptyBlobVersionHash.selector, 0)); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, correctCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + correctCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); vm.clearMockedCalls(); } @@ -744,7 +827,11 @@ contract CommittingTest is ExecutorTest { vm.blobhashes(blobVersionedHashes); vm.expectRevert(abi.encodeWithSelector(NonEmptyBlobVersionHash.selector, uint256(1))); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, correctCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + correctCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); vm.clearMockedCalls(); } @@ -798,7 +885,9 @@ contract CommittingTest is ExecutorTest { // vm.prank(validator); // vm.expectRevert(abi.encodeWithSelector(BlobHashCommitmentError.selector, uint256(1), true, false)); - // executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, correctCommitBatchInfoArray); + // (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = + // Utils.encodeCommitBatchesData(genesisStoredBatchInfo, correctCommitBatchInfoArray); + // executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); // } // function test_RevertWhen_SecondBlobLinearHashNotZeroWithEmptyCommitment() public { diff --git a/l1-contracts/test/foundry/unit/concrete/Executor/Executing.t.sol b/l1-contracts/test/foundry/unit/concrete/Executor/Executing.t.sol index 85d828ea0..fbfc92fd4 100644 --- a/l1-contracts/test/foundry/unit/concrete/Executor/Executing.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Executor/Executing.t.sol @@ -74,7 +74,11 @@ contract ExecutingTest is ExecutorTest { vm.prank(validator); vm.blobhashes(blobVersionedHashes); vm.recordLogs(); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, commitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + commitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); Vm.Log[] memory entries = vm.getRecordedLogs(); newStoredBatchInfo = IExecutor.StoredBatchInfo({ @@ -92,7 +96,12 @@ contract ExecutingTest is ExecutorTest { storedBatchInfoArray[0] = newStoredBatchInfo; vm.prank(validator); - executor.proveBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, storedBatchInfoArray, proofInput); + (uint256 proveBatchFrom, uint256 proveBatchTo, bytes memory proveData) = Utils.encodeProveBatchesData( + genesisStoredBatchInfo, + storedBatchInfoArray, + proofInput + ); + executor.proveBatchesSharedBridge(uint256(0), proveBatchFrom, proveBatchTo, proveData); } function test_RevertWhen_ExecutingBlockWithWrongBatchNumber() public { @@ -104,11 +113,11 @@ contract ExecutingTest is ExecutorTest { vm.prank(validator); vm.expectRevert(NonSequentialBatch.selector); - executor.executeBatchesSharedBridge( - uint256(0), + (uint256 executeBatchFrom, uint256 executeBatchTo, bytes memory executeData) = Utils.encodeExecuteBatchesData( storedBatchInfoArray, Utils.generatePriorityOps(storedBatchInfoArray.length) ); + executor.executeBatchesSharedBridge(uint256(0), executeBatchFrom, executeBatchTo, executeData); } function test_RevertWhen_ExecutingBlockWithWrongData() public { @@ -126,11 +135,11 @@ contract ExecutingTest is ExecutorTest { keccak256(abi.encode(wrongNewStoredBatchInfo)) ) ); - executor.executeBatchesSharedBridge( - uint256(0), + (uint256 executeBatchFrom, uint256 executeBatchTo, bytes memory executeData) = Utils.encodeExecuteBatchesData( storedBatchInfoArray, Utils.generatePriorityOps(storedBatchInfoArray.length) ); + executor.executeBatchesSharedBridge(uint256(0), executeBatchFrom, executeBatchTo, executeData); } function test_RevertWhen_ExecutingRevertedBlockWithoutCommittingAndProvingAgain() public { @@ -142,11 +151,11 @@ contract ExecutingTest is ExecutorTest { vm.prank(validator); vm.expectRevert(CantExecuteUnprovenBatches.selector); - executor.executeBatchesSharedBridge( - uint256(0), + (uint256 executeBatchFrom, uint256 executeBatchTo, bytes memory executeData) = Utils.encodeExecuteBatchesData( storedBatchInfoArray, Utils.generatePriorityOps(storedBatchInfoArray.length) ); + executor.executeBatchesSharedBridge(uint256(0), executeBatchFrom, executeBatchTo, executeData); } function test_RevertWhen_ExecutingUnavailablePriorityOperationHash() public { @@ -187,7 +196,11 @@ contract ExecutingTest is ExecutorTest { vm.prank(validator); vm.blobhashes(blobVersionedHashes); vm.recordLogs(); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, correctNewCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + correctNewCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); Vm.Log[] memory entries = vm.getRecordedLogs(); IExecutor.StoredBatchInfo memory correctNewStoredBatchInfo = newStoredBatchInfo; @@ -200,20 +213,27 @@ contract ExecutingTest is ExecutorTest { correctNewStoredBatchInfoArray[0] = correctNewStoredBatchInfo; vm.prank(validator); - executor.proveBatchesSharedBridge( - uint256(0), - genesisStoredBatchInfo, - correctNewStoredBatchInfoArray, - proofInput - ); + uint256 processBatchFrom; + uint256 processBatchTo; + bytes memory processData; + { + (processBatchFrom, processBatchTo, processData) = Utils.encodeProveBatchesData( + genesisStoredBatchInfo, + correctNewStoredBatchInfoArray, + proofInput + ); + executor.proveBatchesSharedBridge(uint256(0), processBatchFrom, processBatchTo, processData); + } vm.prank(validator); vm.expectRevert(QueueIsEmpty.selector); - executor.executeBatchesSharedBridge( - uint256(0), - correctNewStoredBatchInfoArray, - Utils.generatePriorityOps(correctNewStoredBatchInfoArray.length) - ); + { + (processBatchFrom, processBatchTo, processData) = Utils.encodeExecuteBatchesData( + correctNewStoredBatchInfoArray, + Utils.generatePriorityOps(correctNewStoredBatchInfoArray.length) + ); + executor.executeBatchesSharedBridge(uint256(0), processBatchFrom, processBatchTo, processData); + } } function test_RevertWhen_ExecutingWithUnmatchedPriorityOperationHash() public { @@ -253,7 +273,11 @@ contract ExecutingTest is ExecutorTest { vm.prank(validator); vm.blobhashes(blobVersionedHashes); vm.recordLogs(); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, correctNewCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + correctNewCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); Vm.Log[] memory entries = vm.getRecordedLogs(); IExecutor.StoredBatchInfo memory correctNewStoredBatchInfo = newStoredBatchInfo; @@ -266,12 +290,17 @@ contract ExecutingTest is ExecutorTest { correctNewStoredBatchInfoArray[0] = correctNewStoredBatchInfo; vm.prank(validator); - executor.proveBatchesSharedBridge( - uint256(0), - genesisStoredBatchInfo, - correctNewStoredBatchInfoArray, - proofInput - ); + uint256 processBatchFrom; + uint256 processBatchTo; + bytes memory processData; + { + (processBatchFrom, processBatchTo, processData) = Utils.encodeProveBatchesData( + genesisStoredBatchInfo, + correctNewStoredBatchInfoArray, + proofInput + ); + executor.proveBatchesSharedBridge(uint256(0), processBatchFrom, processBatchTo, processData); + } bytes32 randomFactoryDeps0 = Utils.randomBytes32("randomFactoryDeps0"); @@ -296,11 +325,14 @@ contract ExecutingTest is ExecutorTest { vm.prank(validator); vm.expectRevert(PriorityOperationsRollingHashMismatch.selector); - executor.executeBatchesSharedBridge( - uint256(0), - correctNewStoredBatchInfoArray, - Utils.generatePriorityOps(correctNewStoredBatchInfoArray.length) - ); + + { + (processBatchFrom, processBatchTo, processData) = Utils.encodeExecuteBatchesData( + correctNewStoredBatchInfoArray, + Utils.generatePriorityOps(correctNewStoredBatchInfoArray.length) + ); + executor.executeBatchesSharedBridge(uint256(0), processBatchFrom, processBatchTo, processData); + } } function test_RevertWhen_CommittingBlockWithWrongPreviousBatchHash() public { @@ -330,7 +362,11 @@ contract ExecutingTest is ExecutorTest { vm.expectRevert( abi.encodeWithSelector(BatchHashMismatch.selector, storedBatchHash, keccak256(abi.encode(genesisBlock))) ); - executor.commitBatchesSharedBridge(uint256(0), genesisBlock, correctNewCommitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisBlock, + correctNewCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } function test_ShouldExecuteBatchesuccessfully() public { @@ -338,11 +374,11 @@ contract ExecutingTest is ExecutorTest { storedBatchInfoArray[0] = newStoredBatchInfo; vm.prank(validator); - executor.executeBatchesSharedBridge( - uint256(0), + (uint256 executeBatchFrom, uint256 executeBatchTo, bytes memory executeData) = Utils.encodeExecuteBatchesData( storedBatchInfoArray, Utils.generatePriorityOps(storedBatchInfoArray.length) ); + executor.executeBatchesSharedBridge(uint256(0), executeBatchFrom, executeBatchTo, executeData); uint256 totalBlocksExecuted = getters.getTotalBlocksExecuted(); assertEq(totalBlocksExecuted, 1); diff --git a/l1-contracts/test/foundry/unit/concrete/Executor/Proving.t.sol b/l1-contracts/test/foundry/unit/concrete/Executor/Proving.t.sol index c5b97b54d..73b104186 100644 --- a/l1-contracts/test/foundry/unit/concrete/Executor/Proving.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Executor/Proving.t.sol @@ -41,7 +41,11 @@ contract ProvingTest is ExecutorTest { vm.prank(validator); vm.blobhashes(blobVersionedHashes); vm.recordLogs(); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, commitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + commitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); Vm.Log[] memory entries = vm.getRecordedLogs(); newStoredBatchInfo = IExecutor.StoredBatchInfo({ @@ -106,7 +110,12 @@ contract ProvingTest is ExecutorTest { keccak256(abi.encode(wrongPreviousStoredBatchInfo)) ) ); - executor.proveBatchesSharedBridge(uint256(0), wrongPreviousStoredBatchInfo, storedBatchInfoArray, proofInput); + (uint256 proveBatchFrom, uint256 proveBatchTo, bytes memory proveData) = Utils.encodeProveBatchesData( + wrongPreviousStoredBatchInfo, + storedBatchInfoArray, + proofInput + ); + executor.proveBatchesSharedBridge(uint256(0), proveBatchFrom, proveBatchTo, proveData); } function test_RevertWhen_ProvingWithWrongCommittedBlock() public { @@ -125,7 +134,12 @@ contract ProvingTest is ExecutorTest { keccak256(abi.encode(wrongNewStoredBatchInfo)) ) ); - executor.proveBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, storedBatchInfoArray, proofInput); + (uint256 proveBatchFrom, uint256 proveBatchTo, bytes memory proveData) = Utils.encodeProveBatchesData( + genesisStoredBatchInfo, + storedBatchInfoArray, + proofInput + ); + executor.proveBatchesSharedBridge(uint256(0), proveBatchFrom, proveBatchTo, proveData); } function test_RevertWhen_ProvingRevertedBlockWithoutCommittingAgain() public { @@ -138,7 +152,12 @@ contract ProvingTest is ExecutorTest { vm.prank(validator); vm.expectRevert(VerifiedBatchesExceedsCommittedBatches.selector); - executor.proveBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, storedBatchInfoArray, proofInput); + (uint256 proveBatchFrom, uint256 proveBatchTo, bytes memory proveData) = Utils.encodeProveBatchesData( + genesisStoredBatchInfo, + storedBatchInfoArray, + proofInput + ); + executor.proveBatchesSharedBridge(uint256(0), proveBatchFrom, proveBatchTo, proveData); } function test_SuccessfulProve() public { @@ -146,8 +165,12 @@ contract ProvingTest is ExecutorTest { storedBatchInfoArray[0] = newStoredBatchInfo; vm.prank(validator); - - executor.proveBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, storedBatchInfoArray, proofInput); + (uint256 proveBatchFrom, uint256 proveBatchTo, bytes memory proveData) = Utils.encodeProveBatchesData( + genesisStoredBatchInfo, + storedBatchInfoArray, + proofInput + ); + executor.proveBatchesSharedBridge(uint256(0), proveBatchFrom, proveBatchTo, proveData); uint256 totalBlocksVerified = getters.getTotalBlocksVerified(); assertEq(totalBlocksVerified, 1); diff --git a/l1-contracts/test/foundry/unit/concrete/Executor/Reverting.t.sol b/l1-contracts/test/foundry/unit/concrete/Executor/Reverting.t.sol index 6ce83e15e..ba2fc4b60 100644 --- a/l1-contracts/test/foundry/unit/concrete/Executor/Reverting.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Executor/Reverting.t.sol @@ -40,7 +40,11 @@ contract RevertingTest is ExecutorTest { vm.prank(validator); vm.blobhashes(blobVersionedHashes); vm.recordLogs(); - executor.commitBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, commitBatchInfoArray); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + commitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); Vm.Log[] memory entries = vm.getRecordedLogs(); newStoredBatchInfo = IExecutor.StoredBatchInfo({ @@ -58,8 +62,12 @@ contract RevertingTest is ExecutorTest { storedBatchInfoArray[0] = newStoredBatchInfo; vm.prank(validator); - - executor.proveBatchesSharedBridge(uint256(0), genesisStoredBatchInfo, storedBatchInfoArray, proofInput); + (uint256 proveBatchFrom, uint256 proveBatchTo, bytes memory proveData) = Utils.encodeProveBatchesData( + genesisStoredBatchInfo, + storedBatchInfoArray, + proofInput + ); + executor.proveBatchesSharedBridge(uint256(0), proveBatchFrom, proveBatchTo, proveData); } function setUpCommitBatch() public { diff --git a/l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol b/l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol index 821cbf8fe..07aab22c7 100644 --- a/l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol @@ -55,7 +55,7 @@ contract ExecutorTest is Test { uint256 eraChainId; IExecutor.StoredBatchInfo internal genesisStoredBatchInfo; - IExecutor.ProofInput internal proofInput; + uint256[] internal proofInput; function getAdminSelectors() private view returns (bytes4[] memory) { bytes4[] memory selectors = new bytes4[](12); @@ -259,10 +259,6 @@ contract ExecutorTest is Test { vm.prank(address(owner)); admin.setDAValidatorPair(address(rollupL1DAValidator), L2_DA_VALIDATOR_ADDRESS); - uint256[] memory recursiveAggregationInput; - uint256[] memory serializedProof; - proofInput = IExecutor.ProofInput(recursiveAggregationInput, serializedProof); - // foundry's default value is 1 for the block's timestamp, it is expected // that block.timestamp > COMMIT_TIMESTAMP_NOT_OLDER + 1 vm.warp(COMMIT_TIMESTAMP_NOT_OLDER + 1 + 1); diff --git a/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol b/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol index 2cb954e9c..8ab52c976 100644 --- a/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol +++ b/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol @@ -155,17 +155,6 @@ library Utils { }); } - function createProofInput() public pure returns (IExecutor.ProofInput memory) { - uint256[] memory recursiveAggregationInput; - uint256[] memory serializedProof; - - return - IExecutor.ProofInput({ - recursiveAggregationInput: recursiveAggregationInput, - serializedProof: serializedProof - }); - } - function encodePacked(bytes[] memory data) public pure returns (bytes memory) { bytes memory result; for (uint256 i = 0; i < data.length; i++) { @@ -174,6 +163,40 @@ library Utils { return result; } + function encodeCommitBatchesData( + IExecutor.StoredBatchInfo memory _lastCommittedBatchData, + IExecutor.CommitBatchInfo[] memory _newBatchesData + ) internal pure returns (uint256, uint256, bytes memory) { + return ( + _newBatchesData[0].batchNumber, + _newBatchesData[_newBatchesData.length - 1].batchNumber, + bytes.concat(bytes1(0x00), abi.encode(_lastCommittedBatchData, _newBatchesData)) + ); + } + + function encodeProveBatchesData( + IExecutor.StoredBatchInfo memory _prevBatch, + IExecutor.StoredBatchInfo[] memory _committedBatches, + uint256[] memory _proof + ) internal pure returns (uint256, uint256, bytes memory) { + return ( + _committedBatches[0].batchNumber, + _committedBatches[_committedBatches.length - 1].batchNumber, + bytes.concat(bytes1(0x00), abi.encode(_prevBatch, _committedBatches, _proof)) + ); + } + + function encodeExecuteBatchesData( + IExecutor.StoredBatchInfo[] memory _batchesData, + PriorityOpsBatchInfo[] memory _priorityOpsData + ) internal pure returns (uint256, uint256, bytes memory) { + return ( + _batchesData[0].batchNumber, + _batchesData[_batchesData.length - 1].batchNumber, + bytes.concat(bytes1(0x00), abi.encode(_batchesData, _priorityOpsData)) + ); + } + function getAdminSelectors() public pure returns (bytes4[] memory) { bytes4[] memory selectors = new bytes4[](12); selectors[0] = AdminFacet.setPendingAdmin.selector; diff --git a/l1-contracts/test/foundry/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol b/l1-contracts/test/foundry/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol index 9a7b7bcf4..3725f54e2 100644 --- a/l1-contracts/test/foundry/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol @@ -92,7 +92,11 @@ contract ValidatorTimelockTest is Test { batchesToCommit[0] = batchToCommit; vm.prank(alice); - validator.commitBatchesSharedBridge(chainId, storedBatch, batchesToCommit); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + storedBatch, + batchesToCommit + ); + validator.commitBatchesSharedBridge(chainId, commitBatchFrom, commitBatchTo, commitData); } function test_setChainTypeManager() public { @@ -140,7 +144,11 @@ contract ValidatorTimelockTest is Test { batchesToCommit[0] = batchToCommit; vm.prank(alice); - validator.commitBatchesSharedBridge(chainId, storedBatch, batchesToCommit); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + storedBatch, + batchesToCommit + ); + validator.commitBatchesSharedBridge(chainId, commitBatchFrom, commitBatchTo, commitData); assert(validator.getCommittedBatchTimestamp(chainId, batchNumber) == timestamp); } @@ -155,7 +163,11 @@ contract ValidatorTimelockTest is Test { batchesToCommit[0] = batchToCommit; vm.prank(alice); - validator.commitBatchesSharedBridge(chainId, storedBatch, batchesToCommit); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + storedBatch, + batchesToCommit + ); + validator.commitBatchesSharedBridge(chainId, commitBatchFrom, commitBatchTo, commitData); } function test_revertBatchesSharedBridge() public { @@ -168,7 +180,7 @@ contract ValidatorTimelockTest is Test { function test_proveBatchesSharedBridge() public { IExecutor.StoredBatchInfo memory prevBatch = Utils.createStoredBatchInfo(); IExecutor.StoredBatchInfo memory batchToProve = Utils.createStoredBatchInfo(); - IExecutor.ProofInput memory proof = Utils.createProofInput(); + uint256[] memory proof = new uint256[](0); IExecutor.StoredBatchInfo[] memory batchesToProve = new IExecutor.StoredBatchInfo[](1); batchesToProve[0] = batchToProve; @@ -179,7 +191,12 @@ contract ValidatorTimelockTest is Test { abi.encode(chainId, prevBatch, batchesToProve, proof) ); vm.prank(alice); - validator.proveBatchesSharedBridge(chainId, prevBatch, batchesToProve, proof); + (uint256 proveBatchFrom, uint256 proveBatchTo, bytes memory proveData) = Utils.encodeProveBatchesData( + prevBatch, + batchesToProve, + proof + ); + validator.proveBatchesSharedBridge(chainId, proveBatchFrom, proveBatchTo, proveData); } function test_executeBatchesSharedBridge() public { @@ -197,7 +214,11 @@ contract ValidatorTimelockTest is Test { vm.prank(alice); vm.warp(timestamp); - validator.commitBatchesSharedBridge(chainId, storedBatch1, batchesToCommit); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + storedBatch1, + batchesToCommit + ); + validator.commitBatchesSharedBridge(chainId, commitBatchFrom, commitBatchTo, commitData); // Execute batches IExecutor.StoredBatchInfo memory storedBatch2 = Utils.createStoredBatchInfo(); @@ -213,7 +234,11 @@ contract ValidatorTimelockTest is Test { vm.prank(alice); vm.warp(timestamp + executionDelay + 1); - validator.executeBatchesSharedBridge(chainId, storedBatches, Utils.emptyData()); + (uint256 executeBatchFrom, uint256 executeBatchTo, bytes memory executeData) = Utils.encodeExecuteBatchesData( + storedBatches, + Utils.emptyData() + ); + validator.executeBatchesSharedBridge(chainId, executeBatchFrom, executeBatchTo, executeData); } function test_RevertWhen_setExecutionDelayNotOwner() public { @@ -265,7 +290,11 @@ contract ValidatorTimelockTest is Test { vm.prank(bob); vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, bob)); - validator.commitBatchesSharedBridge(chainId, storedBatch, batchesToCommit); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + storedBatch, + batchesToCommit + ); + validator.commitBatchesSharedBridge(chainId, commitBatchFrom, commitBatchTo, commitData); } function test_RevertWhen_setChainTypeManagerNotOwner() public { @@ -286,14 +315,19 @@ contract ValidatorTimelockTest is Test { function test_RevertWhen_proveBatchesSharedBridgeNotValidator() public { IExecutor.StoredBatchInfo memory prevBatch = Utils.createStoredBatchInfo(); IExecutor.StoredBatchInfo memory batchToProve = Utils.createStoredBatchInfo(); - IExecutor.ProofInput memory proof = Utils.createProofInput(); + uint256[] memory proof = new uint256[](0); IExecutor.StoredBatchInfo[] memory batchesToProve = new IExecutor.StoredBatchInfo[](1); batchesToProve[0] = batchToProve; vm.prank(bob); vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, bob)); - validator.proveBatchesSharedBridge(chainId, prevBatch, batchesToProve, proof); + (uint256 proveBatchFrom, uint256 proveBatchTo, bytes memory proveData) = Utils.encodeProveBatchesData( + prevBatch, + batchesToProve, + proof + ); + validator.proveBatchesSharedBridge(chainId, proveBatchFrom, proveBatchTo, proveData); } function test_RevertWhen_executeBatchesSharedBridgeNotValidator() public { @@ -304,7 +338,11 @@ contract ValidatorTimelockTest is Test { vm.prank(bob); vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, bob)); - validator.executeBatchesSharedBridge(chainId, storedBatches, Utils.emptyData()); + (uint256 executeBatchFrom, uint256 executeBatchTo, bytes memory executeData) = Utils.encodeExecuteBatchesData( + storedBatches, + Utils.emptyData() + ); + validator.executeBatchesSharedBridge(chainId, executeBatchFrom, executeBatchTo, executeData); } function test_RevertWhen_executeBatchesSharedBridgeTooEarly() public { @@ -322,7 +360,11 @@ contract ValidatorTimelockTest is Test { vm.prank(alice); vm.warp(timestamp); - validator.commitBatchesSharedBridge(chainId, storedBatch1, batchesToCommit); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + storedBatch1, + batchesToCommit + ); + validator.commitBatchesSharedBridge(chainId, commitBatchFrom, commitBatchTo, commitData); // Execute batches IExecutor.StoredBatchInfo memory storedBatch2 = Utils.createStoredBatchInfo(); @@ -335,6 +377,10 @@ contract ValidatorTimelockTest is Test { vm.expectRevert( abi.encodeWithSelector(TimeNotReached.selector, timestamp + executionDelay, timestamp + executionDelay - 1) ); - validator.executeBatchesSharedBridge(chainId, storedBatches, Utils.emptyData()); + (uint256 executeBatchFrom, uint256 executeBatchTo, bytes memory executeData) = Utils.encodeExecuteBatchesData( + storedBatches, + Utils.emptyData() + ); + validator.executeBatchesSharedBridge(chainId, executeBatchFrom, executeBatchTo, executeData); } } diff --git a/l1-contracts/test/foundry/unit/concrete/Verifier/Verifier.t.sol b/l1-contracts/test/foundry/unit/concrete/Verifier/Verifier.t.sol index 54ab49974..bd67cfa2b 100644 --- a/l1-contracts/test/foundry/unit/concrete/Verifier/Verifier.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Verifier/Verifier.t.sol @@ -12,7 +12,6 @@ contract VerifierTestTest is Test { uint256[] public publicInputs; uint256[] public serializedProof; - uint256[] public recursiveAggregationInput; Verifier public verifier; @@ -68,7 +67,7 @@ contract VerifierTestTest is Test { } function testShouldVerify() public view { - bool success = verifier.verify(publicInputs, serializedProof, recursiveAggregationInput); + bool success = verifier.verify(publicInputs, serializedProof); assert(success); } @@ -76,7 +75,7 @@ contract VerifierTestTest is Test { uint256[] memory newPublicInputs = publicInputs; newPublicInputs[0] += uint256(bytes32(0xe000000000000000000000000000000000000000000000000000000000000000)); - bool success = verifier.verify(newPublicInputs, serializedProof, recursiveAggregationInput); + bool success = verifier.verify(newPublicInputs, serializedProof); assert(success); } @@ -86,7 +85,7 @@ contract VerifierTestTest is Test { newSerializedProof[1] += Q_MOD; newSerializedProof[1] += Q_MOD; - bool success = verifier.verify(publicInputs, newSerializedProof, recursiveAggregationInput); + bool success = verifier.verify(publicInputs, newSerializedProof); assert(success); } @@ -94,7 +93,7 @@ contract VerifierTestTest is Test { uint256[] memory newSerializedProof = serializedProof; newSerializedProof[22] += R_MOD; - bool success = verifier.verify(publicInputs, newSerializedProof, recursiveAggregationInput); + bool success = verifier.verify(publicInputs, newSerializedProof); assert(success); } @@ -104,14 +103,14 @@ contract VerifierTestTest is Test { newPublicInputs[1] = publicInputs[0]; vm.expectRevert(bytes("loadProof: Proof is invalid")); - verifier.verify(newPublicInputs, serializedProof, recursiveAggregationInput); + verifier.verify(newPublicInputs, serializedProof); } function testEmptyPublicInput_shouldRevert() public { uint256[] memory newPublicInputs; vm.expectRevert(bytes("loadProof: Proof is invalid")); - verifier.verify(newPublicInputs, serializedProof, recursiveAggregationInput); + verifier.verify(newPublicInputs, serializedProof); } function testMoreThan44WordsProof_shouldRevert() public { @@ -123,21 +122,25 @@ contract VerifierTestTest is Test { newSerializedProof[newSerializedProof.length - 1] = serializedProof[serializedProof.length - 1]; vm.expectRevert(bytes("loadProof: Proof is invalid")); - verifier.verify(publicInputs, newSerializedProof, recursiveAggregationInput); + verifier.verify(publicInputs, newSerializedProof); } function testEmptyProof_shouldRevert() public { uint256[] memory newSerializedProof; vm.expectRevert(bytes("loadProof: Proof is invalid")); - verifier.verify(publicInputs, newSerializedProof, recursiveAggregationInput); + verifier.verify(publicInputs, newSerializedProof); } - function testNotEmptyRecursiveAggregationInput_shouldRevert() public { - uint256[] memory newRecursiveAggregationInput = publicInputs; + function testLongerProofInput_shouldRevert() public { + uint256[] memory newSerializedProof = new uint256[](serializedProof.length + 1); + for (uint256 i = 0; i < serializedProof.length; i++) { + newSerializedProof[i] = serializedProof[i]; + } + newSerializedProof[newSerializedProof.length - 1] = publicInputs[0]; vm.expectRevert(bytes("loadProof: Proof is invalid")); - verifier.verify(publicInputs, serializedProof, newRecursiveAggregationInput); + verifier.verify(publicInputs, newSerializedProof); } function testEllipticCurvePointAtInfinity_shouldRevert() public { @@ -146,7 +149,7 @@ contract VerifierTestTest is Test { newSerializedProof[1] = 0; vm.expectRevert(bytes("loadProof: Proof is invalid")); - verifier.verify(publicInputs, newSerializedProof, recursiveAggregationInput); + verifier.verify(publicInputs, newSerializedProof); } function testInvalidPublicInput_shouldRevert() public { @@ -154,7 +157,7 @@ contract VerifierTestTest is Test { newPublicInputs[0] = 0; vm.expectRevert(bytes("invalid quotient evaluation")); - verifier.verify(newPublicInputs, serializedProof, recursiveAggregationInput); + verifier.verify(newPublicInputs, serializedProof); } function testVerificationKeyHash() public virtual { diff --git a/l1-contracts/test/foundry/unit/concrete/Verifier/VerifierRecursive.t.sol b/l1-contracts/test/foundry/unit/concrete/Verifier/VerifierRecursive.t.sol index 69bad2303..c23759f35 100644 --- a/l1-contracts/test/foundry/unit/concrete/Verifier/VerifierRecursive.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/Verifier/VerifierRecursive.t.sol @@ -8,44 +8,45 @@ contract VerifierRecursiveTestTest is VerifierTestTest { function setUp() public override { super.setUp(); - recursiveAggregationInput.push(2257920826825449939414463854743099397427742128922725774525544832270890253504); - recursiveAggregationInput.push(9091218701914748532331969127001446391756173432977615061129552313204917562530); - recursiveAggregationInput.push(16188304989094043810949359833767911976672882599560690320245309499206765021563); - recursiveAggregationInput.push(3201093556796962656759050531176732990872300033146738631772984017549903765305); + serializedProof.push(2257920826825449939414463854743099397427742128922725774525544832270890253504); + serializedProof.push(9091218701914748532331969127001446391756173432977615061129552313204917562530); + serializedProof.push(16188304989094043810949359833767911976672882599560690320245309499206765021563); + serializedProof.push(3201093556796962656759050531176732990872300033146738631772984017549903765305); verifier = new VerifierRecursiveTest(); } function testMoreThan4WordsRecursiveInput_shouldRevert() public { - uint256[] memory newRecursiveAggregationInput = new uint256[](recursiveAggregationInput.length + 1); + uint256[] memory newSerializedProof = new uint256[](serializedProof.length + 1); - for (uint256 i = 0; i < recursiveAggregationInput.length; i++) { - newRecursiveAggregationInput[i] = recursiveAggregationInput[i]; + for (uint256 i = 0; i < serializedProof.length; i++) { + newSerializedProof[i] = serializedProof[i]; } - newRecursiveAggregationInput[newRecursiveAggregationInput.length - 1] = recursiveAggregationInput[ - recursiveAggregationInput.length - 1 - ]; + newSerializedProof[newSerializedProof.length - 1] = serializedProof[serializedProof.length - 1]; vm.expectRevert(bytes("loadProof: Proof is invalid")); - verifier.verify(publicInputs, serializedProof, newRecursiveAggregationInput); + verifier.verify(publicInputs, newSerializedProof); } function testEmptyRecursiveInput_shouldRevert() public { - uint256[] memory newRecursiveAggregationInput; + uint256[] memory newSerializedProof = new uint256[](serializedProof.length - 4); + for (uint256 i = 0; i < newSerializedProof.length; i++) { + newSerializedProof[i] = serializedProof[i]; + } vm.expectRevert(bytes("loadProof: Proof is invalid")); - verifier.verify(publicInputs, serializedProof, newRecursiveAggregationInput); + verifier.verify(publicInputs, newSerializedProof); } function testInvalidRecursiveInput_shouldRevert() public { - uint256[] memory newRecursiveAggregationInput = new uint256[](4); - newRecursiveAggregationInput[0] = 1; - newRecursiveAggregationInput[1] = 2; - newRecursiveAggregationInput[2] = 1; - newRecursiveAggregationInput[3] = 2; + uint256[] memory newSerializedProof = serializedProof; + newSerializedProof[newSerializedProof.length - 4] = 1; + newSerializedProof[newSerializedProof.length - 3] = 2; + newSerializedProof[newSerializedProof.length - 2] = 1; + newSerializedProof[newSerializedProof.length - 1] = 2; vm.expectRevert(bytes("finalPairing: pairing failure")); - verifier.verify(publicInputs, serializedProof, newRecursiveAggregationInput); + verifier.verify(publicInputs, newSerializedProof); } function testVerificationKeyHash() public override { diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol index 71eab393f..cdac3e776 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol +++ b/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol @@ -19,7 +19,7 @@ contract revertBatchesTest is ChainTypeManagerTest { IExecutor.CommitBatchInfo internal newCommitBatchInfo; IExecutor.StoredBatchInfo internal newStoredBatchInfo; IExecutor.StoredBatchInfo internal genesisStoredBatchInfo; - IExecutor.ProofInput internal proofInput; + uint256[] internal proofInput; // Facets exposing the diamond AdminFacet internal adminFacet; diff --git a/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts b/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts index c85afab1f..4d04f6695 100644 --- a/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts +++ b/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts @@ -27,6 +27,7 @@ import { diamondCut, Action, facetCut } from "../../src.ts/diamondCut"; import type { CommitBatchInfo, StoredBatchInfo, CommitBatchInfoWithTimestamp } from "./utils"; import { + encodeCommitBatchesData, L2_BOOTLOADER_ADDRESS, L2_SYSTEM_CONTEXT_ADDRESS, SYSTEM_LOG_KEYS, @@ -135,9 +136,11 @@ describe("L2 upgrade test", function () { ); const commitReceipt = await ( - await proxyExecutor.commitBatchesSharedBridge(chainId, genesisStoredBatchInfo(), [batch1InfoChainIdUpgrade]) + await proxyExecutor.commitBatchesSharedBridge( + chainId, + ...encodeCommitBatchesData(genesisStoredBatchInfo(), [batch1InfoChainIdUpgrade]) + ) ).wait(); - const commitment = commitReceipt.events[0].args.commitment; storedBatch1InfoChainIdUpgrade = getBatchStoredInfo(batch1InfoChainIdUpgrade, commitment); await makeExecutedEqualCommitted(proxyExecutor, genesisStoredBatchInfo(), [storedBatch1InfoChainIdUpgrade], []); @@ -151,7 +154,10 @@ describe("L2 upgrade test", function () { }); const commitReceipt = await ( - await proxyExecutor.commitBatchesSharedBridge(chainId, storedBatch1InfoChainIdUpgrade, [batch2Info]) + await proxyExecutor.commitBatchesSharedBridge( + chainId, + ...encodeCommitBatchesData(storedBatch1InfoChainIdUpgrade, [batch2Info]) + ) ).wait(); const commitment = commitReceipt.events[0].args.commitment; @@ -628,7 +634,7 @@ describe("L2 upgrade test", function () { // batchNumber: 3, // }); // const revertReason = await getCallRevertReason( - // proxyExecutor.commitBatchesSharedBridge(storedBatch2Info, [batch3InfoNoUpgradeTx]) + // proxyExecutor.commitBatchesSharedBridge(chainId, ...encodeCommitBatchesData(storedBatch2Info, [batch3InfoNoUpgradeTx])) // ); // expect(revertReason).to.contains("MissingSystemLogs"); // }); @@ -670,8 +676,12 @@ describe("L2 upgrade test", function () { }, systemLogs ); + const revertReason = await getCallRevertReason( - proxyExecutor.commitBatchesSharedBridge(chainId, storedBatch2Info, [batch3InfoNoUpgradeTx]) + proxyExecutor.commitBatchesSharedBridge( + chainId, + ...encodeCommitBatchesData(storedBatch2Info, [batch3InfoNoUpgradeTx]) + ) ); expect(revertReason).to.contains("LogAlreadyProcessed"); }); @@ -704,7 +714,10 @@ describe("L2 upgrade test", function () { ); const revertReason = await getCallRevertReason( - proxyExecutor.commitBatchesSharedBridge(chainId, storedBatch2Info, [batch3InfoTwoUpgradeTx]) + proxyExecutor.commitBatchesSharedBridge( + chainId, + ...encodeCommitBatchesData(storedBatch2Info, [batch3InfoTwoUpgradeTx]) + ) ); expect(revertReason).to.contains("TxHashMismatch"); }); @@ -736,7 +749,12 @@ describe("L2 upgrade test", function () { systemLogs ); - await (await proxyExecutor.commitBatchesSharedBridge(chainId, storedBatch2Info, [batch3InfoTwoUpgradeTx])).wait(); + await ( + await proxyExecutor.commitBatchesSharedBridge( + chainId, + ...encodeCommitBatchesData(storedBatch2Info, [batch3InfoTwoUpgradeTx]) + ) + ).wait(); expect(await proxyGetters.getL2SystemContractsUpgradeBatchNumber()).to.equal(3); }); @@ -770,7 +788,10 @@ describe("L2 upgrade test", function () { ); const commitReceipt = await ( - await proxyExecutor.commitBatchesSharedBridge(chainId, storedBatch2Info, [batch3InfoTwoUpgradeTx]) + await proxyExecutor.commitBatchesSharedBridge( + chainId, + ...encodeCommitBatchesData(storedBatch2Info, [batch3InfoTwoUpgradeTx]) + ) ).wait(); expect(await proxyGetters.getL2SystemContractsUpgradeBatchNumber()).to.equal(3); @@ -809,7 +830,10 @@ describe("L2 upgrade test", function () { ); const commitReceipt = await ( - await proxyExecutor.commitBatchesSharedBridge(chainId, storedBatch2Info, [batch4InfoTwoUpgradeTx]) + await proxyExecutor.commitBatchesSharedBridge( + chainId, + ...encodeCommitBatchesData(storedBatch2Info, [batch4InfoTwoUpgradeTx]) + ) ).wait(); const commitment = commitReceipt.events[0].args.commitment; const newBatchStoredInfo = getBatchStoredInfo(batch4InfoTwoUpgradeTx, commitment); @@ -865,7 +889,10 @@ describe("L2 upgrade test", function () { ); const commitReceipt = await ( - await proxyExecutor.commitBatchesSharedBridge(chainId, storedBatch2Info, [batch5InfoTwoUpgradeTx]) + await proxyExecutor.commitBatchesSharedBridge( + chainId, + ...encodeCommitBatchesData(storedBatch2Info, [batch5InfoTwoUpgradeTx]) + ) ).wait(); const commitment = commitReceipt.events[0].args.commitment; const newBatchStoredInfo = getBatchStoredInfo(batch5InfoTwoUpgradeTx, commitment); diff --git a/l1-contracts/test/unit_tests/utils.ts b/l1-contracts/test/unit_tests/utils.ts index 3d9fd89b7..af74fa28f 100644 --- a/l1-contracts/test/unit_tests/utils.ts +++ b/l1-contracts/test/unit_tests/utils.ts @@ -10,9 +10,16 @@ import type { IMailbox } from "../../typechain/IMailbox"; import type { ExecutorFacet } from "../../typechain"; import type { FeeParams, L2CanonicalTransaction } from "../../src.ts/utils"; -import { ADDRESS_ONE, PubdataPricingMode, EMPTY_STRING_KECCAK } from "../../src.ts/utils"; +import { + ADDRESS_ONE, + PubdataPricingMode, + EMPTY_STRING_KECCAK, + STORED_BATCH_INFO_ABI_STRING, + COMMIT_BATCH_INFO_ABI_STRING, + PRIORITY_OPS_BATCH_INFO_ABI_STRING, +} from "../../src.ts/utils"; import { packSemver } from "../../scripts/utils"; -import { keccak256 } from "ethers/lib/utils"; +import { keccak256, hexConcat, defaultAbiCoder } from "ethers/lib/utils"; export const CONTRACTS_GENESIS_PROTOCOL_VERSION = packSemver(0, 21, 0).toString(); // eslint-disable-next-line @typescript-eslint/no-var-requires @@ -362,6 +369,12 @@ export interface CommitBatchInfo { operatorDAInput: BytesLike; } +export interface PriorityOpsBatchInfo { + leftPath: Array; + rightPath: Array; + itemHashes: Array; +} + export async function depositERC20( bridge: IL1ERC20Bridge, bridgehubContract: IBridgehub, @@ -503,14 +516,13 @@ export async function makeExecutedEqualCommitted( batchesToExecute = [...batchesToProve, ...batchesToExecute]; await ( - await proxyExecutor.proveBatchesSharedBridge(0, prevBatchInfo, batchesToProve, { - recursiveAggregationInput: [], - serializedProof: [], - }) + await proxyExecutor.proveBatchesSharedBridge(0, ...encodeProveBatchesData(prevBatchInfo, batchesToProve, [])) ).wait(); const dummyMerkleProofs = batchesToExecute.map(() => ({ leftPath: [], rightPath: [], itemHashes: [] })); - await (await proxyExecutor.executeBatchesSharedBridge(0, batchesToExecute, dummyMerkleProofs)).wait(); + await ( + await proxyExecutor.executeBatchesSharedBridge(0, ...encodeExecuteBatchesData(batchesToExecute, dummyMerkleProofs)) + ).wait(); } export function getBatchStoredInfo(commitInfo: CommitBatchInfo, commitment: string): StoredBatchInfo { @@ -525,3 +537,40 @@ export function getBatchStoredInfo(commitInfo: CommitBatchInfo, commitment: stri commitment: commitment, }; } + +export function encodeCommitBatchesData( + storedBatchInfo: StoredBatchInfo, + commitBatchInfos: Array +): [BigNumberish, BigNumberish, string] { + const encodedCommitDataWithoutVersion = defaultAbiCoder.encode( + [STORED_BATCH_INFO_ABI_STRING, `${COMMIT_BATCH_INFO_ABI_STRING}[]`], + [storedBatchInfo, commitBatchInfos] + ); + const commitData = hexConcat(["0x00", encodedCommitDataWithoutVersion]); + return [commitBatchInfos[0].batchNumber, commitBatchInfos[commitBatchInfos.length - 1].batchNumber, commitData]; +} + +export function encodeProveBatchesData( + prevBatch: StoredBatchInfo, + committedBatches: Array, + proof: Array +): [BigNumberish, BigNumberish, string] { + const encodedProveDataWithoutVersion = defaultAbiCoder.encode( + [STORED_BATCH_INFO_ABI_STRING, `${STORED_BATCH_INFO_ABI_STRING}[]`, "uint256[]"], + [prevBatch, committedBatches, proof] + ); + const proveData = hexConcat(["0x00", encodedProveDataWithoutVersion]); + return [committedBatches[0].batchNumber, committedBatches[committedBatches.length - 1].batchNumber, proveData]; +} + +export function encodeExecuteBatchesData( + batchesData: Array, + priorityOpsBatchInfo: Array +): [BigNumberish, BigNumberish, string] { + const encodedExecuteDataWithoutVersion = defaultAbiCoder.encode( + [`${STORED_BATCH_INFO_ABI_STRING}[]`, `${PRIORITY_OPS_BATCH_INFO_ABI_STRING}[]`], + [batchesData, priorityOpsBatchInfo] + ); + const executeData = hexConcat(["0x00", encodedExecuteDataWithoutVersion]); + return [batchesData[0].batchNumber, batchesData[batchesData.length - 1].batchNumber, executeData]; +} diff --git a/l1-contracts/test/unit_tests/validator_timelock_test.spec.ts b/l1-contracts/test/unit_tests/validator_timelock_test.spec.ts deleted file mode 100644 index 5093c2573..000000000 --- a/l1-contracts/test/unit_tests/validator_timelock_test.spec.ts +++ /dev/null @@ -1,290 +0,0 @@ -import { expect } from "chai"; -import { ethers } from "ethers"; -import * as hardhat from "hardhat"; -import type { DummyExecutor, ValidatorTimelock, DummyChainTypeManager } from "../../typechain"; -import { DummyExecutorFactory, ValidatorTimelockFactory, DummyChainTypeManagerFactory } from "../../typechain"; -import { getCallRevertReason } from "./utils"; - -describe("ValidatorTimelock tests", function () { - let owner: ethers.Signer; - let validator: ethers.Signer; - let randomSigner: ethers.Signer; - let validatorTimelock: ValidatorTimelock; - let dummyExecutor: DummyExecutor; - let dummyChainTypeManager: DummyChainTypeManager; - const chainId: number = 270; - - const MOCK_PROOF_INPUT = { - recursiveAggregationInput: [], - serializedProof: [], - }; - - function getMockCommitBatchInfo(batchNumber: number, timestamp: number = 0) { - return { - batchNumber, - timestamp, - indexRepeatedStorageChanges: 0, - newStateRoot: ethers.constants.HashZero, - numberOfLayer1Txs: 0, - priorityOperationsHash: ethers.constants.HashZero, - bootloaderHeapInitialContentsHash: ethers.utils.randomBytes(32), - eventsQueueStateHash: ethers.utils.randomBytes(32), - systemLogs: [], - operatorDAInput: - "0x00290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - }; - } - - function getMockStoredBatchInfo(batchNumber: number, timestamp: number = 0) { - return { - batchNumber, - batchHash: ethers.constants.HashZero, - indexRepeatedStorageChanges: 0, - numberOfLayer1Txs: 0, - priorityOperationsHash: ethers.constants.HashZero, - l2LogsTreeRoot: ethers.constants.HashZero, - timestamp, - commitment: ethers.constants.HashZero, - }; - } - - before(async () => { - [owner, validator, randomSigner] = await hardhat.ethers.getSigners(); - - const dummyExecutorFactory = await hardhat.ethers.getContractFactory("DummyExecutor"); - const dummyExecutorContract = await dummyExecutorFactory.deploy(); - dummyExecutor = DummyExecutorFactory.connect(dummyExecutorContract.address, dummyExecutorContract.signer); - - const dummyChainTypeManagerFactory = await hardhat.ethers.getContractFactory( - "DummyChainTypeManagerForValidatorTimelock" - ); - const dummyChainTypeManagerContract = await dummyChainTypeManagerFactory.deploy( - await owner.getAddress(), - dummyExecutor.address - ); - dummyChainTypeManager = DummyChainTypeManagerFactory.connect( - dummyChainTypeManagerContract.address, - dummyChainTypeManagerContract.signer - ); - - const validatorTimelockFactory = await hardhat.ethers.getContractFactory("ValidatorTimelock"); - const validatorTimelockContract = await validatorTimelockFactory.deploy(await owner.getAddress(), 0, chainId); - validatorTimelock = ValidatorTimelockFactory.connect( - validatorTimelockContract.address, - validatorTimelockContract.signer - ); - const setCTMtx = await validatorTimelock.setChainTypeManager(dummyChainTypeManager.address); - await setCTMtx.wait(); - }); - - it("Should check deployment", async () => { - expect(await validatorTimelock.owner()).equal(await owner.getAddress()); - expect(await validatorTimelock.executionDelay()).equal(0); - expect(await validatorTimelock.validators(chainId, ethers.constants.AddressZero)).equal(false); - expect(await validatorTimelock.chainTypeManager()).equal(dummyChainTypeManager.address); - expect(await dummyChainTypeManager.getZKChain(chainId)).equal(dummyExecutor.address); - expect(await dummyChainTypeManager.getChainAdmin(chainId)).equal(await owner.getAddress()); - expect(await dummyExecutor.getAdmin()).equal(await owner.getAddress()); - }); - - it("Should revert if non-validator commits batches", async () => { - const revertReason = await getCallRevertReason( - validatorTimelock - .connect(randomSigner) - .commitBatchesSharedBridge(chainId, getMockStoredBatchInfo(0), [getMockCommitBatchInfo(1)]) - ); - - expect(revertReason).contains("Unauthorized"); - }); - - it("Should revert if non-validator proves batches", async () => { - const revertReason = await getCallRevertReason( - validatorTimelock - .connect(randomSigner) - .proveBatchesSharedBridge(chainId, getMockStoredBatchInfo(0), [getMockStoredBatchInfo(1)], MOCK_PROOF_INPUT) - ); - - expect(revertReason).contains("Unauthorized"); - }); - - it("Should revert if non-validator revert batches", async () => { - const revertReason = await getCallRevertReason( - validatorTimelock.connect(randomSigner).revertBatchesSharedBridge(chainId, 1) - ); - - expect(revertReason).contains("Unauthorized"); - }); - - it("Should revert if non-validator executes batches", async () => { - const revertReason = await getCallRevertReason( - validatorTimelock.connect(randomSigner).executeBatchesSharedBridge(chainId, [getMockStoredBatchInfo(1)], []) - ); - - expect(revertReason).contains("Unauthorized"); - }); - - it("Should revert if not chain governor sets validator", async () => { - const revertReason = await getCallRevertReason( - validatorTimelock.connect(randomSigner).addValidator(chainId, await randomSigner.getAddress()) - ); - - expect(revertReason).contains("Unauthorized"); - }); - - it("Should revert if non-owner sets execution delay", async () => { - const revertReason = await getCallRevertReason(validatorTimelock.connect(randomSigner).setExecutionDelay(1000)); - - expect(revertReason).equal("Ownable: caller is not the owner"); - }); - - it("Should successfully set the validator", async () => { - const validatorAddress = await validator.getAddress(); - await validatorTimelock.connect(owner).addValidator(chainId, validatorAddress); - - expect(await validatorTimelock.validators(chainId, validatorAddress)).equal(true); - }); - - it("Should successfully set the execution delay", async () => { - await validatorTimelock.connect(owner).setExecutionDelay(10); // set to 10 seconds - - expect(await validatorTimelock.executionDelay()).equal(10); - }); - - it("Should successfully commit batches", async () => { - await validatorTimelock - .connect(validator) - .commitBatchesSharedBridge(chainId, getMockStoredBatchInfo(0), [getMockCommitBatchInfo(1)]); - - expect(await dummyExecutor.getTotalBatchesCommitted()).equal(1); - }); - - it("Should successfully prove batches", async () => { - await validatorTimelock - .connect(validator) - .proveBatchesSharedBridge(chainId, getMockStoredBatchInfo(0), [getMockStoredBatchInfo(1, 1)], MOCK_PROOF_INPUT); - - expect(await dummyExecutor.getTotalBatchesVerified()).equal(1); - }); - - it("Should revert on executing earlier than the delay", async () => { - const revertReason = await getCallRevertReason( - validatorTimelock.connect(validator).executeBatchesSharedBridge(chainId, [getMockStoredBatchInfo(1)], []) - ); - - expect(revertReason).contains("TimeNotReached"); - }); - - it("Should successfully revert batches", async () => { - await validatorTimelock.connect(validator).revertBatchesSharedBridge(chainId, 0); - - expect(await dummyExecutor.getTotalBatchesVerified()).equal(0); - expect(await dummyExecutor.getTotalBatchesCommitted()).equal(0); - }); - - it("Should successfully overwrite the committing timestamp on the reverted batches timestamp", async () => { - const revertedBatchesTimestamp = Number(await validatorTimelock.getCommittedBatchTimestamp(chainId, 1)); - - await validatorTimelock - .connect(validator) - .commitBatchesSharedBridge(chainId, getMockStoredBatchInfo(0), [getMockCommitBatchInfo(1)]); - - await validatorTimelock - .connect(validator) - .proveBatchesSharedBridge(chainId, getMockStoredBatchInfo(0), [getMockStoredBatchInfo(1)], MOCK_PROOF_INPUT); - - const newBatchesTimestamp = Number(await validatorTimelock.getCommittedBatchTimestamp(chainId, 1)); - - expect(newBatchesTimestamp).greaterThanOrEqual(revertedBatchesTimestamp); - }); - - it("Should successfully execute batches after the delay", async () => { - await hardhat.network.provider.send("hardhat_mine", ["0x2", "0xc"]); //mine 2 batches with intervals of 12 seconds - await validatorTimelock.connect(validator).executeBatchesSharedBridge(chainId, [getMockStoredBatchInfo(1)], []); - expect(await dummyExecutor.getTotalBatchesExecuted()).equal(1); - }); - - it("Should revert if validator tries to commit batches with invalid last committed batchNumber", async () => { - const revertReason = await getCallRevertReason( - validatorTimelock - .connect(validator) - .commitBatchesSharedBridge(chainId, getMockStoredBatchInfo(0), [getMockCommitBatchInfo(2)]) - ); - - // Error should be forwarded from the DummyExecutor - expect(revertReason).equal("DummyExecutor: Invalid last committed batch number"); - }); - - // Test case to check if proving batches with invalid batchNumber fails - it("Should revert if validator tries to prove batches with invalid batchNumber", async () => { - const revertReason = await getCallRevertReason( - validatorTimelock - .connect(validator) - .proveBatchesSharedBridge(chainId, getMockStoredBatchInfo(0), [getMockStoredBatchInfo(2, 1)], MOCK_PROOF_INPUT) - ); - - expect(revertReason).equal("DummyExecutor: Invalid previous batch number"); - }); - - it("Should revert if validator tries to execute more batches than were proven", async () => { - await hardhat.network.provider.send("hardhat_mine", ["0x2", "0xc"]); //mine 2 batches with intervals of 12 seconds - const revertReason = await getCallRevertReason( - validatorTimelock.connect(validator).executeBatchesSharedBridge(chainId, [getMockStoredBatchInfo(2)], []) - ); - - expect(revertReason).equal("DummyExecutor 2: Can"); - }); - - // These tests primarily needed to make gas statistics be more accurate. - - it("Should commit multiple batches in one transaction", async () => { - await validatorTimelock - .connect(validator) - .commitBatchesSharedBridge(chainId, getMockStoredBatchInfo(1), [ - getMockCommitBatchInfo(2), - getMockCommitBatchInfo(3), - getMockCommitBatchInfo(4), - getMockCommitBatchInfo(5), - getMockCommitBatchInfo(6), - getMockCommitBatchInfo(7), - getMockCommitBatchInfo(8), - ]); - - expect(await dummyExecutor.getTotalBatchesCommitted()).equal(8); - }); - - it("Should prove multiple batches in one transactions", async () => { - for (let i = 1; i < 8; i++) { - await validatorTimelock - .connect(validator) - .proveBatchesSharedBridge( - chainId, - getMockStoredBatchInfo(i), - [getMockStoredBatchInfo(i + 1)], - MOCK_PROOF_INPUT - ); - - expect(await dummyExecutor.getTotalBatchesVerified()).equal(i + 1); - } - }); - - it("Should execute multiple batches in multiple transactions", async () => { - await hardhat.network.provider.send("hardhat_mine", ["0x2", "0xc"]); //mine 2 batches with intervals of 12 seconds - await validatorTimelock - .connect(validator) - .executeBatchesSharedBridge( - chainId, - [ - getMockStoredBatchInfo(2), - getMockStoredBatchInfo(3), - getMockStoredBatchInfo(4), - getMockStoredBatchInfo(5), - getMockStoredBatchInfo(6), - getMockStoredBatchInfo(7), - getMockStoredBatchInfo(8), - ], - [] - ); - - expect(await dummyExecutor.getTotalBatchesExecuted()).equal(8); - }); -}); diff --git a/l2-contracts/contracts/verifier/Verifier.sol b/l2-contracts/contracts/verifier/Verifier.sol index 54d9b00be..dd4eaff55 100644 --- a/l2-contracts/contracts/verifier/Verifier.sol +++ b/l2-contracts/contracts/verifier/Verifier.sol @@ -343,8 +343,7 @@ contract Verifier is IVerifier { /// @inheritdoc IVerifier function verify( uint256[] calldata, // _publicInputs - uint256[] calldata, // _proof - uint256[] calldata // _recursiveAggregationInput + uint256[] calldata // _proof ) public view virtual returns (bool) { // No memory was accessed yet, so keys can be loaded into the right place and not corrupt any other memory. _loadVerificationKey(); @@ -525,7 +524,17 @@ contract Verifier is IVerifier { // 2. Load the proof (except for the recursive part) offset := calldataload(0x24) let proofLengthInWords := calldataload(add(offset, 0x04)) - isValid := and(eq(proofLengthInWords, 44), isValid) + + // Check the proof length depending on whether the recursive part is present + let expectedProofLength + switch mload(VK_RECURSIVE_FLAG_SLOT) + case 0 { + expectedProofLength := 44 + } + default { + expectedProofLength := 48 + } + isValid := and(eq(proofLengthInWords, expectedProofLength), isValid) // PROOF_STATE_POLYS_0 { @@ -672,21 +681,13 @@ contract Verifier is IVerifier { } // 3. Load the recursive part of the proof - offset := calldataload(0x44) - let recursiveProofLengthInWords := calldataload(add(offset, 0x04)) - - switch mload(VK_RECURSIVE_FLAG_SLOT) - case 0 { - // recursive part should be empty - isValid := and(iszero(recursiveProofLengthInWords), isValid) - } - default { + if mload(VK_RECURSIVE_FLAG_SLOT) { // recursive part should be consist of 2 points - isValid := and(eq(recursiveProofLengthInWords, 4), isValid) + // PROOF_RECURSIVE_PART_P1 { - let x := mod(calldataload(add(offset, 0x024)), Q_MOD) - let y := mod(calldataload(add(offset, 0x044)), Q_MOD) + let x := mod(calldataload(add(offset, 0x5a4)), Q_MOD) + let y := mod(calldataload(add(offset, 0x5c4)), Q_MOD) let xx := mulmod(x, x, Q_MOD) isValid := and(eq(mulmod(y, y, Q_MOD), addmod(mulmod(x, xx, Q_MOD), 3, Q_MOD)), isValid) mstore(PROOF_RECURSIVE_PART_P1_X_SLOT, x) @@ -694,8 +695,8 @@ contract Verifier is IVerifier { } // PROOF_RECURSIVE_PART_P2 { - let x := mod(calldataload(add(offset, 0x064)), Q_MOD) - let y := mod(calldataload(add(offset, 0x084)), Q_MOD) + let x := mod(calldataload(add(offset, 0x5e4)), Q_MOD) + let y := mod(calldataload(add(offset, 0x604)), Q_MOD) let xx := mulmod(x, x, Q_MOD) isValid := and(eq(mulmod(y, y, Q_MOD), addmod(mulmod(x, xx, Q_MOD), 3, Q_MOD)), isValid) mstore(PROOF_RECURSIVE_PART_P2_X_SLOT, x) diff --git a/l2-contracts/contracts/verifier/chain-interfaces/IVerifier.sol b/l2-contracts/contracts/verifier/chain-interfaces/IVerifier.sol index dbca3bf0c..40a6903f4 100644 --- a/l2-contracts/contracts/verifier/chain-interfaces/IVerifier.sol +++ b/l2-contracts/contracts/verifier/chain-interfaces/IVerifier.sol @@ -16,11 +16,7 @@ interface IVerifier { /// @dev Verifies a zk-SNARK proof. /// @return A boolean value indicating whether the zk-SNARK proof is valid. /// Note: The function may revert execution instead of returning false in some cases. - function verify( - uint256[] calldata _publicInputs, - uint256[] calldata _proof, - uint256[] calldata _recursiveAggregationInput - ) external view returns (bool); + function verify(uint256[] calldata _publicInputs, uint256[] calldata _proof) external view returns (bool); /// @notice Calculates a keccak256 hash of the runtime loaded verification keys. /// @return vkHash The keccak256 hash of the loaded verification keys. diff --git a/l2-contracts/test/foundry/unit/verifier/Verifier.t.sol b/l2-contracts/test/foundry/unit/verifier/Verifier.t.sol index 5d2a429e4..39b7ad944 100644 --- a/l2-contracts/test/foundry/unit/verifier/Verifier.t.sol +++ b/l2-contracts/test/foundry/unit/verifier/Verifier.t.sol @@ -17,11 +17,10 @@ contract VerifierCaller { function verify( uint256[] memory publicInputs, - uint256[] memory serializedProof, - uint256[] memory recursiveAggregationInput + uint256[] memory serializedProof ) public view returns (bool result, uint256 gasUsed) { uint256 gasBefore = gasleft(); - result = verifier.verify(publicInputs, serializedProof, recursiveAggregationInput); + result = verifier.verify(publicInputs, serializedProof); gasUsed = gasBefore - gasleft(); } } @@ -32,7 +31,6 @@ contract VerifierTestTest is Test { uint256[] public publicInputs; uint256[] public serializedProof; - uint256[] public recursiveAggregationInput; Verifier public verifier; @@ -88,7 +86,7 @@ contract VerifierTestTest is Test { } function testShouldVerify() public view { - bool success = verifier.verify(publicInputs, serializedProof, recursiveAggregationInput); + bool success = verifier.verify(publicInputs, serializedProof); assert(success); } @@ -99,7 +97,7 @@ contract VerifierTestTest is Test { // - Call the verify function from the VerifierCaller contract and return the gas used VerifierCaller caller = new VerifierCaller(verifier); - (bool success, uint256 gasUsed) = caller.verify(publicInputs, serializedProof, recursiveAggregationInput); + (bool success, uint256 gasUsed) = caller.verify(publicInputs, serializedProof); assert(success); console.log("Gas used: %d", gasUsed); @@ -109,7 +107,7 @@ contract VerifierTestTest is Test { uint256[] memory newPublicInputs = publicInputs; newPublicInputs[0] += uint256(bytes32(0xe000000000000000000000000000000000000000000000000000000000000000)); - bool success = verifier.verify(newPublicInputs, serializedProof, recursiveAggregationInput); + bool success = verifier.verify(newPublicInputs, serializedProof); assert(success); } @@ -119,7 +117,7 @@ contract VerifierTestTest is Test { newSerializedProof[1] += Q_MOD; newSerializedProof[1] += Q_MOD; - bool success = verifier.verify(publicInputs, newSerializedProof, recursiveAggregationInput); + bool success = verifier.verify(publicInputs, newSerializedProof); assert(success); } @@ -127,7 +125,7 @@ contract VerifierTestTest is Test { uint256[] memory newSerializedProof = serializedProof; newSerializedProof[22] += R_MOD; - bool success = verifier.verify(publicInputs, newSerializedProof, recursiveAggregationInput); + bool success = verifier.verify(publicInputs, newSerializedProof); assert(success); } @@ -137,14 +135,14 @@ contract VerifierTestTest is Test { newPublicInputs[1] = publicInputs[0]; vm.expectRevert(bytes("loadProof: Proof is invalid")); - verifier.verify(newPublicInputs, serializedProof, recursiveAggregationInput); + verifier.verify(newPublicInputs, serializedProof); } function testEmptyPublicInput_shouldRevert() public { uint256[] memory newPublicInputs; vm.expectRevert(bytes("loadProof: Proof is invalid")); - verifier.verify(newPublicInputs, serializedProof, recursiveAggregationInput); + verifier.verify(newPublicInputs, serializedProof); } function testMoreThan44WordsProof_shouldRevert() public { @@ -156,21 +154,25 @@ contract VerifierTestTest is Test { newSerializedProof[newSerializedProof.length - 1] = serializedProof[serializedProof.length - 1]; vm.expectRevert(bytes("loadProof: Proof is invalid")); - verifier.verify(publicInputs, newSerializedProof, recursiveAggregationInput); + verifier.verify(publicInputs, newSerializedProof); } function testEmptyProof_shouldRevert() public { uint256[] memory newSerializedProof; vm.expectRevert(bytes("loadProof: Proof is invalid")); - verifier.verify(publicInputs, newSerializedProof, recursiveAggregationInput); + verifier.verify(publicInputs, newSerializedProof); } - function testNotEmptyRecursiveAggregationInput_shouldRevert() public { - uint256[] memory newRecursiveAggregationInput = publicInputs; + function testLongerProofInput_shouldRevert() public { + uint256[] memory newSerializedProof = new uint256[](serializedProof.length + 1); + for (uint256 i = 0; i < serializedProof.length; i++) { + newSerializedProof[i] = serializedProof[i]; + } + newSerializedProof[newSerializedProof.length - 1] = publicInputs[0]; vm.expectRevert(bytes("loadProof: Proof is invalid")); - verifier.verify(publicInputs, serializedProof, newRecursiveAggregationInput); + verifier.verify(publicInputs, newSerializedProof); } function testEllipticCurvePointAtInfinity_shouldRevert() public { @@ -179,7 +181,7 @@ contract VerifierTestTest is Test { newSerializedProof[1] = 0; vm.expectRevert(bytes("loadProof: Proof is invalid")); - verifier.verify(publicInputs, newSerializedProof, recursiveAggregationInput); + verifier.verify(publicInputs, newSerializedProof); } function testInvalidPublicInput_shouldRevert() public { @@ -187,7 +189,7 @@ contract VerifierTestTest is Test { newPublicInputs[0] = 0; vm.expectRevert(bytes("invalid quotient evaluation")); - verifier.verify(newPublicInputs, serializedProof, recursiveAggregationInput); + verifier.verify(newPublicInputs, serializedProof); } function testVerificationKeyHash() public virtual { diff --git a/l2-contracts/test/foundry/unit/verifier/VerifierRecursive.t.sol b/l2-contracts/test/foundry/unit/verifier/VerifierRecursive.t.sol index cf9d1ef69..df43a07ed 100644 --- a/l2-contracts/test/foundry/unit/verifier/VerifierRecursive.t.sol +++ b/l2-contracts/test/foundry/unit/verifier/VerifierRecursive.t.sol @@ -8,44 +8,45 @@ contract VerifierRecursiveTestTest is VerifierTestTest { function setUp() public override { super.setUp(); - recursiveAggregationInput.push(2257920826825449939414463854743099397427742128922725774525544832270890253504); - recursiveAggregationInput.push(9091218701914748532331969127001446391756173432977615061129552313204917562530); - recursiveAggregationInput.push(16188304989094043810949359833767911976672882599560690320245309499206765021563); - recursiveAggregationInput.push(3201093556796962656759050531176732990872300033146738631772984017549903765305); + serializedProof.push(2257920826825449939414463854743099397427742128922725774525544832270890253504); + serializedProof.push(9091218701914748532331969127001446391756173432977615061129552313204917562530); + serializedProof.push(16188304989094043810949359833767911976672882599560690320245309499206765021563); + serializedProof.push(3201093556796962656759050531176732990872300033146738631772984017549903765305); verifier = new VerifierRecursiveTest(); } function testMoreThan4WordsRecursiveInput_shouldRevert() public { - uint256[] memory newRecursiveAggregationInput = new uint256[](recursiveAggregationInput.length + 1); + uint256[] memory newSerializedProof = new uint256[](serializedProof.length + 1); - for (uint256 i = 0; i < recursiveAggregationInput.length; i++) { - newRecursiveAggregationInput[i] = recursiveAggregationInput[i]; + for (uint256 i = 0; i < serializedProof.length; i++) { + newSerializedProof[i] = serializedProof[i]; } - newRecursiveAggregationInput[newRecursiveAggregationInput.length - 1] = recursiveAggregationInput[ - recursiveAggregationInput.length - 1 - ]; + newSerializedProof[newSerializedProof.length - 1] = serializedProof[serializedProof.length - 1]; vm.expectRevert(bytes("loadProof: Proof is invalid")); - verifier.verify(publicInputs, serializedProof, newRecursiveAggregationInput); + verifier.verify(publicInputs, newSerializedProof); } function testEmptyRecursiveInput_shouldRevert() public { - uint256[] memory newRecursiveAggregationInput; + uint256[] memory newSerializedProof = new uint256[](serializedProof.length - 4); + for (uint256 i = 0; i < newSerializedProof.length; i++) { + newSerializedProof[i] = serializedProof[i]; + } vm.expectRevert(bytes("loadProof: Proof is invalid")); - verifier.verify(publicInputs, serializedProof, newRecursiveAggregationInput); + verifier.verify(publicInputs, newSerializedProof); } function testInvalidRecursiveInput_shouldRevert() public { - uint256[] memory newRecursiveAggregationInput = new uint256[](4); - newRecursiveAggregationInput[0] = 1; - newRecursiveAggregationInput[1] = 2; - newRecursiveAggregationInput[2] = 1; - newRecursiveAggregationInput[3] = 2; + uint256[] memory newSerializedProof = serializedProof; + newSerializedProof[newSerializedProof.length - 4] = 1; + newSerializedProof[newSerializedProof.length - 3] = 2; + newSerializedProof[newSerializedProof.length - 2] = 1; + newSerializedProof[newSerializedProof.length - 1] = 2; vm.expectRevert(bytes("finalPairing: pairing failure")); - verifier.verify(publicInputs, serializedProof, newRecursiveAggregationInput); + verifier.verify(publicInputs, newSerializedProof); } function testVerificationKeyHash() public override { diff --git a/tools/data/verifier_contract_template.txt b/tools/data/verifier_contract_template.txt index 314e92dc3..23249c9ab 100644 --- a/tools/data/verifier_contract_template.txt +++ b/tools/data/verifier_contract_template.txt @@ -278,8 +278,7 @@ contract Verifier is IVerifier { /// @inheritdoc IVerifier function verify( uint256[] calldata, // _publicInputs - uint256[] calldata, // _proof - uint256[] calldata // _recursiveAggregationInput + uint256[] calldata // _proof ) public view virtual returns (bool) { // No memory was accessed yet, so keys can be loaded into the right place and not corrupt any other memory. _loadVerificationKey(); @@ -447,7 +446,17 @@ contract Verifier is IVerifier { // 2. Load the proof (except for the recursive part) offset := calldataload(0x24) let proofLengthInWords := calldataload(add(offset, 0x04)) - isValid := and(eq(proofLengthInWords, 44), isValid) + + // Check the proof length depending on whether the recursive part is present + let expectedProofLength + switch mload(VK_RECURSIVE_FLAG_SLOT) + case 0 { + expectedProofLength := 44 + } + default { + expectedProofLength := 48 + } + isValid := and(eq(proofLengthInWords, expectedProofLength), isValid) // PROOF_STATE_POLYS_0 { @@ -594,21 +603,13 @@ contract Verifier is IVerifier { } // 3. Load the recursive part of the proof - offset := calldataload(0x44) - let recursiveProofLengthInWords := calldataload(add(offset, 0x04)) - - switch mload(VK_RECURSIVE_FLAG_SLOT) - case 0 { - // recursive part should be empty - isValid := and(iszero(recursiveProofLengthInWords), isValid) - } - default { + if mload(VK_RECURSIVE_FLAG_SLOT) { // recursive part should be consist of 2 points - isValid := and(eq(recursiveProofLengthInWords, 4), isValid) + // PROOF_RECURSIVE_PART_P1 { - let x := mod(calldataload(add(offset, 0x024)), Q_MOD) - let y := mod(calldataload(add(offset, 0x044)), Q_MOD) + let x := mod(calldataload(add(offset, 0x5a4)), Q_MOD) + let y := mod(calldataload(add(offset, 0x5c4)), Q_MOD) let xx := mulmod(x, x, Q_MOD) isValid := and(eq(mulmod(y, y, Q_MOD), addmod(mulmod(x, xx, Q_MOD), 3, Q_MOD)), isValid) mstore(PROOF_RECURSIVE_PART_P1_X_SLOT, x) @@ -616,8 +617,8 @@ contract Verifier is IVerifier { } // PROOF_RECURSIVE_PART_P2 { - let x := mod(calldataload(add(offset, 0x064)), Q_MOD) - let y := mod(calldataload(add(offset, 0x084)), Q_MOD) + let x := mod(calldataload(add(offset, 0x5e4)), Q_MOD) + let y := mod(calldataload(add(offset, 0x604)), Q_MOD) let xx := mulmod(x, x, Q_MOD) isValid := and(eq(mulmod(y, y, Q_MOD), addmod(mulmod(x, xx, Q_MOD), 3, Q_MOD)), isValid) mstore(PROOF_RECURSIVE_PART_P2_X_SLOT, x) From bebdefc32664e84aca1fcd0cd1f02dab91cf3e45 Mon Sep 17 00:00:00 2001 From: Raid5594 <52794079+Raid5594@users.noreply.github.com> Date: Tue, 10 Sep 2024 12:41:48 +0400 Subject: [PATCH 39/53] (feat): add tx filterer contract (#772) Co-authored-by: Raid Ateir Co-authored-by: Stanislav Breadless --- .../contracts/common/L1ContractErrors.sol | 4 + .../chain-deps/facets/Getters.sol | 5 + .../chain-interfaces/IGetters.sol | 3 + .../GatewayTransactionFilterer.sol | 95 +++++++++++++++++++ l1-contracts/deploy-scripts/Gateway.s.sol | 34 ++++++- l1-contracts/src.ts/deploy-test-process.ts | 1 + .../script-out/output-deploy-l1.toml | 92 +++++------------- .../CheckTransaction.sol | 89 +++++++++++++++++ .../ManageWhitelist.sol | 37 ++++++++ .../_GatewayTransactionFilterer_Shared.t.sol | 38 ++++++++ 10 files changed, 326 insertions(+), 72 deletions(-) create mode 100644 l1-contracts/contracts/transactionFilterer/GatewayTransactionFilterer.sol create mode 100644 l1-contracts/test/foundry/unit/concrete/GatewayTransactionFilterer/CheckTransaction.sol create mode 100644 l1-contracts/test/foundry/unit/concrete/GatewayTransactionFilterer/ManageWhitelist.sol create mode 100644 l1-contracts/test/foundry/unit/concrete/GatewayTransactionFilterer/_GatewayTransactionFilterer_Shared.t.sol diff --git a/l1-contracts/contracts/common/L1ContractErrors.sol b/l1-contracts/contracts/common/L1ContractErrors.sol index c265a4804..b78bd53e3 100644 --- a/l1-contracts/contracts/common/L1ContractErrors.sol +++ b/l1-contracts/contracts/common/L1ContractErrors.sol @@ -29,6 +29,8 @@ error AddressAlreadyUsed(address addr); error AddressHasNoCode(address); // 0x1eee5481 error AddressTooLow(address); +// 0x0bfcef28 +error AlreadyWhitelisted(address); // 0x6afd6c20 error BadReturnData(); // 0x6ef9a972 @@ -193,6 +195,8 @@ error NonZeroAddress(address); error NotEnoughGas(); // 0xdd7e3621 error NotInitializedReentrancyGuard(); +// 0xdf17e316 +error NotWhitelisted(address); // 0xf3ed9dfa error OnlyEraSupported(); // 0x1a21feed diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol index 6067b549a..1ffdb5b0c 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Getters.sol @@ -105,6 +105,11 @@ contract GettersFacet is ZKChainBase, IGetters, ILegacyGetters { return s.totalBatchesExecuted; } + /// @inheritdoc IGetters + function getTransactionFilterer() external view returns (address) { + return s.transactionFilterer; + } + /// @inheritdoc IGetters function getTotalPriorityTxs() external view returns (uint256) { return _getTotalPriorityTxs(); diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol index e612c24fb..5dfd600ca 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IGetters.sol @@ -53,6 +53,9 @@ interface IGetters is IZKChainBase { /// @return The total number of batches that were committed & verified & executed function getTotalBatchesExecuted() external view returns (uint256); + // @return Address of transaction filterer + function getTransactionFilterer() external view returns (address); + /// @return The total number of priority operations that were added to the priority queue, including all processed ones function getTotalPriorityTxs() external view returns (uint256); diff --git a/l1-contracts/contracts/transactionFilterer/GatewayTransactionFilterer.sol b/l1-contracts/contracts/transactionFilterer/GatewayTransactionFilterer.sol new file mode 100644 index 000000000..d1d236ac5 --- /dev/null +++ b/l1-contracts/contracts/transactionFilterer/GatewayTransactionFilterer.sol @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/access/Ownable2StepUpgradeable.sol"; + +import {ReentrancyGuard} from "../common/ReentrancyGuard.sol"; +import {AlreadyWhitelisted, InvalidSelector, NotWhitelisted, ZeroAddress} from "../common/L1ContractErrors.sol"; +import {ITransactionFilterer} from "../state-transition/chain-interfaces/ITransactionFilterer.sol"; +import {IBridgehub} from "../bridgehub/IBridgehub.sol"; +import {IL2Bridge} from "../bridge/interfaces/IL2Bridge.sol"; + +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +/// @dev Filters transactions received by the Mailbox +/// @dev Only allows whitelisted senders to deposit to Gateway +contract GatewayTransactionFilterer is ITransactionFilterer, ReentrancyGuard, Ownable2StepUpgradeable { + /// @notice Event emitted when sender is whitelisted + event WhitelistGranted(address indexed sender); + + /// @notice Event emitted when sender is removed from whitelist + event WhitelistRevoked(address indexed sender); + + /// @notice The ecosystem's Bridgehub + IBridgehub public immutable BRIDGE_HUB; + + /// @notice The L1 asset router + address public immutable L1_ASSET_ROUTER; + + /// @notice Indicates whether the sender is whitelisted to deposit to Gateway + mapping(address sender => bool whitelisted) public whitelistedSenders; + + /// @dev Contract is expected to be used as proxy implementation. + /// @dev Initialize the implementation to prevent Parity hack. + constructor(IBridgehub _bridgeHub, address _assetRouter) reentrancyGuardInitializer { + BRIDGE_HUB = _bridgeHub; + L1_ASSET_ROUTER = _assetRouter; + _disableInitializers(); + } + + /// @notice Initializes a contract filterer for later use. Expected to be used in the proxy. + /// @param _owner The address which can upgrade the implementation. + function initialize(address _owner) external reentrancyGuardInitializer initializer { + if (_owner == address(0)) { + revert ZeroAddress(); + } + _transferOwnership(_owner); + } + + /// @notice Whitelists the sender. + /// @param sender Address of the tx sender. + function grantWhitelist(address sender) external onlyOwner { + if (whitelistedSenders[sender]) { + revert AlreadyWhitelisted(sender); + } + whitelistedSenders[sender] = true; + emit WhitelistGranted(sender); + } + + /// @notice Revoke the sender from whitelist. + /// @param sender Address of the tx sender. + function revokeWhitelist(address sender) external onlyOwner { + if (!whitelistedSenders[sender]) { + revert NotWhitelisted(sender); + } + whitelistedSenders[sender] = false; + emit WhitelistRevoked(sender); + } + + /// @notice Checks if the transaction is allowed + /// @param sender The sender of the transaction + /// @param l2Calldata The calldata of the L2 transaction + /// @return Whether the transaction is allowed + function isTransactionAllowed( + address sender, + address, + uint256, + uint256, + bytes calldata l2Calldata, + address + ) external view returns (bool) { + if (sender == L1_ASSET_ROUTER) { + bytes4 l2TxSelector = bytes4(l2Calldata[:4]); + if (IL2Bridge.finalizeDeposit.selector != l2TxSelector) { + revert InvalidSelector(l2TxSelector); + } + + (bytes32 decodedAssetId, ) = abi.decode(l2Calldata[4:], (bytes32, bytes)); + address stmAddress = BRIDGE_HUB.ctmAssetIdToAddress(decodedAssetId); + return (stmAddress != address(0)); + } + + return whitelistedSenders[sender]; + } +} diff --git a/l1-contracts/deploy-scripts/Gateway.s.sol b/l1-contracts/deploy-scripts/Gateway.s.sol index 81293a6ea..c4daba99c 100644 --- a/l1-contracts/deploy-scripts/Gateway.s.sol +++ b/l1-contracts/deploy-scripts/Gateway.s.sol @@ -7,9 +7,12 @@ import {Script, console2 as console} from "forge-std/Script.sol"; // import {Vm} from "forge-std/Vm.sol"; import {stdToml} from "forge-std/StdToml.sol"; +import {TransparentUpgradeableProxy} from "@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol"; + import {Ownable} from "@openzeppelin/contracts-v4/access/Ownable.sol"; import {IBridgehub, BridgehubBurnCTMAssetData} from "contracts/bridgehub/IBridgehub.sol"; import {IZKChain} from "contracts/state-transition/chain-interfaces/IZKChain.sol"; +import {GatewayTransactionFilterer} from "contracts/transactionFilterer/GatewayTransactionFilterer.sol"; // import {ValidatorTimelock} from "contracts/state-transition/ValidatorTimelock.sol"; // import {Governance} from "contracts/governance/Governance.sol"; // import {Utils} from "./Utils.sol"; @@ -21,8 +24,6 @@ import {L2_BRIDGEHUB_ADDR} from "contracts/common/L2ContractAddresses.sol"; // import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; -import {IZKChain} from "contracts/state-transition/chain-interfaces/IZKChain.sol"; - contract GatewayScript is Script { using stdToml for string; @@ -118,9 +119,32 @@ contract GatewayScript is Script { function registerGateway() public { IBridgehub bridgehub = IBridgehub(config.bridgehub); Ownable ownable = Ownable(config.bridgehub); - vm.prank(ownable.owner()); + Ownable ownableStmDT = Ownable(config.ctmDeploymentTracker); + IZKChain chainL2 = IZKChain(bridgehub.getZKChain(config.chainChainId)); + IZKChain chain = IZKChain(bridgehub.getZKChain(config.gatewayChainId)); + vm.startPrank(chain.getAdmin()); + GatewayTransactionFilterer transactionFiltererImplementation = new GatewayTransactionFilterer( + IBridgehub(config.bridgehub), + config.sharedBridgeProxy + ); + address transactionFiltererProxy = address( + new TransparentUpgradeableProxy( + address(transactionFiltererImplementation), + chain.getAdmin(), + abi.encodeCall(GatewayTransactionFilterer.initialize, ownable.owner()) + ) + ); + chain.setTransactionFilterer(transactionFiltererProxy); + vm.stopPrank(); + + vm.startPrank(ownable.owner()); + GatewayTransactionFilterer(transactionFiltererProxy).grantWhitelist(ownableStmDT.owner()); + GatewayTransactionFilterer(transactionFiltererProxy).grantWhitelist(chainL2.getAdmin()); + GatewayTransactionFilterer(transactionFiltererProxy).grantWhitelist(config.sharedBridgeProxy); bridgehub.registerSettlementLayer(config.gatewayChainId, true); - // bytes memory data = abi.encodeCall(ctm.registerSettlementLayer, (config.chainChainId, true)); + + vm.stopPrank(); + // bytes memory data = abi.encodeCall(stm.registerSettlementLayer, (config.chainChainId, true)); // Utils.executeUpgrade({ // _governor: ownable.owner(), // _salt: bytes32(config.bridgehubCreateNewChainSalt), @@ -183,7 +207,7 @@ contract GatewayScript is Script { function registerL2Contracts() public { IBridgehub bridgehub = IBridgehub(config.bridgehub); Ownable ownable = Ownable(config.ctmDeploymentTracker); - // IChainTypeManager ctm = IChainTypeManager(config.stateTransitionProxy); + // IStateTransitionManager stm = IStateTransitionManager(config.stateTransitionProxy); uint256 gasPrice = 10; uint256 l2GasLimit = 72000000; diff --git a/l1-contracts/src.ts/deploy-test-process.ts b/l1-contracts/src.ts/deploy-test-process.ts index e7bf6deef..f6b0d00fb 100644 --- a/l1-contracts/src.ts/deploy-test-process.ts +++ b/l1-contracts/src.ts/deploy-test-process.ts @@ -112,6 +112,7 @@ export async function initialTestnetDeploymentProcess( await initialBridgehubDeployment(deployer, extraFacets, gasPrice, false); await registerZKChainWithBridgeRegistration(deployer, false, extraFacets, gasPrice, baseTokenName); await registerTestDAValidators(deployer); + return deployer; } diff --git a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml index 68cf9c2a9..d814b1100 100644 --- a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml +++ b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml @@ -2,21 +2,13 @@ create2_factory_addr = "0x4e59b44847b379578588920cA78FbF26c0B4956C" create2_factory_salt = "0x00000000000000000000000000000000000000000000000000000000000000ff" deployer_addr = "0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496" era_chain_id = 9 -force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000000000000000000000000000000000000000044016be2c4df653dc16d4f32b0da783b6ffcb4b9f102604d126f3ce7927d739f36c00000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9447bf69c0e623e1365f68b9682081c8aaf2005f3346a6bb9df35dc505c91cbbc00000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001542f9245b27fa8a082741b6727b86d24c07131b4afdfb66bba0b75c767bf668500000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9554b5e8820768894caf758e182b80205d2a55d217795c711cc044cf83539f66000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000001fc36471c3e2b43168f0632490d41dc71e347fcc2b3068bbf03276e9dd6cbb5b00000000000000000000000000000000000000000000000000000000000100050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010002" +force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000000000000000000000000000000000000000044057a1f541e2810b602ab7b7e8693b11637725d8593c147036bcbd6a39f92685db00000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9c156a211e2be8ddc2c09d615b68d676891959b66e884c1bb87d052129cbd33aa00000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001c935eb77922a6cd5b9a2c90cc75dc6b2205bf70c196b94e11ec12c908d85d0a400000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9554b5e8820768894caf758e182b80205d2a55d217795c711cc044cf83539f66000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000000120f7429ef6dabd06c8f10849cc6590798b232fd69a4748c7d43c05d8984976c00000000000000000000000000000000000000000000000000000000000100050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010002" l1_chain_id = 31337 -<<<<<<< HEAD -multicall3_addr = "0xb4CA672635D5E33C2725B4F250Dc5D3BFC489469" -owner_address = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" - -[contracts_config] -diamond_cut_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000009b6fd93a7da534e2ed9c0752c8927653e70b01150000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc00000000000000000000000009bc4b812a24e04455b611966e192bd866451db2300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000000000000000000000000000429df21d6d3d9a127b98bbe4115ea15ab7b4e409000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005518c73b000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c000000000000000000000000000000000000000000000000000000000000000000000000000000008d1a32b054862e63baab0381cd000d7c75c5bcd6000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000d077255100000000000000000000000000000000000000000000000000000000ddcc9eec00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab700000000000000000000000000000000000000000000000000000000000000000000000000000000905fe79f61bcee0d2335f83679e423c3f3eae389000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c000000000000000000000000064fd27c7082f2f3e4f8629977eab095b82ddc422000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" -======= multicall3_addr = "0x0cbaE56294C5e394648A323238F6428bD0D0Bc35" owner_address = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" [contracts_config] -diamond_cut_data = "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000dea634df59ae14b62f4e9875196b4ff86f1f90fd0000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc0000000000000000000000000207d7fa7b533ec0b9f64e66b04756b90bbfa869400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000000000000000000000000000ccbff7e1593e966d85ad89954f5e3ee8dfff97ad000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000946ebad100000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000000000000000000000000000ffc625196eaa62687256cf61a60dfff06ac5083d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab0000000000000000000000000000000000000000000000000000000013f3756e00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000dc8cc04600000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab700000000000000000000000000000000000000000000000000000000000000000000000000000000fb1829d7c11028b7b8e56ba684ad928ec7812c17000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c00000000000000000000000008f3c4d76725e03f1fff1c53f88bb685b447143d8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" ->>>>>>> kl/sync-layer-reorg +diamond_cut_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000003f7f7d7ff6f56b740065e7847364a71c862766610000000000000000000000000000000000000000000000000000000000000d8000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009e00000000000000000000000000000000000000000000000000000000000000be000000000000000000000000060ea3b1444f8b0679a7952464676682b915e975900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db865000000000000000000000000000000000000000000000000000000000000000000000000000000004ddc445c3ce03a1d5a3afd2db83bcdd2ef23c75d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002e06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000022c5cf230000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000946ebad100000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000000000000000000000000000762a0212978b65456fb5894d4e2304fcb586366f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000d077255100000000000000000000000000000000000000000000000000000000ddcc9eec00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab700000000000000000000000000000000000000000000000000000000000000000000000000000000093836714630aa112946f59ab96b55bbcc6f223c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040f23da4300000000000000000000000000000000000000000000000000000000e12a61370000000000000000000000000000000000000000000000000000000098f8196200000000000000000000000000000000000000000000000000000000cf02827d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000773c73f5bb8e67672e89d70c17f2a72efede1707000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" diamond_init_batch_overhead_l1_gas = 1000000 diamond_init_max_l2_gas_per_batch = 80000000 diamond_init_max_pubdata_per_batch = 120000 @@ -31,68 +23,34 @@ recursion_node_level_vk_hash = "0x0000000000000000000000000000000000000000000000 [deployed_addresses] blob_versioned_hash_retriever_addr = "0xA4cB26d6933D2c3E76718D30de8547bCDF8dD241" -<<<<<<< HEAD -governance_addr = "0x4c1B68B9aA94AfA75e614900315c19fA6711a44D" -native_token_vault_addr = "0x33421CD52DBE336fED66308B3782ff0D498ab728" -transparent_proxy_admin_addr = "0xD718d5A27a29FF1cD22403426084bA0d479869a0" -validator_timelock_addr = "0x7fa73029C36063f9768A9c1b77b1C2b535775C1b" - -[deployed_addresses.bridgehub] -bridgehub_implementation_addr = "0xE59b6138A1E46380E9Ce0ef0F8FdbF0e9203F494" -bridgehub_proxy_addr = "0x4455192400dfCcEE887dC9CDAEEd59cCB4EeE8d4" -message_root_implementation_addr = "0xFb4701313b2d2B0AB4666E37a6b00F3e04B36299" -message_root_proxy_addr = "0x444c0EEd508E6dA7c951f7844F0bC44c0BCbf423" -stm_deployment_tracker_implementation_addr = "0xcF8c2AE6072dB4dCc31890723e5a41616B79e603" -stm_deployment_tracker_proxy_addr = "0x5A465c55c9Db2D8182F9E57d674820E146DbF6E9" - -[deployed_addresses.bridges] -erc20_bridge_implementation_addr = "0xdf264da18b3E0c85b93e366C6458D8e81E87c150" -erc20_bridge_proxy_addr = "0x35eA6514dFEB8906C3b271ea23dB225517534aC1" -shared_bridge_implementation_addr = "0x7DF37de2F2BB652526aFf70636D40bD00ab476Eb" -shared_bridge_proxy_addr = "0x18cB271e64E4E3b8916c2510840DeDB6c353408B" - -[deployed_addresses.state_transition] -admin_facet_addr = "0x9bc4B812a24E04455B611966E192bd866451db23" -default_upgrade_addr = "0x6833C753cB05aBB077D32bF86e1b8fa15f92BF05" -diamond_init_addr = "0x9B6FD93A7DA534E2Ed9C0752C8927653E70B0115" -diamond_proxy_addr = "0x0000000000000000000000000000000000000000" -executor_facet_addr = "0x905fE79F61BCee0D2335f83679E423c3F3eae389" -genesis_upgrade_addr = "0x0fc0378c54E8783D9d979136aF89e0A56BceB247" -getters_facet_addr = "0x429dF21D6d3D9a127b98bbE4115EA15ab7B4e409" -mailbox_facet_addr = "0x8D1A32B054862e63bAaB0381CD000D7c75c5Bcd6" -state_transition_implementation_addr = "0x687908B2E1c5093fe888C250eBE6AA05CD98df80" -state_transition_proxy_addr = "0xF87Fc118957db8f843ab031b213f7635EaaaB74B" -verifier_addr = "0x64Fd27c7082F2f3E4F8629977eaB095b82ddC422" -======= -governance_addr = "0x9F9E84e66a6604D489478Abb441fA29EE00d6b3c" -native_token_vault_addr = "0x8edF0E9de19042FB9106618Ea14959D54A422729" +governance_addr = "0x1A1f85cb95be3a3684D77bf774b58055bD32C937" +native_token_vault_addr = "0x989cfAeC0dc117aeDC07214354b87e4D2111576f" transparent_proxy_admin_addr = "0x4f559F30f5eB88D635FDe1548C4267DB8FaB0351" -validator_timelock_addr = "0xF1E54EFa3ddad166A15a71746E81674790B25E78" +validator_timelock_addr = "0x118c6472E53FE71DCDFa7Def302eFA97c89a9fb5" [deployed_addresses.bridgehub] -bridgehub_implementation_addr = "0xf6bE6Dd45254b1Cd91d0Ca773c47E3a19eC5383a" -bridgehub_proxy_addr = "0xae3175922eA3D3e1f63698b9DEeCC9a24dCCd30d" -ctm_deployment_tracker_implementation_addr = "0xB5Cf80879f9B2dC1F000E2E8D75afBd5b6cbFA19" -ctm_deployment_tracker_proxy_addr = "0x6306C2F2d254c965E8E32CCEFdC8D0E5E97D1920" -message_root_implementation_addr = "0xCA3359AC26749d07F3Db2D124e12CF25B380E0Cd" -message_root_proxy_addr = "0xC018530eE9aa956Cc3F3cc943a27Bf0AAb0286Cf" +bridgehub_implementation_addr = "0xCC492cFda50ac96AbdD1EEAbADc1592d1Ad0F919" +bridgehub_proxy_addr = "0x7fa8C3590E5B8a661dFdF2f80Eeb63FC8eF8d75c" +ctm_deployment_tracker_implementation_addr = "0x01D8E20da1C7922C6665e669C2ab0faF87E2112E" +ctm_deployment_tracker_proxy_addr = "0x90Bd8fECCFAc74A7bd80CE92CBFE9C3d41EA22dE" +message_root_implementation_addr = "0x5D8dfB5052A39Ec48459185f0A3bdc5Cc2D398D8" +message_root_proxy_addr = "0xc041eD26369228342771DbEFFccC945b3AE39634" [deployed_addresses.bridges] -erc20_bridge_implementation_addr = "0xD32fc9de19Aa3cCf41d48934d4375F03397F2438" -erc20_bridge_proxy_addr = "0xeA108c45022Ac85f3be36eE16d7280AD273Ec4bD" -shared_bridge_implementation_addr = "0x4A44383DbDD11EcdBC89e1eD1AA73Fa650acFab6" -shared_bridge_proxy_addr = "0xaE93f79B59BF1CA684F8C4F4aC58F790a68bdF5e" +erc20_bridge_implementation_addr = "0x792C3873689e1C7fAD832BEE71EFde5b3a96Bc75" +erc20_bridge_proxy_addr = "0xe48A3910d1Ce2a3B2Dd4c882695647B53aaE2C2A" +shared_bridge_implementation_addr = "0xDBc1c67DfC2f4EFCF275Edf56fbe0aE4198309Ba" +shared_bridge_proxy_addr = "0xaA3d7997Ed6E5810735908B149827CB9D05ac055" [deployed_addresses.state_transition] -admin_facet_addr = "0x207D7fA7b533Ec0b9f64e66B04756B90Bbfa8694" -default_upgrade_addr = "0x6D26D095d92f6AE10E43A0bd6aba1fa4A6146a75" -diamond_init_addr = "0xDeA634df59ae14b62F4e9875196b4Ff86F1F90FD" +admin_facet_addr = "0x60EA3B1444F8b0679A7952464676682B915e9759" +default_upgrade_addr = "0x73dc8F82EB3841e9686cF851885a20E7eCC0a55e" +diamond_init_addr = "0x3f7F7d7ff6f56B740065E7847364A71C86276661" diamond_proxy_addr = "0x0000000000000000000000000000000000000000" -executor_facet_addr = "0xFB1829d7c11028b7B8e56bA684ad928EC7812C17" -genesis_upgrade_addr = "0x57b697a6Dc1fFDAc922710B6D7F8f8953C336988" -getters_facet_addr = "0xcCbfF7E1593e966d85AD89954f5e3ee8dffF97ad" -mailbox_facet_addr = "0xfFc625196eAA62687256cF61a60DFFf06ac5083d" -state_transition_implementation_addr = "0xA43901D5d901239E6B18b579379d906769778beD" -state_transition_proxy_addr = "0x4E567C2165d04893932d4E3E8B51C67a00C8Cbf4" -verifier_addr = "0x8F3c4D76725e03F1FFf1C53f88BB685b447143D8" ->>>>>>> kl/sync-layer-reorg +executor_facet_addr = "0x093836714630AA112946F59Ab96b55bBCc6f223C" +genesis_upgrade_addr = "0x43d15D60832EC0bBcd2AEFDa0F7753150D7c99B2" +getters_facet_addr = "0x4dDc445C3cE03a1D5A3afD2dB83Bcdd2Ef23C75D" +mailbox_facet_addr = "0x762a0212978b65456Fb5894d4E2304FcB586366f" +state_transition_implementation_addr = "0xEeBD46649B10448378A5D82D18f615Cb1dC7D6B6" +state_transition_proxy_addr = "0xEe2311976DF44E9337fCF9dd42819dDE98Ca28D8" +verifier_addr = "0x773C73f5bB8E67672E89D70c17F2a72EfEDe1707" diff --git a/l1-contracts/test/foundry/unit/concrete/GatewayTransactionFilterer/CheckTransaction.sol b/l1-contracts/test/foundry/unit/concrete/GatewayTransactionFilterer/CheckTransaction.sol new file mode 100644 index 000000000..3231a7144 --- /dev/null +++ b/l1-contracts/test/foundry/unit/concrete/GatewayTransactionFilterer/CheckTransaction.sol @@ -0,0 +1,89 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.8.24; + +import {GatewayTransactionFiltererTest} from "./_GatewayTransactionFilterer_Shared.t.sol"; + +import {IGetters} from "contracts/state-transition/chain-interfaces/IGetters.sol"; +import {IL2Bridge} from "contracts/bridge/interfaces/IL2Bridge.sol"; +import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; +import {AlreadyWhitelisted, InvalidSelector, NotWhitelisted} from "contracts/common/L1ContractErrors.sol"; + +contract CheckTransactionTest is GatewayTransactionFiltererTest { + function test_TransactionAllowedOnlyFromWhitelistedSenderWhichIsNotAssetRouter() public { + bytes memory txCalladata = abi.encodeCall(IL2Bridge.finalizeDeposit, (bytes32("0x12345"), bytes("0x23456"))); + vm.startPrank(owner); + vm.mockCall( + bridgehub, + abi.encodeWithSelector(IBridgehub.ctmAssetIdToAddress.selector), + abi.encode(address(0)) // Return any address + ); + bool isTxAllowed = transactionFiltererProxy.isTransactionAllowed( + sender, + address(0), + 0, + 0, + txCalladata, + address(0) + ); // Other arguments do not make a difference for the test + + assertEq(isTxAllowed, false, "Transaction should not be allowed"); + + transactionFiltererProxy.grantWhitelist(sender); + isTxAllowed = transactionFiltererProxy.isTransactionAllowed(sender, address(0), 0, 0, txCalladata, address(0)); // Other arguments do not make a difference for the test + + assertEq(isTxAllowed, true, "Transaction should be allowed"); + + transactionFiltererProxy.grantWhitelist(assetRouter); + isTxAllowed = transactionFiltererProxy.isTransactionAllowed( + assetRouter, + address(0), + 0, + 0, + txCalladata, + address(0) + ); // Other arguments do not make a difference for the test + + assertEq(isTxAllowed, false, "Transaction should not be allowed"); + + vm.stopPrank(); + } + + function test_TransactionAllowedFromWhitelistedSenderForChainBridging() public { + address stm = address(0x6060606); + bytes memory txCalladata = abi.encodeCall(IL2Bridge.finalizeDeposit, (bytes32("0x12345"), bytes("0x23456"))); + vm.startPrank(owner); + vm.mockCall( + bridgehub, + abi.encodeWithSelector(IBridgehub.ctmAssetIdToAddress.selector), + abi.encode(stm) // Return random address + ); + + transactionFiltererProxy.grantWhitelist(assetRouter); + bool isTxAllowed = transactionFiltererProxy.isTransactionAllowed( + assetRouter, + address(0), + 0, + 0, + txCalladata, + address(0) + ); // Other arguments do not make a difference for the test + + assertEq(isTxAllowed, true, "Transaction should be allowed"); + + vm.stopPrank(); + } + + function test_TransactionFailsWithInvalidSelectorEvenIfTheSenderIsAR() public { + bytes memory txCalladata = abi.encodeCall(IL2Bridge.withdraw, (bytes32("0x12345"), bytes("0x23456"))); + vm.prank(owner); + vm.expectRevert(abi.encodeWithSelector(InvalidSelector.selector, IL2Bridge.withdraw.selector)); + bool isTxAllowed = transactionFiltererProxy.isTransactionAllowed( + assetRouter, + address(0), + 0, + 0, + txCalladata, + address(0) + ); // Other arguments do not make a difference for the test + } +} diff --git a/l1-contracts/test/foundry/unit/concrete/GatewayTransactionFilterer/ManageWhitelist.sol b/l1-contracts/test/foundry/unit/concrete/GatewayTransactionFilterer/ManageWhitelist.sol new file mode 100644 index 000000000..be176e150 --- /dev/null +++ b/l1-contracts/test/foundry/unit/concrete/GatewayTransactionFilterer/ManageWhitelist.sol @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.8.24; + +import {GatewayTransactionFiltererTest} from "./_GatewayTransactionFilterer_Shared.t.sol"; + +import {AlreadyWhitelisted, NotWhitelisted} from "contracts/common/L1ContractErrors.sol"; + +contract ManageWhitelistTest is GatewayTransactionFiltererTest { + function test_GrantingWhitelistToSender() public { + vm.startPrank(owner); + transactionFiltererProxy.grantWhitelist(sender); + + assertEq( + transactionFiltererProxy.whitelistedSenders(sender), + true, + "Whitelisting of sender was not successful" + ); + + vm.expectRevert(abi.encodeWithSelector(AlreadyWhitelisted.selector, sender)); + transactionFiltererProxy.grantWhitelist(sender); + } + + function test_RevokeWhitelistFromSender() public { + vm.startPrank(owner); + vm.expectRevert(abi.encodeWithSelector(NotWhitelisted.selector, sender)); + transactionFiltererProxy.revokeWhitelist(sender); + + transactionFiltererProxy.grantWhitelist(sender); + transactionFiltererProxy.revokeWhitelist(sender); + + assertEq( + transactionFiltererProxy.whitelistedSenders(sender), + false, + "Revoking the sender from whitelist was not successful" + ); + } +} diff --git a/l1-contracts/test/foundry/unit/concrete/GatewayTransactionFilterer/_GatewayTransactionFilterer_Shared.t.sol b/l1-contracts/test/foundry/unit/concrete/GatewayTransactionFilterer/_GatewayTransactionFilterer_Shared.t.sol new file mode 100644 index 000000000..1b3646ccb --- /dev/null +++ b/l1-contracts/test/foundry/unit/concrete/GatewayTransactionFilterer/_GatewayTransactionFilterer_Shared.t.sol @@ -0,0 +1,38 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.8.21; + +import {Test} from "forge-std/Test.sol"; + +import {TransparentUpgradeableProxy} from "@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol"; + +import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; + +import {GatewayTransactionFilterer} from "contracts/transactionFilterer/GatewayTransactionFilterer.sol"; + +contract GatewayTransactionFiltererTest is Test { + GatewayTransactionFilterer internal transactionFiltererProxy; + GatewayTransactionFilterer internal transactionFiltererImplementation; + address internal constant owner = address(0x1010101); + address internal constant admin = address(0x2020202); + address internal constant sender = address(0x3030303); + address internal constant bridgehub = address(0x5050505); + address internal constant assetRouter = address(0x4040404); + + constructor() { + transactionFiltererImplementation = new GatewayTransactionFilterer(IBridgehub(bridgehub), assetRouter); + + transactionFiltererProxy = GatewayTransactionFilterer( + address( + new TransparentUpgradeableProxy( + address(transactionFiltererImplementation), + admin, + abi.encodeCall(GatewayTransactionFilterer.initialize, owner) + ) + ) + ); + } + + // add this to be excluded from coverage report + function test() internal virtual {} +} From f95beef0325c5586f625a10cc6570e7dbda4e8e1 Mon Sep 17 00:00:00 2001 From: Raid5594 <52794079+Raid5594@users.noreply.github.com> Date: Tue, 10 Sep 2024 14:01:14 +0400 Subject: [PATCH 40/53] Ra/split asset router (#595) Co-authored-by: Raid Ateir Co-authored-by: kelemeno Co-authored-by: kelemeno <34402761+kelemeno@users.noreply.github.com> Co-authored-by: Stanislav Bezkorovainyi Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com> --- .github/workflows/l1-contracts-ci.yaml | 51 + .gitignore | 3 +- l1-contracts/.env | 4 + .../contracts/bridge/BridgeHelper.sol | 7 +- .../contracts/bridge/BridgedStandardERC20.sol | 22 +- .../contracts/bridge/L1AssetRouter.sol | 1085 ----------------- .../contracts/bridge/L1ERC20Bridge.sol | 71 +- .../contracts/bridge/L1NativeTokenVault.sol | 291 ----- l1-contracts/contracts/bridge/L1Nullifier.sol | 720 +++++++++++ .../contracts/bridge/L2SharedBridgeLegacy.sol | 32 +- .../contracts/bridge/L2WrappedBaseToken.sol | 8 +- .../bridge/asset-router/AssetRouterBase.sol | 170 +++ .../bridge/asset-router/IAssetRouterBase.sol | 73 ++ .../bridge/asset-router/IL1AssetRouter.sol | 176 +++ .../bridge/asset-router/IL2AssetRouter.sol | 24 + .../bridge/asset-router/L1AssetRouter.sol | 584 +++++++++ .../bridge/asset-router}/L2AssetRouter.sol | 151 ++- .../bridge/interfaces/IAssetHandler.sol | 45 + .../interfaces/IBridgedStandardToken.sol | 2 +- .../bridge/interfaces/IL1AssetHandler.sol | 33 - .../bridge/interfaces/IL1AssetRouter.sol | 173 --- .../bridge/interfaces/IL1ERC20Bridge.sol | 11 +- .../bridge/interfaces/IL1NativeTokenVault.sol | 31 - .../bridge/interfaces/IL1Nullifier.sol | 110 ++ .../interfaces/IL1SharedBridgeLegacy.sol | 9 + .../bridge/interfaces/IL2BridgeLegacy.sol | 21 - .../interfaces/IL2SharedBridgeLegacy.sol | 2 + .../IL2SharedBridgeLegacyFunctions.sol | 12 +- .../bridge/interfaces/IL2WrappedBaseToken.sol | 0 .../bridge/ntv/IL1NativeTokenVault.sol | 18 + .../bridge/ntv}/IL2NativeTokenVault.sol | 9 +- .../bridge/ntv/INativeTokenVault.sol | 40 + .../bridge/ntv/L1NativeTokenVault.sol | 237 ++++ .../bridge/ntv/L2NativeTokenVault.sol | 215 ++++ .../contracts/bridge/ntv/NativeTokenVault.sol | 407 +++++++ .../contracts/bridgehub/Bridgehub.sol | 145 ++- .../bridgehub/CTMDeploymentTracker.sol | 8 +- .../contracts/bridgehub/IBridgehub.sol | 6 +- .../bridgehub/ICTMDeploymentTracker.sol | 4 +- .../contracts/common/L1ContractErrors.sol | 37 + .../contracts/common/L2ContractAddresses.sol | 32 + .../common/libraries/DataEncoding.sol | 30 + .../common/libraries/L2ContractHelper.sol | 39 + .../libraries/SystemContractsCaller.sol | 145 +++ .../dev-contracts/DummyL1ERC20Bridge.sol | 8 +- .../contracts/dev-contracts/WETH9.sol | 12 +- .../test/DummyAdminFacetNoOverlap.sol | 2 +- .../dev-contracts/test/DummySharedBridge.sol | 16 +- .../dev-contracts/test/L1ERC20BridgeTest.sol | 10 +- .../state-transition/ChainTypeManager.sol | 6 +- .../state-transition/IChainTypeManager.sol | 2 +- .../chain-deps/facets/Mailbox.sol | 6 +- .../chain-interfaces/IZKChainBase.sol | 2 +- .../l2-deps/ISystemContext.sol | 2 +- .../libraries/PriorityTree.sol | 4 +- .../GatewayTransactionFilterer.sol | 8 +- l1-contracts/deploy-scripts/DeployL1.s.sol | 111 +- .../deploy-scripts/DeployL2Contracts.sol | 14 +- l1-contracts/deploy-scripts/Gateway.s.sol | 4 +- .../GenerateForceDeploymentsData.s.sol | 10 +- .../deploy-scripts/RegisterZKChain.s.sol | 8 +- l1-contracts/foundry.toml | 9 +- l1-contracts/hardhat.config.ts | 15 +- l1-contracts/package.json | 5 +- .../scripts/initialize-l2-weth-token.ts | 2 +- l1-contracts/scripts/sync-layer.ts | 8 +- l1-contracts/src.ts/deploy-process.ts | 4 +- l1-contracts/src.ts/deploy-utils-zk.ts | 4 +- l1-contracts/src.ts/deploy-utils.ts | 8 + l1-contracts/src.ts/deploy.ts | 169 ++- .../script-out/output-deploy-l1.toml | 56 - .../l1/integration/AssetRouterTest.t.sol | 188 +++ .../integration/BridgeHubInvariantTests.t.sol | 18 +- .../{ => l1}/integration/BridgehubTests.t.sol | 18 +- .../{ => l1}/integration/DeploymentTest.t.sol | 0 .../{ => l1}/integration/GatewayTests.t.sol | 6 +- .../integration/_SharedGatewayDeployer.t.sol | 8 +- .../_SharedL1ContractDeployer.t.sol | 31 +- .../integration/_SharedL2TxMocker.t.sol | 0 .../integration/_SharedTokenDeployer.t.sol | 5 +- .../integration/_SharedZKChainDeployer.t.sol | 4 +- .../script-config/config-deploy-erc20.toml | 0 .../script-config/config-deploy-l1.toml | 0 .../generate-force-deployments-data.toml | 0 .../deploy-scripts/script-out/.gitkeep | 0 .../_AddressAliasHelper_Shared.t.sol | 0 .../AddressAliasHelper/applyL1ToL2Alias.t.sol | 0 .../AddressAliasHelper/undoL1ToL2Alias.t.sol | 0 .../unit/concrete/Bridgehub/Initialize.t.sol | 0 .../unit/concrete/Bridgehub/MessageRoot.t.sol | 0 .../Bridgehub/_Bridgehub_Shared.t.sol | 0 .../Bridgehub/experimental_bridge.t.sol | 15 +- .../L1Erc20Bridge/ClaimFailedDeposit.t.sol | 2 +- .../Bridges/L1Erc20Bridge/Deposit.t.sol | 2 +- .../L1Erc20Bridge/FinalizeWithdrawal.sol | 30 +- .../Bridges/L1Erc20Bridge/Getters.t.sol | 0 .../L1Erc20Bridge/Initialization.t.sol | 0 .../Bridges/L1Erc20Bridge/Reentrancy.t.sol | 0 .../L1Erc20Bridge/_L1Erc20Bridge_Shared.t.sol | 33 +- .../L1SharedBridge/L1SharedBridgeBase.t.sol | 63 +- .../L1SharedBridge/L1SharedBridgeFails.t.sol | 99 +- .../L1SharedBridgeHyperEnabled.t.sol | 45 +- .../L1SharedBridge/L1SharedBridgeLegacy.t.sol | 35 +- .../_L1SharedBridge_Shared.t.sol | 71 +- .../unit/concrete/DiamondCut/FacetCut.t.sol | 0 .../concrete/DiamondCut/Initialization.t.sol | 0 .../concrete/DiamondCut/UpgradeLogic.t.sol | 0 .../DiamondCut/_DiamondCut_Shared.t.sol | 0 .../concrete/Executor/Authorization.t.sol | 0 .../unit/concrete/Executor/Committing.t.sol | 0 .../unit/concrete/Executor/Executing.t.sol | 0 .../concrete/Executor/ExecutorProof.t.sol | 4 +- .../unit/concrete/Executor/Proving.t.sol | 0 .../unit/concrete/Executor/Reverting.t.sol | 0 .../concrete/Executor/_Executor_Shared.t.sol | 3 +- .../Governance/AccessControlRestriction.t.sol | 2 +- .../concrete}/Governance/Authorization.t.sol | 0 .../concrete}/Governance/ChainAdmin.t.sol | 2 +- .../unit/concrete}/Governance/Executing.t.sol | 2 +- .../unit/concrete}/Governance/Fallback.t.sol | 0 .../Governance/OperationStatus.t.sol | 2 +- .../Governance/PermanentRestriction.t.sol | 2 +- .../concrete}/Governance/Reentrancy.t.sol | 0 .../concrete}/Governance/SelfUpgrades.t.sol | 2 +- .../Governance/_Governance_Shared.t.sol | 0 .../{ => l1}/unit/concrete/Utils/Utils.sol | 0 .../{ => l1}/unit/concrete/Utils/Utils.t.sol | 0 .../unit/concrete/Utils/UtilsFacet.sol | 0 .../ValidatorTimelock/ValidatorTimelock.t.sol | 0 .../unit/concrete/Verifier/Verifier.t.sol | 0 .../concrete/Verifier/VerifierRecursive.t.sol | 0 .../libraries/FullMerkle/PushNewLeaf.t.sol | 0 .../common/libraries/FullMerkle/Root.t.sol | 0 .../common/libraries/FullMerkle/Setup.t.sol | 0 .../FullMerkle/UpdateAllLeaves.t.sol | 0 .../FullMerkle/UpdateAllNodesAtHeight.t.sol | 0 .../libraries/FullMerkle/UpdateLeaf.t.sol | 0 .../FullMerkle/_FullMerkle_Shared.t.sol | 0 .../IncrementalMerkle/IncrementalMerkle.t.sol | 0 .../common/libraries/Merkle/Merkle.t.sol | 0 .../libraries/Merkle/MerkleTreeNoSort.sol | 0 .../UncheckedMath/UncheckedAdd.t.sol | 0 .../UncheckedMath/UncheckedInc.t.sol | 0 .../UncheckedMath/_UncheckedMath_Shared.t.sol | 0 .../libraries/UnsafeBytes/UnsafeBytes.t.sol | 0 .../ChainTypeManager/Admin.t.sol | 0 .../ChainTypeManager/CreateNewChain.t.sol | 2 +- .../ChainTypeManager/FreezeChain.t.sol | 0 .../ChainTypeManager/RevertBatches.t.sol | 0 .../SetChainCreationParams.t.sol | 0 .../SetNewVersionUpgrade.t.sol | 0 .../SetUpgradeDiamondCut.t.sol | 0 .../SetValidatorTimelock.t.sol | 0 .../StateTransitionOwnerZero.t.sol | 0 .../_ChainTypeManager_Shared.t.sol | 7 +- .../chain-deps/DiamondInit/Initialize.t.sol | 4 +- .../DiamondInit/_DiamondInit_Shared.t.sol | 4 +- .../DiamondProxy/DiamondProxy.t.sol | 4 +- .../chain-deps/facets/Admin/AcceptAdmin.t.sol | 0 .../facets/Admin/ChangeFeeParams.t.sol | 0 .../facets/Admin/ExecuteUpgrade.t.sol | 0 .../facets/Admin/FreezeDiamond.t.sol | 0 .../facets/Admin/SetPendingGovernor.t.sol | 0 .../facets/Admin/SetPorterAvailability.t.sol | 0 .../Admin/SetPriorityTxMaxGasLimit.t.sol | 0 .../facets/Admin/SetTransactionFilterer.t.sol | 0 .../facets/Admin/SetValidator.t.sol | 0 .../facets/Admin/UnfreezeDiamond.t.sol | 0 .../Admin/UpgradeChainFromVersion.t.sol | 0 .../facets/Admin/_Admin_Shared.t.sol | 4 +- .../facets/Base/OnlyBridgehub.t.sol | 0 .../chain-deps/facets/Base/OnlyGovernor.t.sol | 0 ...OnlyGovernorOrStateTransitionManager.t.sol | 0 .../Base/OnlyStateTransitionManager.t.sol | 0 .../facets/Base/OnlyValidator.t.sol | 0 .../chain-deps/facets/Base/_Base_Shared.t.sol | 4 +- .../facets/Getters/FacetAddress.t.sol | 0 .../facets/Getters/FacetAddresses.t.sol | 0 .../Getters/FacetFunctionSelectors.t.sol | 0 .../chain-deps/facets/Getters/Facets.t.sol | 0 .../chain-deps/facets/Getters/GetAdmin.t.sol | 0 .../facets/Getters/GetBaseToken.t.sol | 0 .../facets/Getters/GetBaseTokenBridge.t.sol | 0 .../facets/Getters/GetBridgehub.t.sol | 0 .../GetFirstUnprocessedPriorityTx.t.sol | 0 .../Getters/GetL2BootloaderBytecodeHash.t.sol | 0 .../GetL2DefaultAccountBytecodeHash.t.sol | 0 ...tL2SystemContractsUpgradeBatchNumber.t.sol | 0 ...tL2SystemContractsUpgradeBlockNumber.t.sol | 0 .../GetL2SystemContractsUpgradeTxHash.t.sol | 0 .../facets/Getters/GetPendingAdmin.t.sol | 0 .../facets/Getters/GetPriorityQueueSize.t.sol | 0 .../Getters/GetPriorityTxMaxGasLimit.t.sol | 0 .../facets/Getters/GetProtocolVersion.t.sol | 0 .../Getters/GetStateTransitionManager.t.sol | 0 .../Getters/GetTotalBatchesCommitted.t.sol | 0 .../Getters/GetTotalBatchesExecuted.t.sol | 0 .../Getters/GetTotalBatchesVerified.t.sol | 0 .../Getters/GetTotalBlocksCommitted.t.sol | 0 .../Getters/GetTotalBlocksExecuted.t.sol | 0 .../Getters/GetTotalBlocksVerified.t.sol | 0 .../facets/Getters/GetTotalPriorityTxs.t.sol | 0 .../facets/Getters/GetVerifier.t.sol | 0 .../facets/Getters/GetVerifierParams.t.sol | 0 .../Getters/IsDiamondStorageFrozen.t.sol | 0 .../Getters/IsEthWithdrawalFinalized.t.sol | 0 .../facets/Getters/IsFacetFreezable.t.sol | 0 .../facets/Getters/IsFunctionFreezable.t.sol | 0 .../facets/Getters/IsValidator.t.sol | 0 .../facets/Getters/L2LogsRootHash.t.sol | 0 .../facets/Getters/StoredBatchHash.t.sol | 0 .../facets/Getters/StoredBlockHash.t.sol | 0 .../facets/Getters/_Getters_Shared.t.sol | 0 .../facets/Mailbox/BaseMailboxTests.t.sol | 0 .../BridgehubRequestL2Transaction.t.sol | 0 .../facets/Mailbox/FinalizeWithdrawal.t.sol | 4 +- .../Mailbox/ProvingL2LogsInclusion.t.sol | 2 +- .../facets/Mailbox/RequestL2Transaction.t.sol | 2 +- .../facets/Mailbox/_Mailbox_Shared.t.sol | 4 +- .../data-availability/CalldataDA.t.sol | 0 .../RelayedSLDAValidator.t.sol | 0 .../libraries/PriorityQueue/OnEmptyQueue.sol | 0 .../libraries/PriorityQueue/PopOperations.sol | 0 .../PriorityQueue/PushOperations.sol | 0 .../PriorityQueue/_PriorityQueue_Shared.t.sol | 0 .../libraries/PriorityTree/PriorityTree.t.sol | 0 .../PriorityTree/_PriorityTree_Shared.t.sol | 0 .../TransactionValidator/ValidateL1L2Tx.t.sol | 0 .../ValidateUpgradeTransaction.t.sol | 0 .../_TransactionValidator_Shared.t.sol | 0 .../l2}/unit/erc20/L2Erc20BridgeTest.t.sol | 60 +- .../test/foundry/l2/unit/utils/L2Utils.sol | 37 +- .../test/foundry/l2}/unit/weth/WETH.t.sol | 4 +- .../initial_deployment_test.spec.ts | 55 +- .../test/unit_tests/legacy_era_test.spec.ts | 11 +- l2-contracts/contracts/L2ContractHelper.sol | 7 - .../contracts/bridge/L2NativeTokenVault.sol | 261 ---- .../bridge/interfaces/IL1AssetRouter.sol | 17 - .../bridge/interfaces/IL1ERC20Bridge.sol | 17 - .../bridge/interfaces/IL2AssetHandler.sol | 34 - .../bridge/interfaces/IL2AssetRouter.sol | 35 - .../common/libraries/DataEncoding.sol | 90 -- .../contracts/errors/L2ContractErrors.sol | 2 - .../verifier/chain-interfaces/IVerifier.sol | 2 +- .../deploy-shared-bridge-on-l2-through-l1.ts | 36 - system-contracts/SystemContractsHashes.json | 32 +- .../contracts/interfaces/IBridgehub.sol | 2 +- .../contracts/interfaces/IL2DAValidator.sol | 2 +- .../interfaces/IL2GenesisUpgrade.sol | 2 +- .../contracts/interfaces/IMessageRoot.sol | 2 +- 250 files changed, 4440 insertions(+), 2799 deletions(-) rename l2-contracts/contracts/bridge/L2StandardERC20.sol => l1-contracts/contracts/bridge/BridgedStandardERC20.sol (90%) delete mode 100644 l1-contracts/contracts/bridge/L1AssetRouter.sol delete mode 100644 l1-contracts/contracts/bridge/L1NativeTokenVault.sol create mode 100644 l1-contracts/contracts/bridge/L1Nullifier.sol rename {l2-contracts => l1-contracts}/contracts/bridge/L2SharedBridgeLegacy.sol (82%) rename {l2-contracts => l1-contracts}/contracts/bridge/L2WrappedBaseToken.sol (94%) create mode 100644 l1-contracts/contracts/bridge/asset-router/AssetRouterBase.sol create mode 100644 l1-contracts/contracts/bridge/asset-router/IAssetRouterBase.sol create mode 100644 l1-contracts/contracts/bridge/asset-router/IL1AssetRouter.sol create mode 100644 l1-contracts/contracts/bridge/asset-router/IL2AssetRouter.sol create mode 100644 l1-contracts/contracts/bridge/asset-router/L1AssetRouter.sol rename {l2-contracts/contracts/bridge => l1-contracts/contracts/bridge/asset-router}/L2AssetRouter.sol (62%) create mode 100644 l1-contracts/contracts/bridge/interfaces/IAssetHandler.sol rename l2-contracts/contracts/bridge/interfaces/IL2StandardToken.sol => l1-contracts/contracts/bridge/interfaces/IBridgedStandardToken.sol (95%) delete mode 100644 l1-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol delete mode 100644 l1-contracts/contracts/bridge/interfaces/IL1NativeTokenVault.sol create mode 100644 l1-contracts/contracts/bridge/interfaces/IL1Nullifier.sol delete mode 100644 l1-contracts/contracts/bridge/interfaces/IL2BridgeLegacy.sol rename {l2-contracts => l1-contracts}/contracts/bridge/interfaces/IL2SharedBridgeLegacy.sol (90%) rename l2-contracts/contracts/bridge/interfaces/IL2SharedBridge.sol => l1-contracts/contracts/bridge/interfaces/IL2SharedBridgeLegacyFunctions.sol (65%) rename {l2-contracts => l1-contracts}/contracts/bridge/interfaces/IL2WrappedBaseToken.sol (100%) create mode 100644 l1-contracts/contracts/bridge/ntv/IL1NativeTokenVault.sol rename {l2-contracts/contracts/bridge/interfaces => l1-contracts/contracts/bridge/ntv}/IL2NativeTokenVault.sol (66%) create mode 100644 l1-contracts/contracts/bridge/ntv/INativeTokenVault.sol create mode 100644 l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol create mode 100644 l1-contracts/contracts/bridge/ntv/L2NativeTokenVault.sol create mode 100644 l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol create mode 100644 l1-contracts/contracts/common/libraries/SystemContractsCaller.sol delete mode 100644 l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml create mode 100644 l1-contracts/test/foundry/l1/integration/AssetRouterTest.t.sol rename l1-contracts/test/foundry/{ => l1}/integration/BridgeHubInvariantTests.t.sol (97%) rename l1-contracts/test/foundry/{ => l1}/integration/BridgehubTests.t.sol (97%) rename l1-contracts/test/foundry/{ => l1}/integration/DeploymentTest.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/integration/GatewayTests.t.sol (97%) rename l1-contracts/test/foundry/{ => l1}/integration/_SharedGatewayDeployer.t.sol (60%) rename l1-contracts/test/foundry/{ => l1}/integration/_SharedL1ContractDeployer.t.sol (69%) rename l1-contracts/test/foundry/{ => l1}/integration/_SharedL2TxMocker.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/integration/_SharedTokenDeployer.t.sol (77%) rename l1-contracts/test/foundry/{ => l1}/integration/_SharedZKChainDeployer.t.sol (96%) rename l1-contracts/test/foundry/{ => l1}/integration/deploy-scripts/script-config/config-deploy-erc20.toml (100%) rename l1-contracts/test/foundry/{ => l1}/integration/deploy-scripts/script-config/config-deploy-l1.toml (100%) rename l1-contracts/test/foundry/{ => l1}/integration/deploy-scripts/script-config/generate-force-deployments-data.toml (100%) rename l1-contracts/test/foundry/{ => l1}/integration/deploy-scripts/script-out/.gitkeep (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/AddressAliasHelper/_AddressAliasHelper_Shared.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/AddressAliasHelper/applyL1ToL2Alias.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/AddressAliasHelper/undoL1ToL2Alias.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Bridgehub/Initialize.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Bridgehub/MessageRoot.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Bridgehub/_Bridgehub_Shared.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Bridgehub/experimental_bridge.t.sol (99%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Bridges/L1Erc20Bridge/ClaimFailedDeposit.t.sol (91%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Bridges/L1Erc20Bridge/Deposit.t.sol (98%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Bridges/L1Erc20Bridge/FinalizeWithdrawal.sol (69%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Bridges/L1Erc20Bridge/Getters.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Bridges/L1Erc20Bridge/Initialization.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Bridges/L1Erc20Bridge/Reentrancy.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Bridges/L1Erc20Bridge/_L1Erc20Bridge_Shared.t.sol (62%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeBase.t.sol (89%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol (90%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeHyperEnabled.t.sol (89%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeLegacy.t.sol (79%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol (78%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/DiamondCut/FacetCut.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/DiamondCut/Initialization.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/DiamondCut/UpgradeLogic.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/DiamondCut/_DiamondCut_Shared.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Executor/Authorization.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Executor/Committing.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Executor/Executing.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Executor/ExecutorProof.t.sol (99%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Executor/Proving.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Executor/Reverting.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Executor/_Executor_Shared.t.sol (98%) rename l1-contracts/test/foundry/{unit/concrete/governance => l1/unit/concrete}/Governance/AccessControlRestriction.t.sol (99%) rename l1-contracts/test/foundry/{unit/concrete/governance => l1/unit/concrete}/Governance/Authorization.t.sol (100%) rename l1-contracts/test/foundry/{unit/concrete/governance => l1/unit/concrete}/Governance/ChainAdmin.t.sol (98%) rename l1-contracts/test/foundry/{unit/concrete/governance => l1/unit/concrete}/Governance/Executing.t.sol (99%) rename l1-contracts/test/foundry/{unit/concrete/governance => l1/unit/concrete}/Governance/Fallback.t.sol (100%) rename l1-contracts/test/foundry/{unit/concrete/governance => l1/unit/concrete}/Governance/OperationStatus.t.sol (99%) rename l1-contracts/test/foundry/{unit/concrete/governance => l1/unit/concrete}/Governance/PermanentRestriction.t.sol (98%) rename l1-contracts/test/foundry/{unit/concrete/governance => l1/unit/concrete}/Governance/Reentrancy.t.sol (100%) rename l1-contracts/test/foundry/{unit/concrete/governance => l1/unit/concrete}/Governance/SelfUpgrades.t.sol (97%) rename l1-contracts/test/foundry/{unit/concrete/governance => l1/unit/concrete}/Governance/_Governance_Shared.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Utils/Utils.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Utils/Utils.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Utils/UtilsFacet.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Verifier/Verifier.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/Verifier/VerifierRecursive.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/common/libraries/FullMerkle/PushNewLeaf.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/common/libraries/FullMerkle/Root.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/common/libraries/FullMerkle/Setup.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/common/libraries/FullMerkle/UpdateAllLeaves.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/common/libraries/FullMerkle/UpdateAllNodesAtHeight.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/common/libraries/FullMerkle/UpdateLeaf.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/common/libraries/FullMerkle/_FullMerkle_Shared.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/common/libraries/IncrementalMerkle/IncrementalMerkle.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/common/libraries/Merkle/Merkle.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/common/libraries/Merkle/MerkleTreeNoSort.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/common/libraries/UncheckedMath/UncheckedAdd.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/common/libraries/UncheckedMath/UncheckedInc.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/common/libraries/UncheckedMath/_UncheckedMath_Shared.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/common/libraries/UnsafeBytes/UnsafeBytes.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/ChainTypeManager/Admin.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/ChainTypeManager/CreateNewChain.t.sol (97%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/ChainTypeManager/FreezeChain.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/ChainTypeManager/SetChainCreationParams.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/ChainTypeManager/SetNewVersionUpgrade.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/ChainTypeManager/SetUpgradeDiamondCut.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/ChainTypeManager/SetValidatorTimelock.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/ChainTypeManager/StateTransitionOwnerZero.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol (97%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/DiamondInit/Initialize.t.sol (97%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/DiamondInit/_DiamondInit_Shared.t.sol (84%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/DiamondProxy/DiamondProxy.t.sol (97%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Admin/AcceptAdmin.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Admin/ExecuteUpgrade.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Admin/FreezeDiamond.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Admin/SetPendingGovernor.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Admin/SetPorterAvailability.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Admin/SetPriorityTxMaxGasLimit.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Admin/SetTransactionFilterer.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Admin/SetValidator.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Admin/UnfreezeDiamond.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Admin/UpgradeChainFromVersion.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Admin/_Admin_Shared.t.sol (93%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Base/OnlyBridgehub.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernor.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernorOrStateTransitionManager.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Base/OnlyStateTransitionManager.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Base/OnlyValidator.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol (95%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/FacetAddress.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/FacetAddresses.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/FacetFunctionSelectors.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/Facets.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetAdmin.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetBaseToken.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetBaseTokenBridge.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetBridgehub.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetFirstUnprocessedPriorityTx.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2BootloaderBytecodeHash.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2DefaultAccountBytecodeHash.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2SystemContractsUpgradeBatchNumber.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2SystemContractsUpgradeBlockNumber.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2SystemContractsUpgradeTxHash.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetPendingAdmin.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetPriorityQueueSize.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetPriorityTxMaxGasLimit.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetProtocolVersion.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetStateTransitionManager.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBatchesCommitted.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBatchesExecuted.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBatchesVerified.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBlocksCommitted.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBlocksExecuted.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBlocksVerified.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalPriorityTxs.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetVerifier.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/GetVerifierParams.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/IsDiamondStorageFrozen.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/IsEthWithdrawalFinalized.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/IsFacetFreezable.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/IsFunctionFreezable.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/IsValidator.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/L2LogsRootHash.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/StoredBatchHash.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/StoredBlockHash.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Getters/_Getters_Shared.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Mailbox/BaseMailboxTests.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Mailbox/BridgehubRequestL2Transaction.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Mailbox/FinalizeWithdrawal.t.sol (93%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Mailbox/ProvingL2LogsInclusion.t.sol (99%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Mailbox/RequestL2Transaction.t.sol (98%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/chain-deps/facets/Mailbox/_Mailbox_Shared.t.sol (93%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/data-availability/CalldataDA.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/data-availability/RelayedSLDAValidator.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/libraries/PriorityQueue/OnEmptyQueue.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/libraries/PriorityQueue/PopOperations.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/libraries/PriorityQueue/PushOperations.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/libraries/PriorityQueue/_PriorityQueue_Shared.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/libraries/PriorityTree/PriorityTree.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/libraries/PriorityTree/_PriorityTree_Shared.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/libraries/TransactionValidator/ValidateL1L2Tx.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/libraries/TransactionValidator/ValidateUpgradeTransaction.t.sol (100%) rename l1-contracts/test/foundry/{ => l1}/unit/concrete/state-transition/libraries/TransactionValidator/_TransactionValidator_Shared.t.sol (100%) rename {l2-contracts/test/foundry => l1-contracts/test/foundry/l2}/unit/erc20/L2Erc20BridgeTest.t.sol (58%) rename l2-contracts/test/foundry/unit/utils/Utils.sol => l1-contracts/test/foundry/l2/unit/utils/L2Utils.sol (81%) rename {l2-contracts/test/foundry => l1-contracts/test/foundry/l2}/unit/weth/WETH.t.sol (93%) delete mode 100644 l2-contracts/contracts/bridge/L2NativeTokenVault.sol delete mode 100644 l2-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol delete mode 100644 l2-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol delete mode 100644 l2-contracts/contracts/bridge/interfaces/IL2AssetHandler.sol delete mode 100644 l2-contracts/contracts/bridge/interfaces/IL2AssetRouter.sol delete mode 100644 l2-contracts/contracts/common/libraries/DataEncoding.sol delete mode 100644 l2-contracts/src/deploy-shared-bridge-on-l2-through-l1.ts diff --git a/.github/workflows/l1-contracts-ci.yaml b/.github/workflows/l1-contracts-ci.yaml index 3b5c269d1..fe3c28379 100644 --- a/.github/workflows/l1-contracts-ci.yaml +++ b/.github/workflows/l1-contracts-ci.yaml @@ -113,6 +113,57 @@ jobs: working-directory: ./l1-contracts run: FOUNDRY_PROFILE=default yarn test:foundry + test-foundry-zksync: + needs: [build, lint] + runs-on: ubuntu-latest + + steps: + - name: Checkout the repository + uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Use Node.js + uses: actions/setup-node@v3 + with: + node-version: 18.18.0 + cache: yarn + + - name: Install dependencies + run: yarn + + - name: Build system contract artifacts + run: yarn sc build + + - name: Restore artifacts cache + uses: actions/cache/restore@v3 + with: + fail-on-cache-miss: true + key: artifacts-l1-${{ github.sha }} + path: | + 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: | + wget https://github.com/matter-labs/foundry-zksync/releases/download/nightly-f908ce43834bc1ffb4de6576ea5600eaab49dddb/foundry_nightly_linux_amd64.tar.gz -O foundry-zksync.tar.gz + tar -xzf foundry-zksync.tar.gz + sudo mv forge /usr/local/bin/forge + sudo mv cast /usr/local/bin/cast + sudo chmod +x /usr/local/bin/forge + sudo chmod +x /usr/local/bin/cast + forge --version + + - name: Run tests + working-directory: ./l1-contracts + run: FOUNDRY_PROFILE=default yarn test:zkfoundry + test-hardhat: needs: [build, lint] runs-on: ubuntu-latest diff --git a/.gitignore b/.gitignore index 58c92d50f..0baffaadb 100644 --- a/.gitignore +++ b/.gitignore @@ -22,10 +22,11 @@ l1-contracts/lcov.info l1-contracts/report/* l1-contracts/coverage/* l1-contracts/out/* +l1-contracts/zkout/* l1-contracts/broadcast/* l1-contracts/script-config/* !l1-contracts/script-config/artifacts l1-contracts/script-out/* -l1-contracts/test/foundry/integration/deploy-scripts/script-out/*.toml +l1-contracts/test/foundry/l1/integration/deploy-scripts/script-out/*.toml !l1-contracts/script-out/.gitkeep *.timestamp diff --git a/l1-contracts/.env b/l1-contracts/.env index a2cd3b3e8..25ec2b87f 100644 --- a/l1-contracts/.env +++ b/l1-contracts/.env @@ -24,8 +24,12 @@ CONTRACTS_TRANSPARENT_PROXY_ADMIN_ADDR=0x000000000000000000000000000000000000000 CONTRACTS_GOVERNANCE_ADDR=0x0000000000000000000000000000000000000000 CONTRACTS_L1_ERC20_BRIDGE_IMPL_ADDR=0x0000000000000000000000000000000000000000 CONTRACTS_L1_ERC20_BRIDGE_PROXY_ADDR=0x0000000000000000000000000000000000000000 +CONTRACTS_L1_NULLIFIER_IMPL_ADDR=0x0000000000000000000000000000000000000000 +CONTRACTS_L1_NULLIFIER_PROXY_ADDR=0x0000000000000000000000000000000000000000 CONTRACTS_L1_SHARED_BRIDGE_IMPL_ADDR=0x0000000000000000000000000000000000000000 CONTRACTS_L1_SHARED_BRIDGE_PROXY_ADDR=0x0000000000000000000000000000000000000000 +CONTRACTS_L1_BRIDGED_STANDARD_ERC20_IMPL_ADDR=0x0000000000000000000000000000000000000000 +CONTRACTS_L1_BRIDGED_TOKEN_BEACON_ADDR=0x0000000000000000000000000000000000000000 CONTRACTS_L1_ALLOW_LIST_ADDR=0x0000000000000000000000000000000000000000 CONTRACTS_CREATE2_FACTORY_ADDR=0x0000000000000000000000000000000000000000 CONTRACTS_VALIDATOR_TIMELOCK_ADDR=0x0000000000000000000000000000000000000000 diff --git a/l1-contracts/contracts/bridge/BridgeHelper.sol b/l1-contracts/contracts/bridge/BridgeHelper.sol index 09ad8cd6d..8e293100f 100644 --- a/l1-contracts/contracts/bridge/BridgeHelper.sol +++ b/l1-contracts/contracts/bridge/BridgeHelper.sol @@ -5,6 +5,7 @@ pragma solidity 0.8.24; // solhint-disable gas-custom-errors import {IERC20Metadata} from "@openzeppelin/contracts-v4/token/ERC20/extensions/IERC20Metadata.sol"; +import {ETH_TOKEN_ADDRESS} from "../common/Config.sol"; /** * @author Matter Labs @@ -13,14 +14,14 @@ import {IERC20Metadata} from "@openzeppelin/contracts-v4/token/ERC20/extensions/ */ library BridgeHelper { /// @dev Receives and parses (name, symbol, decimals) from the token contract - function getERC20Getters(address _token, address _ethTokenAddress) internal view returns (bytes memory) { - if (_token == _ethTokenAddress) { + function getERC20Getters(address _token) internal view returns (bytes memory) { + if (_token == ETH_TOKEN_ADDRESS) { bytes memory name = abi.encode("Ether"); bytes memory symbol = abi.encode("ETH"); bytes memory decimals = abi.encode(uint8(18)); return abi.encode(name, symbol, decimals); // when depositing eth to a non-eth based chain it is an ERC20 } - + /// note this also works on the L2 for the base token. (, bytes memory data1) = _token.staticcall(abi.encodeCall(IERC20Metadata.name, ())); (, bytes memory data2) = _token.staticcall(abi.encodeCall(IERC20Metadata.symbol, ())); (, bytes memory data3) = _token.staticcall(abi.encodeCall(IERC20Metadata.decimals, ())); diff --git a/l2-contracts/contracts/bridge/L2StandardERC20.sol b/l1-contracts/contracts/bridge/BridgedStandardERC20.sol similarity index 90% rename from l2-contracts/contracts/bridge/L2StandardERC20.sol rename to l1-contracts/contracts/bridge/BridgedStandardERC20.sol index a3f493991..2a353e223 100644 --- a/l2-contracts/contracts/bridge/L2StandardERC20.sol +++ b/l1-contracts/contracts/bridge/BridgedStandardERC20.sol @@ -6,15 +6,15 @@ import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/tok import {UpgradeableBeacon} from "@openzeppelin/contracts-v4/proxy/beacon/UpgradeableBeacon.sol"; import {ERC1967Upgrade} from "@openzeppelin/contracts-v4/proxy/ERC1967/ERC1967Upgrade.sol"; -import {IL2StandardToken} from "./interfaces/IL2StandardToken.sol"; -import {ZeroAddress, Unauthorized, NonSequentialVersion} from "../errors/L2ContractErrors.sol"; -import {L2_NATIVE_TOKEN_VAULT} from "../L2ContractHelper.sol"; +import {IBridgedStandardToken} from "./interfaces/IBridgedStandardToken.sol"; +import {Unauthorized, NonSequentialVersion, ZeroAddress} from "../common/L1ContractErrors.sol"; +import {L2_NATIVE_TOKEN_VAULT_ADDR} from "../common/L2ContractAddresses.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev /// @notice The ERC20 token implementation, that is used in the "default" ERC20 bridge. Note, that it does not /// support any custom token logic, i.e. rebase tokens' functionality is not supported. -contract L2StandardERC20 is ERC20PermitUpgradeable, IL2StandardToken, ERC1967Upgrade { +contract BridgedStandardERC20 is ERC20PermitUpgradeable, IBridgedStandardToken, ERC1967Upgrade { /// @dev Describes whether there is a specific getter in the token. /// @notice Used to explicitly separate which getters the token has and which it does not. /// @notice Different tokens in L1 can implement or not implement getter function as `name`/`symbol`/`decimals`, @@ -39,8 +39,18 @@ contract L2StandardERC20 is ERC20PermitUpgradeable, IL2StandardToken, ERC1967Upg /// @dev Address of the L1 token that can be deposited to mint this L2 token address public override l1Address; + /// @dev Address of the native token vault that is used as trustee who can mint/burn tokens + address public nativeTokenVault; + + /// @dev This also sets the native token vault to the default value if it is not set. + /// It is not set only on the L2s for legacy tokens. modifier onlyNTV() { - if (msg.sender != address(L2_NATIVE_TOKEN_VAULT)) { + address ntv = nativeTokenVault; + if (ntv == address(0)) { + ntv = L2_NATIVE_TOKEN_VAULT_ADDR; + nativeTokenVault = L2_NATIVE_TOKEN_VAULT_ADDR; + } + if (msg.sender != ntv) { revert Unauthorized(msg.sender); } _; @@ -72,7 +82,7 @@ contract L2StandardERC20 is ERC20PermitUpgradeable, IL2StandardToken, ERC1967Upg } l1Address = _l1Address; - l2Bridge = msg.sender; + nativeTokenVault = msg.sender; // We parse the data exactly as they were created on the L1 bridge (bytes memory nameBytes, bytes memory symbolBytes, bytes memory decimalsBytes) = abi.decode( diff --git a/l1-contracts/contracts/bridge/L1AssetRouter.sol b/l1-contracts/contracts/bridge/L1AssetRouter.sol deleted file mode 100644 index 545aefbfc..000000000 --- a/l1-contracts/contracts/bridge/L1AssetRouter.sol +++ /dev/null @@ -1,1085 +0,0 @@ -// SPDX-License-Identifier: MIT - -pragma solidity 0.8.24; - -// solhint-disable reason-string, gas-custom-errors - -import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/access/Ownable2StepUpgradeable.sol"; -import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/security/PausableUpgradeable.sol"; - -import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; -import {SafeERC20} from "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol"; - -import {IL1ERC20Bridge} from "./interfaces/IL1ERC20Bridge.sol"; -import {IL1AssetRouter} from "./interfaces/IL1AssetRouter.sol"; -import {IL2Bridge} from "./interfaces/IL2Bridge.sol"; -import {IL2BridgeLegacy} from "./interfaces/IL2BridgeLegacy.sol"; -import {IL1AssetHandler} from "./interfaces/IL1AssetHandler.sol"; -import {IL1NativeTokenVault} from "./interfaces/IL1NativeTokenVault.sol"; -import {IL1SharedBridgeLegacy} from "./interfaces/IL1SharedBridgeLegacy.sol"; - -import {IMailbox} from "../state-transition/chain-interfaces/IMailbox.sol"; -import {L2Message, TxStatus} from "../common/Messaging.sol"; -import {UnsafeBytes} from "../common/libraries/UnsafeBytes.sol"; -import {ReentrancyGuard} from "../common/ReentrancyGuard.sol"; -import {DataEncoding} from "../common/libraries/DataEncoding.sol"; -import {AddressAliasHelper} from "../vendor/AddressAliasHelper.sol"; -import {TWO_BRIDGES_MAGIC_VALUE, ETH_TOKEN_ADDRESS} from "../common/Config.sol"; -import {L2_NATIVE_TOKEN_VAULT_ADDR} from "../common/L2ContractAddresses.sol"; - -import {IBridgehub, L2TransactionRequestTwoBridgesInner, L2TransactionRequestDirect} from "../bridgehub/IBridgehub.sol"; -import {L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR, L2_ASSET_ROUTER_ADDR} from "../common/L2ContractAddresses.sol"; - -import {BridgeHelper} from "./BridgeHelper.sol"; - -import {IL1AssetDeploymentTracker} from "../bridge/interfaces/IL1AssetDeploymentTracker.sol"; - -import {AssetIdNotSupported, Unauthorized, ZeroAddress, SharedBridgeKey, TokenNotSupported, DepositExists, AddressAlreadyUsed, InvalidProof, DepositDoesNotExist, SharedBridgeValueNotSet, WithdrawalAlreadyFinalized, L2WithdrawalMessageWrongLength, InvalidSelector, SharedBridgeValueNotSet} from "../common/L1ContractErrors.sol"; - -/// @author Matter Labs -/// @custom:security-contact security@matterlabs.dev -/// @dev Bridges assets between L1 and ZK chain, supporting both ETH and ERC20 tokens. -/// @dev Designed for use with a proxy for upgradability. -contract L1AssetRouter is - IL1AssetRouter, - IL1SharedBridgeLegacy, - ReentrancyGuard, - Ownable2StepUpgradeable, - PausableUpgradeable -{ - using SafeERC20 for IERC20; - - /// @dev The address of the WETH token on L1. - address public immutable override L1_WETH_TOKEN; - - /// @dev Bridgehub smart contract that is used to operate with L2 via asynchronous L2 <-> L1 communication. - IBridgehub public immutable override BRIDGE_HUB; - - /// @dev Era's chainID - uint256 internal immutable ERA_CHAIN_ID; - - /// @dev The address of ZKsync Era diamond proxy contract. - address internal immutable ERA_DIAMOND_PROXY; - - /// @dev The encoding version used for new txs. - bytes1 internal constant LEGACY_ENCODING_VERSION = 0x00; - - /// @dev The encoding version used for legacy txs. - bytes1 internal constant NEW_ENCODING_VERSION = 0x01; - - /// @dev The encoding version used for txs that set the asset handler on the counterpart contract. - bytes1 internal constant SET_ASSET_HANDLER_COUNTERPART_ENCODING_VERSION = 0x02; - - /// @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. - uint256 internal eraPostDiamondUpgradeFirstBatch; - - /// @dev Stores the first batch number on the ZKsync Era Diamond Proxy that was settled after L1ERC20 Bridge upgrade. - /// This variable is used to differentiate between pre-upgrade and post-upgrade ERC20 withdrawals. Withdrawals from batches older - /// than this value are considered to have been finalized prior to the upgrade and handled separately. - uint256 internal eraPostLegacyBridgeUpgradeFirstBatch; - - /// @dev Stores the ZKsync Era batch number that processes the last deposit tx initiated by the legacy bridge - /// This variable (together with eraLegacyBridgeLastDepositTxNumber) is used to differentiate between pre-upgrade and post-upgrade deposits. Deposits processed in older batches - /// than this value are considered to have been processed prior to the upgrade and handled separately. - /// We use this both for Eth and erc20 token deposits, so we need to update the diamond and bridge simultaneously. - uint256 internal eraLegacyBridgeLastDepositBatch; - - /// @dev The tx number in the _eraLegacyBridgeLastDepositBatch of the last deposit tx initiated by the legacy bridge - /// This variable (together with eraLegacyBridgeLastDepositBatch) is used to differentiate between pre-upgrade and post-upgrade deposits. Deposits processed in older txs - /// than this value are considered to have been processed prior to the upgrade and handled separately. - /// We use this both for Eth and erc20 token deposits, so we need to update the diamond and bridge simultaneously. - uint256 internal eraLegacyBridgeLastDepositTxNumber; - - /// @dev Legacy bridge smart contract that used to hold ERC20 tokens. - IL1ERC20Bridge public override legacyBridge; - - /// @dev A mapping chainId => bridgeProxy. Used to store the bridge proxy's address, and to see if it has been deployed yet. - // slither-disable-next-line uninitialized-state - mapping(uint256 chainId => address l2Bridge) public __DEPRECATED_l2BridgeAddress; - - /// @dev A mapping chainId => L2 deposit transaction hash => dataHash - // keccak256(abi.encode(account, tokenAddress, amount)) for legacy transfers - // keccak256(abi.encode(_prevMsgSender, assetId, transferData)) for new transfers - /// @dev Tracks deposit transactions to L2 to enable users to claim their funds if a deposit fails. - mapping(uint256 chainId => mapping(bytes32 l2DepositTxHash => bytes32 depositDataHash)) - public - override depositHappened; - - /// @dev Tracks the processing status of L2 to L1 messages, indicating whether a message has already been finalized. - mapping(uint256 chainId => mapping(uint256 l2BatchNumber => mapping(uint256 l2ToL1MessageNumber => bool isFinalized))) - public isWithdrawalFinalized; - - /// @notice Deprecated. Kept for backwards compatibility. - /// @dev Indicates whether the hyperbridging is enabled for a given chain. - // slither-disable-next-line uninitialized-state - mapping(uint256 chainId => bool enabled) public hyperbridgingEnabled; - - /// @dev Maps token balances for each chain to prevent unauthorized spending across ZK chain. - /// This serves as a security measure until hyperbridging is implemented. - /// NOTE: this function may be removed in the future, don't rely on it! - mapping(uint256 chainId => mapping(address l1Token => uint256 balance)) public chainBalance; - - /// @dev Maps asset ID to address of corresponding asset handler. - /// @dev Tracks the address of Asset Handler contracts, where bridged funds are locked for each asset. - /// @dev P.S. this liquidity was locked directly in SharedBridge before. - mapping(bytes32 assetId => address assetHandlerAddress) public assetHandlerAddress; - - /// @dev Maps asset ID to the asset deployment tracker address. - /// @dev Tracks the address of Deployment Tracker contract on L1, which sets Asset Handlers on L2s (ZK chain). - /// @dev For the asset and stores respective addresses. - mapping(bytes32 assetId => address assetDeploymentTracker) public assetDeploymentTracker; - - /// @dev Address of native token vault. - IL1NativeTokenVault public nativeTokenVault; - - /// @notice Checks that the message sender is the bridgehub. - modifier onlyBridgehub() { - if (msg.sender != address(BRIDGE_HUB)) { - revert Unauthorized(msg.sender); - } - _; - } - - /// @notice Checks that the message sender is the bridgehub or ZKsync Era Diamond Proxy. - modifier onlyBridgehubOrEra(uint256 _chainId) { - if (msg.sender != address(BRIDGE_HUB) && (_chainId != ERA_CHAIN_ID || msg.sender != ERA_DIAMOND_PROXY)) { - revert Unauthorized(msg.sender); - } - _; - } - - /// @notice Checks that the message sender is the legacy bridge. - modifier onlyLegacyBridge() { - if (msg.sender != address(legacyBridge)) { - revert Unauthorized(msg.sender); - } - _; - } - - /// @dev Contract is expected to be used as proxy implementation. - /// @dev Initialize the implementation to prevent Parity hack. - constructor( - address _l1WethAddress, - IBridgehub _bridgehub, - uint256 _eraChainId, - address _eraDiamondProxy - ) reentrancyGuardInitializer { - _disableInitializers(); - L1_WETH_TOKEN = _l1WethAddress; - BRIDGE_HUB = _bridgehub; - ERA_CHAIN_ID = _eraChainId; - ERA_DIAMOND_PROXY = _eraDiamondProxy; - } - - /// @dev Initializes a contract bridge for later use. Expected to be used in the proxy. - /// @dev Used for testing purposes only, as the contract has been initialized on mainnet. - /// @param _owner The 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. - /// @param _eraPostDiamondUpgradeFirstBatch The first batch number on the ZKsync Era Diamond Proxy that was settled after diamond proxy upgrade. - /// @param _eraPostLegacyBridgeUpgradeFirstBatch The first batch number on the ZKsync Era Diamond Proxy that was settled after legacy bridge upgrade. - /// @param _eraLegacyBridgeLastDepositBatch The the ZKsync Era batch number that processes the last deposit tx initiated by the legacy bridge. - /// @param _eraLegacyBridgeLastDepositTxNumber The tx number in the _eraLegacyBridgeLastDepositBatch of the last deposit tx initiated by the legacy bridge. - function initialize( - address _owner, - uint256 _eraPostDiamondUpgradeFirstBatch, - uint256 _eraPostLegacyBridgeUpgradeFirstBatch, - uint256 _eraLegacyBridgeLastDepositBatch, - uint256 _eraLegacyBridgeLastDepositTxNumber - ) external reentrancyGuardInitializer initializer { - if (_owner == address(0)) { - revert ZeroAddress(); - } - _transferOwnership(_owner); - if (eraPostDiamondUpgradeFirstBatch == 0) { - eraPostDiamondUpgradeFirstBatch = _eraPostDiamondUpgradeFirstBatch; - eraPostLegacyBridgeUpgradeFirstBatch = _eraPostLegacyBridgeUpgradeFirstBatch; - eraLegacyBridgeLastDepositBatch = _eraLegacyBridgeLastDepositBatch; - eraLegacyBridgeLastDepositTxNumber = _eraLegacyBridgeLastDepositTxNumber; - } - } - - /// @notice Transfers tokens from shared bridge to native token vault. - /// @dev This function is part of the upgrade process used to transfer liquidity. - /// @param _token The address of the token to be transferred to NTV. - function transferTokenToNTV(address _token) external { - address ntvAddress = address(nativeTokenVault); - require(msg.sender == ntvAddress, "L1AR: not NTV"); - 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, "L1AR: eth transfer failed"); - } else { - IERC20(_token).safeTransfer(ntvAddress, IERC20(_token).balanceOf(address(this))); - } - } - - /// @notice Clears chain balance for specific token. - /// @dev This function is part of the upgrade process used to nullify chain balances once they are credited to NTV. - /// @param _chainId The ID of the ZK chain. - /// @param _token The address of the token which was previously deposit to shared bridge. - function nullifyChainBalanceByNTV(uint256 _chainId, address _token) external { - require(msg.sender == address(nativeTokenVault), "L1AR: not NTV"); - chainBalance[_chainId][_token] = 0; - } - - /// @notice Legacy function used for migration, do not use! - /// @param _chainId The chain id on which the bridge is deployed. - // slither-disable-next-line uninitialized-state-variables - function l2BridgeAddress(uint256 _chainId) external view returns (address) { - // slither-disable-next-line uninitialized-state-variables - return __DEPRECATED_l2BridgeAddress[_chainId]; - } - - /// @notice Sets the L1ERC20Bridge contract address. - /// @dev Should be called only once by the owner. - /// @param _legacyBridge The address of the legacy bridge. - function setL1Erc20Bridge(address _legacyBridge) external onlyOwner { - if (address(legacyBridge) != address(0)) { - revert AddressAlreadyUsed(address(legacyBridge)); - } - if (_legacyBridge == address(0)) { - revert ZeroAddress(); - } - legacyBridge = IL1ERC20Bridge(_legacyBridge); - } - - /// @notice Sets the nativeTokenVault contract address. - /// @dev Should be called only once by the owner. - /// @param _nativeTokenVault The address of the native token vault. - function setNativeTokenVault(IL1NativeTokenVault _nativeTokenVault) external onlyOwner { - require(address(nativeTokenVault) == address(0), "L1AR: native token vault already set"); - require(address(_nativeTokenVault) != address(0), "L1AR: native token vault 0"); - nativeTokenVault = _nativeTokenVault; - } - - /// @notice Used to set the assed deployment tracker address for given asset data. - /// @param _assetRegistrationData The asset data which may include the asset address and any additional required data or encodings. - /// @param _assetDeploymentTracker The whitelisted address of asset deployment tracker for provided asset. - function setAssetDeploymentTracker( - bytes32 _assetRegistrationData, - address _assetDeploymentTracker - ) external onlyOwner { - bytes32 assetId = keccak256( - abi.encode(uint256(block.chainid), _assetDeploymentTracker, _assetRegistrationData) - ); - assetDeploymentTracker[assetId] = _assetDeploymentTracker; - emit AssetDeploymentTrackerSet(assetId, _assetDeploymentTracker, _assetRegistrationData); - } - - /// @notice Sets the asset handler address for a specified asset ID on the chain of the asset deployment tracker. - /// @dev The caller of this function is encoded within the `assetId`, therefore, it should be invoked by the asset deployment tracker contract. - /// @dev Typically, for most tokens, ADT is the native token vault. However, custom tokens may have their own specific asset deployment trackers. - /// @dev `setAssetHandlerAddressOnCounterpart` should be called on L1 to set asset handlers on L2 chains for a specific asset ID. - /// @param _assetRegistrationData The asset data which may include the asset address and any additional required data or encodings. - /// @param _assetHandlerAddress The address of the asset handler to be set for the provided asset. - function setAssetHandlerAddressThisChain(bytes32 _assetRegistrationData, address _assetHandlerAddress) external { - bool senderIsNTV = msg.sender == address(nativeTokenVault); - address sender = senderIsNTV ? L2_NATIVE_TOKEN_VAULT_ADDR : msg.sender; - bytes32 assetId = DataEncoding.encodeAssetId(block.chainid, _assetRegistrationData, sender); - require(senderIsNTV || msg.sender == assetDeploymentTracker[assetId], "ShB: not NTV or ADT"); - assetHandlerAddress[assetId] = _assetHandlerAddress; - if (senderIsNTV) { - assetDeploymentTracker[assetId] = msg.sender; - } - emit AssetHandlerRegisteredInitial(assetId, _assetHandlerAddress, _assetRegistrationData, sender); - } - - /// @notice Used to set the asset handler address for a given asset ID on a remote ZK chain - /// @dev No access control on the caller, as msg.sender is encoded in the assetId. - /// @param _chainId The ZK chain ID. - /// @param _assetId The encoding of asset ID. - /// @param _assetHandlerAddressOnCounterpart The address of the asset handler, which will hold the token of interest. - /// @return request The tx request sent to the Bridgehub - function _setAssetHandlerAddressOnCounterpart( - uint256 _chainId, - address _prevMsgSender, - bytes32 _assetId, - address _assetHandlerAddressOnCounterpart - ) internal returns (L2TransactionRequestTwoBridgesInner memory request) { - IL1AssetDeploymentTracker(assetDeploymentTracker[_assetId]).bridgeCheckCounterpartAddress( - _chainId, - _assetId, - _prevMsgSender, - _assetHandlerAddressOnCounterpart - ); - - bytes memory l2Calldata = abi.encodeCall( - IL2Bridge.setAssetHandlerAddress, - (_assetId, _assetHandlerAddressOnCounterpart) - ); - request = L2TransactionRequestTwoBridgesInner({ - magicValue: TWO_BRIDGES_MAGIC_VALUE, - l2Contract: L2_ASSET_ROUTER_ADDR, - l2Calldata: l2Calldata, - factoryDeps: new bytes[](0), - txDataHash: bytes32(0x00) - }); - } - - /// @notice Allows bridgehub to acquire mintValue for L1->L2 transactions. - /// @dev If the corresponding L2 transaction fails, refunds are issued to a refund recipient on L2. - /// @param _chainId The chain ID of the ZK chain to which deposit. - /// @param _assetId The deposited asset ID. - /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. - /// @param _amount The total amount of tokens to be bridged. - function bridgehubDepositBaseToken( - uint256 _chainId, - bytes32 _assetId, - address _prevMsgSender, - uint256 _amount - ) external payable onlyBridgehubOrEra(_chainId) whenNotPaused { - address l1AssetHandler = assetHandlerAddress[_assetId]; - require(l1AssetHandler != address(0), "ShB: asset handler not set"); - - _transferAllowanceToNTV(_assetId, _amount, _prevMsgSender); - // slither-disable-next-line unused-return - IL1AssetHandler(l1AssetHandler).bridgeBurn{value: msg.value}({ - _chainId: _chainId, - _l2Value: 0, - _assetId: _assetId, - _prevMsgSender: _prevMsgSender, - _data: abi.encode(_amount, address(0)) - }); - - // Note that we don't save the deposited amount, as this is for the base token, which gets sent to the refundRecipient if the tx fails - emit BridgehubDepositBaseTokenInitiated(_chainId, _prevMsgSender, _assetId, _amount); - } - - /// @notice Initiates a deposit transaction within Bridgehub, used by `requestL2TransactionTwoBridges`. - /// @param _chainId The chain ID of the ZK chain to which deposit. - /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. - /// @param _l2Value The L2 `msg.value` from the L1 -> L2 deposit transaction. - /// @param _data The calldata for the second bridge deposit. - /// @return request The data used by the bridgehub to create L2 transaction request to specific ZK chain. - function bridgehubDeposit( - uint256 _chainId, - address _prevMsgSender, - uint256 _l2Value, - bytes calldata _data - ) - external - payable - override - onlyBridgehub - whenNotPaused - returns (L2TransactionRequestTwoBridgesInner memory request) - { - bytes32 assetId; - bytes memory transferData; - bytes1 encodingVersion = _data[0]; - - // The new encoding ensures that the calldata is collision-resistant with respect to the legacy format. - // In the legacy calldata, the first input was the address, meaning the most significant byte was always `0x00`. - if (encodingVersion == SET_ASSET_HANDLER_COUNTERPART_ENCODING_VERSION) { - (bytes32 _assetId, address _assetHandlerAddressOnCounterpart) = abi.decode(_data[1:], (bytes32, address)); - return - _setAssetHandlerAddressOnCounterpart( - _chainId, - _prevMsgSender, - _assetId, - _assetHandlerAddressOnCounterpart - ); - } else if (encodingVersion == NEW_ENCODING_VERSION) { - (assetId, transferData) = abi.decode(_data[1:], (bytes32, bytes)); - require( - assetHandlerAddress[assetId] != address(nativeTokenVault), - "ShB: new encoding format not yet supported for NTV" - ); - } else { - (assetId, transferData) = _handleLegacyData(_data, _prevMsgSender); - } - - if (BRIDGE_HUB.baseTokenAssetId(_chainId) == assetId) { - revert AssetIdNotSupported(assetId); - } - - bytes memory bridgeMintCalldata = _burn({ - _chainId: _chainId, - _l2Value: _l2Value, - _assetId: assetId, - _prevMsgSender: _prevMsgSender, - _transferData: transferData, - _passValue: true - }); - bytes32 txDataHash = this.encodeTxDataHash(encodingVersion, _prevMsgSender, assetId, transferData); - - request = _requestToBridge({ - _prevMsgSender: _prevMsgSender, - _assetId: assetId, - _bridgeMintCalldata: bridgeMintCalldata, - _txDataHash: txDataHash - }); - - emit BridgehubDepositInitiated({ - chainId: _chainId, - txDataHash: txDataHash, - from: _prevMsgSender, - assetId: assetId, - bridgeMintCalldata: bridgeMintCalldata - }); - } - - /// @notice Confirms the acceptance of a transaction by the Mailbox, as part of the L2 transaction process within Bridgehub. - /// This function is utilized by `requestL2TransactionTwoBridges` to validate the execution of a transaction. - /// @param _chainId The chain ID of the ZK chain to which confirm the deposit. - /// @param _txDataHash The keccak256 hash of 0x01 || abi.encode(bytes32, bytes) to identify deposits. - /// @param _txHash The hash of the L1->L2 transaction to confirm the deposit. - function bridgehubConfirmL2Transaction( - uint256 _chainId, - bytes32 _txDataHash, - bytes32 _txHash - ) external override onlyBridgehub whenNotPaused { - if (depositHappened[_chainId][_txHash] != 0x00) { - revert DepositExists(); - } - depositHappened[_chainId][_txHash] = _txDataHash; - emit BridgehubDepositFinalized(_chainId, _txDataHash, _txHash); - } - - /// @notice Finalize the withdrawal and release funds - /// @param _chainId The chain ID of the transaction to check - /// @param _l2BatchNumber The L2 batch number where the withdrawal was processed - /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message - /// @param _l2TxNumberInBatch The L2 transaction number in the batch, in which the log was sent - /// @param _message The L2 withdraw data, stored in an L2 -> L1 message - /// @param _merkleProof The Merkle proof of the inclusion L2 -> L1 message about withdrawal initialization - function finalizeWithdrawal( - uint256 _chainId, - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes calldata _message, - bytes32[] calldata _merkleProof - ) external override { - _finalizeWithdrawal({ - _chainId: _chainId, - _l2BatchNumber: _l2BatchNumber, - _l2MessageIndex: _l2MessageIndex, - _l2TxNumberInBatch: _l2TxNumberInBatch, - _message: _message, - _merkleProof: _merkleProof - }); - } - - /// @dev Calls the internal `_encodeTxDataHash`. Used as a wrapped for try / catch case. - /// @param _encodingVersion The version of the encoding. - /// @param _prevMsgSender The address of the entity that initiated the deposit. - /// @param _assetId The unique identifier of the deposited L1 token. - /// @param _transferData The encoded transfer data, which includes both the deposit amount and the address of the L2 receiver. - /// @return txDataHash The resulting encoded transaction data hash. - function encodeTxDataHash( - bytes1 _encodingVersion, - address _prevMsgSender, - bytes32 _assetId, - bytes calldata _transferData - ) external view returns (bytes32 txDataHash) { - return _encodeTxDataHash(_encodingVersion, _prevMsgSender, _assetId, _transferData); - } - - /// @dev Withdraw funds from the initiated deposit, that failed when finalizing on L2. - /// @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. - /// @param _assetData The encoded transfer data, which includes both the deposit amount and the address of the L2 receiver. Might include extra information. - /// @param _l2TxHash The L2 transaction hash of the failed deposit finalization. - /// @param _l2BatchNumber The L2 batch number where the deposit finalization was processed. - /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message. - /// @param _l2TxNumberInBatch The L2 transaction number in a batch, in which the log was sent. - /// @param _merkleProof The Merkle proof of the processing L1 -> L2 transaction with deposit finalization. - /// @dev Processes claims of failed deposit, whether they originated from the legacy bridge or the current system. - function bridgeRecoverFailedTransfer( - uint256 _chainId, - address _depositSender, - bytes32 _assetId, - bytes memory _assetData, - bytes32 _l2TxHash, - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes32[] calldata _merkleProof - ) public nonReentrant whenNotPaused { - { - bool proofValid = BRIDGE_HUB.proveL1ToL2TransactionStatus({ - _chainId: _chainId, - _l2TxHash: _l2TxHash, - _l2BatchNumber: _l2BatchNumber, - _l2MessageIndex: _l2MessageIndex, - _l2TxNumberInBatch: _l2TxNumberInBatch, - _merkleProof: _merkleProof, - _status: TxStatus.Failure - }); - if (!proofValid) { - revert InvalidProof(); - } - } - - require(!_isEraLegacyDeposit(_chainId, _l2BatchNumber, _l2TxNumberInBatch), "L1AR: legacy cFD"); - { - bytes32 dataHash = depositHappened[_chainId][_l2TxHash]; - // Determine if the given dataHash matches the calculated legacy transaction hash. - bool isLegacyTxDataHash = _isLegacyTxDataHash(_depositSender, _assetId, _assetData, dataHash); - // If the dataHash matches the legacy transaction hash, skip the next step. - // Otherwise, perform the check using the new transaction data hash encoding. - if (!isLegacyTxDataHash) { - bytes32 txDataHash = _encodeTxDataHash(NEW_ENCODING_VERSION, _depositSender, _assetId, _assetData); - if (dataHash != txDataHash) { - revert DepositDoesNotExist(); - } - } - } - delete depositHappened[_chainId][_l2TxHash]; - - IL1AssetHandler(assetHandlerAddress[_assetId]).bridgeRecoverFailedTransfer( - _chainId, - _assetId, - _depositSender, - _assetData - ); - - emit ClaimedFailedDepositAssetRouter(_chainId, _depositSender, _assetId, _assetData); - } - - /// @dev Receives and parses (name, symbol, decimals) from the token contract - function getERC20Getters(address _token) public view returns (bytes memory) { - return BridgeHelper.getERC20Getters(_token, ETH_TOKEN_ADDRESS); - } - - /// @dev send the burn message to the asset - /// @notice Forwards the burn request for specific asset to respective asset handler - /// @param _chainId The chain ID of the ZK chain to which deposit. - /// @param _l2Value The L2 `msg.value` from the L1 -> L2 deposit transaction. - /// @param _assetId The deposited asset ID. - /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. - /// @param _transferData The encoded data, which is used by the asset handler to determine L2 recipient and amount. Might include extra information. - /// @param _passValue Boolean indicating whether to pass msg.value in the call. - /// @return bridgeMintCalldata The calldata used by remote asset handler to mint tokens for recipient. - function _burn( - uint256 _chainId, - uint256 _l2Value, - bytes32 _assetId, - address _prevMsgSender, - bytes memory _transferData, - bool _passValue - ) internal returns (bytes memory bridgeMintCalldata) { - address l1AssetHandler = assetHandlerAddress[_assetId]; - require(l1AssetHandler != address(0), "ShB: asset handler does not exist for assetId"); - - uint256 msgValue = _passValue ? msg.value : 0; - bridgeMintCalldata = IL1AssetHandler(l1AssetHandler).bridgeBurn{value: msgValue}({ - _chainId: _chainId, - _l2Value: _l2Value, - _assetId: _assetId, - _prevMsgSender: _prevMsgSender, - _data: _transferData - }); - } - - struct MessageParams { - uint256 l2BatchNumber; - uint256 l2MessageIndex; - uint16 l2TxNumberInBatch; - } - - /// @notice Internal function that handles the logic for finalizing withdrawals, supporting both the current bridge system and the legacy ERC20 bridge. - /// @param _chainId The chain ID of the transaction to check. - /// @param _l2BatchNumber The L2 batch number where the withdrawal was processed. - /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message. - /// @param _l2TxNumberInBatch The L2 transaction number in the batch, in which the log was sent. - /// @param _message The L2 withdraw data, stored in an L2 -> L1 message. - /// @param _merkleProof The Merkle proof of the inclusion L2 -> L1 message about withdrawal initialization. - /// @return l1Receiver The address to receive bridged assets. - /// @return assetId The bridged asset ID. - /// @return amount The amount of asset bridged. - function _finalizeWithdrawal( - uint256 _chainId, - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes calldata _message, - bytes32[] calldata _merkleProof - ) internal nonReentrant whenNotPaused returns (address l1Receiver, bytes32 assetId, uint256 amount) { - if (isWithdrawalFinalized[_chainId][_l2BatchNumber][_l2MessageIndex]) { - revert WithdrawalAlreadyFinalized(); - } - isWithdrawalFinalized[_chainId][_l2BatchNumber][_l2MessageIndex] = true; - - // Handling special case for withdrawal from ZKsync Era initiated before Shared Bridge. - require(!_isEraLegacyEthWithdrawal(_chainId, _l2BatchNumber), "L1AR: legacy eth withdrawal"); - require(!_isEraLegacyTokenWithdrawal(_chainId, _l2BatchNumber), "L1AR: legacy token withdrawal"); - - bytes memory transferData; - { - MessageParams memory messageParams = MessageParams({ - l2BatchNumber: _l2BatchNumber, - l2MessageIndex: _l2MessageIndex, - l2TxNumberInBatch: _l2TxNumberInBatch - }); - (assetId, transferData) = _checkWithdrawal(_chainId, messageParams, _message, _merkleProof); - } - address l1AssetHandler = assetHandlerAddress[assetId]; - IL1AssetHandler(l1AssetHandler).bridgeMint(_chainId, assetId, transferData); - if (l1AssetHandler == address(nativeTokenVault)) { - (amount, l1Receiver) = abi.decode(transferData, (uint256, address)); - } - emit WithdrawalFinalizedAssetRouter(_chainId, assetId, transferData); - } - - /// @notice Decodes the transfer input for legacy data and transfers allowance to NTV - /// @dev Is not applicable for custom asset handlers - /// @param _data encoded transfer data (address _l1Token, uint256 _depositAmount, address _l2Receiver) - /// @param _prevMsgSender address of the deposit initiator - function _handleLegacyData(bytes calldata _data, address _prevMsgSender) internal returns (bytes32, bytes memory) { - (address _l1Token, uint256 _depositAmount, address _l2Receiver) = abi.decode( - _data, - (address, uint256, address) - ); - bytes32 assetId = _ensureTokenRegisteredWithNTV(_l1Token); - _transferAllowanceToNTV(assetId, _depositAmount, _prevMsgSender); - return (assetId, abi.encode(_depositAmount, _l2Receiver)); - } - - function _ensureTokenRegisteredWithNTV(address _l1Token) internal returns (bytes32 assetId) { - assetId = DataEncoding.encodeNTVAssetId(block.chainid, _l1Token); - if (nativeTokenVault.tokenAddress(assetId) == address(0)) { - nativeTokenVault.registerToken(_l1Token); - } - } - - /// @notice Transfers allowance to Native Token Vault, if the asset is registered with it. Does nothing for ETH or non-registered tokens. - /// @dev assetId is not the padded address, but the correct encoded id (NTV stores respective format for IDs) - function _transferAllowanceToNTV(bytes32 _assetId, uint256 _amount, address _prevMsgSender) internal { - address l1TokenAddress = nativeTokenVault.tokenAddress(_assetId); - if (l1TokenAddress == address(0) || l1TokenAddress == ETH_TOKEN_ADDRESS) { - return; - } - IERC20 l1Token = IERC20(l1TokenAddress); - - // Do the transfer if allowance to Shared bridge is bigger than amount - // And if there is not enough allowance for the NTV - if ( - l1Token.allowance(_prevMsgSender, address(this)) >= _amount && - l1Token.allowance(_prevMsgSender, address(nativeTokenVault)) < _amount - ) { - // slither-disable-next-line arbitrary-send-erc20 - l1Token.safeTransferFrom(_prevMsgSender, address(this), _amount); - l1Token.forceApprove(address(nativeTokenVault), _amount); - } - } - - /// @dev The request data that is passed to the bridgehub - function _requestToBridge( - address _prevMsgSender, - bytes32 _assetId, - bytes memory _bridgeMintCalldata, - bytes32 _txDataHash - ) internal view returns (L2TransactionRequestTwoBridgesInner memory request) { - // Request the finalization of the deposit on the L2 side - bytes memory l2TxCalldata = _getDepositL2Calldata(_prevMsgSender, _assetId, _bridgeMintCalldata); - - request = L2TransactionRequestTwoBridgesInner({ - magicValue: TWO_BRIDGES_MAGIC_VALUE, - l2Contract: L2_ASSET_ROUTER_ADDR, - l2Calldata: l2TxCalldata, - factoryDeps: new bytes[](0), - txDataHash: _txDataHash - }); - } - - /// @dev Generate a calldata for calling the deposit finalization on the L2 bridge contract - function _getDepositL2Calldata( - address _l1Sender, - bytes32 _assetId, - bytes memory _assetData - ) internal view returns (bytes memory) { - // First branch covers the case when asset is not registered with NTV (custom asset handler) - // Second branch handles tokens registered with NTV and uses legacy calldata encoding - if (nativeTokenVault.tokenAddress(_assetId) == address(0)) { - return abi.encodeCall(IL2Bridge.finalizeDeposit, (_assetId, _assetData)); - } else { - // slither-disable-next-line unused-return - (, address _l2Receiver, address _parsedL1Token, uint256 _amount, bytes memory _gettersData) = DataEncoding - .decodeBridgeMintData(_assetData); - return - abi.encodeCall( - IL2BridgeLegacy.finalizeDeposit, - (_l1Sender, _l2Receiver, _parsedL1Token, _amount, _gettersData) - ); - } - } - - /// @dev Determines if an eth withdrawal was initiated on ZKsync Era before the upgrade to the Shared Bridge. - /// @param _chainId The chain ID of the transaction to check. - /// @param _l2BatchNumber The L2 batch number for the withdrawal. - /// @return Whether withdrawal was initiated on ZKsync Era before diamond proxy upgrade. - function _isEraLegacyEthWithdrawal(uint256 _chainId, uint256 _l2BatchNumber) internal view returns (bool) { - if ((_chainId == ERA_CHAIN_ID) && eraPostDiamondUpgradeFirstBatch == 0) { - revert SharedBridgeValueNotSet(SharedBridgeKey.PostUpgradeFirstBatch); - } - return (_chainId == ERA_CHAIN_ID) && (_l2BatchNumber < eraPostDiamondUpgradeFirstBatch); - } - - /// @dev Determines if a token withdrawal was initiated on ZKsync Era before the upgrade to the Shared Bridge. - /// @param _chainId The chain ID of the transaction to check. - /// @param _l2BatchNumber The L2 batch number for the withdrawal. - /// @return Whether withdrawal was initiated on ZKsync Era before Legacy Bridge upgrade. - function _isEraLegacyTokenWithdrawal(uint256 _chainId, uint256 _l2BatchNumber) internal view returns (bool) { - if ((_chainId == ERA_CHAIN_ID) && eraPostLegacyBridgeUpgradeFirstBatch == 0) { - revert SharedBridgeValueNotSet(SharedBridgeKey.LegacyBridgeFirstBatch); - } - return (_chainId == ERA_CHAIN_ID) && (_l2BatchNumber < eraPostLegacyBridgeUpgradeFirstBatch); - } - - /// @dev Determines if the provided data for a failed deposit corresponds to a legacy failed deposit. - /// @param _prevMsgSender The address of the entity that initiated the deposit. - /// @param _assetId The unique identifier of the deposited L1 token. - /// @param _transferData The encoded transfer data, which includes both the deposit amount and the address of the L2 receiver. - /// @param _expectedTxDataHash The nullifier data hash stored for the failed deposit. - /// @return isLegacyTxDataHash True if the transaction is legacy, false otherwise. - function _isLegacyTxDataHash( - address _prevMsgSender, - bytes32 _assetId, - bytes memory _transferData, - bytes32 _expectedTxDataHash - ) internal view returns (bool isLegacyTxDataHash) { - try this.encodeTxDataHash(LEGACY_ENCODING_VERSION, _prevMsgSender, _assetId, _transferData) returns ( - bytes32 txDataHash - ) { - return txDataHash == _expectedTxDataHash; - } catch { - return false; - } - } - - /// @dev Encodes the transaction data hash using either the latest encoding standard or the legacy standard. - /// @param _encodingVersion EncodingVersion. - /// @param _prevMsgSender The address of the entity that initiated the deposit. - /// @param _assetId The unique identifier of the deposited L1 token. - /// @param _transferData The encoded transfer data, which includes both the deposit amount and the address of the L2 receiver. - /// @return txDataHash The resulting encoded transaction data hash. - function _encodeTxDataHash( - bytes1 _encodingVersion, - address _prevMsgSender, - bytes32 _assetId, - bytes memory _transferData - ) internal view returns (bytes32 txDataHash) { - if (_encodingVersion == LEGACY_ENCODING_VERSION) { - (uint256 depositAmount, ) = abi.decode(_transferData, (uint256, address)); - txDataHash = keccak256(abi.encode(_prevMsgSender, nativeTokenVault.tokenAddress(_assetId), depositAmount)); - } else { - // Similarly to calldata, the txDataHash is collision-resistant. - // In the legacy data hash, the first encoded variable was the address, which is padded with zeros during `abi.encode`. - txDataHash = keccak256(bytes.concat(_encodingVersion, abi.encode(_prevMsgSender, _assetId, _transferData))); - } - } - - /// @dev Determines if a deposit was initiated on ZKsync Era before the upgrade to the Shared Bridge. - /// @param _chainId The chain ID of the transaction to check. - /// @param _l2BatchNumber The L2 batch number for the deposit where it was processed. - /// @param _l2TxNumberInBatch The L2 transaction number in the batch, in which the deposit was processed. - /// @return Whether deposit was initiated on ZKsync Era before Shared Bridge upgrade. - function _isEraLegacyDeposit( - uint256 _chainId, - uint256 _l2BatchNumber, - uint256 _l2TxNumberInBatch - ) internal view returns (bool) { - if ((_chainId == ERA_CHAIN_ID) && (eraLegacyBridgeLastDepositBatch == 0)) { - revert SharedBridgeValueNotSet(SharedBridgeKey.LegacyBridgeLastDepositBatch); - } - return - (_chainId == ERA_CHAIN_ID) && - (_l2BatchNumber < eraLegacyBridgeLastDepositBatch || - (_l2TxNumberInBatch <= eraLegacyBridgeLastDepositTxNumber && - _l2BatchNumber == eraLegacyBridgeLastDepositBatch)); - } - - /// @notice Verifies the validity of a withdrawal message from L2 and returns withdrawal details. - /// @param _chainId The chain ID of the transaction to check. - /// @param _messageParams The message params, which include batch number, message index, and L2 tx number in batch. - /// @param _message The L2 withdraw data, stored in an L2 -> L1 message. - /// @param _merkleProof The Merkle proof of the inclusion L2 -> L1 message about withdrawal initialization. - /// @return assetId The ID of the bridged asset. - /// @return transferData The transfer data used to finalize withdawal. - function _checkWithdrawal( - uint256 _chainId, - MessageParams memory _messageParams, - bytes calldata _message, - bytes32[] calldata _merkleProof - ) internal view returns (bytes32 assetId, bytes memory transferData) { - (assetId, transferData) = _parseL2WithdrawalMessage(_chainId, _message); - L2Message memory l2ToL1Message; - { - bool baseTokenWithdrawal = (assetId == BRIDGE_HUB.baseTokenAssetId(_chainId)); - address l2Sender = baseTokenWithdrawal ? L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR : L2_ASSET_ROUTER_ADDR; - - l2ToL1Message = L2Message({ - txNumberInBatch: _messageParams.l2TxNumberInBatch, - sender: l2Sender, - data: _message - }); - } - - bool success = BRIDGE_HUB.proveL2MessageInclusion({ - _chainId: _chainId, - _batchNumber: _messageParams.l2BatchNumber, - _index: _messageParams.l2MessageIndex, - _message: l2ToL1Message, - _proof: _merkleProof - }); - // withdrawal wrong proof - if (!success) { - revert InvalidProof(); - } - } - - /// @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. - function _parseL2WithdrawalMessage( - uint256 _chainId, - bytes memory _l2ToL1message - ) internal view returns (bytes32 assetId, bytes memory transferData) { - // We check that the message is long enough to read the data. - // Please note that there are three versions of the message: - // 1. The message that is sent by `withdraw(address _l1Receiver)` or `withdrawWithMessage`. In the second case, this function ignores the extra data - // It should be equal to the length of the bytes4 function signature + address l1Receiver + uint256 amount = 4 + 20 + 32 = 56 (bytes). - // 2. The legacy `getL1WithdrawMessage`, the length of the data is known. - // 3. The message that is encoded by `getL1WithdrawMessage(bytes32 _assetId, bytes memory _bridgeMintData)` - // No length is assumed. The assetId is decoded and the mintData is passed to respective assetHandler - - (uint32 functionSignature, uint256 offset) = UnsafeBytes.readUint32(_l2ToL1message, 0); - if (bytes4(functionSignature) == IMailbox.finalizeEthWithdrawal.selector) { - uint256 amount; - address l1Receiver; - - // The data is expected to be at least 56 bytes long. - if (_l2ToL1message.length < 56) { - revert L2WithdrawalMessageWrongLength(_l2ToL1message.length); - } - // this message is a base token withdrawal - (l1Receiver, offset) = UnsafeBytes.readAddress(_l2ToL1message, offset); - // slither-disable-next-line unused-return - (amount, ) = UnsafeBytes.readUint256(_l2ToL1message, offset); - assetId = BRIDGE_HUB.baseTokenAssetId(_chainId); - transferData = abi.encode(amount, l1Receiver); - } else if (bytes4(functionSignature) == IL1ERC20Bridge.finalizeWithdrawal.selector) { - address l1Token; - uint256 amount; - address l1Receiver; - // We use the IL1ERC20Bridge for backward compatibility with old withdrawals. - // This message is a token withdrawal - - // Check that the message length is correct. - // It should be equal to the length of the function signature + address + address + uint256 = 4 + 20 + 20 + 32 = - // 76 (bytes). - if (_l2ToL1message.length != 76) { - revert L2WithdrawalMessageWrongLength(_l2ToL1message.length); - } - (l1Receiver, offset) = UnsafeBytes.readAddress(_l2ToL1message, offset); - (l1Token, offset) = UnsafeBytes.readAddress(_l2ToL1message, offset); - // slither-disable-next-line unused-return - (amount, ) = UnsafeBytes.readUint256(_l2ToL1message, offset); - - assetId = DataEncoding.encodeNTVAssetId(block.chainid, l1Token); - transferData = abi.encode(amount, l1Receiver); - } else if (bytes4(functionSignature) == this.finalizeWithdrawal.selector) { - // The data is expected to be at least 36 bytes long to contain assetId. - require(_l2ToL1message.length >= 36, "L1AR: wrong msg len"); // wrong message length - (assetId, offset) = UnsafeBytes.readBytes32(_l2ToL1message, offset); - transferData = UnsafeBytes.readRemainingBytes(_l2ToL1message, offset); - } else { - revert InvalidSelector(bytes4(functionSignature)); - } - } - - /*////////////////////////////////////////////////////////////// - SHARED BRIDGE TOKEN BRIDGING LEGACY FUNCTIONS - //////////////////////////////////////////////////////////////*/ - - /// @notice Withdraw funds from the initiated deposit, that failed when finalizing on L2. - /// @dev Cannot be used to claim deposits made with new encoding. - /// @param _chainId The ZK chain id to which deposit was initiated. - /// @param _depositSender The address of the deposit initiator. - /// @param _l1Asset The address of the deposited L1 ERC20 token. - /// @param _amount The amount of the deposit that failed. - /// @param _l2TxHash The L2 transaction hash of the failed deposit finalization. - /// @param _l2BatchNumber The L2 batch number where the deposit finalization was processed. - /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message. - /// @param _l2TxNumberInBatch The L2 transaction number in a batch, in which the log was sent. - /// @param _merkleProof The Merkle proof of the processing L1 -> L2 transaction with deposit finalization. - function claimFailedDeposit( - uint256 _chainId, - address _depositSender, - address _l1Asset, - uint256 _amount, - bytes32 _l2TxHash, - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes32[] calldata _merkleProof - ) external override { - bytes32 assetId = DataEncoding.encodeNTVAssetId(block.chainid, _l1Asset); - // For legacy deposits, the l2 receiver is not required to check tx data hash - bytes memory transferData = abi.encode(_amount, address(0)); - bridgeRecoverFailedTransfer({ - _chainId: _chainId, - _depositSender: _depositSender, - _assetId: assetId, - _assetData: transferData, - _l2TxHash: _l2TxHash, - _l2BatchNumber: _l2BatchNumber, - _l2MessageIndex: _l2MessageIndex, - _l2TxNumberInBatch: _l2TxNumberInBatch, - _merkleProof: _merkleProof - }); - } - - /*////////////////////////////////////////////////////////////// - ERA ERC20 LEGACY FUNCTIONS - //////////////////////////////////////////////////////////////*/ - - /// @notice 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. - /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. - /// @param _l2Receiver The account address that should receive funds on L2. - /// @param _l1Token The L1 token address which is deposited. - /// @param _amount The total amount of tokens to be bridged. - /// @param _l2TxGasLimit The L2 gas limit to be used in the corresponding L2 transaction. - /// @param _l2TxGasPerPubdataByte The gasPerPubdataByteLimit to be used in the corresponding L2 transaction. - /// @param _refundRecipient The address on L2 that will receive the refund for the transaction. - /// @dev If the L2 deposit finalization transaction fails, the `_refundRecipient` will receive the `_l2Value`. - /// Please note, the contract may change the refund recipient's address to eliminate sending funds to addresses - /// out of control. - /// - If `_refundRecipient` is a contract on L1, the refund will be sent to the aliased `_refundRecipient`. - /// - If `_refundRecipient` is set to `address(0)` and the sender has NO deployed bytecode on L1, the refund will - /// be sent to the `msg.sender` address. - /// - If `_refundRecipient` is set to `address(0)` and the sender has deployed bytecode on L1, the refund will be - /// sent to the aliased `msg.sender` address. - /// @dev The address aliasing of L1 contracts as refund recipient on L2 is necessary to guarantee that the funds - /// are controllable through the Mailbox, since the Mailbox applies address aliasing to the from address for the - /// L2 tx if the L1 msg.sender is a contract. Without address aliasing for L1 contracts as refund recipients they - /// would not be able to make proper L2 tx requests through the Mailbox to use or withdraw the funds from L2, and - /// the funds would be lost. - /// @return txHash The L2 transaction hash of deposit finalization. - function depositLegacyErc20Bridge( - address _prevMsgSender, - address _l2Receiver, - address _l1Token, - uint256 _amount, - uint256 _l2TxGasLimit, - uint256 _l2TxGasPerPubdataByte, - address _refundRecipient - ) external payable override onlyLegacyBridge nonReentrant whenNotPaused returns (bytes32 txHash) { - if (_l1Token == L1_WETH_TOKEN) { - revert TokenNotSupported(L1_WETH_TOKEN); - } - - bytes32 _assetId; - bytes memory bridgeMintCalldata; - - { - // Inner call to encode data to decrease local var numbers - _assetId = _ensureTokenRegisteredWithNTV(_l1Token); - IERC20(_l1Token).forceApprove(address(nativeTokenVault), _amount); - } - - { - bridgeMintCalldata = _burn({ - _chainId: ERA_CHAIN_ID, - _l2Value: 0, - _assetId: _assetId, - _prevMsgSender: _prevMsgSender, - _transferData: abi.encode(_amount, _l2Receiver), - _passValue: false - }); - } - - { - bytes memory l2TxCalldata = _getDepositL2Calldata(_prevMsgSender, _assetId, bridgeMintCalldata); - - // If the refund recipient is not specified, the refund will be sent to the sender of the transaction. - // Otherwise, the refund will be sent to the specified address. - // If the recipient is a contract on L1, the address alias will be applied. - address refundRecipient = AddressAliasHelper.actualRefundRecipient(_refundRecipient, _prevMsgSender); - - L2TransactionRequestDirect memory request = L2TransactionRequestDirect({ - chainId: ERA_CHAIN_ID, - l2Contract: L2_ASSET_ROUTER_ADDR, - mintValue: msg.value, // l2 gas + l2 msg.Value the bridgehub will withdraw the mintValue from the shared bridge (base token bridge) for gas - l2Value: 0, // L2 msg.value, this contract doesn't support base token deposits or wrapping functionality, for direct deposits use bridgehub - l2Calldata: l2TxCalldata, - l2GasLimit: _l2TxGasLimit, - l2GasPerPubdataByteLimit: _l2TxGasPerPubdataByte, - factoryDeps: new bytes[](0), - refundRecipient: refundRecipient - }); - txHash = BRIDGE_HUB.requestL2TransactionDirect{value: msg.value}(request); - } - - // Save the deposited amount to claim funds on L1 if the deposit failed on L2 - depositHappened[ERA_CHAIN_ID][txHash] = keccak256(abi.encode(_prevMsgSender, _l1Token, _amount)); - - emit LegacyDepositInitiated({ - chainId: ERA_CHAIN_ID, - l2DepositTxHash: txHash, - from: _prevMsgSender, - to: _l2Receiver, - l1Asset: _l1Token, - amount: _amount - }); - } - - /// @notice Finalizes the withdrawal for transactions initiated via the legacy ERC20 bridge. - /// @param _l2BatchNumber The L2 batch number where the withdrawal was processed. - /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message. - /// @param _l2TxNumberInBatch The L2 transaction number in the batch, in which the log was sent. - /// @param _message The L2 withdraw data, stored in an L2 -> L1 message. - /// @param _merkleProof The Merkle proof of the inclusion L2 -> L1 message about withdrawal initialization. - /// - /// @return l1Receiver The address on L1 that will receive the withdrawn funds. - /// @return l1Asset The address of the L1 token being withdrawn. - /// @return amount The amount of the token being withdrawn. - function finalizeWithdrawalLegacyErc20Bridge( - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes calldata _message, - bytes32[] calldata _merkleProof - ) external override onlyLegacyBridge returns (address l1Receiver, address l1Asset, uint256 amount) { - bytes32 assetId; - (l1Receiver, assetId, amount) = _finalizeWithdrawal({ - _chainId: ERA_CHAIN_ID, - _l2BatchNumber: _l2BatchNumber, - _l2MessageIndex: _l2MessageIndex, - _l2TxNumberInBatch: _l2TxNumberInBatch, - _message: _message, - _merkleProof: _merkleProof - }); - l1Asset = nativeTokenVault.tokenAddress(assetId); - } - - /*////////////////////////////////////////////////////////////// - PAUSE - //////////////////////////////////////////////////////////////*/ - - /// @notice Pauses all functions marked with the `whenNotPaused` modifier. - function pause() external onlyOwner { - _pause(); - } - - /// @notice Unpauses the contract, allowing all functions marked with the `whenNotPaused` modifier to be called again. - function unpause() external onlyOwner { - _unpause(); - } -} diff --git a/l1-contracts/contracts/bridge/L1ERC20Bridge.sol b/l1-contracts/contracts/bridge/L1ERC20Bridge.sol index bfe68882c..ffdc45177 100644 --- a/l1-contracts/contracts/bridge/L1ERC20Bridge.sol +++ b/l1-contracts/contracts/bridge/L1ERC20Bridge.sol @@ -6,13 +6,15 @@ import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; import {SafeERC20} from "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol"; import {IL1ERC20Bridge} from "./interfaces/IL1ERC20Bridge.sol"; -import {IL1AssetRouter} from "./interfaces/IL1AssetRouter.sol"; -import {IL1NativeTokenVault} from "./interfaces/IL1NativeTokenVault.sol"; +import {IL1Nullifier, FinalizeL1DepositParams} from "./interfaces/IL1Nullifier.sol"; +import {IL1NativeTokenVault} from "./ntv/IL1NativeTokenVault.sol"; +import {IL1AssetRouter} from "./asset-router/IL1AssetRouter.sol"; import {L2ContractHelper} from "../common/libraries/L2ContractHelper.sol"; import {ReentrancyGuard} from "../common/ReentrancyGuard.sol"; -import {EmptyDeposit, TokensWithFeesNotSupported, WithdrawalAlreadyFinalized} from "../common/L1ContractErrors.sol"; +import {EmptyDeposit, WithdrawalAlreadyFinalized, TokensWithFeesNotSupported, ETHDepositNotSupported} from "../common/L1ContractErrors.sol"; +import {ETH_TOKEN_ADDRESS} from "../common/Config.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev @@ -23,10 +25,13 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { using SafeERC20 for IERC20; /// @dev The shared bridge that is now used for all bridging, replacing the legacy contract. - IL1AssetRouter public immutable override SHARED_BRIDGE; + IL1Nullifier public immutable override L1_NULLIFIER; + + /// @dev The asset router, which holds deposited tokens. + IL1AssetRouter public immutable override L1_ASSET_ROUTER; /// @dev The native token vault, which holds deposited tokens. - IL1NativeTokenVault public immutable override NATIVE_TOKEN_VAULT; + IL1NativeTokenVault public immutable override L1_NATIVE_TOKEN_VAULT; /// @dev The chainId of Era uint256 public immutable ERA_CHAIN_ID; @@ -66,12 +71,14 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { /// @dev Contract is expected to be used as proxy implementation. /// @dev Initialize the implementation to prevent Parity hack. constructor( - IL1AssetRouter _sharedBridge, + IL1Nullifier _nullifier, + IL1AssetRouter _assetRouter, IL1NativeTokenVault _nativeTokenVault, uint256 _eraChainId ) reentrancyGuardInitializer { - SHARED_BRIDGE = _sharedBridge; - NATIVE_TOKEN_VAULT = _nativeTokenVault; + L1_NULLIFIER = _nullifier; + L1_ASSET_ROUTER = _assetRouter; + L1_NATIVE_TOKEN_VAULT = _nativeTokenVault; ERA_CHAIN_ID = _eraChainId; } @@ -102,8 +109,7 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { } delete depositAmount[_depositSender][_l1Token][_l2TxHash]; - SHARED_BRIDGE.claimFailedDeposit({ - _chainId: ERA_CHAIN_ID, + L1_NULLIFIER.claimFailedDepositLegacyErc20Bridge({ _depositSender: _depositSender, _l1Token: _l1Token, _amount: amount, @@ -167,14 +173,16 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { } // We don't need to set finalizeWithdrawal here, as we set it in the shared bridge - (address l1Receiver, address l1Token, uint256 amount) = SHARED_BRIDGE.finalizeWithdrawalLegacyErc20Bridge({ - _l2BatchNumber: _l2BatchNumber, - _l2MessageIndex: _l2MessageIndex, - _l2TxNumberInBatch: _l2TxNumberInBatch, - _message: _message, - _merkleProof: _merkleProof + FinalizeL1DepositParams memory finalizeWithdrawalParams = FinalizeL1DepositParams({ + chainId: ERA_CHAIN_ID, + l2BatchNumber: _l2BatchNumber, + l2MessageIndex: _l2MessageIndex, + l2Sender: l2Bridge, + l2TxNumberInBatch: _l2TxNumberInBatch, + message: _message, + merkleProof: _merkleProof }); - emit WithdrawalFinalized(l1Receiver, l1Token, amount); + L1_NULLIFIER.finalizeWithdrawalLegacyContracts(finalizeWithdrawalParams); } /// @notice Initiates a deposit by locking funds on the contract and sending the request @@ -210,17 +218,20 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { uint256 _l2TxGasPerPubdataByte, address _refundRecipient ) public payable nonReentrant returns (bytes32 l2TxHash) { - // empty deposit if (_amount == 0) { + // empty deposit amount revert EmptyDeposit(); } - uint256 amount = _depositFundsToSharedBridge(msg.sender, IERC20(_l1Token), _amount); - // The token has non-standard transfer logic + if (_l1Token == ETH_TOKEN_ADDRESS) { + revert ETHDepositNotSupported(); + } + uint256 amount = _depositFundsToAssetRouter(msg.sender, IERC20(_l1Token), _amount); if (amount != _amount) { + // The token has non-standard transfer logic revert TokensWithFeesNotSupported(); } - l2TxHash = SHARED_BRIDGE.depositLegacyErc20Bridge{value: msg.value}({ + l2TxHash = L1_ASSET_ROUTER.depositLegacyErc20Bridge{value: msg.value}({ _prevMsgSender: msg.sender, _l2Receiver: _l2Receiver, _l1Token: _l1Token, @@ -239,12 +250,17 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { }); } - /// @dev Transfers tokens from the depositor address to the shared bridge address. + /*////////////////////////////////////////////////////////////// + ERA LEGACY FUNCTIONS + //////////////////////////////////////////////////////////////*/ + + /// @dev Transfers tokens from the depositor address to the native token vault address. /// @return The difference between the contract balance before and after the transferring of funds. - function _depositFundsToSharedBridge(address _from, IERC20 _token, uint256 _amount) internal returns (uint256) { - uint256 balanceBefore = _token.balanceOf(address(SHARED_BRIDGE)); - _token.safeTransferFrom(_from, address(SHARED_BRIDGE), _amount); - uint256 balanceAfter = _token.balanceOf(address(SHARED_BRIDGE)); + function _depositFundsToAssetRouter(address _from, IERC20 _token, uint256 _amount) internal returns (uint256) { + uint256 balanceBefore = _token.balanceOf(address(L1_ASSET_ROUTER)); + _token.safeTransferFrom(_from, address(L1_ASSET_ROUTER), _amount); + uint256 balanceAfter = _token.balanceOf(address(L1_ASSET_ROUTER)); + return balanceAfter - balanceBefore; } @@ -252,11 +268,10 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { ERA LEGACY GETTERS //////////////////////////////////////////////////////////////*/ - /// @return The L2 token address that would be minted for deposit of the given L1 token on zkSync Era. + /// @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, "")); bytes32 salt = bytes32(uint256(uint160(_l1Token))); - return L2ContractHelper.computeCreate2Address(l2Bridge, salt, l2TokenProxyBytecodeHash, constructorInputHash); } } diff --git a/l1-contracts/contracts/bridge/L1NativeTokenVault.sol b/l1-contracts/contracts/bridge/L1NativeTokenVault.sol deleted file mode 100644 index 91897a12b..000000000 --- a/l1-contracts/contracts/bridge/L1NativeTokenVault.sol +++ /dev/null @@ -1,291 +0,0 @@ -// SPDX-License-Identifier: MIT - -pragma solidity 0.8.24; - -// solhint-disable reason-string, gas-custom-errors - -import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/access/Ownable2StepUpgradeable.sol"; -import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/security/PausableUpgradeable.sol"; - -import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; -import {SafeERC20} from "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol"; - -import {IL1NativeTokenVault} from "./interfaces/IL1NativeTokenVault.sol"; -import {IL1AssetHandler} from "./interfaces/IL1AssetHandler.sol"; -import {IL1AssetRouter} from "./interfaces/IL1AssetRouter.sol"; -import {ETH_TOKEN_ADDRESS} from "../common/Config.sol"; -import {DataEncoding} from "../common/libraries/DataEncoding.sol"; - -import {BridgeHelper} from "./BridgeHelper.sol"; - -import {Unauthorized, ZeroAddress, NoFundsTransferred, ValueMismatch, TokensWithFeesNotSupported, NonEmptyMsgValue, TokenNotSupported, EmptyDeposit, InsufficientChainBalance, WithdrawFailed} from "../common/L1ContractErrors.sol"; - -/// @author Matter Labs -/// @custom:security-contact security@matterlabs.dev -/// @dev Vault holding L1 native ETH and ERC20 tokens bridged into the ZK chains. -/// @dev Designed for use with a proxy for upgradability. -contract L1NativeTokenVault is IL1NativeTokenVault, Ownable2StepUpgradeable, PausableUpgradeable { - using SafeERC20 for IERC20; - - /// @dev The address of the WETH token on L1. - address public immutable override L1_WETH_TOKEN; - - /// @dev L1 Shared Bridge smart contract that handles communication with its counterparts on L2s - IL1AssetRouter public immutable override L1_SHARED_BRIDGE; - - /// @dev Maps token balances for each chain to prevent unauthorized spending across ZK chains. - /// This serves as a security measure until hyperbridging is implemented. - /// NOTE: this function may be removed in the future, don't rely on it! - mapping(uint256 chainId => mapping(address l1Token => uint256 balance)) public chainBalance; - - /// @dev A mapping assetId => tokenAddress - mapping(bytes32 assetId => address tokenAddress) public tokenAddress; - - /// @notice Checks that the message sender is the bridge. - modifier onlyBridge() { - if (msg.sender != address(L1_SHARED_BRIDGE)) { - revert Unauthorized(msg.sender); - } - _; - } - - /// @dev Contract is expected to be used as proxy implementation. - /// @dev Initialize the implementation to prevent Parity hack. - constructor(address _l1WethAddress, IL1AssetRouter _l1SharedBridge) { - _disableInitializers(); - L1_WETH_TOKEN = _l1WethAddress; - L1_SHARED_BRIDGE = _l1SharedBridge; - } - - /// @dev Accepts ether only from the Shared Bridge. - receive() external payable { - require(address(L1_SHARED_BRIDGE) == msg.sender, "NTV: ETH only accepted from Shared Bridge"); - } - - /// @dev Initializes a contract for later use. Expected to be used in the proxy - /// @param _owner Address which can change pause / unpause the NTV - /// 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) external initializer { - if (_owner == address(0)) { - revert ZeroAddress(); - } - _transferOwnership(_owner); - } - - /// @notice Transfers tokens from shared bridge as part of the migration process. - /// @dev Both ETH and ERC20 tokens can be transferred. Exhausts balance of shared bridge after the first call. - /// @dev Calling second time for the same token will revert. - /// @param _token The address of token to be transferred (address(1) for ether and contract address for ERC20). - function transferFundsFromSharedBridge(address _token) external { - if (_token == ETH_TOKEN_ADDRESS) { - uint256 balanceBefore = address(this).balance; - L1_SHARED_BRIDGE.transferTokenToNTV(_token); - uint256 balanceAfter = address(this).balance; - if (balanceAfter <= balanceBefore) { - revert NoFundsTransferred(); - } - } else { - uint256 balanceBefore = IERC20(_token).balanceOf(address(this)); - uint256 sharedBridgeChainBalance = IERC20(_token).balanceOf(address(L1_SHARED_BRIDGE)); - require(sharedBridgeChainBalance > 0, "NTV: 0 amount to transfer"); - L1_SHARED_BRIDGE.transferTokenToNTV(_token); - uint256 balanceAfter = IERC20(_token).balanceOf(address(this)); - require(balanceAfter - balanceBefore >= sharedBridgeChainBalance, "NTV: wrong amount transferred"); - } - } - - /// @notice Updates chain token balance within NTV to account for tokens transferred from the shared bridge (part of the migration process). - /// @dev Clears chain balance on the shared bridge after the first call. Subsequent calls will not affect the state. - /// @param _token The address of token to be transferred (address(1) for ether and contract address for ERC20). - /// @param _targetChainId The chain ID of the corresponding ZK chain. - function updateChainBalancesFromSharedBridge(address _token, uint256 _targetChainId) external { - uint256 sharedBridgeChainBalance = L1_SHARED_BRIDGE.chainBalance(_targetChainId, _token); - chainBalance[_targetChainId][_token] = chainBalance[_targetChainId][_token] + sharedBridgeChainBalance; - L1_SHARED_BRIDGE.nullifyChainBalanceByNTV(_targetChainId, _token); - } - - /// @notice Registers tokens within the NTV. - /// @dev The goal was to allow bridging L1 native tokens automatically, by registering them on the fly. - /// @notice Allows the bridge to register a token address for the vault. - /// @notice No access control is ok, since the bridging of tokens should be permissionless. This requires permissionless registration. - function registerToken(address _l1Token) external { - if (_l1Token == L1_WETH_TOKEN) { - revert TokenNotSupported(L1_WETH_TOKEN); - } - require(_l1Token == ETH_TOKEN_ADDRESS || _l1Token.code.length > 0, "NTV: empty token"); - bytes32 assetId = DataEncoding.encodeNTVAssetId(block.chainid, _l1Token); - L1_SHARED_BRIDGE.setAssetHandlerAddressThisChain(bytes32(uint256(uint160(_l1Token))), address(this)); - tokenAddress[assetId] = _l1Token; - } - - /// @inheritdoc IL1AssetHandler - function bridgeMint( - uint256 _chainId, - bytes32 _assetId, - bytes calldata _data - ) external payable override onlyBridge whenNotPaused { - // here we are minting the tokens after the bridgeBurn has happened on an L2, so we can assume the l1Token is not zero - address l1Token = tokenAddress[_assetId]; - (uint256 amount, address l1Receiver) = abi.decode(_data, (uint256, address)); - // Check that the chain has sufficient balance - if (chainBalance[_chainId][l1Token] < amount) { - revert InsufficientChainBalance(); - } - chainBalance[_chainId][l1Token] -= amount; - - if (l1Token == ETH_TOKEN_ADDRESS) { - bool callSuccess; - // Low-level assembly call, to avoid any memory copying (save gas) - assembly { - callSuccess := call(gas(), l1Receiver, amount, 0, 0, 0, 0) - } - if (!callSuccess) { - revert WithdrawFailed(); - } - } else { - // Withdraw funds - IERC20(l1Token).safeTransfer(l1Receiver, amount); - } - emit BridgeMint(_chainId, _assetId, l1Receiver, amount); - } - - /// @inheritdoc IL1AssetHandler - /// @notice Allows bridgehub to acquire mintValue for L1->L2 transactions. - /// @dev In case of native token vault _data is the tuple of _depositAmount and _l2Receiver. - function bridgeBurn( - uint256 _chainId, - uint256, - bytes32 _assetId, - address _prevMsgSender, - bytes calldata _data - ) external payable override onlyBridge whenNotPaused returns (bytes memory _bridgeMintData) { - (uint256 _depositAmount, address _l2Receiver) = abi.decode(_data, (uint256, address)); - - uint256 amount; - address l1Token = tokenAddress[_assetId]; - if (l1Token == ETH_TOKEN_ADDRESS) { - amount = msg.value; - - // In the old SDK/contracts the user had to always provide `0` as the deposit amount for ETH token, while - // ultimately the provided `msg.value` was used as the deposit amount. This check is needed for backwards compatibility. - if (_depositAmount == 0) { - _depositAmount = amount; - } - - if (_depositAmount != amount) { - revert ValueMismatch(amount, msg.value); - } - } else { - // The Bridgehub also checks this, but we want to be sure - if (msg.value != 0) { - revert NonEmptyMsgValue(); - } - - amount = _depositAmount; - - uint256 expectedDepositAmount = _depositFunds(_prevMsgSender, IERC20(l1Token), _depositAmount); // note if _prevMsgSender is this contract, this will return 0. This does not happen. - // The token has non-standard transfer logic - if (amount != expectedDepositAmount) { - revert TokensWithFeesNotSupported(); - } - } - if (amount == 0) { - // empty deposit amount - revert EmptyDeposit(); - } - - chainBalance[_chainId][l1Token] += amount; - - _bridgeMintData = DataEncoding.encodeBridgeMintData({ - _prevMsgSender: _prevMsgSender, - _l2Receiver: _l2Receiver, - _l1Token: l1Token, - _amount: amount, - _erc20Metadata: getERC20Getters(l1Token) - }); - - emit BridgeBurn({ - chainId: _chainId, - assetId: _assetId, - l1Sender: _prevMsgSender, - l2receiver: _l2Receiver, - amount: amount - }); - } - - /// @inheritdoc IL1AssetHandler - function bridgeRecoverFailedTransfer( - uint256 _chainId, - bytes32 _assetId, - address _depositSender, - bytes calldata _data - ) external payable override onlyBridge whenNotPaused { - (uint256 _amount, ) = abi.decode(_data, (uint256, address)); - address l1Token = tokenAddress[_assetId]; - if (_amount == 0) { - revert NoFundsTransferred(); - } - - // check that the chain has sufficient balance - if (chainBalance[_chainId][l1Token] < _amount) { - revert InsufficientChainBalance(); - } - chainBalance[_chainId][l1Token] -= _amount; - - if (l1Token == ETH_TOKEN_ADDRESS) { - bool callSuccess; - // Low-level assembly call, to avoid any memory copying (save gas) - assembly { - callSuccess := call(gas(), _depositSender, _amount, 0, 0, 0, 0) - } - require(callSuccess, "NTV: claimFailedDeposit failed, no funds or cannot transfer to receiver"); - } else { - IERC20(l1Token).safeTransfer(_depositSender, _amount); - // Note we don't allow weth deposits anymore, but there might be legacy weth deposits. - // until we add Weth bridging capabilities, we don't wrap/unwrap weth to ether. - } - } - - /// @dev Receives and parses (name, symbol, decimals) from the token contract - function getERC20Getters(address _token) public view override returns (bytes memory) { - return BridgeHelper.getERC20Getters(_token, ETH_TOKEN_ADDRESS); - } - - /// @dev Shows the assetId for a given chain and token address - function getAssetId(uint256 _chainId, address _l1Token) external pure override returns (bytes32) { - return DataEncoding.encodeNTVAssetId(_chainId, _l1Token); - } - - /// @dev Transfers tokens from the depositor address to the smart contract address. - /// @return The difference between the contract balance before and after the transferring of funds. - function _depositFunds(address _from, IERC20 _token, uint256 _amount) internal returns (uint256) { - uint256 balanceBefore = _token.balanceOf(address(this)); - address from = _from; - // in the legacy scenario the SharedBridge was granting the allowance, we have to transfer from them instead of the user - if ( - _token.allowance(address(L1_SHARED_BRIDGE), address(this)) >= _amount && - _token.allowance(_from, address(this)) < _amount - ) { - from = address(L1_SHARED_BRIDGE); - } - // slither-disable-next-line arbitrary-send-erc20 - _token.safeTransferFrom(from, address(this), _amount); - uint256 balanceAfter = _token.balanceOf(address(this)); - - return balanceAfter - balanceBefore; - } - - /*////////////////////////////////////////////////////////////// - PAUSE - //////////////////////////////////////////////////////////////*/ - - /// @notice Pauses all functions marked with the `whenNotPaused` modifier. - function pause() external onlyOwner { - _pause(); - } - - /// @notice Unpauses the contract, allowing all functions marked with the `whenNotPaused` modifier to be called again. - function unpause() external onlyOwner { - _unpause(); - } -} diff --git a/l1-contracts/contracts/bridge/L1Nullifier.sol b/l1-contracts/contracts/bridge/L1Nullifier.sol new file mode 100644 index 000000000..6e0bb6d7a --- /dev/null +++ b/l1-contracts/contracts/bridge/L1Nullifier.sol @@ -0,0 +1,720 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +// solhint-disable reason-string, gas-custom-errors + +import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/access/Ownable2StepUpgradeable.sol"; +import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/security/PausableUpgradeable.sol"; + +import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; +import {SafeERC20} from "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol"; + +import {NEW_ENCODING_VERSION, LEGACY_ENCODING_VERSION} from "./asset-router/IAssetRouterBase.sol"; +import {IL1NativeTokenVault} from "./ntv/IL1NativeTokenVault.sol"; + +import {IL1ERC20Bridge} from "./interfaces/IL1ERC20Bridge.sol"; +import {IL1AssetRouter} from "./asset-router/IL1AssetRouter.sol"; +import {IAssetRouterBase} from "./asset-router/IAssetRouterBase.sol"; +import {INativeTokenVault} from "./ntv/INativeTokenVault.sol"; + +import {IL1Nullifier, FinalizeL1DepositParams} from "./interfaces/IL1Nullifier.sol"; + +import {IMailbox} from "../state-transition/chain-interfaces/IMailbox.sol"; +import {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"; +import {DataEncoding} from "../common/libraries/DataEncoding.sol"; + +import {IBridgehub} from "../bridgehub/IBridgehub.sol"; +import {L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR, L2_ASSET_ROUTER_ADDR} from "../common/L2ContractAddresses.sol"; +import {DataEncoding} from "../common/libraries/DataEncoding.sol"; +import {Unauthorized, SharedBridgeKey, DepositExists, AddressAlreadySet, InvalidProof, DepositDoesNotExist, SharedBridgeValueNotSet, WithdrawalAlreadyFinalized, L2WithdrawalMessageWrongLength, InvalidSelector, SharedBridgeValueNotSet, ZeroAddress} from "../common/L1ContractErrors.sol"; + +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +/// @dev Bridges assets between L1 and ZK chain, supporting both ETH and ERC20 tokens. +/// @dev Designed for use with a proxy for upgradability. +contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, PausableUpgradeable { + using SafeERC20 for IERC20; + + /// @dev Bridgehub smart contract that is used to operate with L2 via asynchronous L2 <-> L1 communication. + IBridgehub public immutable override BRIDGE_HUB; + + /// @dev Era's chainID + uint256 internal immutable ERA_CHAIN_ID; + + /// @dev The address of ZKsync Era diamond proxy contract. + address internal immutable ERA_DIAMOND_PROXY; + + /// @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. + uint256 internal eraPostDiamondUpgradeFirstBatch; + + /// @dev Stores the first batch number on the ZKsync Era Diamond Proxy that was settled after L1ERC20 Bridge upgrade. + /// This variable is used to differentiate between pre-upgrade and post-upgrade ERC20 withdrawals. Withdrawals from batches older + /// than this value are considered to have been finalized prior to the upgrade and handled separately. + uint256 internal eraPostLegacyBridgeUpgradeFirstBatch; + + /// @dev Stores the ZKsync Era batch number that processes the last deposit tx initiated by the legacy bridge + /// This variable (together with eraLegacyBridgeLastDepositTxNumber) is used to differentiate between pre-upgrade and post-upgrade deposits. Deposits processed in older batches + /// than this value are considered to have been processed prior to the upgrade and handled separately. + /// We use this both for Eth and erc20 token deposits, so we need to update the diamond and bridge simultaneously. + uint256 internal eraLegacyBridgeLastDepositBatch; + + /// @dev The tx number in the _eraLegacyBridgeLastDepositBatch of the last deposit tx initiated by the legacy bridge. + /// This variable (together with eraLegacyBridgeLastDepositBatch) is used to differentiate between pre-upgrade and post-upgrade deposits. Deposits processed in older txs + /// than this value are considered to have been processed prior to the upgrade and handled separately. + /// We use this both for Eth and erc20 token deposits, so we need to update the diamond and bridge simultaneously. + uint256 internal eraLegacyBridgeLastDepositTxNumber; + + /// @dev Legacy bridge smart contract that used to hold ERC20 tokens. + address public override legacyBridge; + + /// @dev A mapping chainId => bridgeProxy. Used to store the bridge proxy's address, and to see if it has been deployed yet. + // slither-disable-next-line uninitialized-state + mapping(uint256 chainId => address l2Bridge) public __DEPRECATED_l2BridgeAddress; + + /// @dev A mapping chainId => L2 deposit transaction hash => dataHash + // keccak256(abi.encode(account, tokenAddress, amount)) for legacy transfers + // keccak256(abi.encode(_prevMsgSender, assetId, transferData)) for new transfers + /// @dev Tracks deposit transactions to L2 to enable users to claim their funds if a deposit fails. + mapping(uint256 chainId => mapping(bytes32 l2DepositTxHash => bytes32 depositDataHash)) + public + override depositHappened; + + /// @dev Tracks the processing status of L2 to L1 messages, indicating whether a message has already been finalized. + mapping(uint256 chainId => mapping(uint256 l2BatchNumber => mapping(uint256 l2ToL1MessageNumber => bool isFinalized))) + public isWithdrawalFinalized; + + /// @notice Deprecated. Kept for backwards compatibility. + /// @dev Indicates whether the hyperbridging is enabled for a given chain. + // slither-disable-next-line uninitialized-state + mapping(uint256 chainId => bool enabled) private __DEPRECATED_hyperbridgingEnabled; + + /// @dev Maps token balances for each chain to prevent unauthorized spending across ZK chain. + /// This serves as a security measure until hyperbridging is implemented. + /// NOTE: this function may be removed in the future, don't rely on it! + mapping(uint256 chainId => mapping(address l1Token => uint256 balance)) public __DEPRECATED_chainBalance; + + /// @dev Address of L1 asset router. + IL1AssetRouter public l1AssetRouter; + + /// @dev Address of native token vault. + IL1NativeTokenVault public l1NativeTokenVault; + + /// @notice Checks that the message sender is the asset router.. + modifier onlyAssetRouter() { + if (msg.sender != address(l1AssetRouter)) { + revert Unauthorized(msg.sender); + } + _; + } + + /// @notice Checks that the message sender is the native token vault. + modifier onlyL1NTV() { + if (msg.sender != address(l1NativeTokenVault)) { + revert Unauthorized(msg.sender); + } + _; + } + + /// @notice Checks that the message sender is the bridgehub or ZKsync Era Diamond Proxy. + modifier onlyBridgehubOrEra(uint256 _chainId) { + if (msg.sender != address(BRIDGE_HUB) && (_chainId != ERA_CHAIN_ID || msg.sender != ERA_DIAMOND_PROXY)) { + revert Unauthorized(msg.sender); + } + _; + } + + /// @notice Checks that the message sender is the legacy bridge. + modifier onlyLegacyBridge() { + if (msg.sender != legacyBridge) { + revert Unauthorized(msg.sender); + } + _; + } + + /// @notice Checks that the message sender is the legacy bridge. + modifier onlyAssetRouterOrErc20Bridge() { + if (msg.sender != address(l1AssetRouter) && msg.sender != legacyBridge) { + revert Unauthorized(msg.sender); + } + _; + } + + /// @dev Contract is expected to be used as proxy implementation. + /// @dev Initialize the implementation to prevent Parity hack. + constructor(IBridgehub _bridgehub, uint256 _eraChainId, address _eraDiamondProxy) reentrancyGuardInitializer { + _disableInitializers(); + BRIDGE_HUB = _bridgehub; + ERA_CHAIN_ID = _eraChainId; + ERA_DIAMOND_PROXY = _eraDiamondProxy; + } + + /// @dev Initializes a contract bridge for later use. Expected to be used in the proxy. + /// @dev Used for testing purposes only, as the contract has been initialized on mainnet. + /// @param _owner The 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. + /// @param _eraPostDiamondUpgradeFirstBatch The first batch number on the ZKsync Era Diamond Proxy that was settled after diamond proxy upgrade. + /// @param _eraPostLegacyBridgeUpgradeFirstBatch The first batch number on the ZKsync Era Diamond Proxy that was settled after legacy bridge upgrade. + /// @param _eraLegacyBridgeLastDepositBatch The the ZKsync Era batch number that processes the last deposit tx initiated by the legacy bridge. + /// @param _eraLegacyBridgeLastDepositTxNumber The tx number in the _eraLegacyBridgeLastDepositBatch of the last deposit tx initiated by the legacy bridge. + function initialize( + address _owner, + uint256 _eraPostDiamondUpgradeFirstBatch, + uint256 _eraPostLegacyBridgeUpgradeFirstBatch, + uint256 _eraLegacyBridgeLastDepositBatch, + uint256 _eraLegacyBridgeLastDepositTxNumber + ) external reentrancyGuardInitializer initializer { + if (_owner == address(0)) { + revert ZeroAddress(); + } + _transferOwnership(_owner); + if (eraPostDiamondUpgradeFirstBatch == 0) { + eraPostDiamondUpgradeFirstBatch = _eraPostDiamondUpgradeFirstBatch; + eraPostLegacyBridgeUpgradeFirstBatch = _eraPostLegacyBridgeUpgradeFirstBatch; + eraLegacyBridgeLastDepositBatch = _eraLegacyBridgeLastDepositBatch; + eraLegacyBridgeLastDepositTxNumber = _eraLegacyBridgeLastDepositTxNumber; + } + } + + /// @notice Transfers tokens from shared bridge to native token vault. + /// @dev This function is part of the upgrade process used to transfer liquidity. + /// @param _token The address of the token to be transferred to NTV. + 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, "L1N: eth transfer failed"); + } else { + IERC20(_token).safeTransfer(ntvAddress, IERC20(_token).balanceOf(address(this))); + } + } + + /// @notice Clears chain balance for specific token. + /// @dev This function is part of the upgrade process used to nullify chain balances once they are credited to NTV. + /// @param _chainId The ID of the ZK chain. + /// @param _token The address of the token which was previously deposit to shared bridge. + function nullifyChainBalanceByNTV(uint256 _chainId, address _token) external { + require(msg.sender == address(l1NativeTokenVault), "L1N: not NTV"); + __DEPRECATED_chainBalance[_chainId][_token] = 0; + } + + /// @notice Legacy function used for migration, do not use! + /// @param _chainId The chain id on which the bridge is deployed. + // slither-disable-next-line uninitialized-state-variables + function l2BridgeAddress(uint256 _chainId) external view returns (address) { + // slither-disable-next-line uninitialized-state-variables + return __DEPRECATED_l2BridgeAddress[_chainId]; + } + + /// @notice Sets the L1ERC20Bridge contract address. + /// @dev Should be called only once by the owner. + /// @param _legacyBridge The address of the legacy bridge. + function setL1Erc20Bridge(address _legacyBridge) external onlyOwner { + if (address(legacyBridge) != address(0)) { + revert AddressAlreadySet(address(legacyBridge)); + } + if (_legacyBridge == address(0)) { + revert ZeroAddress(); + } + legacyBridge = _legacyBridge; + } + + /// @notice Sets the nativeTokenVault contract address. + /// @dev Should be called only once by the owner. + /// @param _l1NativeTokenVault The address of the native token vault. + function setL1NativeTokenVault(IL1NativeTokenVault _l1NativeTokenVault) external onlyOwner { + require(address(l1NativeTokenVault) == address(0), "L1N: native token vault already set"); + require(address(_l1NativeTokenVault) != address(0), "L1N: native token vault 0"); + l1NativeTokenVault = _l1NativeTokenVault; + } + + /// @notice Sets the L1 asset router contract address. + /// @dev Should be called only once by the owner. + /// @param _l1AssetRouter The address of the asset router. + function setL1AssetRouter(address _l1AssetRouter) external onlyOwner { + if (address(l1AssetRouter) != address(0)) { + revert AddressAlreadySet(address(_l1AssetRouter)); + } + require(_l1AssetRouter != address(0), "ShB: nullifier 0"); + l1AssetRouter = IL1AssetRouter(_l1AssetRouter); + } + + /// @notice Confirms the acceptance of a transaction by the Mailbox, as part of the L2 transaction process within Bridgehub. + /// This function is utilized by `requestL2TransactionTwoBridges` to validate the execution of a transaction. + /// @param _chainId The chain ID of the ZK chain to which confirm the deposit. + /// @param _txDataHash The keccak256 hash of 0x01 || abi.encode(bytes32, bytes) to identify deposits. + /// @param _txHash The hash of the L1->L2 transaction to confirm the deposit. + function bridgehubConfirmL2TransactionForwarded( + uint256 _chainId, + bytes32 _txDataHash, + bytes32 _txHash + ) external override onlyAssetRouter whenNotPaused { + if (depositHappened[_chainId][_txHash] != 0x00) { + revert DepositExists(); + } + depositHappened[_chainId][_txHash] = _txDataHash; + emit BridgehubDepositFinalized(_chainId, _txDataHash, _txHash); + } + + /// @dev Calls the internal `_encodeTxDataHash`. Used as a wrapped for try / catch case. + /// @dev Encodes the transaction data hash using either the latest encoding standard or the legacy standard. + /// @param _encodingVersion EncodingVersion. + /// @param _prevMsgSender The address of the entity that initiated the deposit. + /// @param _assetId The unique identifier of the deposited L1 token. + /// @param _transferData The encoded transfer data, which includes both the deposit amount and the address of the L2 receiver. + /// @return txDataHash The resulting encoded transaction data hash. + function encodeTxDataHash( + bytes1 _encodingVersion, + address _prevMsgSender, + bytes32 _assetId, + bytes calldata _transferData + ) external view returns (bytes32 txDataHash) { + txDataHash = DataEncoding.encodeTxDataHash({ + _encodingVersion: _encodingVersion, + _prevMsgSender: _prevMsgSender, + _assetId: _assetId, + _nativeTokenVault: address(l1NativeTokenVault), + _transferData: _transferData + }); + } + + /// @inheritdoc IL1Nullifier + function bridgeRecoverFailedTransfer( + uint256 _chainId, + address _depositSender, + bytes32 _assetId, + bytes memory _assetData, + bytes32 _l2TxHash, + uint256 _l2BatchNumber, + uint256 _l2MessageIndex, + uint16 _l2TxNumberInBatch, + bytes32[] calldata _merkleProof + ) public nonReentrant whenNotPaused { + _verifyAndClearFailedTransfer({ + _chainId: _chainId, + _depositSender: _depositSender, + _assetId: _assetId, + _assetData: _assetData, + _l2TxHash: _l2TxHash, + _l2BatchNumber: _l2BatchNumber, + _l2MessageIndex: _l2MessageIndex, + _l2TxNumberInBatch: _l2TxNumberInBatch, + _merkleProof: _merkleProof + }); + + l1AssetRouter.bridgeRecoverFailedTransfer(_chainId, _depositSender, _assetId, _assetData); + } + + /// @dev Withdraw funds from the initiated deposit, that failed when finalizing on L2. + /// @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. + /// @param _assetData The encoded data, which is used by the asset handler to determine L2 recipient and amount. Might include extra information. + /// @param _l2TxHash The L2 transaction hash of the failed deposit finalization. + /// @param _l2BatchNumber The L2 batch number where the deposit finalization was processed. + /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message. + /// @param _l2TxNumberInBatch The L2 transaction number in a batch, in which the log was sent. + /// @param _merkleProof The Merkle proof of the processing L1 -> L2 transaction with deposit finalization. + /// @dev Processes claims of failed deposit, whether they originated from the legacy bridge or the current system. + function _verifyAndClearFailedTransfer( + uint256 _chainId, + address _depositSender, + bytes32 _assetId, + bytes memory _assetData, + bytes32 _l2TxHash, + uint256 _l2BatchNumber, + uint256 _l2MessageIndex, + uint16 _l2TxNumberInBatch, + bytes32[] calldata _merkleProof + ) internal { + { + bool proofValid = BRIDGE_HUB.proveL1ToL2TransactionStatus({ + _chainId: _chainId, + _l2TxHash: _l2TxHash, + _l2BatchNumber: _l2BatchNumber, + _l2MessageIndex: _l2MessageIndex, + _l2TxNumberInBatch: _l2TxNumberInBatch, + _merkleProof: _merkleProof, + _status: TxStatus.Failure + }); + if (!proofValid) { + revert InvalidProof(); + } + } + + require(!_isEraLegacyDeposit(_chainId, _l2BatchNumber, _l2TxNumberInBatch), "L1N: legacy cFD"); + { + bytes32 dataHash = depositHappened[_chainId][_l2TxHash]; + // Determine if the given dataHash matches the calculated legacy transaction hash. + bool isLegacyTxDataHash = _isLegacyTxDataHash(_depositSender, _assetId, _assetData, dataHash); + // If the dataHash matches the legacy transaction hash, skip the next step. + // Otherwise, perform the check using the new transaction data hash encoding. + if (!isLegacyTxDataHash) { + bytes32 txDataHash = DataEncoding.encodeTxDataHash({ + _encodingVersion: NEW_ENCODING_VERSION, + _prevMsgSender: _depositSender, + _assetId: _assetId, + _nativeTokenVault: address(l1NativeTokenVault), + _transferData: _assetData + }); + if (dataHash != txDataHash) { + revert DepositDoesNotExist(); + } + } + } + delete depositHappened[_chainId][_l2TxHash]; + } + + /// @notice Finalize the withdrawal and release funds. + /// @param _finalizeWithdrawalParams The structure that holds all necessary data to finalize withdrawal + /// @dev We have both the legacy finalizeWithdrawal and the new finalizeDeposit functions, + /// finalizeDeposit uses the new format. On the L2 we have finalizeDeposit with new and old formats both. + function finalizeDeposit(FinalizeL1DepositParams calldata _finalizeWithdrawalParams) public { + _finalizeDeposit(_finalizeWithdrawalParams); + } + + /// @notice Internal function that handles the logic for finalizing withdrawals, supporting both the current bridge system and the legacy ERC20 bridge. + /// @param _finalizeWithdrawalParams The structure that holds all necessary data to finalize withdrawal + function _finalizeDeposit( + FinalizeL1DepositParams calldata _finalizeWithdrawalParams + ) internal nonReentrant whenNotPaused { + bytes memory transferData; + bytes32 assetId; + (assetId, transferData) = _verifyAndGetWithdrawalData(_finalizeWithdrawalParams); + l1AssetRouter.finalizeDeposit(_finalizeWithdrawalParams.chainId, assetId, transferData); + } + + /// @notice Internal function that handles the logic for finalizing withdrawals, supporting both the current bridge system and the legacy ERC20 bridge. + /// @param _finalizeWithdrawalParams The structure that holds all necessary data to finalize withdrawal + /// @return assetId The bridged asset ID. + /// @return transferData The encoded transfer data. + function _verifyAndGetWithdrawalData( + FinalizeL1DepositParams calldata _finalizeWithdrawalParams + ) internal whenNotPaused returns (bytes32 assetId, bytes memory transferData) { + if ( + isWithdrawalFinalized[_finalizeWithdrawalParams.chainId][_finalizeWithdrawalParams.l2BatchNumber][ + _finalizeWithdrawalParams.l2MessageIndex + ] + ) { + revert WithdrawalAlreadyFinalized(); + } + isWithdrawalFinalized[_finalizeWithdrawalParams.chainId][_finalizeWithdrawalParams.l2BatchNumber][ + _finalizeWithdrawalParams.l2MessageIndex + ] = true; + + // Handling special case for withdrawal from ZKsync Era initiated before Shared Bridge. + require( + !_isEraLegacyEthWithdrawal(_finalizeWithdrawalParams.chainId, _finalizeWithdrawalParams.l2BatchNumber), + "L1N: legacy eth withdrawal" + ); + require( + !_isEraLegacyTokenWithdrawal(_finalizeWithdrawalParams.chainId, _finalizeWithdrawalParams.l2BatchNumber), + "L1N: legacy token withdrawal" + ); + + (assetId, transferData) = _verifyWithdrawal(_finalizeWithdrawalParams); + } + + /// @dev Determines if an eth withdrawal was initiated on ZKsync Era before the upgrade to the Shared Bridge. + /// @param _chainId The chain ID of the transaction to check. + /// @param _l2BatchNumber The L2 batch number for the withdrawal. + /// @return Whether withdrawal was initiated on ZKsync Era before diamond proxy upgrade. + function _isEraLegacyEthWithdrawal(uint256 _chainId, uint256 _l2BatchNumber) internal view returns (bool) { + if ((_chainId == ERA_CHAIN_ID) && eraPostDiamondUpgradeFirstBatch == 0) { + revert SharedBridgeValueNotSet(SharedBridgeKey.PostUpgradeFirstBatch); + } + return (_chainId == ERA_CHAIN_ID) && (_l2BatchNumber < eraPostDiamondUpgradeFirstBatch); + } + + /// @dev Determines if a token withdrawal was initiated on ZKsync Era before the upgrade to the Shared Bridge. + /// @param _chainId The chain ID of the transaction to check. + /// @param _l2BatchNumber The L2 batch number for the withdrawal. + /// @return Whether withdrawal was initiated on ZKsync Era before Legacy Bridge upgrade. + function _isEraLegacyTokenWithdrawal(uint256 _chainId, uint256 _l2BatchNumber) internal view returns (bool) { + if ((_chainId == ERA_CHAIN_ID) && eraPostLegacyBridgeUpgradeFirstBatch == 0) { + revert SharedBridgeValueNotSet(SharedBridgeKey.LegacyBridgeFirstBatch); + } + return (_chainId == ERA_CHAIN_ID) && (_l2BatchNumber < eraPostLegacyBridgeUpgradeFirstBatch); + } + + /// @dev Determines if the provided data for a failed deposit corresponds to a legacy failed deposit. + /// @param _prevMsgSender The address of the entity that initiated the deposit. + /// @param _assetId The unique identifier of the deposited L1 token. + /// @param _transferData The encoded transfer data, which includes both the deposit amount and the address of the L2 receiver. + /// @param _expectedTxDataHash The nullifier data hash stored for the failed deposit. + /// @return isLegacyTxDataHash True if the transaction is legacy, false otherwise. + function _isLegacyTxDataHash( + address _prevMsgSender, + bytes32 _assetId, + bytes memory _transferData, + bytes32 _expectedTxDataHash + ) internal view returns (bool isLegacyTxDataHash) { + try this.encodeTxDataHash(LEGACY_ENCODING_VERSION, _prevMsgSender, _assetId, _transferData) returns ( + bytes32 txDataHash + ) { + return txDataHash == _expectedTxDataHash; + } catch { + return false; + } + } + + /// @dev Determines if a deposit was initiated on ZKsync Era before the upgrade to the Shared Bridge. + /// @param _chainId The chain ID of the transaction to check. + /// @param _l2BatchNumber The L2 batch number for the deposit where it was processed. + /// @param _l2TxNumberInBatch The L2 transaction number in the batch, in which the deposit was processed. + /// @return Whether deposit was initiated on ZKsync Era before Shared Bridge upgrade. + function _isEraLegacyDeposit( + uint256 _chainId, + uint256 _l2BatchNumber, + uint256 _l2TxNumberInBatch + ) internal view returns (bool) { + if ((_chainId == ERA_CHAIN_ID) && (eraLegacyBridgeLastDepositBatch == 0)) { + revert SharedBridgeValueNotSet(SharedBridgeKey.LegacyBridgeLastDepositBatch); + } + return + (_chainId == ERA_CHAIN_ID) && + (_l2BatchNumber < eraLegacyBridgeLastDepositBatch || + (_l2TxNumberInBatch <= eraLegacyBridgeLastDepositTxNumber && + _l2BatchNumber == eraLegacyBridgeLastDepositBatch)); + } + + /// @notice Verifies the validity of a withdrawal message from L2 and returns withdrawal details. + /// @param _finalizeWithdrawalParams The structure that holds all necessary data to finalize withdrawal + /// @return assetId The ID of the bridged asset. + /// @return transferData The transfer data used to finalize withdawal. + function _verifyWithdrawal( + FinalizeL1DepositParams calldata _finalizeWithdrawalParams + ) internal view returns (bytes32 assetId, bytes memory transferData) { + (assetId, transferData) = _parseL2WithdrawalMessage( + _finalizeWithdrawalParams.chainId, + _finalizeWithdrawalParams.message + ); + L2Message memory l2ToL1Message; + { + bool baseTokenWithdrawal = (assetId == BRIDGE_HUB.baseTokenAssetId(_finalizeWithdrawalParams.chainId)); + if (baseTokenWithdrawal) { + require( + /// @dev for legacy function calls we hardcode the sender as the L2AssetRouter as we don't know if it is + /// a base token or erc20 token withdrawal beforehand, + /// so we have to allow that option even if we override it. + _finalizeWithdrawalParams.l2Sender == L2_ASSET_ROUTER_ADDR || + _finalizeWithdrawalParams.l2Sender == L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR || + _finalizeWithdrawalParams.l2Sender == + __DEPRECATED_l2BridgeAddress[_finalizeWithdrawalParams.chainId], + "L1N: wrong l2 sender" + ); + } + + l2ToL1Message = L2Message({ + txNumberInBatch: _finalizeWithdrawalParams.l2TxNumberInBatch, + sender: baseTokenWithdrawal ? L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR : _finalizeWithdrawalParams.l2Sender, + data: _finalizeWithdrawalParams.message + }); + } + + bool success = BRIDGE_HUB.proveL2MessageInclusion({ + _chainId: _finalizeWithdrawalParams.chainId, + _batchNumber: _finalizeWithdrawalParams.l2BatchNumber, + _index: _finalizeWithdrawalParams.l2MessageIndex, + _message: l2ToL1Message, + _proof: _finalizeWithdrawalParams.merkleProof + }); + // withdrawal wrong proof + if (!success) { + revert InvalidProof(); + } + } + + /// @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. + function _parseL2WithdrawalMessage( + uint256 _chainId, + bytes memory _l2ToL1message + ) internal view returns (bytes32 assetId, bytes memory transferData) { + // We check that the message is long enough to read the data. + // Please note that there are two versions of the message: + // 1. The message that is sent by `withdraw(address _l1Receiver)` + // It should be equal to the length of the bytes4 function signature + address l1Receiver + uint256 amount = 4 + 20 + 32 = 56 (bytes). + // 2. The message that is encoded by `getL1WithdrawMessage(bytes32 _assetId, bytes memory _bridgeMintData)` + // No length is assume. The assetId is decoded and the mintData is passed to respective assetHandler + + // The data is expected to be at least 56 bytes long. + if (_l2ToL1message.length < 56) { + revert L2WithdrawalMessageWrongLength(_l2ToL1message.length); + } + uint256 amount; + address l1Receiver; + + (uint32 functionSignature, uint256 offset) = UnsafeBytes.readUint32(_l2ToL1message, 0); + if (bytes4(functionSignature) == IMailbox.finalizeEthWithdrawal.selector) { + // this message is a base token withdrawal + (l1Receiver, offset) = UnsafeBytes.readAddress(_l2ToL1message, offset); + // slither-disable-next-line unused-return + (amount, ) = UnsafeBytes.readUint256(_l2ToL1message, offset); + assetId = BRIDGE_HUB.baseTokenAssetId(_chainId); + transferData = abi.encode(amount, l1Receiver); + } else if (bytes4(functionSignature) == IL1ERC20Bridge.finalizeWithdrawal.selector) { + // We use the IL1ERC20Bridge for backward compatibility with old withdrawals. + address l1Token; + // this message is a token withdrawal + + // Check that the message length is correct. + // It should be equal to the length of the function signature + address + address + uint256 = 4 + 20 + 20 + 32 = + // 76 (bytes). + if (_l2ToL1message.length != 76) { + revert L2WithdrawalMessageWrongLength(_l2ToL1message.length); + } + (l1Receiver, offset) = UnsafeBytes.readAddress(_l2ToL1message, offset); + (l1Token, offset) = UnsafeBytes.readAddress(_l2ToL1message, offset); + // slither-disable-next-line unused-return + (amount, ) = UnsafeBytes.readUint256(_l2ToL1message, offset); + + assetId = DataEncoding.encodeNTVAssetId(block.chainid, l1Token); + transferData = abi.encode(amount, l1Receiver); + } else if (bytes4(functionSignature) == IAssetRouterBase.finalizeDeposit.selector) { + // The data is expected to be at least 36 bytes long to contain assetId. + require(_l2ToL1message.length >= 36, "L1N: wrong msg len"); // wrong message length + // slither-disable-next-line unused-return + (, offset) = UnsafeBytes.readBytes32(_l2ToL1message, offset); // originChainId, not used for L2->L1 txs + (assetId, offset) = UnsafeBytes.readBytes32(_l2ToL1message, offset); + transferData = UnsafeBytes.readRemainingBytes(_l2ToL1message, offset); + } else { + revert InvalidSelector(bytes4(functionSignature)); + } + } + + /*////////////////////////////////////////////////////////////// + SHARED BRIDGE TOKEN BRIDGING LEGACY FUNCTIONS + //////////////////////////////////////////////////////////////*/ + + /// @dev Withdraw funds from the initiated deposit, that failed when finalizing on L2. + /// @param _depositSender The address of the deposit initiator. + /// @param _l1Token The address of the deposited L1 ERC20 token. + /// @param _amount The amount of the deposit that failed. + /// @param _l2TxHash The L2 transaction hash of the failed deposit finalization. + /// @param _l2BatchNumber The L2 batch number where the deposit finalization was processed. + /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message. + /// @param _l2TxNumberInBatch The L2 transaction number in a batch, in which the log was sent. + /// @param _merkleProof The Merkle proof of the processing L1 -> L2 transaction with deposit finalization. + function claimFailedDeposit( + uint256 _chainId, + address _depositSender, + address _l1Token, + uint256 _amount, + bytes32 _l2TxHash, + uint256 _l2BatchNumber, + uint256 _l2MessageIndex, + uint16 _l2TxNumberInBatch, + bytes32[] calldata _merkleProof + ) external override { + bytes32 assetId = INativeTokenVault(address(l1NativeTokenVault)).getAssetId(block.chainid, _l1Token); + // For legacy deposits, the l2 receiver is not required to check tx data hash + // bytes memory transferData = abi.encode(_amount, _depositSender); + bytes memory assetData = abi.encode(_amount, address(0)); + + _verifyAndClearFailedTransfer({ + _depositSender: _depositSender, + _chainId: _chainId, + _assetId: assetId, + _assetData: assetData, + _l2TxHash: _l2TxHash, + _l2BatchNumber: _l2BatchNumber, + _l2MessageIndex: _l2MessageIndex, + _l2TxNumberInBatch: _l2TxNumberInBatch, + _merkleProof: _merkleProof + }); + + l1AssetRouter.bridgeRecoverFailedTransfer({ + _chainId: _chainId, + _depositSender: _depositSender, + _assetId: assetId, + _assetData: assetData + }); + } + + /*////////////////////////////////////////////////////////////// + ERA ERC20 LEGACY FUNCTIONS + //////////////////////////////////////////////////////////////*/ + + /// @notice Finalizes the withdrawal for transactions initiated via the legacy ERC20 bridge. + function finalizeWithdrawalLegacyContracts( + FinalizeL1DepositParams calldata _finalizeWithdrawalParams + ) external override onlyAssetRouterOrErc20Bridge { + _finalizeDeposit(_finalizeWithdrawalParams); + } + + /// @notice Withdraw funds from the initiated deposit, that failed when finalizing on ZKsync Era chain. + /// This function is specifically designed for maintaining backward-compatibility with legacy `claimFailedDeposit` + /// method in `L1ERC20Bridge`. + /// + /// @param _depositSender The address of the deposit initiator. + /// @param _l1Asset The address of the deposited L1 ERC20 token. + /// @param _amount The amount of the deposit that failed. + /// @param _l2TxHash The L2 transaction hash of the failed deposit finalization. + /// @param _l2BatchNumber The L2 batch number where the deposit finalization was processed. + /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message. + /// @param _l2TxNumberInBatch The L2 transaction number in a batch, in which the log was sent. + /// @param _merkleProof The Merkle proof of the processing L1 -> L2 transaction with deposit finalization. + function claimFailedDepositLegacyErc20Bridge( + address _depositSender, + address _l1Asset, + uint256 _amount, + bytes32 _l2TxHash, + uint256 _l2BatchNumber, + uint256 _l2MessageIndex, + uint16 _l2TxNumberInBatch, + bytes32[] calldata _merkleProof + ) external override onlyLegacyBridge { + bytes memory assetData = abi.encode(_amount, _depositSender); + /// the legacy bridge can only be used with L1 native tokens. + bytes32 assetId = INativeTokenVault(address(l1NativeTokenVault)).getAssetId(block.chainid, _l1Asset); + + _verifyAndClearFailedTransfer({ + _depositSender: _depositSender, + _chainId: ERA_CHAIN_ID, + _assetId: assetId, + _assetData: assetData, + _l2TxHash: _l2TxHash, + _l2BatchNumber: _l2BatchNumber, + _l2MessageIndex: _l2MessageIndex, + _l2TxNumberInBatch: _l2TxNumberInBatch, + _merkleProof: _merkleProof + }); + + l1AssetRouter.bridgeRecoverFailedTransfer({ + _chainId: ERA_CHAIN_ID, + _depositSender: _depositSender, + _assetId: assetId, + _assetData: assetData + }); + } + + /*////////////////////////////////////////////////////////////// + PAUSE + //////////////////////////////////////////////////////////////*/ + + /// @notice Pauses all functions marked with the `whenNotPaused` modifier. + function pause() external onlyOwner { + _pause(); + } + + /// @notice Unpauses the contract, allowing all functions marked with the `whenNotPaused` modifier to be called again. + function unpause() external onlyOwner { + _unpause(); + } +} diff --git a/l2-contracts/contracts/bridge/L2SharedBridgeLegacy.sol b/l1-contracts/contracts/bridge/L2SharedBridgeLegacy.sol similarity index 82% rename from l2-contracts/contracts/bridge/L2SharedBridgeLegacy.sol rename to l1-contracts/contracts/bridge/L2SharedBridgeLegacy.sol index 39d2769ec..61e6141c2 100644 --- a/l2-contracts/contracts/bridge/L2SharedBridgeLegacy.sol +++ b/l1-contracts/contracts/bridge/L2SharedBridgeLegacy.sol @@ -5,13 +5,17 @@ pragma solidity 0.8.24; import {Initializable} from "@openzeppelin/contracts-v4/proxy/utils/Initializable.sol"; import {UpgradeableBeacon} from "@openzeppelin/contracts-v4/proxy/beacon/UpgradeableBeacon.sol"; -import {L2StandardERC20} from "./L2StandardERC20.sol"; +import {BridgedStandardERC20} from "./BridgedStandardERC20.sol"; -import {L2ContractHelper, DEPLOYER_SYSTEM_CONTRACT, L2_ASSET_ROUTER, L2_NATIVE_TOKEN_VAULT, IContractDeployer} from "../L2ContractHelper.sol"; -import {SystemContractsCaller} from "../SystemContractsCaller.sol"; +import {DEPLOYER_SYSTEM_CONTRACT, L2_ASSET_ROUTER_ADDR, L2_NATIVE_TOKEN_VAULT_ADDR} from "../common/L2ContractAddresses.sol"; +import {SystemContractsCaller} from "../common/libraries/SystemContractsCaller.sol"; +import {L2ContractHelper, IContractDeployer} from "../common/libraries/L2ContractHelper.sol"; + +import {IL2AssetRouter} from "./asset-router/IL2AssetRouter.sol"; +import {IL2NativeTokenVault} from "./ntv/IL2NativeTokenVault.sol"; import {IL2SharedBridgeLegacy} from "./interfaces/IL2SharedBridgeLegacy.sol"; -import {ZeroAddress, EmptyBytes32, Unauthorized, AmountMustBeGreaterThanZero, DeployFailed} from "../errors/L2ContractErrors.sol"; +import {ZeroAddress, EmptyBytes32, Unauthorized, AmountMustBeGreaterThanZero, DeployFailed} from "../common/L1ContractErrors.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev @@ -40,7 +44,14 @@ contract L2SharedBridgeLegacy is IL2SharedBridgeLegacy, Initializable { address public override l1Bridge; modifier onlyNTV() { - if (msg.sender != address(L2_NATIVE_TOKEN_VAULT)) { + if (msg.sender != L2_NATIVE_TOKEN_VAULT_ADDR) { + revert Unauthorized(msg.sender); + } + _; + } + + modifier onlyAssetRouter() { + if (msg.sender != L2_ASSET_ROUTER_ADDR) { revert Unauthorized(msg.sender); } _; @@ -77,7 +88,7 @@ contract L2SharedBridgeLegacy is IL2SharedBridgeLegacy, Initializable { l1SharedBridge = _l1SharedBridge; if (block.chainid != ERA_CHAIN_ID) { - address l2StandardToken = address(new L2StandardERC20{salt: bytes32(0)}()); + address l2StandardToken = address(new BridgedStandardERC20{salt: bytes32(0)}()); l2TokenBeacon = new UpgradeableBeacon{salt: bytes32(0)}(l2StandardToken); l2TokenProxyBytecodeHash = _l2TokenProxyBytecodeHash; l2TokenBeacon.transferOwnership(_aliasedOwner); @@ -99,12 +110,12 @@ contract L2SharedBridgeLegacy is IL2SharedBridgeLegacy, Initializable { if (_amount == 0) { revert AmountMustBeGreaterThanZero(); } - L2_ASSET_ROUTER.withdrawLegacyBridge(_l1Receiver, _l2Token, _amount, msg.sender); + IL2AssetRouter(L2_ASSET_ROUTER_ADDR).withdrawLegacyBridge(_l1Receiver, _l2Token, _amount, msg.sender); } /// @return Address of an L2 token counterpart function l2TokenAddress(address _l1Token) public view override returns (address) { - address token = L2_NATIVE_TOKEN_VAULT.l2TokenAddress(_l1Token); + address token = IL2NativeTokenVault(L2_NATIVE_TOKEN_VAULT_ADDR).l2TokenAddress(_l1Token); if (token != address(0)) { return token; } @@ -146,4 +157,9 @@ contract L2SharedBridgeLegacy is IL2SharedBridgeLegacy, Initializable { } proxy = abi.decode(returndata, (address)); } + + function sendMessageToL1(bytes calldata _message) external override onlyAssetRouter { + // slither-disable-next-line unused-return + L2ContractHelper.sendMessageToL1(_message); + } } diff --git a/l2-contracts/contracts/bridge/L2WrappedBaseToken.sol b/l1-contracts/contracts/bridge/L2WrappedBaseToken.sol similarity index 94% rename from l2-contracts/contracts/bridge/L2WrappedBaseToken.sol rename to l1-contracts/contracts/bridge/L2WrappedBaseToken.sol index 17b0f1b8f..b1d2e7396 100644 --- a/l2-contracts/contracts/bridge/L2WrappedBaseToken.sol +++ b/l1-contracts/contracts/bridge/L2WrappedBaseToken.sol @@ -5,9 +5,9 @@ pragma solidity 0.8.24; import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/token/ERC20/extensions/draft-ERC20PermitUpgradeable.sol"; import {IL2WrappedBaseToken} from "./interfaces/IL2WrappedBaseToken.sol"; -import {IL2StandardToken} from "./interfaces/IL2StandardToken.sol"; +import {IBridgedStandardToken} from "./interfaces/IBridgedStandardToken.sol"; -import {ZeroAddress, Unauthorized, UnimplementedMessage, BRIDGE_MINT_NOT_IMPLEMENTED, WithdrawFailed} from "../errors/L2ContractErrors.sol"; +import {ZeroAddress, Unauthorized, BridgeMintNotImplemented, WithdrawFailed} from "../common/L1ContractErrors.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev @@ -22,7 +22,7 @@ import {ZeroAddress, Unauthorized, UnimplementedMessage, BRIDGE_MINT_NOT_IMPLEME /// /// Note: This is an upgradeable contract. In the future, we will remove upgradeability to make it trustless. /// But for now, when the Rollup has instant upgradability, we leave the possibility of upgrading to improve the contract if needed. -contract L2WrappedBaseToken is ERC20PermitUpgradeable, IL2WrappedBaseToken, IL2StandardToken { +contract L2WrappedBaseToken is ERC20PermitUpgradeable, IL2WrappedBaseToken, IBridgedStandardToken { /// @dev Address of the L2 WETH Bridge. address public override l2Bridge; @@ -85,7 +85,7 @@ contract L2WrappedBaseToken is ERC20PermitUpgradeable, IL2WrappedBaseToken, IL2S /// Note: Use `deposit`/`depositTo` methods instead. // solhint-disable-next-line no-unused-vars function bridgeMint(address _to, uint256 _amount) external override onlyBridge { - revert UnimplementedMessage(BRIDGE_MINT_NOT_IMPLEMENTED); + revert BridgeMintNotImplemented(); } /// @dev Burn tokens from a given account and send the same amount of Ether to the bridge. diff --git a/l1-contracts/contracts/bridge/asset-router/AssetRouterBase.sol b/l1-contracts/contracts/bridge/asset-router/AssetRouterBase.sol new file mode 100644 index 000000000..a623a8187 --- /dev/null +++ b/l1-contracts/contracts/bridge/asset-router/AssetRouterBase.sol @@ -0,0 +1,170 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/access/Ownable2StepUpgradeable.sol"; +import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/security/PausableUpgradeable.sol"; + +import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; +import {SafeERC20} from "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol"; + +import {IAssetRouterBase} from "./IAssetRouterBase.sol"; +import {IAssetHandler} from "../interfaces/IAssetHandler.sol"; +import {DataEncoding} from "../../common/libraries/DataEncoding.sol"; + +import {L2_NATIVE_TOKEN_VAULT_ADDR} from "../../common/L2ContractAddresses.sol"; + +import {IBridgehub} from "../../bridgehub/IBridgehub.sol"; +import {Unauthorized, AssetHandlerDoesNotExist} from "../../common/L1ContractErrors.sol"; + +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +/// @dev Bridges assets between L1 and ZK chain, supporting both ETH and ERC20 tokens. +/// @dev Designed for use with a proxy for upgradability. +abstract contract AssetRouterBase is IAssetRouterBase, Ownable2StepUpgradeable, PausableUpgradeable { + using SafeERC20 for IERC20; + + /// @dev Bridgehub smart contract that is used to operate with L2 via asynchronous L2 <-> L1 communication. + IBridgehub public immutable override BRIDGE_HUB; + + /// @dev Chain ID of L1 for bridging reasons + uint256 public immutable L1_CHAIN_ID; + + /// @dev Chain ID of Era for legacy reasons + uint256 public immutable ERA_CHAIN_ID; + + /// @dev Maps asset ID to address of corresponding asset handler. + /// @dev Tracks the address of Asset Handler contracts, where bridged funds are locked for each asset. + /// @dev P.S. this liquidity was locked directly in SharedBridge before. + /// @dev Current AssetHandlers: NTV for tokens, Bridgehub for chains. + mapping(bytes32 assetId => address assetHandlerAddress) public assetHandlerAddress; + + /// @dev Maps asset ID to the asset deployment tracker address. + /// @dev Tracks the address of Deployment Tracker contract on L1, which sets Asset Handlers on L2s (ZK chain). + /// @dev For the asset and stores respective addresses. + /// @dev Current AssetDeploymentTrackers: NTV for tokens, CTMDeploymentTracker for chains. + mapping(bytes32 assetId => address assetDeploymentTracker) public assetDeploymentTracker; + + /** + * @dev This empty reserved space is put in place to allow future versions to add new + * variables without shifting down storage in the inheritance chain. + * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps + */ + uint256[47] private __gap; + + /// @notice Checks that the message sender is the bridgehub. + modifier onlyBridgehub() { + if (msg.sender != address(BRIDGE_HUB)) { + revert Unauthorized(msg.sender); + } + _; + } + + /// @dev Contract is expected to be used as proxy implementation. + /// @dev Initialize the implementation to prevent Parity hack. + constructor(uint256 _l1ChainId, uint256 _eraChainId, IBridgehub _bridgehub) { + L1_CHAIN_ID = _l1ChainId; + ERA_CHAIN_ID = _eraChainId; + BRIDGE_HUB = _bridgehub; + } + + /// @inheritdoc IAssetRouterBase + function setAssetHandlerAddressThisChain( + bytes32 _assetRegistrationData, + address _assetHandlerAddress + ) external virtual override; + + function _setAssetHandlerAddressThisChain( + address _nativeTokenVault, + bytes32 _assetRegistrationData, + address _assetHandlerAddress + ) internal { + bool senderIsNTV = msg.sender == address(_nativeTokenVault); + address sender = senderIsNTV ? L2_NATIVE_TOKEN_VAULT_ADDR : msg.sender; + bytes32 assetId = DataEncoding.encodeAssetId(block.chainid, _assetRegistrationData, sender); + if (!senderIsNTV && msg.sender != assetDeploymentTracker[assetId]) { + revert Unauthorized(msg.sender); + } + assetHandlerAddress[assetId] = _assetHandlerAddress; + assetDeploymentTracker[assetId] = msg.sender; + emit AssetHandlerRegisteredInitial(assetId, _assetHandlerAddress, _assetRegistrationData, sender); + } + + function _setAssetHandlerAddress(bytes32 _assetId, address _assetAddress) internal { + assetHandlerAddress[_assetId] = _assetAddress; + emit AssetHandlerRegistered(_assetId, _assetAddress); + } + + /*////////////////////////////////////////////////////////////// + Receive transaction Functions + //////////////////////////////////////////////////////////////*/ + + /// @inheritdoc IAssetRouterBase + function finalizeDeposit(uint256 _chainId, bytes32 _assetId, bytes calldata _transferData) public virtual; + + function _finalizeDeposit( + uint256 _chainId, + bytes32 _assetId, + bytes calldata _transferData, + address _nativeTokenVault + ) internal { + address assetHandler = assetHandlerAddress[_assetId]; + + if (assetHandler != address(0)) { + IAssetHandler(assetHandler).bridgeMint(_chainId, _assetId, _transferData); + } else { + assetHandlerAddress[_assetId] = _nativeTokenVault; + IAssetHandler(_nativeTokenVault).bridgeMint(_chainId, _assetId, _transferData); // ToDo: Maybe it's better to receive amount and receiver here? transferData may have different encoding + } + } + + /*////////////////////////////////////////////////////////////// + Internal Functions + //////////////////////////////////////////////////////////////*/ + + /// @dev send the burn message to the asset + /// @notice Forwards the burn request for specific asset to respective asset handler. + /// @param _chainId The chain ID of the ZK chain to which to deposit. + /// @param _nextMsgValue The L2 `msg.value` from the L1 -> L2 deposit transaction. + /// @param _assetId The deposited asset ID. + /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. + /// @param _transferData The encoded data, which is used by the asset handler to determine L2 recipient and amount. Might include extra information. + /// @param _passValue Boolean indicating whether to pass msg.value in the call. + /// @return bridgeMintCalldata The calldata used by remote asset handler to mint tokens for recipient. + function _burn( + uint256 _chainId, + uint256 _nextMsgValue, + bytes32 _assetId, + address _prevMsgSender, + bytes memory _transferData, + bool _passValue + ) internal returns (bytes memory bridgeMintCalldata) { + address l1AssetHandler = assetHandlerAddress[_assetId]; + if (l1AssetHandler == address(0)) { + revert AssetHandlerDoesNotExist(_assetId); + } + + uint256 msgValue = _passValue ? msg.value : 0; + bridgeMintCalldata = IAssetHandler(l1AssetHandler).bridgeBurn{value: msgValue}({ + _chainId: _chainId, + _msgValue: _nextMsgValue, + _assetId: _assetId, + _prevMsgSender: _prevMsgSender, + _data: _transferData + }); + } + + /*////////////////////////////////////////////////////////////// + PAUSE + //////////////////////////////////////////////////////////////*/ + + /// @notice Pauses all functions marked with the `whenNotPaused` modifier. + function pause() external onlyOwner { + _pause(); + } + + /// @notice Unpauses the contract, allowing all functions marked with the `whenNotPaused` modifier to be called again. + function unpause() external onlyOwner { + _unpause(); + } +} diff --git a/l1-contracts/contracts/bridge/asset-router/IAssetRouterBase.sol b/l1-contracts/contracts/bridge/asset-router/IAssetRouterBase.sol new file mode 100644 index 000000000..a307ba526 --- /dev/null +++ b/l1-contracts/contracts/bridge/asset-router/IAssetRouterBase.sol @@ -0,0 +1,73 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +import {IBridgehub} from "../../bridgehub/IBridgehub.sol"; + +/// @dev The encoding version used for legacy txs. +bytes1 constant LEGACY_ENCODING_VERSION = 0x00; + +/// @dev The encoding version used for new txs. +bytes1 constant NEW_ENCODING_VERSION = 0x01; + +/// @dev The encoding version used for txs that set the asset handler on the counterpart contract. +bytes1 constant SET_ASSET_HANDLER_COUNTERPART_ENCODING_VERSION = 0x02; + +/// @title L1 Bridge contract interface +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +interface IAssetRouterBase { + event BridgehubDepositBaseTokenInitiated( + uint256 indexed chainId, + address indexed from, + bytes32 assetId, + uint256 amount + ); + + event BridgehubDepositInitiated( + uint256 indexed chainId, + bytes32 indexed txDataHash, + address indexed from, + bytes32 assetId, + bytes bridgeMintCalldata + ); + + event BridgehubWithdrawalInitiated( + uint256 chainId, + address indexed sender, + bytes32 indexed assetId, + bytes32 assetDataHash // Todo: What's the point of emitting hash? + ); + + event AssetHandlerRegisteredInitial( + bytes32 indexed assetId, + address indexed assetHandlerAddress, + bytes32 indexed additionalData, + address assetDeploymentTracker + ); + + event AssetHandlerRegistered(bytes32 indexed assetId, address indexed _assetAddress); + + event DepositFinalizedAssetRouter(uint256 indexed chainId, bytes32 indexed assetId, bytes assetData); + + function BRIDGE_HUB() external view returns (IBridgehub); + + /// @notice Sets the asset handler address for a specified asset ID on the chain of the asset deployment tracker. + /// @dev The caller of this function is encoded within the `assetId`, therefore, it should be invoked by the asset deployment tracker contract. + /// @dev No access control on the caller, as msg.sender is encoded in the assetId. + /// @dev Typically, for most tokens, ADT is the native token vault. However, custom tokens may have their own specific asset deployment trackers. + /// @dev `setAssetHandlerAddressOnCounterpart` should be called on L1 to set asset handlers on L2 chains for a specific asset ID. + /// @param _assetRegistrationData The asset data which may include the asset address and any additional required data or encodings. + /// @param _assetHandlerAddress The address of the asset handler to be set for the provided asset. + function setAssetHandlerAddressThisChain(bytes32 _assetRegistrationData, address _assetHandlerAddress) external; + + function assetHandlerAddress(bytes32 _assetId) external view returns (address); + + /// @notice Finalize the withdrawal and release funds. + /// @param _chainId The chain ID of the transaction to check. + /// @param _assetId The bridged asset ID. + /// @param _transferData The position in the L2 logs Merkle tree of the l2Log that was sent with the message. + /// @dev We have both the legacy finalizeWithdrawal and the new finalizeDeposit functions, + /// finalizeDeposit uses the new format. On the L2 we have finalizeDeposit with new and old formats both. + function finalizeDeposit(uint256 _chainId, bytes32 _assetId, bytes memory _transferData) external; +} diff --git a/l1-contracts/contracts/bridge/asset-router/IL1AssetRouter.sol b/l1-contracts/contracts/bridge/asset-router/IL1AssetRouter.sol new file mode 100644 index 000000000..85427813e --- /dev/null +++ b/l1-contracts/contracts/bridge/asset-router/IL1AssetRouter.sol @@ -0,0 +1,176 @@ +// SPDX-License-Identifier: MIT +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. +pragma solidity ^0.8.21; + +import {IL1Nullifier} from "../interfaces/IL1Nullifier.sol"; +import {INativeTokenVault} from "../ntv/INativeTokenVault.sol"; +import {IAssetRouterBase} from "./IAssetRouterBase.sol"; +import {L2TransactionRequestTwoBridgesInner} from "../../bridgehub/IBridgehub.sol"; + +/// @title L1 Bridge contract interface +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +interface IL1AssetRouter is IAssetRouterBase { + event BridgehubMintData(bytes bridgeMintData); + + event BridgehubDepositFinalized( + uint256 indexed chainId, + bytes32 indexed txDataHash, + bytes32 indexed l2DepositTxHash + ); + + event ClaimedFailedDepositAssetRouter(uint256 indexed chainId, bytes32 indexed assetId, bytes assetData); + + event AssetDeploymentTrackerSet( + bytes32 indexed assetId, + address indexed assetDeploymentTracker, + bytes32 indexed additionalData + ); + + event LegacyDepositInitiated( + uint256 indexed chainId, + bytes32 indexed l2DepositTxHash, + address indexed from, + address to, + address l1Asset, + uint256 amount + ); + + /// @notice 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. + /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. + /// @param _l2Receiver The account address that should receive funds on L2. + /// @param _l1Token The L1 token address which is deposited. + /// @param _amount The total amount of tokens to be bridged. + /// @param _l2TxGasLimit The L2 gas limit to be used in the corresponding L2 transaction. + /// @param _l2TxGasPerPubdataByte The gasPerPubdataByteLimit to be used in the corresponding L2 transaction. + /// @param _refundRecipient The address on L2 that will receive the refund for the transaction. + /// @dev If the L2 deposit finalization transaction fails, the `_refundRecipient` will receive the `_l2Value`. + /// Please note, the contract may change the refund recipient's address to eliminate sending funds to addresses + /// out of control. + /// - If `_refundRecipient` is a contract on L1, the refund will be sent to the aliased `_refundRecipient`. + /// - If `_refundRecipient` is set to `address(0)` and the sender has NO deployed bytecode on L1, the refund will + /// be sent to the `msg.sender` address. + /// - If `_refundRecipient` is set to `address(0)` and the sender has deployed bytecode on L1, the refund will be + /// sent to the aliased `msg.sender` address. + /// @dev The address aliasing of L1 contracts as refund recipient on L2 is necessary to guarantee that the funds + /// are controllable through the Mailbox, since the Mailbox applies address aliasing to the from address for the + /// L2 tx if the L1 msg.sender is a contract. Without address aliasing for L1 contracts as refund recipients they + /// would not be able to make proper L2 tx requests through the Mailbox to use or withdraw the funds from L2, and + /// the funds would be lost. + /// @return txHash The L2 transaction hash of deposit finalization. + function depositLegacyErc20Bridge( + address _prevMsgSender, + address _l2Receiver, + address _l1Token, + uint256 _amount, + uint256 _l2TxGasLimit, + uint256 _l2TxGasPerPubdataByte, + address _refundRecipient + ) external payable returns (bytes32 txHash); + + function L1_NULLIFIER() external view returns (IL1Nullifier); + + function L1_WETH_TOKEN() external view returns (address); + + function nativeTokenVault() external view returns (INativeTokenVault); + + function setAssetDeploymentTracker(bytes32 _assetRegistrationData, address _assetDeploymentTracker) external; + + function setNativeTokenVault(INativeTokenVault _nativeTokenVault) external; + + /// @notice Withdraw funds from the initiated deposit, that failed when finalizing on L2. + /// @param _chainId The ZK chain id to which the deposit was initiated. + /// @param _depositSender The address of the entity that initiated the deposit. + /// @param _assetId The unique identifier of the deposited L1 token. + /// @param _assetData The encoded transfer data, which includes both the deposit amount and the address of the L2 receiver. Might include extra information. + // / @param _l2TxHash The L2 transaction hash of the failed deposit finalization. + // / @param _l2BatchNumber The L2 batch number where the deposit finalization was processed. + // / @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message. + // / @param _l2TxNumberInBatch The L2 transaction number in a batch, in which the log was sent. + // / @param _merkleProof The Merkle proof of the processing L1 -> L2 transaction with deposit finalization. + /// @dev Processes claims of failed deposit, whether they originated from the legacy bridge or the current system. + function bridgeRecoverFailedTransfer( + uint256 _chainId, + address _depositSender, + bytes32 _assetId, + bytes calldata _assetData + ) external; + + /// @notice Transfers funds to Native Token Vault, if the asset is registered with it. Does nothing for ETH or non-registered tokens. + /// @dev assetId is not the padded address, but the correct encoded id (NTV stores respective format for IDs) + /// @param _amount The asset amount to be transferred to native token vault. + /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. + function transferFundsToNTV(bytes32 _assetId, uint256 _amount, address _prevMsgSender) external returns (bool); + + /// @notice Finalize the withdrawal and release funds + /// @param _chainId The chain ID of the transaction to check + /// @param _l2BatchNumber The L2 batch number where the withdrawal was processed + /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message + /// @param _l2TxNumberInBatch The L2 transaction number in the batch, in which the log was sent + /// @param _message The L2 withdraw data, stored in an L2 -> L1 message + /// @param _merkleProof The Merkle proof of the inclusion L2 -> L1 message about withdrawal initialization + function finalizeWithdrawal( + uint256 _chainId, + uint256 _l2BatchNumber, + uint256 _l2MessageIndex, + uint16 _l2TxNumberInBatch, + bytes calldata _message, + bytes32[] calldata _merkleProof + ) external; + + /// @notice Initiates a transfer transaction within Bridgehub, used by `requestL2TransactionTwoBridges`. + /// @param _chainId The chain ID of the ZK chain to which deposit. + /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. + /// @param _value The `msg.value` on the target chain tx. + /// @param _data The calldata for the second bridge deposit. + /// @return request The data used by the bridgehub to create L2 transaction request to specific ZK chain. + /// @dev Data has the following abi encoding for legacy deposits: + /// address _l1Token, + /// uint256 _amount, + /// address _l2Receiver + /// for new deposits: + /// bytes32 _assetId, + /// bytes _transferData + function bridgehubDeposit( + uint256 _chainId, + address _prevMsgSender, + uint256 _value, + bytes calldata _data + ) external payable returns (L2TransactionRequestTwoBridgesInner memory request); + + /// @notice Generates a calldata for calling the deposit finalization on the L2 native token contract. + // / @param _chainId The chain ID of the ZK chain to which deposit. + /// @param _sender The address of the deposit initiator. + /// @param _assetId The deposited asset ID. + /// @param _assetData The encoded data, which is used by the asset handler to determine L2 recipient and amount. Might include extra information. + /// @return Returns calldata used on ZK chain. + function getDepositCalldata( + address _sender, + bytes32 _assetId, + bytes memory _assetData + ) external view returns (bytes memory); + + /// @notice Allows bridgehub to acquire mintValue for L1->L2 transactions. + /// @dev If the corresponding L2 transaction fails, refunds are issued to a refund recipient on L2. + /// @param _chainId The chain ID of the ZK chain to which deposit. + /// @param _assetId The deposited asset ID. + /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. + /// @param _amount The total amount of tokens to be bridged. + function bridgehubDepositBaseToken( + uint256 _chainId, + bytes32 _assetId, + address _prevMsgSender, + uint256 _amount + ) external payable; + + /// @notice Routes the confirmation to nullifier for backward compatibility. + /// @notice Confirms the acceptance of a transaction by the Mailbox, as part of the L2 transaction process within Bridgehub. + /// This function is utilized by `requestL2TransactionTwoBridges` to validate the execution of a transaction. + /// @param _chainId The chain ID of the ZK chain to which confirm the deposit. + /// @param _txDataHash The keccak256 hash of 0x01 || abi.encode(bytes32, bytes) to identify deposits. + /// @param _txHash The hash of the L1->L2 transaction to confirm the deposit. + function bridgehubConfirmL2Transaction(uint256 _chainId, bytes32 _txDataHash, bytes32 _txHash) external; +} diff --git a/l1-contracts/contracts/bridge/asset-router/IL2AssetRouter.sol b/l1-contracts/contracts/bridge/asset-router/IL2AssetRouter.sol new file mode 100644 index 000000000..34ce2ecd1 --- /dev/null +++ b/l1-contracts/contracts/bridge/asset-router/IL2AssetRouter.sol @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: MIT + +pragma solidity ^0.8.20; + +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +interface IL2AssetRouter { + event WithdrawalInitiatedAssetRouter( + uint256 chainId, + address indexed l2Sender, + bytes32 indexed assetId, + bytes assetData + ); + + function withdraw(bytes32 _assetId, bytes calldata _transferData) external; + + function l1AssetRouter() external view returns (address); + + function withdrawLegacyBridge(address _l1Receiver, address _l2Token, uint256 _amount, address _sender) external; + + /// @dev Used to set the assedAddress for a given assetId. + /// @dev Will be used by ZK Gateway + function setAssetHandlerAddress(uint256 _originChainId, bytes32 _assetId, address _assetAddress) external; +} diff --git a/l1-contracts/contracts/bridge/asset-router/L1AssetRouter.sol b/l1-contracts/contracts/bridge/asset-router/L1AssetRouter.sol new file mode 100644 index 000000000..0d79b7be7 --- /dev/null +++ b/l1-contracts/contracts/bridge/asset-router/L1AssetRouter.sol @@ -0,0 +1,584 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +// solhint-disable reason-string, gas-custom-errors + +import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; +import {SafeERC20} from "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol"; + +import {IL1AssetRouter} from "./IL1AssetRouter.sol"; +import {IL2AssetRouter} from "./IL2AssetRouter.sol"; +import {IAssetRouterBase, LEGACY_ENCODING_VERSION, NEW_ENCODING_VERSION, SET_ASSET_HANDLER_COUNTERPART_ENCODING_VERSION} from "./IAssetRouterBase.sol"; +import {AssetRouterBase} from "./AssetRouterBase.sol"; + +import {IL1AssetHandler} from "../interfaces/IL1AssetHandler.sol"; +import {IAssetHandler} from "../interfaces/IAssetHandler.sol"; +import {IL1Nullifier, FinalizeL1DepositParams} from "../interfaces/IL1Nullifier.sol"; +import {INativeTokenVault} from "../ntv/INativeTokenVault.sol"; +import {IL2SharedBridgeLegacyFunctions} from "../interfaces/IL2SharedBridgeLegacyFunctions.sol"; + +import {ReentrancyGuard} from "../../common/ReentrancyGuard.sol"; +import {DataEncoding} from "../../common/libraries/DataEncoding.sol"; +import {AddressAliasHelper} from "../../vendor/AddressAliasHelper.sol"; +import {TWO_BRIDGES_MAGIC_VALUE, ETH_TOKEN_ADDRESS} from "../../common/Config.sol"; +import {UnsupportedEncodingVersion, AssetIdNotSupported, AssetHandlerDoesNotExist, Unauthorized, ZeroAddress, TokenNotSupported, AddressAlreadyUsed} from "../../common/L1ContractErrors.sol"; +import {L2_ASSET_ROUTER_ADDR} from "../../common/L2ContractAddresses.sol"; + +import {IBridgehub, L2TransactionRequestTwoBridgesInner, L2TransactionRequestDirect} from "../../bridgehub/IBridgehub.sol"; + +import {IL1AssetDeploymentTracker} from "../interfaces/IL1AssetDeploymentTracker.sol"; + +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +/// @dev Bridges assets between L1 and ZK chain, supporting both ETH and ERC20 tokens. +/// @dev Designed for use with a proxy for upgradability. +contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { + using SafeERC20 for IERC20; + + /// @dev The address of the WETH token on L1. + address public immutable override L1_WETH_TOKEN; + + /// @dev The address of ZKsync Era diamond proxy contract. + address internal immutable ERA_DIAMOND_PROXY; + + /// @dev Address of nullifier. + IL1Nullifier public immutable L1_NULLIFIER; + + /// @dev Address of native token vault. + INativeTokenVault public nativeTokenVault; + + /// @dev Address of legacy bridge. + address public legacyBridge; + + /// @notice Checks that the message sender is the nullifier. + modifier onlyNullifier() { + if (msg.sender != address(L1_NULLIFIER)) { + revert Unauthorized(msg.sender); + } + _; + } + + /// @notice Checks that the message sender is the bridgehub or ZKsync Era Diamond Proxy. + modifier onlyBridgehubOrEra(uint256 _chainId) { + if (msg.sender != address(BRIDGE_HUB) && (_chainId != ERA_CHAIN_ID || msg.sender != ERA_DIAMOND_PROXY)) { + revert Unauthorized(msg.sender); + } + _; + } + + /// @notice Checks that the message sender is the legacy bridge. + modifier onlyLegacyBridge() { + if (msg.sender != address(legacyBridge)) { + revert Unauthorized(msg.sender); + } + _; + } + + /// @notice Checks that the message sender is the native token vault. + modifier onlyNativeTokenVault() { + if (msg.sender != address(nativeTokenVault)) { + revert Unauthorized(msg.sender); + } + _; + } + + /// @dev Contract is expected to be used as proxy implementation. + /// @dev Initialize the implementation to prevent Parity hack. + constructor( + address _l1WethAddress, + address _bridgehub, + address _l1Nullifier, + uint256 _eraChainId, + address _eraDiamondProxy + ) reentrancyGuardInitializer AssetRouterBase(block.chainid, _eraChainId, IBridgehub(_bridgehub)) { + _disableInitializers(); + L1_WETH_TOKEN = _l1WethAddress; + ERA_DIAMOND_PROXY = _eraDiamondProxy; + L1_NULLIFIER = IL1Nullifier(_l1Nullifier); + } + + /// @dev Initializes a contract bridge for later use. Expected to be used in the proxy. + /// @dev Used for testing purposes only, as the contract has been initialized on mainnet. + /// @param _owner The 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) external reentrancyGuardInitializer initializer { + if (_owner == address(0)) { + revert ZeroAddress(); + } + _transferOwnership(_owner); + } + + /// @notice Sets the L1ERC20Bridge contract address. + /// @dev Should be called only once by the owner. + /// @param _nativeTokenVault The address of the native token vault. + function setNativeTokenVault(INativeTokenVault _nativeTokenVault) external onlyOwner { + require(address(nativeTokenVault) == address(0), "AR: native token v already set"); + require(address(_nativeTokenVault) != address(0), "AR: native token vault 0"); + nativeTokenVault = _nativeTokenVault; + bytes32 ethAssetId = DataEncoding.encodeNTVAssetId(block.chainid, ETH_TOKEN_ADDRESS); + assetHandlerAddress[ethAssetId] = address(nativeTokenVault); + } + + /// @notice Sets the L1ERC20Bridge contract address. + /// @dev Should be called only once by the owner. + /// @param _legacyBridge The address of the legacy bridge. + function setL1Erc20Bridge(address _legacyBridge) external onlyOwner { + if (address(legacyBridge) != address(0)) { + revert AddressAlreadyUsed(address(legacyBridge)); + } + if (_legacyBridge == address(0)) { + revert ZeroAddress(); + } + legacyBridge = _legacyBridge; + } + + /// @notice Used to set the assed deployment tracker address for given asset data. + /// @param _assetRegistrationData The asset data which may include the asset address and any additional required data or encodings. + /// @param _assetDeploymentTracker The whitelisted address of asset deployment tracker for provided asset. + function setAssetDeploymentTracker( + bytes32 _assetRegistrationData, + address _assetDeploymentTracker + ) external onlyOwner { + bytes32 assetId = keccak256( + abi.encode(uint256(block.chainid), _assetDeploymentTracker, _assetRegistrationData) + ); + assetDeploymentTracker[assetId] = _assetDeploymentTracker; + emit AssetDeploymentTrackerSet(assetId, _assetDeploymentTracker, _assetRegistrationData); + } + + /// @inheritdoc IAssetRouterBase + function setAssetHandlerAddressThisChain( + bytes32 _assetRegistrationData, + address _assetHandlerAddress + ) external override(AssetRouterBase, IAssetRouterBase) { + _setAssetHandlerAddressThisChain(address(nativeTokenVault), _assetRegistrationData, _assetHandlerAddress); + } + + /// @notice Used to set the asset handler address for a given asset ID on a remote ZK chain + /// @dev No access control on the caller, as msg.sender is encoded in the assetId. + /// @param _chainId The ZK chain ID. + /// @param _assetId The encoding of asset ID. + /// @param _assetHandlerAddressOnCounterpart The address of the asset handler, which will hold the token of interest. + /// @return request The tx request sent to the Bridgehub + function _setAssetHandlerAddressOnCounterpart( + uint256 _chainId, + address _prevMsgSender, + bytes32 _assetId, + address _assetHandlerAddressOnCounterpart + ) internal view returns (L2TransactionRequestTwoBridgesInner memory request) { + IL1AssetDeploymentTracker(assetDeploymentTracker[_assetId]).bridgeCheckCounterpartAddress( + _chainId, + _assetId, + _prevMsgSender, + _assetHandlerAddressOnCounterpart + ); + + bytes memory l2Calldata = abi.encodeCall( + IL2AssetRouter.setAssetHandlerAddress, + (block.chainid, _assetId, _assetHandlerAddressOnCounterpart) + ); + request = L2TransactionRequestTwoBridgesInner({ + magicValue: TWO_BRIDGES_MAGIC_VALUE, + l2Contract: L2_ASSET_ROUTER_ADDR, + l2Calldata: l2Calldata, + factoryDeps: new bytes[](0), + txDataHash: bytes32(0x00) + }); + } + + /*////////////////////////////////////////////////////////////// + INITIATTE DEPOSIT Functions + //////////////////////////////////////////////////////////////*/ + + /// @inheritdoc IL1AssetRouter + function bridgehubDepositBaseToken( + uint256 _chainId, + bytes32 _assetId, + address _prevMsgSender, + uint256 _amount + ) public payable virtual override onlyBridgehubOrEra(_chainId) whenNotPaused { + address assetHandler = assetHandlerAddress[_assetId]; + if (assetHandler == address(0)) { + revert AssetHandlerDoesNotExist(_assetId); + } + + // slither-disable-next-line unused-return + IAssetHandler(assetHandler).bridgeBurn{value: msg.value}({ + _chainId: _chainId, + _msgValue: 0, + _assetId: _assetId, + _prevMsgSender: _prevMsgSender, + _data: abi.encode(_amount, address(0)) + }); + + // Note that we don't save the deposited amount, as this is for the base token, which gets sent to the refundRecipient if the tx fails + emit BridgehubDepositBaseTokenInitiated(_chainId, _prevMsgSender, _assetId, _amount); + } + + /// @inheritdoc IL1AssetRouter + function bridgehubDeposit( + uint256 _chainId, + address _prevMsgSender, + uint256 _value, + bytes calldata _data + ) + external + payable + virtual + override + onlyBridgehub + whenNotPaused + returns (L2TransactionRequestTwoBridgesInner memory request) + { + bytes32 assetId; + bytes memory transferData; + bytes1 encodingVersion = _data[0]; + // The new encoding ensures that the calldata is collision-resistant with respect to the legacy format. + // In the legacy calldata, the first input was the address, meaning the most significant byte was always `0x00`. + if (encodingVersion == SET_ASSET_HANDLER_COUNTERPART_ENCODING_VERSION) { + (bytes32 _assetId, address _assetHandlerAddressOnCounterpart) = abi.decode(_data[1:], (bytes32, address)); + return + _setAssetHandlerAddressOnCounterpart( + _chainId, + _prevMsgSender, + _assetId, + _assetHandlerAddressOnCounterpart + ); + } else if (encodingVersion == NEW_ENCODING_VERSION) { + (assetId, transferData) = abi.decode(_data[1:], (bytes32, bytes)); + } else if (encodingVersion == LEGACY_ENCODING_VERSION) { + (assetId, transferData) = _handleLegacyData(_data, _prevMsgSender); + } else { + revert UnsupportedEncodingVersion(); + } + + if (BRIDGE_HUB.baseTokenAssetId(_chainId) == assetId) { + revert AssetIdNotSupported(assetId); + } + + bytes memory bridgeMintCalldata = _burn({ + _chainId: _chainId, + _nextMsgValue: _value, + _assetId: assetId, + _prevMsgSender: _prevMsgSender, + _transferData: transferData, + _passValue: true + }); + + bytes32 txDataHash = DataEncoding.encodeTxDataHash({ + _nativeTokenVault: address(nativeTokenVault), + _encodingVersion: encodingVersion, + _prevMsgSender: _prevMsgSender, + _assetId: assetId, + _transferData: transferData + }); + + request = _requestToBridge({ + _prevMsgSender: _prevMsgSender, + _assetId: assetId, + _bridgeMintCalldata: bridgeMintCalldata, + _txDataHash: txDataHash + }); + + emit BridgehubDepositInitiated({ + chainId: _chainId, + txDataHash: txDataHash, + from: _prevMsgSender, + assetId: assetId, + bridgeMintCalldata: bridgeMintCalldata + }); + } + + /// @inheritdoc IL1AssetRouter + function bridgehubConfirmL2Transaction( + uint256 _chainId, + bytes32 _txDataHash, + bytes32 _txHash + ) external override onlyBridgehub whenNotPaused { + L1_NULLIFIER.bridgehubConfirmL2TransactionForwarded(_chainId, _txDataHash, _txHash); + } + + /*////////////////////////////////////////////////////////////// + Receive transaction Functions + //////////////////////////////////////////////////////////////*/ + + /// @inheritdoc IAssetRouterBase + function finalizeDeposit( + uint256 _chainId, + bytes32 _assetId, + bytes calldata _transferData + ) public override(AssetRouterBase, IAssetRouterBase) onlyNullifier { + _finalizeDeposit(_chainId, _assetId, _transferData, address(nativeTokenVault)); + emit DepositFinalizedAssetRouter(_chainId, _assetId, _transferData); + } + + /*////////////////////////////////////////////////////////////// + CLAIM FAILED DEPOSIT Functions + //////////////////////////////////////////////////////////////*/ + + /// @inheritdoc IL1AssetRouter + function bridgeRecoverFailedTransfer( + uint256 _chainId, + address _depositSender, + bytes32 _assetId, + bytes calldata _assetData + ) external override onlyNullifier nonReentrant whenNotPaused { + IL1AssetHandler(assetHandlerAddress[_assetId]).bridgeRecoverFailedTransfer( + _chainId, + _assetId, + _depositSender, + _assetData + ); + + emit ClaimedFailedDepositAssetRouter(_chainId, _assetId, _assetData); + } + /*////////////////////////////////////////////////////////////// + Internal & Helpers + //////////////////////////////////////////////////////////////*/ + + /// @notice Decodes the transfer input for legacy data and transfers allowance to NTV. + /// @dev Is not applicable for custom asset handlers. + /// @param _data The encoded transfer data (address _l1Token, uint256 _depositAmount, address _l2Receiver). + // / @param _prevMsgSender The address of the deposit initiator. + /// @return Tuple of asset ID and encoded transfer data to conform with new encoding standard. + function _handleLegacyData(bytes calldata _data, address) internal returns (bytes32, bytes memory) { + (address _l1Token, uint256 _depositAmount, address _l2Receiver) = abi.decode( + _data, + (address, uint256, address) + ); + bytes32 assetId = _ensureTokenRegisteredWithNTV(_l1Token); + return (assetId, abi.encode(_depositAmount, _l2Receiver)); + } + + /// @notice Ensures that token is registered with native token vault. + /// @dev Only used when deposit is made with legacy data encoding format. + /// @param _token The L1 token address which should be registered with native token vault. + /// @return assetId The asset ID of the token provided. + function _ensureTokenRegisteredWithNTV(address _token) internal returns (bytes32 assetId) { + assetId = nativeTokenVault.getAssetId(block.chainid, _token); + if (nativeTokenVault.tokenAddress(assetId) == address(0)) { + nativeTokenVault.registerToken(_token); + } + } + + /// @inheritdoc IL1AssetRouter + function transferFundsToNTV( + bytes32 _assetId, + uint256 _amount, + address _prevMsgSender + ) external onlyNativeTokenVault returns (bool) { + address l1TokenAddress = INativeTokenVault(address(nativeTokenVault)).tokenAddress(_assetId); + if (l1TokenAddress == address(0) || l1TokenAddress == ETH_TOKEN_ADDRESS) { + return false; + } + IERC20 l1Token = IERC20(l1TokenAddress); + + // Do the transfer if allowance to Shared bridge is bigger than amount + // And if there is not enough allowance for the NTV + if ( + l1Token.allowance(_prevMsgSender, address(this)) >= _amount && + l1Token.allowance(_prevMsgSender, address(nativeTokenVault)) < _amount + ) { + // slither-disable-next-line arbitrary-send-erc20 + l1Token.safeTransferFrom(_prevMsgSender, address(nativeTokenVault), _amount); + return true; + } + return false; + } + + /// @dev The request data that is passed to the bridgehub. + /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. + /// @param _assetId The deposited asset ID. + /// @param _bridgeMintCalldata The calldata used by remote asset handler to mint tokens for recipient. + /// @param _txDataHash The keccak256 hash of 0x01 || abi.encode(bytes32, bytes) to identify deposits. + /// @return request The data used by the bridgehub to create L2 transaction request to specific ZK chain. + function _requestToBridge( + address _prevMsgSender, + bytes32 _assetId, + bytes memory _bridgeMintCalldata, + bytes32 _txDataHash + ) internal view virtual returns (L2TransactionRequestTwoBridgesInner memory request) { + bytes memory l2TxCalldata = getDepositCalldata(_prevMsgSender, _assetId, _bridgeMintCalldata); + + request = L2TransactionRequestTwoBridgesInner({ + magicValue: TWO_BRIDGES_MAGIC_VALUE, + l2Contract: L2_ASSET_ROUTER_ADDR, + l2Calldata: l2TxCalldata, + factoryDeps: new bytes[](0), + txDataHash: _txDataHash + }); + } + + /// @inheritdoc IL1AssetRouter + function getDepositCalldata( + address _sender, + bytes32 _assetId, + bytes memory _assetData + ) public view override returns (bytes memory) { + // First branch covers the case when asset is not registered with NTV (custom asset handler) + // Second branch handles tokens registered with NTV and uses legacy calldata encoding + // We need to use the legacy encoding to support the old SDK, which relies on a specific encoding of the data. + if ((nativeTokenVault.tokenAddress(_assetId) == address(0)) || (!nativeTokenVault.isTokenNative(_assetId))) { + return abi.encodeCall(IAssetRouterBase.finalizeDeposit, (block.chainid, _assetId, _assetData)); + } else { + // slither-disable-next-line unused-return + (, address _receiver, address _parsedNativeToken, uint256 _amount, bytes memory _gettersData) = DataEncoding + .decodeBridgeMintData(_assetData); + return + _getLegacyNTVCalldata({ + _sender: _sender, + _receiver: _receiver, + _parsedNativeToken: _parsedNativeToken, + _amount: _amount, + _gettersData: _gettersData + }); + } + } + + function _getLegacyNTVCalldata( + address _sender, + address _receiver, + address _parsedNativeToken, + uint256 _amount, + bytes memory _gettersData + ) internal pure returns (bytes memory) { + return + abi.encodeCall( + IL2SharedBridgeLegacyFunctions.finalizeDeposit, + (_sender, _receiver, _parsedNativeToken, _amount, _gettersData) + ); + } + + /*////////////////////////////////////////////////////////////// + Legacy Functions + //////////////////////////////////////////////////////////////*/ + + /// @inheritdoc IL1AssetRouter + function depositLegacyErc20Bridge( + address _prevMsgSender, + address _l2Receiver, + address _l1Token, + uint256 _amount, + uint256 _l2TxGasLimit, + uint256 _l2TxGasPerPubdataByte, + address _refundRecipient + ) external payable override onlyLegacyBridge nonReentrant whenNotPaused returns (bytes32 txHash) { + if (_l1Token == L1_WETH_TOKEN) { + revert TokenNotSupported(L1_WETH_TOKEN); + } + + bytes32 _assetId; + bytes memory bridgeMintCalldata; + + { + // Inner call to encode data to decrease local var numbers + _assetId = _ensureTokenRegisteredWithNTV(_l1Token); + IERC20(_l1Token).forceApprove(address(nativeTokenVault), _amount); + + bridgeMintCalldata = _burn({ + _chainId: ERA_CHAIN_ID, + _nextMsgValue: 0, + _assetId: _assetId, + _prevMsgSender: _prevMsgSender, + _transferData: abi.encode(_amount, _l2Receiver), + _passValue: false + }); + } + + { + bytes memory l2TxCalldata = getDepositCalldata(_prevMsgSender, _assetId, bridgeMintCalldata); + + // If the refund recipient is not specified, the refund will be sent to the sender of the transaction. + // Otherwise, the refund will be sent to the specified address. + // If the recipient is a contract on L1, the address alias will be applied. + address refundRecipient = AddressAliasHelper.actualRefundRecipient(_refundRecipient, _prevMsgSender); + + L2TransactionRequestDirect memory request = L2TransactionRequestDirect({ + chainId: ERA_CHAIN_ID, + l2Contract: L2_ASSET_ROUTER_ADDR, + mintValue: msg.value, // l2 gas + l2 msg.Value the bridgehub will withdraw the mintValue from the base token bridge for gas + l2Value: 0, // L2 msg.value, this contract doesn't support base token deposits or wrapping functionality, for direct deposits use bridgehub + l2Calldata: l2TxCalldata, + l2GasLimit: _l2TxGasLimit, + l2GasPerPubdataByteLimit: _l2TxGasPerPubdataByte, + factoryDeps: new bytes[](0), + refundRecipient: refundRecipient + }); + txHash = BRIDGE_HUB.requestL2TransactionDirect{value: msg.value}(request); + } + + // Save the deposited amount to claim funds on L1 if the deposit failed on L2 + L1_NULLIFIER.bridgehubConfirmL2TransactionForwarded( + ERA_CHAIN_ID, + keccak256(abi.encode(_prevMsgSender, _l1Token, _amount)), + txHash + ); + + emit LegacyDepositInitiated({ + chainId: ERA_CHAIN_ID, + l2DepositTxHash: txHash, + from: _prevMsgSender, + to: _l2Receiver, + l1Asset: _l1Token, + amount: _amount + }); + } + + /// @inheritdoc IL1AssetRouter + function finalizeWithdrawal( + uint256 _chainId, + uint256 _l2BatchNumber, + uint256 _l2MessageIndex, + uint16 _l2TxNumberInBatch, + bytes calldata _message, + bytes32[] calldata _merkleProof + ) external override { + /// @dev We use a deprecated field to support L2->L1 legacy withdrawals, which were started + /// by the legacy bridge. + address legacyL2Bridge = L1_NULLIFIER.__DEPRECATED_l2BridgeAddress(_chainId); + FinalizeL1DepositParams memory finalizeWithdrawalParams = FinalizeL1DepositParams({ + chainId: _chainId, + l2BatchNumber: _l2BatchNumber, + l2MessageIndex: _l2MessageIndex, + l2Sender: legacyL2Bridge == address(0) ? L2_ASSET_ROUTER_ADDR : legacyL2Bridge, + l2TxNumberInBatch: _l2TxNumberInBatch, + message: _message, + merkleProof: _merkleProof + }); + L1_NULLIFIER.finalizeWithdrawalLegacyContracts(finalizeWithdrawalParams); + } + + /// @dev Withdraw funds from the initiated deposit, that failed when finalizing on L2. + /// @param _depositSender The address of the deposit initiator. + /// @param _l1Token The address of the deposited L1 ERC20 token. + /// @param _amount The amount of the deposit that failed. + /// @param _l2TxHash The L2 transaction hash of the failed deposit finalization. + /// @param _l2BatchNumber The L2 batch number where the deposit finalization was processed. + /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message. + /// @param _l2TxNumberInBatch The L2 transaction number in a batch, in which the log was sent. + /// @param _merkleProof The Merkle proof of the processing L1 -> L2 transaction with deposit finalization. + function claimFailedDeposit( + uint256 _chainId, + address _depositSender, + address _l1Token, + uint256 _amount, + bytes32 _l2TxHash, + uint256 _l2BatchNumber, + uint256 _l2MessageIndex, + uint16 _l2TxNumberInBatch, + bytes32[] calldata _merkleProof + ) external { + L1_NULLIFIER.claimFailedDeposit({ + _chainId: _chainId, + _depositSender: _depositSender, + _l1Token: _l1Token, + _amount: _amount, + _l2TxHash: _l2TxHash, + _l2BatchNumber: _l2BatchNumber, + _l2MessageIndex: _l2MessageIndex, + _l2TxNumberInBatch: _l2TxNumberInBatch, + _merkleProof: _merkleProof + }); + } +} diff --git a/l2-contracts/contracts/bridge/L2AssetRouter.sol b/l1-contracts/contracts/bridge/asset-router/L2AssetRouter.sol similarity index 62% rename from l2-contracts/contracts/bridge/L2AssetRouter.sol rename to l1-contracts/contracts/bridge/asset-router/L2AssetRouter.sol index dc2ee05fe..82d49688f 100644 --- a/l2-contracts/contracts/bridge/L2AssetRouter.sol +++ b/l1-contracts/contracts/bridge/asset-router/L2AssetRouter.sol @@ -2,44 +2,58 @@ pragma solidity 0.8.24; -import {Initializable} from "@openzeppelin/contracts-v4/proxy/utils/Initializable.sol"; +import {IL2AssetRouter} from "./IL2AssetRouter.sol"; +import {IL1AssetRouter} from "./IL1AssetRouter.sol"; +import {IAssetRouterBase} from "./IAssetRouterBase.sol"; +import {AssetRouterBase} from "./AssetRouterBase.sol"; -import {IL2AssetRouter} from "./interfaces/IL2AssetRouter.sol"; -import {IL1AssetRouter} from "./interfaces/IL1AssetRouter.sol"; -import {IL2AssetHandler} from "./interfaces/IL2AssetHandler.sol"; -import {IL2StandardToken} from "./interfaces/IL2StandardToken.sol"; +import {IL2NativeTokenVault} from "../ntv/IL2NativeTokenVault.sol"; +import {IL2SharedBridgeLegacy} from "../interfaces/IL2SharedBridgeLegacy.sol"; +import {IAssetHandler} from "../interfaces/IAssetHandler.sol"; +import {IBridgedStandardToken} from "../interfaces/IBridgedStandardToken.sol"; -import {AddressAliasHelper} from "../vendor/AddressAliasHelper.sol"; -import {L2ContractHelper, L2_NATIVE_TOKEN_VAULT} from "../L2ContractHelper.sol"; -import {DataEncoding} from "../common/libraries/DataEncoding.sol"; +import {IBridgehub} from "../../bridgehub/IBridgehub.sol"; +import {AddressAliasHelper} from "../../vendor/AddressAliasHelper.sol"; -import {EmptyAddress, InvalidCaller, AmountMustBeGreaterThanZero} from "../errors/L2ContractErrors.sol"; +import {L2_NATIVE_TOKEN_VAULT_ADDR, L2_BRIDGEHUB_ADDR} from "../../common/L2ContractAddresses.sol"; +import {L2ContractHelper} from "../../common/libraries/L2ContractHelper.sol"; +import {DataEncoding} from "../../common/libraries/DataEncoding.sol"; +import {EmptyAddress, InvalidCaller, AmountMustBeGreaterThanZero, AssetIdNotSupported} from "../../common/L1ContractErrors.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev /// @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 L2AssetRouter is IL2AssetRouter, Initializable { - /// @dev Chain ID of Era for legacy reasons - uint256 public immutable ERA_CHAIN_ID; - - /// @dev Chain ID of L1 for bridging reasons - uint256 public immutable L1_CHAIN_ID; - +contract L2AssetRouter is AssetRouterBase, IL2AssetRouter { /// @dev The address of the L2 legacy shared bridge. address public immutable L2_LEGACY_SHARED_BRIDGE; + /// @dev The asset id of the base token. + bytes32 public immutable BASE_TOKEN_ASSET_ID; + /// @dev The address of the L1 asset router counterpart. address public override l1AssetRouter; - /// @dev A mapping of asset ID to asset handler address - mapping(bytes32 assetId => address assetHandlerAddress) public override assetHandlerAddress; + /// @notice Checks that the message sender is the L1 Asset Router. + modifier onlyAssetRouterCounterpart(uint256 _originChainId) { + if (_originChainId == L1_CHAIN_ID) { + // Only the L1 Asset Router counterpart can initiate and finalize the deposit. + if (AddressAliasHelper.undoL1ToL2Alias(msg.sender) != l1AssetRouter) { + revert InvalidCaller(msg.sender); + } + } else { + revert InvalidCaller(msg.sender); // xL2 messaging not supported for now + } + _; + } /// @notice Checks that the message sender is the L1 Asset Router. - modifier onlyL1AssetRouter() { - // Only the L1 Asset Router counterpart can initiate and finalize the deposit. - if (AddressAliasHelper.undoL1ToL2Alias(msg.sender) != l1AssetRouter) { - revert InvalidCaller(msg.sender); + modifier onlyAssetRouterCounterpartOrSelf(uint256 _originChainId) { + if (_originChainId == L1_CHAIN_ID) { + // Only the L1 Asset Router counterpart can initiate and finalize the deposit. + if ((AddressAliasHelper.undoL1ToL2Alias(msg.sender) != l1AssetRouter) && (msg.sender != address(this))) { + revert InvalidCaller(msg.sender); + } } _; } @@ -54,43 +68,68 @@ contract L2AssetRouter is IL2AssetRouter, Initializable { /// @dev Disable the initialization to prevent Parity hack. /// @param _l1AssetRouter The address of the L1 Bridge contract. - constructor(uint256 _l1ChainId, uint256 _eraChainId, address _l1AssetRouter, address _legacySharedBridge) { - ERA_CHAIN_ID = _eraChainId; - L1_CHAIN_ID = _l1ChainId; + constructor( + uint256 _l1ChainId, + uint256 _eraChainId, + address _l1AssetRouter, + address _legacySharedBridge, + bytes32 _baseTokenAssetId + ) AssetRouterBase(_l1ChainId, _eraChainId, IBridgehub(L2_BRIDGEHUB_ADDR)) { L2_LEGACY_SHARED_BRIDGE = _legacySharedBridge; if (_l1AssetRouter == address(0)) { revert EmptyAddress(); } - l1AssetRouter = _l1AssetRouter; - + assetHandlerAddress[_baseTokenAssetId] = L2_NATIVE_TOKEN_VAULT_ADDR; + BASE_TOKEN_ASSET_ID = _baseTokenAssetId; _disableInitializers(); } - /// @dev Used to set the assedAddress for a given assetId. - /// @dev Will be used by ZK Gateway - function setAssetHandlerAddress(bytes32 _assetId, address _assetAddress) external onlyL1AssetRouter { - assetHandlerAddress[_assetId] = _assetAddress; - emit AssetHandlerRegistered(_assetId, _assetAddress); + /// @inheritdoc IL2AssetRouter + function setAssetHandlerAddress( + uint256 _originChainId, + bytes32 _assetId, + address _assetAddress + ) external override onlyAssetRouterCounterpart(_originChainId) { + _setAssetHandlerAddress(_assetId, _assetAddress); + } + + /// @inheritdoc IAssetRouterBase + function setAssetHandlerAddressThisChain( + bytes32 _assetRegistrationData, + address _assetHandlerAddress + ) external override(AssetRouterBase) { + _setAssetHandlerAddressThisChain(L2_NATIVE_TOKEN_VAULT_ADDR, _assetRegistrationData, _assetHandlerAddress); } + /*////////////////////////////////////////////////////////////// + Receive transaction Functions + //////////////////////////////////////////////////////////////*/ + /// @notice Finalize the deposit and mint funds /// @param _assetId The encoding of the asset on L2 /// @param _transferData The encoded data required for deposit (address _l1Sender, uint256 _amount, address _l2Receiver, bytes memory erc20Data, address originToken) - function finalizeDeposit(bytes32 _assetId, bytes memory _transferData) public override onlyL1AssetRouter { - address assetHandler = assetHandlerAddress[_assetId]; - if (assetHandler != address(0)) { - IL2AssetHandler(assetHandler).bridgeMint(L1_CHAIN_ID, _assetId, _transferData); - } else { - L2_NATIVE_TOKEN_VAULT.bridgeMint(L1_CHAIN_ID, _assetId, _transferData); - assetHandlerAddress[_assetId] = address(L2_NATIVE_TOKEN_VAULT); + function finalizeDeposit( + // solhint-disable-next-line no-unused-vars + uint256, + bytes32 _assetId, + bytes calldata _transferData + ) public override onlyAssetRouterCounterpartOrSelf(L1_CHAIN_ID) { + if (_assetId == BASE_TOKEN_ASSET_ID) { + revert AssetIdNotSupported(BASE_TOKEN_ASSET_ID); } + _finalizeDeposit(L1_CHAIN_ID, _assetId, _transferData, L2_NATIVE_TOKEN_VAULT_ADDR); - emit FinalizeDepositSharedBridge(L1_CHAIN_ID, _assetId, _transferData); + emit DepositFinalizedAssetRouter(L1_CHAIN_ID, _assetId, _transferData); } + /*////////////////////////////////////////////////////////////// + LEGACY FUNCTIONS + //////////////////////////////////////////////////////////////*/ + /// @notice Initiates a withdrawal by burning funds on the contract and sending the message to L1 /// where tokens would be unlocked + /// @dev do not rely on this function, it will be deprecated in the future /// @param _assetId The asset id of the withdrawn asset /// @param _assetData The data that is passed to the asset handler contract function withdraw(bytes32 _assetId, bytes memory _assetData) public override { @@ -104,18 +143,23 @@ contract L2AssetRouter is IL2AssetRouter, Initializable { /// @param _sender The address of the sender of the message function _withdrawSender(bytes32 _assetId, bytes memory _assetData, address _sender) internal { address assetHandler = assetHandlerAddress[_assetId]; - bytes memory _l1bridgeMintData = IL2AssetHandler(assetHandler).bridgeBurn({ + bytes memory _l1bridgeMintData = IAssetHandler(assetHandler).bridgeBurn({ _chainId: L1_CHAIN_ID, - _mintValue: 0, + _msgValue: 0, _assetId: _assetId, _prevMsgSender: _sender, _data: _assetData }); bytes memory message = _getL1WithdrawMessage(_assetId, _l1bridgeMintData); - L2ContractHelper.sendMessageToL1(message); + if (L2_LEGACY_SHARED_BRIDGE != address(0)) { + // slither-disable-next-line unused-return + L2ContractHelper.sendMessageToL1(message); + } else { + IL2SharedBridgeLegacy(L2_LEGACY_SHARED_BRIDGE).sendMessageToL1(message); + } - emit WithdrawalInitiatedSharedBridge(L1_CHAIN_ID, _sender, _assetId, _assetData); + emit WithdrawalInitiatedAssetRouter(L1_CHAIN_ID, _sender, _assetId, _assetData); } /// @notice Encodes the message for l2ToL1log sent during withdraw initialization. @@ -131,10 +175,6 @@ contract L2AssetRouter is IL2AssetRouter, Initializable { return abi.encodePacked(IL1AssetRouter.finalizeWithdrawal.selector, _assetId, _l1bridgeMintData); } - /*////////////////////////////////////////////////////////////// - LEGACY FUNCTIONS - //////////////////////////////////////////////////////////////*/ - /// @notice Legacy finalizeDeposit. /// @dev Finalizes the deposit and mint funds. /// @param _l1Sender The address of token sender on L1. @@ -148,11 +188,11 @@ contract L2AssetRouter is IL2AssetRouter, Initializable { address _l1Token, uint256 _amount, bytes calldata _data - ) external { + ) external onlyAssetRouterCounterpart(L1_CHAIN_ID) { bytes32 assetId = DataEncoding.encodeNTVAssetId(L1_CHAIN_ID, _l1Token); // solhint-disable-next-line func-named-parameters bytes memory data = DataEncoding.encodeBridgeMintData(_l1Sender, _l2Receiver, _l1Token, _amount, _data); - finalizeDeposit(assetId, data); + this.finalizeDeposit(L1_CHAIN_ID, assetId, data); } /// @notice Initiates a withdrawal by burning funds on the contract and sending the message to L1 @@ -193,7 +233,7 @@ contract L2AssetRouter is IL2AssetRouter, Initializable { /// @param _l2Token The address of token on L2. /// @return The address of token on L1. function getL1TokenAddress(address _l2Token) public view returns (address) { - return IL2StandardToken(_l2Token).l1Address(); + return IBridgedStandardToken(_l2Token).l1Address(); } /// @notice Legacy function used for backward compatibility to return L2 wrapped token @@ -203,7 +243,8 @@ contract L2AssetRouter is IL2AssetRouter, Initializable { /// @param _l1Token The address of token on L1. /// @return Address of an L2 token counterpart function l2TokenAddress(address _l1Token) public view returns (address) { - address currentlyDeployedAddress = L2_NATIVE_TOKEN_VAULT.l2TokenAddress(_l1Token); + IL2NativeTokenVault l2NativeTokenVault = IL2NativeTokenVault(L2_NATIVE_TOKEN_VAULT_ADDR); + address currentlyDeployedAddress = l2NativeTokenVault.l2TokenAddress(_l1Token); if (currentlyDeployedAddress != address(0)) { return currentlyDeployedAddress; @@ -211,13 +252,9 @@ contract L2AssetRouter is IL2AssetRouter, Initializable { // For backwards compatibility, the bridge smust return the address of the token even if it // has not been deployed yet. - return L2_NATIVE_TOKEN_VAULT.calculateCreate2TokenAddress(_l1Token); + return l2NativeTokenVault.calculateCreate2TokenAddress(L1_CHAIN_ID, _l1Token); } - /*////////////////////////////////////////////////////////////// - Legacy functions - //////////////////////////////////////////////////////////////*/ - /// @notice Returns the address of the L1 asset router. /// @dev The old name is kept for backward compatibility. function l1Bridge() external view returns (address) { diff --git a/l1-contracts/contracts/bridge/interfaces/IAssetHandler.sol b/l1-contracts/contracts/bridge/interfaces/IAssetHandler.sol new file mode 100644 index 000000000..34e1b23f2 --- /dev/null +++ b/l1-contracts/contracts/bridge/interfaces/IAssetHandler.sol @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +/// @title Asset Handler contract interface +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +/// @notice Used for any asset handler and called by the AssetRouter +interface IAssetHandler { + /// @dev Emitted when a new token is initialized + event BridgeInitialize(address indexed token, string name, string symbol, uint8 decimals); + + /// @dev Emitted when a token is minted + event BridgeMint(uint256 indexed chainId, bytes32 indexed assetId, address receiver, uint256 amount); + + /// @dev Emitted when a token is burned + event BridgeBurn( + uint256 indexed chainId, + bytes32 indexed assetId, + address indexed sender, + address receiver, + uint256 amount + ); + + /// @param _chainId the chainId that the message is from + /// @param _assetId the assetId of the asset being bridged + /// @param _data the actual data specified for the function + function bridgeMint(uint256 _chainId, bytes32 _assetId, bytes calldata _data) external payable; + + /// @notice Burns bridged tokens and returns the calldata for L2 -> L1 message. + /// @dev In case of native token vault _data is the tuple of _depositAmount and _l2Receiver. + /// @param _chainId the chainId that the message will be sent to + /// @param _msgValue the msg.value of the L2 transaction. For now it is always 0. + /// @param _assetId the assetId of the asset being bridged + /// @param _prevMsgSender the original caller of the Bridgehub, + /// @param _data the actual data specified for the function + /// @return _bridgeMintData The calldata used by counterpart asset handler to unlock tokens for recipient. + function bridgeBurn( + uint256 _chainId, + uint256 _msgValue, + bytes32 _assetId, + address _prevMsgSender, + bytes calldata _data + ) external payable returns (bytes memory _bridgeMintData); +} diff --git a/l2-contracts/contracts/bridge/interfaces/IL2StandardToken.sol b/l1-contracts/contracts/bridge/interfaces/IBridgedStandardToken.sol similarity index 95% rename from l2-contracts/contracts/bridge/interfaces/IL2StandardToken.sol rename to l1-contracts/contracts/bridge/interfaces/IBridgedStandardToken.sol index 38cad77d3..af3a4212a 100644 --- a/l2-contracts/contracts/bridge/interfaces/IL2StandardToken.sol +++ b/l1-contracts/contracts/bridge/interfaces/IBridgedStandardToken.sol @@ -2,7 +2,7 @@ // We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; -interface IL2StandardToken { +interface IBridgedStandardToken { event BridgeInitialize(address indexed l1Token, string name, string symbol, uint8 decimals); event BridgeMint(address indexed account, uint256 amount); diff --git a/l1-contracts/contracts/bridge/interfaces/IL1AssetHandler.sol b/l1-contracts/contracts/bridge/interfaces/IL1AssetHandler.sol index 8f8e4f81c..c62dce3da 100644 --- a/l1-contracts/contracts/bridge/interfaces/IL1AssetHandler.sol +++ b/l1-contracts/contracts/bridge/interfaces/IL1AssetHandler.sol @@ -7,39 +7,6 @@ pragma solidity 0.8.24; /// @custom:security-contact security@matterlabs.dev /// @notice Used for any asset handler and called by the L1AssetRouter interface IL1AssetHandler { - /// @dev Emitted when a new token is initialized - event BridgeInitialize(address indexed l1Token, string name, string symbol, uint8 decimals); - - /// @dev Emitted when a token is minted - event BridgeMint(uint256 indexed chainId, bytes32 indexed assetId, address l1Receiver, uint256 amount); - - /// @dev Emitted when a token is burned - event BridgeBurn( - uint256 indexed chainId, - bytes32 indexed assetId, - address indexed l1Sender, - address l2receiver, - uint256 amount - ); - - /// @param _chainId the chainId that the message is from - /// @param _assetId the assetId of the asset being bridged - /// @param _data the actual data specified for the function - function bridgeMint(uint256 _chainId, bytes32 _assetId, bytes calldata _data) external payable; - - /// @param _chainId the chainId that the message will be sent to - /// @param _l2Value the msg.value of the L2 transaction - /// @param _assetId the assetId of the asset being bridged - /// @param _prevMsgSender the original caller of the Bridgehub, - /// @param _data the actual data specified for the function - function bridgeBurn( - uint256 _chainId, - uint256 _l2Value, - bytes32 _assetId, - address _prevMsgSender, - bytes calldata _data - ) external payable returns (bytes memory _bridgeMintData); - /// @param _chainId the chainId that the message will be sent to /// @param _assetId the assetId of the asset being bridged /// @param _depositSender the address of the entity that initiated the deposit. diff --git a/l1-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol b/l1-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol deleted file mode 100644 index 3394fb758..000000000 --- a/l1-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol +++ /dev/null @@ -1,173 +0,0 @@ -// SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. -pragma solidity ^0.8.21; - -import {L2TransactionRequestTwoBridgesInner} from "../../bridgehub/IBridgehub.sol"; -import {IBridgehub} from "../../bridgehub/IBridgehub.sol"; -import {IL1ERC20Bridge} from "./IL1ERC20Bridge.sol"; -import {IL1NativeTokenVault} from "./IL1NativeTokenVault.sol"; - -/// @title L1 Bridge contract interface -/// @author Matter Labs -/// @custom:security-contact security@matterlabs.dev -interface IL1AssetRouter { - event LegacyDepositInitiated( - uint256 indexed chainId, - bytes32 indexed l2DepositTxHash, - address indexed from, - address to, - address l1Asset, - uint256 amount - ); - - event BridgehubDepositInitiated( - uint256 indexed chainId, - bytes32 indexed txDataHash, - address indexed from, - bytes32 assetId, - bytes bridgeMintCalldata - ); - - event BridgehubDepositBaseTokenInitiated( - uint256 indexed chainId, - address indexed from, - bytes32 assetId, - uint256 amount - ); - - event BridgehubMintData(bytes bridgeMintData); - - event BridgehubDepositFinalized( - uint256 indexed chainId, - bytes32 indexed txDataHash, - bytes32 indexed l2DepositTxHash - ); - - event WithdrawalFinalizedAssetRouter(uint256 indexed chainId, bytes32 indexed assetId, bytes assetData); - - event ClaimedFailedDepositAssetRouter( - uint256 indexed chainId, - address indexed to, - bytes32 indexed assetId, - bytes assetData - ); - - event AssetDeploymentTrackerSet( - bytes32 indexed assetId, - address indexed assetDeploymentTracker, - bytes32 indexed additionalData - ); - - event AssetHandlerRegisteredInitial( - bytes32 indexed assetId, - address indexed assetHandlerAddress, - bytes32 indexed additionalData, - address sender - ); - - function isWithdrawalFinalized( - uint256 _chainId, - uint256 _l2BatchNumber, - uint256 _l2ToL1MessageNumber - ) external view returns (bool); - - function depositLegacyErc20Bridge( - address _prevMsgSender, - address _l2Receiver, - address _l1Token, - uint256 _amount, - uint256 _l2TxGasLimit, - uint256 _l2TxGasPerPubdataByte, - address _refundRecipient - ) external payable returns (bytes32 txHash); - - function claimFailedDeposit( - uint256 _chainId, - address _depositSender, - address _l1Token, - uint256 _amount, - bytes32 _l2TxHash, - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes32[] calldata _merkleProof - ) external; - - function finalizeWithdrawalLegacyErc20Bridge( - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes calldata _message, - bytes32[] calldata _merkleProof - ) external returns (address l1Receiver, address l1Asset, uint256 amount); - - function finalizeWithdrawal( - uint256 _chainId, - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes calldata _message, - bytes32[] calldata _merkleProof - ) external; - - function L1_WETH_TOKEN() external view returns (address); - - function BRIDGE_HUB() external view returns (IBridgehub); - - function legacyBridge() external view returns (IL1ERC20Bridge); - - function depositHappened(uint256 _chainId, bytes32 _l2DepositTxHash) external view returns (bytes32); - - /// @dev Data has the following abi encoding for legacy deposits: - /// address _l1Token, - /// uint256 _amount, - /// address _l2Receiver - /// for new deposits: - /// bytes32 _assetId, - /// bytes _transferData - function bridgehubDeposit( - uint256 _chainId, - address _prevMsgSender, - uint256 _l2Value, - bytes calldata _data - ) external payable returns (L2TransactionRequestTwoBridgesInner memory request); - - function bridgehubDepositBaseToken( - uint256 _chainId, - bytes32 _assetId, - address _prevMsgSender, - uint256 _amount - ) external payable; - - function bridgehubConfirmL2Transaction(uint256 _chainId, bytes32 _txDataHash, bytes32 _txHash) external; - - function hyperbridgingEnabled(uint256 _chainId) external view returns (bool); - - function setAssetDeploymentTracker(bytes32 _assetRegistrationData, address _assetDeploymentTracker) external; - - function setAssetHandlerAddressThisChain(bytes32 _additionalData, address _assetHandlerAddress) external; - - function assetHandlerAddress(bytes32 _assetId) external view returns (address); - - function nativeTokenVault() external view returns (IL1NativeTokenVault); - - function setNativeTokenVault(IL1NativeTokenVault _nativeTokenVault) external; - - function bridgeRecoverFailedTransfer( - uint256 _chainId, - address _depositSender, - bytes32 _assetId, - bytes calldata _assetData, - bytes32 _l2TxHash, - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes32[] calldata _merkleProof - ) external; - - function chainBalance(uint256 _chainId, address _l1Token) external view returns (uint256); - - function transferTokenToNTV(address _token) external; - - function nullifyChainBalanceByNTV(uint256 _chainId, address _token) external; -} diff --git a/l1-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol b/l1-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol index b9426f3e1..fcba5da5a 100644 --- a/l1-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol +++ b/l1-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol @@ -2,8 +2,9 @@ // We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; -import {IL1AssetRouter} from "./IL1AssetRouter.sol"; -import {IL1NativeTokenVault} from "./IL1NativeTokenVault.sol"; +import {IL1Nullifier} from "./IL1Nullifier.sol"; +import {IL1NativeTokenVault} from "../ntv/IL1NativeTokenVault.sol"; +import {IL1AssetRouter} from "../asset-router/IL1AssetRouter.sol"; /// @title L1 Bridge contract legacy interface /// @author Matter Labs @@ -61,9 +62,11 @@ interface IL1ERC20Bridge { function l2TokenAddress(address _l1Token) external view returns (address); - function SHARED_BRIDGE() external view returns (IL1AssetRouter); + function L1_NULLIFIER() external view returns (IL1Nullifier); - function NATIVE_TOKEN_VAULT() external view returns (IL1NativeTokenVault); + function L1_ASSET_ROUTER() external view returns (IL1AssetRouter); + + function L1_NATIVE_TOKEN_VAULT() external view returns (IL1NativeTokenVault); function l2TokenBeacon() external view returns (address); diff --git a/l1-contracts/contracts/bridge/interfaces/IL1NativeTokenVault.sol b/l1-contracts/contracts/bridge/interfaces/IL1NativeTokenVault.sol deleted file mode 100644 index d8cb389d2..000000000 --- a/l1-contracts/contracts/bridge/interfaces/IL1NativeTokenVault.sol +++ /dev/null @@ -1,31 +0,0 @@ -// SPDX-License-Identifier: MIT - -pragma solidity 0.8.24; - -import {IL1AssetRouter} from "./IL1AssetRouter.sol"; -import {IL1AssetHandler} from "./IL1AssetHandler.sol"; -import {IL1BaseTokenAssetHandler} from "./IL1BaseTokenAssetHandler.sol"; - -/// @title L1 Native token vault contract interface -/// @author Matter Labs -/// @custom:security-contact security@matterlabs.dev -/// @notice The NTV is an Asset Handler for the L1AssetRouter to handle native tokens -interface IL1NativeTokenVault is IL1AssetHandler, IL1BaseTokenAssetHandler { - /// @notice The L1AssetRouter contract - function L1_SHARED_BRIDGE() external view returns (IL1AssetRouter); - - /// @notice The weth contract - function L1_WETH_TOKEN() external view returns (address); - - /// @notice Used to register a token in the vault - function registerToken(address _l1Token) external; - - /// @notice Used to get the ERC20 data for a token - function getERC20Getters(address _token) external view returns (bytes memory); - - /// @notice Used the get token balance for specific ZK chain in shared bridge - function chainBalance(uint256 _chainId, address _l1Token) external view returns (uint256); - - /// @dev Shows the assetId for a given chain and token address - function getAssetId(uint256 _chainId, address _l1Token) external pure returns (bytes32); -} diff --git a/l1-contracts/contracts/bridge/interfaces/IL1Nullifier.sol b/l1-contracts/contracts/bridge/interfaces/IL1Nullifier.sol new file mode 100644 index 000000000..30ff91357 --- /dev/null +++ b/l1-contracts/contracts/bridge/interfaces/IL1Nullifier.sol @@ -0,0 +1,110 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +import {IBridgehub} from "../../bridgehub/IBridgehub.sol"; +import {IL1NativeTokenVault} from "../ntv/IL1NativeTokenVault.sol"; + +/// @param chainId The chain ID of the transaction to check. +/// @param l2BatchNumber The L2 batch number where the withdrawal was processed. +/// @param l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message. +/// @param l2sender The address of the message sender on L2 (base token system contract address or asset handler) +/// @param l2TxNumberInBatch The L2 transaction number in the batch, in which the log was sent. +/// @param message The L2 withdraw data, stored in an L2 -> L1 message. +/// @param merkleProof The Merkle proof of the inclusion L2 -> L1 message about withdrawal initialization. +struct FinalizeL1DepositParams { + uint256 chainId; + uint256 l2BatchNumber; + uint256 l2MessageIndex; + address l2Sender; + uint16 l2TxNumberInBatch; + bytes message; + bytes32[] merkleProof; +} + +/// @title L1 Bridge contract interface +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +interface IL1Nullifier { + event BridgehubDepositFinalized( + uint256 indexed chainId, + bytes32 indexed txDataHash, + bytes32 indexed l2DepositTxHash + ); + + function isWithdrawalFinalized( + uint256 _chainId, + uint256 _l2BatchNumber, + uint256 _l2MessageIndex + ) external view returns (bool); + + function claimFailedDepositLegacyErc20Bridge( + address _depositSender, + address _l1Token, + uint256 _amount, + bytes32 _l2TxHash, + uint256 _l2BatchNumber, + uint256 _l2MessageIndex, + uint16 _l2TxNumberInBatch, + bytes32[] calldata _merkleProof + ) external; + + function claimFailedDeposit( + uint256 _chainId, + address _depositSender, + address _l1Token, + uint256 _amount, + bytes32 _l2TxHash, + uint256 _l2BatchNumber, + uint256 _l2MessageIndex, + uint16 _l2TxNumberInBatch, + bytes32[] calldata _merkleProof + ) external; + + function finalizeWithdrawalLegacyContracts(FinalizeL1DepositParams calldata _finalizeWithdrawalParams) external; + + function BRIDGE_HUB() external view returns (IBridgehub); + + function legacyBridge() external view returns (address); + + function depositHappened(uint256 _chainId, bytes32 _l2TxHash) external view returns (bytes32); + + function bridgehubConfirmL2TransactionForwarded(uint256 _chainId, bytes32 _txDataHash, bytes32 _txHash) external; + + function l1NativeTokenVault() external view returns (IL1NativeTokenVault); + + function setL1NativeTokenVault(IL1NativeTokenVault _nativeTokenVault) external; + + function setL1AssetRouter(address _l1AssetRouter) external; + + function __DEPRECATED_chainBalance(uint256 _chainId, address _token) external view returns (uint256); + + function __DEPRECATED_l2BridgeAddress(uint256 _chainId) external view returns (address); + + function transferTokenToNTV(address _token) external; + + function nullifyChainBalanceByNTV(uint256 _chainId, address _token) external; + + /// @dev Withdraw funds from the initiated deposit, that failed when finalizing on L2. + /// @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. + /// @param _assetData The encoded transfer data, which includes both the deposit amount and the address of the L2 receiver. Might include extra information. + /// @param _l2TxHash The L2 transaction hash of the failed deposit finalization. + /// @param _l2BatchNumber The L2 batch number where the deposit finalization was processed. + /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message. + /// @param _l2TxNumberInBatch The L2 transaction number in a batch, in which the log was sent. + /// @param _merkleProof The Merkle proof of the processing L1 -> L2 transaction with deposit finalization. + /// @dev Processes claims of failed deposit, whether they originated from the legacy bridge or the current system. + function bridgeRecoverFailedTransfer( + uint256 _chainId, + address _depositSender, + bytes32 _assetId, + bytes memory _assetData, + bytes32 _l2TxHash, + uint256 _l2BatchNumber, + uint256 _l2MessageIndex, + uint16 _l2TxNumberInBatch, + bytes32[] calldata _merkleProof + ) external; +} diff --git a/l1-contracts/contracts/bridge/interfaces/IL1SharedBridgeLegacy.sol b/l1-contracts/contracts/bridge/interfaces/IL1SharedBridgeLegacy.sol index 43fca83a3..627048f75 100644 --- a/l1-contracts/contracts/bridge/interfaces/IL1SharedBridgeLegacy.sol +++ b/l1-contracts/contracts/bridge/interfaces/IL1SharedBridgeLegacy.sol @@ -7,4 +7,13 @@ pragma solidity 0.8.24; /// @custom:security-contact security@matterlabs.dev interface IL1SharedBridgeLegacy { function l2BridgeAddress(uint256 _chainId) external view returns (address); + + event LegacyDepositInitiated( + uint256 indexed chainId, + bytes32 indexed l2DepositTxHash, + address indexed from, + address to, + address l1Asset, + uint256 amount + ); } diff --git a/l1-contracts/contracts/bridge/interfaces/IL2BridgeLegacy.sol b/l1-contracts/contracts/bridge/interfaces/IL2BridgeLegacy.sol deleted file mode 100644 index b163262c7..000000000 --- a/l1-contracts/contracts/bridge/interfaces/IL2BridgeLegacy.sol +++ /dev/null @@ -1,21 +0,0 @@ -// SPDX-License-Identifier: MIT - -pragma solidity 0.8.24; - -/// @author Matter Labs -/// @custom:security-contact security@matterlabs.dev -interface IL2BridgeLegacy { - function withdraw(address _l1Receiver, address _l2Token, uint256 _amount) external; - - function finalizeDeposit( - address _l1Sender, - address _l2Receiver, - address _l1Token, - uint256 _amount, - bytes calldata _data - ) external payable; - - function l1TokenAddress(address _l2Token) external view returns (address); - - function l2TokenAddress(address _l1Token) external view returns (address); -} diff --git a/l2-contracts/contracts/bridge/interfaces/IL2SharedBridgeLegacy.sol b/l1-contracts/contracts/bridge/interfaces/IL2SharedBridgeLegacy.sol similarity index 90% rename from l2-contracts/contracts/bridge/interfaces/IL2SharedBridgeLegacy.sol rename to l1-contracts/contracts/bridge/interfaces/IL2SharedBridgeLegacy.sol index ac1acce22..00a762447 100644 --- a/l2-contracts/contracts/bridge/interfaces/IL2SharedBridgeLegacy.sol +++ b/l1-contracts/contracts/bridge/interfaces/IL2SharedBridgeLegacy.sol @@ -16,4 +16,6 @@ interface IL2SharedBridgeLegacy { function l1SharedBridge() external view returns (address); function deployBeaconProxy(bytes32 _salt) external returns (address); + + function sendMessageToL1(bytes calldata _message) external; } diff --git a/l2-contracts/contracts/bridge/interfaces/IL2SharedBridge.sol b/l1-contracts/contracts/bridge/interfaces/IL2SharedBridgeLegacyFunctions.sol similarity index 65% rename from l2-contracts/contracts/bridge/interfaces/IL2SharedBridge.sol rename to l1-contracts/contracts/bridge/interfaces/IL2SharedBridgeLegacyFunctions.sol index ee31f6691..42c8f7759 100644 --- a/l2-contracts/contracts/bridge/interfaces/IL2SharedBridge.sol +++ b/l1-contracts/contracts/bridge/interfaces/IL2SharedBridgeLegacyFunctions.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.20; /// @author Matter Labs -interface IL2SharedBridge { +interface IL2SharedBridgeLegacyFunctions { event FinalizeDeposit( address indexed l1Sender, address indexed l2Receiver, @@ -25,14 +25,4 @@ interface IL2SharedBridge { uint256 _amount, bytes calldata _data ) external; - - function withdraw(address _l1Receiver, address _l2Token, uint256 _amount) external; - - function l1TokenAddress(address _l2Token) external view returns (address); - - function l2TokenAddress(address _l1Token) external view returns (address); - - function l1Bridge() external view returns (address); - - function l1SharedBridge() external view returns (address); } diff --git a/l2-contracts/contracts/bridge/interfaces/IL2WrappedBaseToken.sol b/l1-contracts/contracts/bridge/interfaces/IL2WrappedBaseToken.sol similarity index 100% rename from l2-contracts/contracts/bridge/interfaces/IL2WrappedBaseToken.sol rename to l1-contracts/contracts/bridge/interfaces/IL2WrappedBaseToken.sol diff --git a/l1-contracts/contracts/bridge/ntv/IL1NativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/IL1NativeTokenVault.sol new file mode 100644 index 000000000..7d8a00444 --- /dev/null +++ b/l1-contracts/contracts/bridge/ntv/IL1NativeTokenVault.sol @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +import {IL1Nullifier} from "../interfaces/IL1Nullifier.sol"; +import {INativeTokenVault} from "./INativeTokenVault.sol"; + +/// @title L1 Native token vault contract interface +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +/// @notice The NTV is an Asset Handler for the L1AssetRouter to handle native tokens +// is IL1AssetHandler, IL1BaseTokenAssetHandler { +interface IL1NativeTokenVault is INativeTokenVault { + /// @notice The L1Nullifier contract + function L1_NULLIFIER() external view returns (IL1Nullifier); + + event TokenBeaconUpdated(address indexed l2TokenBeacon); +} diff --git a/l2-contracts/contracts/bridge/interfaces/IL2NativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/IL2NativeTokenVault.sol similarity index 66% rename from l2-contracts/contracts/bridge/interfaces/IL2NativeTokenVault.sol rename to l1-contracts/contracts/bridge/ntv/IL2NativeTokenVault.sol index ba3ed0e0b..8938a8c28 100644 --- a/l2-contracts/contracts/bridge/interfaces/IL2NativeTokenVault.sol +++ b/l1-contracts/contracts/bridge/ntv/IL2NativeTokenVault.sol @@ -2,12 +2,11 @@ pragma solidity ^0.8.20; -// import {IL2AssetRouter} from "./IL2AssetRouter.sol"; -import {IL2AssetHandler} from "./IL2AssetHandler.sol"; +import {INativeTokenVault} from "./INativeTokenVault.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev -interface IL2NativeTokenVault is IL2AssetHandler { +interface IL2NativeTokenVault is INativeTokenVault { event FinalizeDeposit( address indexed l1Sender, address indexed l2Receiver, @@ -24,9 +23,5 @@ interface IL2NativeTokenVault is IL2AssetHandler { event L2TokenBeaconUpdated(address indexed l2TokenBeacon, bytes32 indexed l2TokenProxyBytecodeHash); - function tokenAddress(bytes32 _assetId) external view returns (address); - function l2TokenAddress(address _l1Token) external view returns (address); - - function calculateCreate2TokenAddress(address _l1Token) external view returns (address); } diff --git a/l1-contracts/contracts/bridge/ntv/INativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/INativeTokenVault.sol new file mode 100644 index 000000000..03f19bdb3 --- /dev/null +++ b/l1-contracts/contracts/bridge/ntv/INativeTokenVault.sol @@ -0,0 +1,40 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +import {IAssetRouterBase} from "../asset-router/IAssetRouterBase.sol"; + +/// @title Base Native token vault contract interface +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +/// @notice The NTV is an Asset Handler for the L1AssetRouter to handle native tokens +interface INativeTokenVault { + event BridgedTokenBeaconUpdated(address bridgedTokenBeacon, bytes32 bridgedTokenProxyBytecodeHash); + + /// @notice The Weth token address + function WETH_TOKEN() external view returns (address); + + /// @notice The AssetRouter contract + function ASSET_ROUTER() external view returns (IAssetRouterBase); + + /// @notice Returns the total number of specific tokens locked for some chain + function chainBalance(uint256 _chainId, bytes32 _assetId) external view returns (uint256); + + /// @notice Returns if the bridged version of bridged token has been deployed + function isTokenNative(bytes32 assetId) external view returns (bool); + + /// @notice Used to register a token in the vault + function registerToken(address _l1Token) external; + + /// @notice Used to get the assetId of a token + function getAssetId(uint256 _chainId, address _tokenAddress) external view returns (bytes32); + + /// @notice Used to get the the ERC20 data for a token + function getERC20Getters(address _token) external view returns (bytes memory); + + /// @notice Used to get the token address of an assetId + function tokenAddress(bytes32 assetId) external view returns (address); + + /// @notice Used to get the expected bridged token address corresponding to its native counterpart + function calculateCreate2TokenAddress(uint256 _originChainId, address _originToken) external view returns (address); +} diff --git a/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol new file mode 100644 index 000000000..8e52bdb33 --- /dev/null +++ b/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol @@ -0,0 +1,237 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +// solhint-disable reason-string, gas-custom-errors + +import {BeaconProxy} from "@openzeppelin/contracts-v4/proxy/beacon/BeaconProxy.sol"; +import {IBeacon} from "@openzeppelin/contracts-v4/proxy/beacon/IBeacon.sol"; +import {Create2} from "@openzeppelin/contracts-v4/utils/Create2.sol"; + +import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; +import {SafeERC20} from "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol"; + +import {IL1NativeTokenVault} from "./IL1NativeTokenVault.sol"; +import {INativeTokenVault} from "./INativeTokenVault.sol"; +import {NativeTokenVault} from "./NativeTokenVault.sol"; + +import {IL1AssetHandler} from "../interfaces/IL1AssetHandler.sol"; +import {IL1Nullifier} from "../interfaces/IL1Nullifier.sol"; +import {IL1AssetRouter} from "../asset-router/IL1AssetRouter.sol"; + +import {ETH_TOKEN_ADDRESS} from "../../common/Config.sol"; +import {DataEncoding} from "../../common/libraries/DataEncoding.sol"; + +import {Unauthorized, ZeroAddress, NoFundsTransferred, InsufficientChainBalance, WithdrawFailed} from "../../common/L1ContractErrors.sol"; + +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +/// @dev Vault holding L1 native ETH and ERC20 tokens bridged into the ZK chains. +/// @dev Designed for use with a proxy for upgradability. +contract L1NativeTokenVault is IL1NativeTokenVault, IL1AssetHandler, NativeTokenVault { + using SafeERC20 for IERC20; + + /// @dev L1 nullifier contract that handles legacy functions & finalize withdrawal, confirm l2 tx mappings + IL1Nullifier public immutable override L1_NULLIFIER; + + /// @dev Era's chainID + uint256 public immutable ERA_CHAIN_ID; + + /// @dev Contract is expected to be used as proxy implementation. + /// @dev Initialize the implementation to prevent Parity hack. + /// @param _l1WethAddress Address of WETH on deployed chain + /// @param _l1AssetRouter Address of Asset Router on L1. + /// @param _eraChainId ID of Era. + /// @param _l1Nullifier Address of the nullifier contract, which handles transaction progress between L1 and ZK chains. + constructor( + address _l1WethAddress, + address _l1AssetRouter, + uint256 _eraChainId, + IL1Nullifier _l1Nullifier + ) + NativeTokenVault( + _l1WethAddress, + _l1AssetRouter, + DataEncoding.encodeNTVAssetId(block.chainid, ETH_TOKEN_ADDRESS) + ) + { + ERA_CHAIN_ID = _eraChainId; + L1_NULLIFIER = _l1Nullifier; + } + + /// @dev Accepts ether only from the contract that was the shared Bridge. + receive() external payable { + if ((address(L1_NULLIFIER) != msg.sender) && (address(ASSET_ROUTER) != msg.sender)) { + revert Unauthorized(msg.sender); + } + } + + /// @dev Initializes a contract for later use. Expected to be used in the proxy + /// @param _owner Address which can change pause / unpause the NTV + /// 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, address _bridgedTokenBeacon) external initializer { + if (_owner == address(0)) { + revert ZeroAddress(); + } + bridgedTokenBeacon = IBeacon(_bridgedTokenBeacon); + tokenAddress[BASE_TOKEN_ASSET_ID] = ETH_TOKEN_ADDRESS; + isTokenNative[BASE_TOKEN_ASSET_ID] = true; + _transferOwnership(_owner); + } + + /// @notice Transfers tokens from shared bridge as part of the migration process. + /// The shared bridge becomes the L1Nullifier contract. + /// @dev Both ETH and ERC20 tokens can be transferred. Exhausts balance of shared bridge after the first call. + /// @dev Calling second time for the same token will revert. + /// @param _token The address of token to be transferred (address(1) for ether and contract address for ERC20). + function transferFundsFromSharedBridge(address _token) external { + if (_token == ETH_TOKEN_ADDRESS) { + uint256 balanceBefore = address(this).balance; + L1_NULLIFIER.transferTokenToNTV(_token); + uint256 balanceAfter = address(this).balance; + if (balanceAfter <= balanceBefore) { + revert NoFundsTransferred(); + } + } else { + uint256 balanceBefore = IERC20(_token).balanceOf(address(this)); + uint256 nullifierChainBalance = IERC20(_token).balanceOf(address(L1_NULLIFIER)); + require(nullifierChainBalance > 0, "NTV: 0 amount to transfer"); + L1_NULLIFIER.transferTokenToNTV(_token); + uint256 balanceAfter = IERC20(_token).balanceOf(address(this)); + require(balanceAfter - balanceBefore >= nullifierChainBalance, "NTV: wrong amount transferred"); + } + } + + /// @notice Updates chain token balance within NTV to account for tokens transferred from the shared bridge (part of the migration process). + /// @dev Clears chain balance on the shared bridge after the first call. Subsequent calls will not affect the state. + /// @param _token The address of token to be transferred (address(1) for ether and contract address for ERC20). + /// @param _targetChainId The chain ID of the corresponding ZK chain. + function updateChainBalancesFromSharedBridge(address _token, uint256 _targetChainId) external { + uint256 nullifierChainBalance = L1_NULLIFIER.__DEPRECATED_chainBalance(_targetChainId, _token); + bytes32 assetId = DataEncoding.encodeNTVAssetId(block.chainid, _token); + chainBalance[_targetChainId][assetId] = chainBalance[_targetChainId][assetId] + nullifierChainBalance; + L1_NULLIFIER.nullifyChainBalanceByNTV(_targetChainId, _token); + } + + /*////////////////////////////////////////////////////////////// + L1 SPECIFIC FUNCTIONS + //////////////////////////////////////////////////////////////*/ + + function _bridgeBurnNativeToken( + uint256 _chainId, + bytes32 _assetId, + address _prevMsgSender, + // solhint-disable-next-line no-unused-vars + bool _depositChecked, + bytes calldata _data + ) internal override returns (bytes memory _bridgeMintData) { + uint256 _depositAmount; + (_depositAmount, ) = abi.decode(_data, (uint256, address)); + bool depositChecked = IL1AssetRouter(address(ASSET_ROUTER)).transferFundsToNTV( + _assetId, + _depositAmount, + _prevMsgSender + ); + _bridgeMintData = super._bridgeBurnNativeToken({ + _chainId: _chainId, + _assetId: _assetId, + _prevMsgSender: _prevMsgSender, + _depositChecked: depositChecked, + _data: _data + }); + } + + /// @inheritdoc IL1AssetHandler + function bridgeRecoverFailedTransfer( + uint256 _chainId, + bytes32 _assetId, + address _depositSender, + bytes calldata _data + ) external payable override onlyAssetRouter whenNotPaused { + (uint256 _amount, ) = abi.decode(_data, (uint256, address)); + address l1Token = tokenAddress[_assetId]; + if (_amount == 0) { + revert NoFundsTransferred(); + } + + // check that the chain has sufficient balance + if (chainBalance[_chainId][_assetId] < _amount) { + revert InsufficientChainBalance(); + } + chainBalance[_chainId][_assetId] -= _amount; + + if (l1Token == ETH_TOKEN_ADDRESS) { + bool callSuccess; + // Low-level assembly call, to avoid any memory copying (save gas) + assembly { + callSuccess := call(gas(), _depositSender, _amount, 0, 0, 0, 0) + } + require(callSuccess, "NTV: claimFailedDeposit failed, no funds or cannot transfer to receiver"); + } else { + IERC20(l1Token).safeTransfer(_depositSender, _amount); + // Note we don't allow weth deposits anymore, but there might be legacy weth deposits. + // until we add Weth bridging capabilities, we don't wrap/unwrap weth to ether. + } + } + + /*////////////////////////////////////////////////////////////// + INTERNAL & HELPER FUNCTIONS + //////////////////////////////////////////////////////////////*/ + + // get the computed address before the contract DeployWithCreate2 deployed using Bytecode of contract DeployWithCreate2 and salt specified by the sender + function calculateCreate2TokenAddress( + uint256 _originChainId, + address _l1Token + ) public view override(INativeTokenVault, NativeTokenVault) returns (address) { + bytes32 salt = _getCreate2Salt(_originChainId, _l1Token); + return + Create2.computeAddress( + salt, + keccak256(abi.encodePacked(type(BeaconProxy).creationCode, abi.encode(bridgedTokenBeacon, ""))) + ); + } + + /// @notice Transfers tokens from the depositor address to the smart contract address. + /// @param _from The address of the depositor. + /// @param _token The ERC20 token to be transferred. + /// @param _amount The amount to be transferred. + /// @return The difference between the contract balance before and after the transferring of funds. + function _depositFunds(address _from, IERC20 _token, uint256 _amount) internal override returns (uint256) { + address from = _from; + // in the legacy scenario the SharedBridge = L1Nullifier was granting the allowance, we have to transfer from them instead of the user + if ( + _token.allowance(address(ASSET_ROUTER), address(this)) >= _amount && + _token.allowance(_from, address(this)) < _amount + ) { + from = address(ASSET_ROUTER); + } + return super._depositFunds(from, _token, _amount); + } + + function _withdrawFunds(bytes32 _assetId, address _to, address _token, uint256 _amount) internal override { + if (_assetId == BASE_TOKEN_ASSET_ID) { + bool callSuccess; + // Low-level assembly call, to avoid any memory copying (save gas) + assembly { + callSuccess := call(gas(), _to, _amount, 0, 0, 0, 0) + } + if (!callSuccess) { + revert WithdrawFailed(); + } + } else { + // Withdraw funds + IERC20(_token).safeTransfer(_to, _amount); + } + } + + function _deployBeaconProxy(bytes32 _salt) internal override returns (BeaconProxy proxy) { + // Use CREATE2 to deploy the BeaconProxy + + address proxyAddress = Create2.deploy( + 0, + _salt, + abi.encodePacked(type(BeaconProxy).creationCode, abi.encode(bridgedTokenBeacon, "")) + ); + return BeaconProxy(payable(proxyAddress)); + } +} diff --git a/l1-contracts/contracts/bridge/ntv/L2NativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/L2NativeTokenVault.sol new file mode 100644 index 000000000..bb4d6743d --- /dev/null +++ b/l1-contracts/contracts/bridge/ntv/L2NativeTokenVault.sol @@ -0,0 +1,215 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +import {BeaconProxy} from "@openzeppelin/contracts-v4/proxy/beacon/BeaconProxy.sol"; +import {IBeacon} from "@openzeppelin/contracts-v4/proxy/beacon/IBeacon.sol"; +import {UpgradeableBeacon} from "@openzeppelin/contracts-v4/proxy/beacon/UpgradeableBeacon.sol"; + +import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; +import {SafeERC20} from "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol"; + +import {INativeTokenVault} from "./INativeTokenVault.sol"; +import {IL2NativeTokenVault} from "./IL2NativeTokenVault.sol"; +import {NativeTokenVault} from "./NativeTokenVault.sol"; + +import {IL2SharedBridgeLegacy} from "../interfaces/IL2SharedBridgeLegacy.sol"; +import {BridgedStandardERC20} from "../BridgedStandardERC20.sol"; + +import {DEPLOYER_SYSTEM_CONTRACT, L2_ASSET_ROUTER_ADDR} from "../../common/L2ContractAddresses.sol"; +import {L2ContractHelper, IContractDeployer} from "../../common/libraries/L2ContractHelper.sol"; + +import {SystemContractsCaller} from "../../common/libraries/SystemContractsCaller.sol"; +import {DataEncoding} from "../../common/libraries/DataEncoding.sol"; + +import {EmptyAddress, EmptyBytes32, AddressMismatch, DeployFailed, AssetIdNotSupported} from "../../common/L1ContractErrors.sol"; + +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +/// @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 L2NativeTokenVault is IL2NativeTokenVault, NativeTokenVault { + using SafeERC20 for IERC20; + + /// @dev Chain ID of L1 for bridging reasons. + uint256 public immutable L1_CHAIN_ID; + + IL2SharedBridgeLegacy public immutable L2_LEGACY_SHARED_BRIDGE; + + /// @dev Bytecode hash of the proxy for tokens deployed by the bridge. + bytes32 internal l2TokenProxyBytecodeHash; + + /// @notice Initializes the bridge contract for later use. + /// @param _l1ChainId The L1 chain id differs between mainnet and testnets. + /// @param _l2TokenProxyBytecodeHash The bytecode hash of the proxy for tokens deployed by the bridge. + /// @param _aliasedOwner The address of the governor contract. + /// @param _legacySharedBridge The address of the L2 legacy shared bridge. + /// @param _bridgedTokenBeacon The address of the L2 token beacon for legacy chains. + /// @param _contractsDeployedAlready Ensures beacon proxy for standard ERC20 has not been deployed. + /// @param _wethToken Address of WETH on deployed chain + constructor( + uint256 _l1ChainId, + address _aliasedOwner, + bytes32 _l2TokenProxyBytecodeHash, + address _legacySharedBridge, + address _bridgedTokenBeacon, + bool _contractsDeployedAlready, + address _wethToken, + bytes32 _baseTokenAssetId + ) NativeTokenVault(_wethToken, L2_ASSET_ROUTER_ADDR, _baseTokenAssetId) { + L1_CHAIN_ID = _l1ChainId; + L2_LEGACY_SHARED_BRIDGE = IL2SharedBridgeLegacy(_legacySharedBridge); + + if (_l2TokenProxyBytecodeHash == bytes32(0)) { + revert EmptyBytes32(); + } + if (_aliasedOwner == address(0)) { + revert EmptyAddress(); + } + + l2TokenProxyBytecodeHash = _l2TokenProxyBytecodeHash; + _transferOwnership(_aliasedOwner); + + if (_contractsDeployedAlready) { + if (_bridgedTokenBeacon == address(0)) { + revert EmptyAddress(); + } + bridgedTokenBeacon = IBeacon(_bridgedTokenBeacon); + } else { + address l2StandardToken = address(new BridgedStandardERC20{salt: bytes32(0)}()); + + UpgradeableBeacon tokenBeacon = new UpgradeableBeacon{salt: bytes32(0)}(l2StandardToken); + + tokenBeacon.transferOwnership(owner()); + bridgedTokenBeacon = IBeacon(address(tokenBeacon)); + emit L2TokenBeaconUpdated(address(bridgedTokenBeacon), _l2TokenProxyBytecodeHash); + } + } + + /// @notice Sets the legacy token asset ID for the given L2 token address. + function setLegacyTokenAssetId(address _l2TokenAddress) public { + address l1TokenAddress = L2_LEGACY_SHARED_BRIDGE.l1TokenAddress(_l2TokenAddress); + bytes32 assetId = DataEncoding.encodeNTVAssetId(L1_CHAIN_ID, l1TokenAddress); + tokenAddress[assetId] = _l2TokenAddress; + } + + /// @notice Ensures that the token is deployed. + /// @param _originChainId The chain ID of the origin chain. + /// @param _assetId The asset ID. + /// @param _originToken The origin token address. + /// @param _erc20Data The ERC20 data. + /// @return expectedToken The token address. + function _ensureTokenDeployed( + uint256 _originChainId, + bytes32 _assetId, + address _originToken, + bytes memory _erc20Data + ) internal override returns (address expectedToken) { + expectedToken = _assetIdCheck(_originChainId, _assetId, _originToken); + address l1LegacyToken; + if (address(L2_LEGACY_SHARED_BRIDGE) != address(0)) { + l1LegacyToken = L2_LEGACY_SHARED_BRIDGE.l1TokenAddress(expectedToken); + } + + if (l1LegacyToken != address(0)) { + /// token is a legacy token, no need to deploy + if (l1LegacyToken != _originToken) { + revert AddressMismatch(_originToken, l1LegacyToken); + } + tokenAddress[_assetId] = expectedToken; + } else { + super._ensureTokenDeployedInner({ + _originChainId: _originChainId, + _assetId: _assetId, + _originToken: _originToken, + _erc20Data: _erc20Data, + _expectedToken: expectedToken + }); + } + } + + /// @notice Deploys the beacon proxy for the L2 token, while using ContractDeployer system contract. + /// @dev This function uses raw call to ContractDeployer to make sure that exactly `l2TokenProxyBytecodeHash` is used + /// for the code of the proxy. + /// @param _salt The salt used for beacon proxy deployment of L2 bridged token. + /// @return proxy The beacon proxy, i.e. L2 bridged token. + function _deployBeaconProxy(bytes32 _salt) internal override returns (BeaconProxy proxy) { + if (address(L2_LEGACY_SHARED_BRIDGE) == address(0)) { + // Deploy the beacon proxy for the L2 token + + (bool success, bytes memory returndata) = SystemContractsCaller.systemCallWithReturndata( + uint32(gasleft()), + DEPLOYER_SYSTEM_CONTRACT, + 0, + abi.encodeCall( + IContractDeployer.create2, + (_salt, l2TokenProxyBytecodeHash, abi.encode(address(bridgedTokenBeacon), "")) + ) + ); + + // The deployment should be successful and return the address of the proxy + if (!success) { + revert DeployFailed(); + } + proxy = BeaconProxy(abi.decode(returndata, (address))); + } else { + // Deploy the beacon proxy for the L2 token + address l2TokenAddr = L2_LEGACY_SHARED_BRIDGE.deployBeaconProxy(_salt); + proxy = BeaconProxy(payable(l2TokenAddr)); + } + } + + function _withdrawFunds(bytes32 _assetId, address _to, address _token, uint256 _amount) internal override { + if (_assetId == BASE_TOKEN_ASSET_ID) { + revert AssetIdNotSupported(BASE_TOKEN_ASSET_ID); + } else { + // Withdraw funds + IERC20(_token).safeTransfer(_to, _amount); + } + } + + /*////////////////////////////////////////////////////////////// + INTERNAL & HELPER FUNCTIONS + //////////////////////////////////////////////////////////////*/ + + /// @notice Calculates L2 wrapped token address given the currently stored beacon proxy bytecode hash and beacon address. + /// @param _l1Token The address of token on L1. + /// @return Address of an L2 token counterpart. + function calculateCreate2TokenAddress( + uint256 _originChainId, + address _l1Token + ) public view override(INativeTokenVault, NativeTokenVault) returns (address) { + bytes32 constructorInputHash = keccak256(abi.encode(address(bridgedTokenBeacon), "")); + bytes32 salt = _getCreate2Salt(_originChainId, _l1Token); + if (address(L2_LEGACY_SHARED_BRIDGE) != address(0)) { + return L2_LEGACY_SHARED_BRIDGE.l2TokenAddress(_l1Token); + } else { + return + L2ContractHelper.computeCreate2Address( + address(this), + salt, + l2TokenProxyBytecodeHash, + constructorInputHash + ); + } + } + + /// @notice Calculates the salt for the Create2 deployment of the L2 token. + function _getCreate2Salt(uint256 _originChainId, address _l1Token) internal view override returns (bytes32 salt) { + salt = _originChainId == L1_CHAIN_ID + ? bytes32(uint256(uint160(_l1Token))) + : keccak256(abi.encode(_originChainId, _l1Token)); + } + + /*////////////////////////////////////////////////////////////// + LEGACY FUNCTIONS + //////////////////////////////////////////////////////////////*/ + + /// @notice Calculates L2 wrapped token address corresponding to L1 token counterpart. + /// @param _l1Token The address of token on L1. + /// @return expectedToken The address of token on L2. + function l2TokenAddress(address _l1Token) public view returns (address expectedToken) { + bytes32 expectedAssetId = DataEncoding.encodeNTVAssetId(L1_CHAIN_ID, _l1Token); + expectedToken = tokenAddress[expectedAssetId]; + } +} diff --git a/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol new file mode 100644 index 000000000..2ae2c9ba6 --- /dev/null +++ b/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol @@ -0,0 +1,407 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +// solhint-disable reason-string, gas-custom-errors + +import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/access/Ownable2StepUpgradeable.sol"; +import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/security/PausableUpgradeable.sol"; +import {BeaconProxy} from "@openzeppelin/contracts-v4/proxy/beacon/BeaconProxy.sol"; +import {IBeacon} from "@openzeppelin/contracts-v4/proxy/beacon/IBeacon.sol"; + +import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; +import {SafeERC20} from "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol"; + +import {IBridgedStandardToken} from "../interfaces/IBridgedStandardToken.sol"; +import {INativeTokenVault} from "./INativeTokenVault.sol"; +import {IAssetHandler} from "../interfaces/IAssetHandler.sol"; +import {IAssetRouterBase} from "../asset-router/IAssetRouterBase.sol"; +import {DataEncoding} from "../../common/libraries/DataEncoding.sol"; + +import {BridgedStandardERC20} from "../BridgedStandardERC20.sol"; +import {BridgeHelper} from "../BridgeHelper.sol"; + +import {EmptyDeposit, Unauthorized, TokensWithFeesNotSupported, TokenNotSupported, NonEmptyMsgValue, ValueMismatch, InsufficientChainBalance, AddressMismatch, AssetIdMismatch, AmountMustBeGreaterThanZero} from "../../common/L1ContractErrors.sol"; + +/// @author Matter Labs +/// @custom:security-contact security@matterlabs.dev +/// @dev Vault holding L1 native ETH and ERC20 tokens bridged into the ZK chains. +/// @dev Designed for use with a proxy for upgradability. +abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2StepUpgradeable, PausableUpgradeable { + using SafeERC20 for IERC20; + + /// @dev The address of the WETH token. + address public immutable override WETH_TOKEN; + + /// @dev L1 Shared Bridge smart contract that handles communication with its counterparts on L2s + IAssetRouterBase public immutable override ASSET_ROUTER; + + /// @dev The assetId of the base token. + bytes32 public immutable BASE_TOKEN_ASSET_ID; + + /// @dev Contract that stores the implementation address for token. + /// @dev For more details see https://docs.openzeppelin.com/contracts/3.x/api/proxy#UpgradeableBeacon. + IBeacon public bridgedTokenBeacon; + + /// @dev Maps token balances for each chain to prevent unauthorized spending across ZK chains. + /// This serves as a security measure until hyperbridging is implemented. + /// NOTE: this function may be removed in the future, don't rely on it! + mapping(uint256 chainId => mapping(bytes32 token => uint256 balance)) public chainBalance; + + /// @dev A mapping assetId => tokenAddress + mapping(bytes32 assetId => address tokenAddress) public tokenAddress; + + /// @dev A mapping assetId => isTokenBridged + mapping(bytes32 assetId => bool bridged) public isTokenNative; + + /** + * @dev This empty reserved space is put in place to allow future versions to add new + * variables without shifting down storage in the inheritance chain. + * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps + */ + uint256[47] private __gap; + + /// @notice Checks that the message sender is the bridgehub. + modifier onlyAssetRouter() { + if (msg.sender != address(ASSET_ROUTER)) { + revert Unauthorized(msg.sender); + } + _; + } + + /// @dev Contract is expected to be used as proxy implementation. + /// @dev Disable the initialization to prevent Parity hack. + /// @param _wethToken Address of WETH on deployed chain + /// @param _assetRouter Address of assetRouter + constructor(address _wethToken, address _assetRouter, bytes32 _baseTokenAssetId) { + _disableInitializers(); + ASSET_ROUTER = IAssetRouterBase(_assetRouter); + WETH_TOKEN = _wethToken; + BASE_TOKEN_ASSET_ID = _baseTokenAssetId; + } + + /// @notice Registers tokens within the NTV. + /// @dev The goal was to allow bridging native tokens automatically, by registering them on the fly. + /// @notice Allows the bridge to register a token address for the vault. + /// @notice No access control is ok, since the bridging of tokens should be permissionless. This requires permissionless registration. + function registerToken(address _nativeToken) external { + if (_nativeToken == WETH_TOKEN) { + revert TokenNotSupported(WETH_TOKEN); + } + require(_nativeToken.code.length > 0, "NTV: empty token"); + bytes32 assetId = DataEncoding.encodeNTVAssetId(block.chainid, _nativeToken); + ASSET_ROUTER.setAssetHandlerAddressThisChain(bytes32(uint256(uint160(_nativeToken))), address(this)); + tokenAddress[assetId] = _nativeToken; + isTokenNative[assetId] = true; + } + + /*////////////////////////////////////////////////////////////// + FINISH TRANSACTION FUNCTIONS + //////////////////////////////////////////////////////////////*/ + + /// @inheritdoc IAssetHandler + /// @notice Used when the chain receives a transfer from L1 Shared Bridge and correspondingly mints the asset. + /// @param _chainId The chainId that the message is from. + /// @param _assetId The assetId of the asset being bridged. + /// @param _data The abi.encoded transfer data. + function bridgeMint( + uint256 _chainId, + bytes32 _assetId, + bytes calldata _data + ) external payable override onlyAssetRouter whenNotPaused { + address receiver; + uint256 amount; + if (isTokenNative[_assetId]) { + (receiver, amount) = _bridgeMintNativeToken(_chainId, _assetId, _data); + } else { + (receiver, amount) = _bridgeMintBridgedToken(_chainId, _assetId, _data); + } + // solhint-disable-next-line func-named-parameters + emit BridgeMint(_chainId, _assetId, receiver, amount); + } + + function _bridgeMintBridgedToken( + uint256 _originChainId, + bytes32 _assetId, + bytes calldata _data + ) internal virtual returns (address receiver, uint256 amount) { + // Either it was bridged before, therefore address is not zero, or it is first time bridging and standard erc20 will be deployed + address token = tokenAddress[_assetId]; + bytes memory erc20Data; + address originToken; + // slither-disable-next-line unused-return + (, receiver, originToken, amount, erc20Data) = DataEncoding.decodeBridgeMintData(_data); + + if (token == address(0)) { + token = _ensureTokenDeployed(_originChainId, _assetId, originToken, erc20Data); + } + + IBridgedStandardToken(token).bridgeMint(receiver, amount); + emit BridgeMint(_originChainId, _assetId, receiver, amount); + } + + function _bridgeMintNativeToken( + uint256 _originChainId, + bytes32 _assetId, + bytes calldata _data + ) internal returns (address receiver, uint256 amount) { + address token = tokenAddress[_assetId]; + (amount, receiver) = abi.decode(_data, (uint256, address)); + // Check that the chain has sufficient balance + if (chainBalance[_originChainId][_assetId] < amount) { + revert InsufficientChainBalance(); + } + chainBalance[_originChainId][_assetId] -= amount; + + _withdrawFunds(_assetId, receiver, token, amount); + emit BridgeMint(_originChainId, _assetId, receiver, amount); + } + + function _withdrawFunds(bytes32 _assetId, address _to, address _token, uint256 _amount) internal virtual; + + /*////////////////////////////////////////////////////////////// + Start transaction Functions + //////////////////////////////////////////////////////////////*/ + + /// @inheritdoc IAssetHandler + /// @notice Allows bridgehub to acquire mintValue for L1->L2 transactions. + /// @dev In case of native token vault _data is the tuple of _depositAmount and _receiver. + function bridgeBurn( + uint256 _chainId, + uint256, + bytes32 _assetId, + address _prevMsgSender, + bytes calldata _data + ) external payable override onlyAssetRouter whenNotPaused returns (bytes memory _bridgeMintData) { + if (!isTokenNative[_assetId]) { + _bridgeMintData = _bridgeBurnBridgedToken(_chainId, _assetId, _prevMsgSender, _data); + } else { + _bridgeMintData = _bridgeBurnNativeToken({ + _chainId: _chainId, + _assetId: _assetId, + _prevMsgSender: _prevMsgSender, + _depositChecked: false, + _data: _data + }); + } + } + + function _bridgeBurnBridgedToken( + uint256 _chainId, + bytes32 _assetId, + address _prevMsgSender, + bytes calldata _data + ) internal returns (bytes memory _bridgeMintData) { + (uint256 _amount, address _receiver) = abi.decode(_data, (uint256, address)); + if (_amount == 0) { + // "Amount cannot be zero"); + revert AmountMustBeGreaterThanZero(); + } + + address bridgedToken = tokenAddress[_assetId]; + IBridgedStandardToken(bridgedToken).bridgeBurn(_prevMsgSender, _amount); + + emit BridgeBurn({ + chainId: _chainId, + assetId: _assetId, + sender: _prevMsgSender, + receiver: _receiver, + amount: _amount + }); + _bridgeMintData = _data; + } + + function _bridgeBurnNativeToken( + uint256 _chainId, + bytes32 _assetId, + address _prevMsgSender, + bool _depositChecked, + bytes calldata _data + ) internal virtual returns (bytes memory _bridgeMintData) { + (uint256 _depositAmount, address _receiver) = abi.decode(_data, (uint256, address)); + + uint256 amount; + address nativeToken = tokenAddress[_assetId]; + if (_assetId == BASE_TOKEN_ASSET_ID) { + amount = msg.value; + + // In the old SDK/contracts the user had to always provide `0` as the deposit amount for ETH token, while + // ultimately the provided `msg.value` was used as the deposit amount. This check is needed for backwards compatibility. + if (_depositAmount == 0) { + _depositAmount = amount; + } + + if (_depositAmount != amount) { + revert ValueMismatch(amount, msg.value); + } + } else { + // The Bridgehub also checks this, but we want to be sure + if (msg.value != 0) { + revert NonEmptyMsgValue(); + } + + amount = _depositAmount; + if (!_depositChecked) { + uint256 expectedDepositAmount = _depositFunds(_prevMsgSender, IERC20(nativeToken), _depositAmount); // note if _prevMsgSender is this contract, this will return 0. This does not happen. + // The token has non-standard transfer logic + if (amount != expectedDepositAmount) { + revert TokensWithFeesNotSupported(); + } + } + } + if (amount == 0) { + // empty deposit amount + revert EmptyDeposit(); + } + + chainBalance[_chainId][_assetId] += amount; + + _bridgeMintData = DataEncoding.encodeBridgeMintData({ + _prevMsgSender: _prevMsgSender, + _l2Receiver: _receiver, + _l1Token: nativeToken, + _amount: amount, + _erc20Metadata: getERC20Getters(nativeToken) + }); + + emit BridgeBurn({ + chainId: _chainId, + assetId: _assetId, + sender: _prevMsgSender, + receiver: _receiver, + amount: amount + }); + } + + /*////////////////////////////////////////////////////////////// + INTERNAL & HELPER FUNCTIONS + //////////////////////////////////////////////////////////////*/ + + /// @notice Transfers tokens from the depositor address to the smart contract address. + /// @param _from The address of the depositor. + /// @param _token The ERC20 token to be transferred. + /// @param _amount The amount to be transferred. + /// @return The difference between the contract balance before and after the transferring of funds. + function _depositFunds(address _from, IERC20 _token, uint256 _amount) internal virtual returns (uint256) { + uint256 balanceBefore = _token.balanceOf(address(this)); + // slither-disable-next-line arbitrary-send-erc20 + _token.safeTransferFrom(_from, address(this), _amount); + uint256 balanceAfter = _token.balanceOf(address(this)); + + return balanceAfter - balanceBefore; + } + + /// @param _token The address of token of interest. + /// @dev Receives and parses (name, symbol, decimals) from the token contract + function getERC20Getters(address _token) public view override returns (bytes memory) { + return BridgeHelper.getERC20Getters(_token); + } + + /// @notice Returns the parsed assetId. + /// @param _nativeToken The address of the token to be parsed. + /// @dev Shows the assetId for a given chain and token address + function getAssetId(uint256 _chainId, address _nativeToken) external pure override returns (bytes32) { + return DataEncoding.encodeNTVAssetId(_chainId, _nativeToken); + } + + /*////////////////////////////////////////////////////////////// + TOKEN DEPLOYER FUNCTIONS + //////////////////////////////////////////////////////////////*/ + + function _ensureTokenDeployed( + uint256 _originChainId, + bytes32 _assetId, + address _originToken, + bytes memory _erc20Data + ) internal virtual returns (address expectedToken) { + expectedToken = _assetIdCheck(_originChainId, _assetId, _originToken); + _ensureTokenDeployedInner({ + _originChainId: _originChainId, + _assetId: _assetId, + _originToken: _originToken, + _erc20Data: _erc20Data, + _expectedToken: expectedToken + }); + } + + function _assetIdCheck( + uint256 _originChainId, + bytes32 _assetId, + address _originToken + ) internal view returns (address expectedToken) { + expectedToken = calculateCreate2TokenAddress(_originChainId, _originToken); + bytes32 expectedAssetId = DataEncoding.encodeNTVAssetId(_originChainId, _originToken); + if (_assetId != expectedAssetId) { + // Make sure that a NativeTokenVault sent the message + revert AssetIdMismatch(_assetId, expectedAssetId); + } + } + + function _ensureTokenDeployedInner( + uint256 _originChainId, + bytes32 _assetId, + address _originToken, + bytes memory _erc20Data, + address _expectedToken + ) internal { + address deployedToken = _deployBridgedToken(_originChainId, _originToken, _erc20Data); + if (deployedToken != _expectedToken) { + revert AddressMismatch(_expectedToken, deployedToken); + } + + tokenAddress[_assetId] = _expectedToken; + } + + /// @notice Calculates the bridged token address corresponding to native token counterpart. + /// @param _bridgeToken The address of native token. + /// @return The address of bridged token. + function calculateCreate2TokenAddress( + uint256 _originChainId, + address _bridgeToken + ) public view virtual override returns (address); + + /// @notice Deploys and initializes the bridged token for the native counterpart. + /// @param _nativeToken The address of native token. + /// @param _erc20Data The ERC20 metadata of the token deployed. + /// @return The address of the beacon proxy (bridged token). + function _deployBridgedToken( + uint256 _originChainId, + address _nativeToken, + bytes memory _erc20Data + ) internal returns (address) { + bytes32 salt = _getCreate2Salt(_originChainId, _nativeToken); + + BeaconProxy l2Token = _deployBeaconProxy(salt); + BridgedStandardERC20(address(l2Token)).bridgeInitialize(_nativeToken, _erc20Data); + + return address(l2Token); + } + + /// @notice Converts the L1 token address to the create2 salt of deployed L2 token. + /// @param _l1Token The address of token on L1. + /// @return salt The salt used to compute address of bridged token on L2 and for beacon proxy deployment. + function _getCreate2Salt(uint256 _originChainId, address _l1Token) internal view virtual returns (bytes32 salt) { + salt = keccak256(abi.encode(_originChainId, _l1Token)); + } + + /// @notice Deploys the beacon proxy for the bridged token. + /// @dev This function uses raw call to ContractDeployer to make sure that exactly `l2TokenProxyBytecodeHash` is used + /// for the code of the proxy. + /// @param _salt The salt used for beacon proxy deployment of the bridged token (we pass the native token address). + /// @return proxy The beacon proxy, i.e. bridged token. + function _deployBeaconProxy(bytes32 _salt) internal virtual returns (BeaconProxy proxy); + + /*////////////////////////////////////////////////////////////// + PAUSE + //////////////////////////////////////////////////////////////*/ + + /// @notice Pauses all functions marked with the `whenNotPaused` modifier. + function pause() external onlyOwner { + _pause(); + } + + /// @notice Unpauses the contract, allowing all functions marked with the `whenNotPaused` modifier to be called again. + function unpause() external onlyOwner { + _unpause(); + } +} diff --git a/l1-contracts/contracts/bridgehub/Bridgehub.sol b/l1-contracts/contracts/bridgehub/Bridgehub.sol index 262d4c148..f3d318fa3 100644 --- a/l1-contracts/contracts/bridgehub/Bridgehub.sol +++ b/l1-contracts/contracts/bridgehub/Bridgehub.sol @@ -10,7 +10,8 @@ import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/ac import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/security/PausableUpgradeable.sol"; import {IBridgehub, L2TransactionRequestDirect, L2TransactionRequestTwoBridgesOuter, L2TransactionRequestTwoBridgesInner, BridgehubMintCTMAssetData, BridgehubBurnCTMAssetData} from "./IBridgehub.sol"; -import {IL1AssetRouter} from "../bridge/interfaces/IL1AssetRouter.sol"; +import {IAssetRouterBase} from "../bridge/asset-router/IAssetRouterBase.sol"; +import {IL1AssetRouter} from "../bridge/asset-router/IL1AssetRouter.sol"; import {IL1BaseTokenAssetHandler} from "../bridge/interfaces/IL1BaseTokenAssetHandler.sol"; import {IChainTypeManager} from "../state-transition/IChainTypeManager.sol"; import {ReentrancyGuard} from "../common/ReentrancyGuard.sol"; @@ -34,7 +35,7 @@ import {AssetHandlerNotRegistered, ZKChainLimitReached, Unauthorized, CTMAlready contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, PausableUpgradeable { using EnumerableMap for EnumerableMap.UintToAddressMap; - /// @notice the asset id of Eth + /// @notice the asset id of Eth. This is only used on L1. bytes32 internal immutable ETH_TOKEN_ASSET_ID; /// @notice The chain id of L1. This contract can be deployed on multiple layers, but this value is still equal to the @@ -46,7 +47,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus uint256 public immutable MAX_NUMBER_OF_ZK_CHAINS; /// @notice all the ether and ERC20 tokens are held by NativeVaultToken managed by this shared Bridge. - IL1AssetRouter public sharedBridge; + address public assetRouter; /// @notice ChainTypeManagers that are registered, and ZKchains that use these CTMs can use this bridgehub as settlement layer. mapping(address chainTypeManager => bool) public chainTypeManagerIsRegistered; @@ -123,7 +124,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus } modifier onlyAssetRouter() { - require(msg.sender == address(sharedBridge), "BH: not asset router"); + require(msg.sender == assetRouter, "BH: not asset router"); _; } @@ -140,6 +141,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus // Note that this assumes that the bridgehub only accepts transactions on chains with ETH base token only. // This is indeed true, since the only methods where this immutable is used are the ones with `onlyL1` modifier. + // We will change this with interop. ETH_TOKEN_ASSET_ID = DataEncoding.encodeNTVAssetId(L1_CHAIN_ID, ETH_TOKEN_ADDRESS); _transferOwnership(_owner); whitelistedSettlementLayers[_l1ChainId] = true; @@ -150,7 +152,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @param _owner the owner of the contract function initialize(address _owner) external reentrancyGuardInitializer { _transferOwnership(_owner); - + assetIdIsRegistered[ETH_TOKEN_ASSET_ID] = true; whitelistedSettlementLayers[L1_CHAIN_ID] = true; } @@ -188,15 +190,15 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @notice To set the addresses of some of the ecosystem contracts, only Owner. Not done in initialize, as /// the order of deployment is Bridgehub, other contracts, and then we call this. - /// @param _sharedBridge the shared bridge address + /// @param _assetRouter the shared bridge address /// @param _l1CtmDeployer the ctm deployment tracker address. Note, that the address of the L1 CTM deployer is provided. /// @param _messageRoot the message root address function setAddresses( - address _sharedBridge, + address _assetRouter, ICTMDeploymentTracker _l1CtmDeployer, IMessageRoot _messageRoot ) external onlyOwner { - sharedBridge = IL1AssetRouter(_sharedBridge); + assetRouter = _assetRouter; l1CtmDeployer = _l1CtmDeployer; messageRoot = _messageRoot; } @@ -343,7 +345,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus require(assetIdIsRegistered[_baseTokenAssetId], "BH: asset id not registered"); - if (address(sharedBridge) == address(0)) { + if (assetRouter == address(0)) { revert SharedBridgeNotSet(); } if (chainTypeManager[_chainId] != address(0)) { @@ -358,7 +360,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus address chainAddress = IChainTypeManager(_chainTypeManager).createNewChain({ _chainId: _chainId, _baseTokenAssetId: _baseTokenAssetId, - _sharedBridge: address(sharedBridge), + _assetRouter: assetRouter, _admin: _admin, _initData: _initData, _factoryDeps: _factoryDeps @@ -386,7 +388,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @notice baseToken function, which takes chainId as input, reads assetHandler from AR, and tokenAddress from AH function baseToken(uint256 _chainId) public view returns (address) { bytes32 baseTokenAssetId = baseTokenAssetId[_chainId]; - address assetHandlerAddress = sharedBridge.assetHandlerAddress(baseTokenAssetId); + address assetHandlerAddress = IAssetRouterBase(assetRouter).assetHandlerAddress(baseTokenAssetId); // It is possible that the asset handler is not deployed for a chain on the current layer. // In this case we throw an error. @@ -433,7 +435,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus Mailbox forwarder //////////////////////////////////////////////////////////////*/ - /// @notice the mailbox is called directly after the sharedBridge received the deposit + /// @notice the mailbox is called directly after the assetRouter received the deposit /// this assumes that either ether is the base token or /// the msg.sender has approved mintValue allowance for the nativeTokenVault. /// This means this is not ideal for contract calls, as the contract would have to handle token allowance of the base Token. @@ -456,7 +458,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus } // slither-disable-next-line arbitrary-send-eth - sharedBridge.bridgehubDepositBaseToken{value: msg.value}( + IL1AssetRouter(assetRouter).bridgehubDepositBaseToken{value: msg.value}( _request.chainId, tokenAssetId, msg.sender, @@ -464,9 +466,9 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus ); } - address zkChain = zkChainMap.get(_request.chainId); - address refundRecipient = AddressAliasHelper.actualRefundRecipient(_request.refundRecipient, msg.sender); - canonicalTxHash = IZKChain(zkChain).bridgehubRequestL2Transaction( + canonicalTxHash = _sendRequest( + _request.chainId, + _request.refundRecipient, BridgehubL2TransactionRequest({ sender: msg.sender, contractL2: _request.l2Contract, @@ -476,12 +478,12 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus l2GasLimit: _request.l2GasLimit, l2GasPerPubdataByteLimit: _request.l2GasPerPubdataByteLimit, factoryDeps: _request.factoryDeps, - refundRecipient: refundRecipient + refundRecipient: address(0) }) ); } - /// @notice After depositing funds to the sharedBridge, the secondBridge is called + /// @notice After depositing funds to the assetRouter, the secondBridge is called /// to return the actual L2 message which is sent to the Mailbox. /// This assumes that either ether is the base token or /// the msg.sender has approved the nativeTokenVault with the mintValue, @@ -516,7 +518,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus } // slither-disable-next-line arbitrary-send-eth - sharedBridge.bridgehubDepositBaseToken{value: baseTokenMsgValue}( + IL1AssetRouter(assetRouter).bridgehubDepositBaseToken{value: baseTokenMsgValue}( _request.chainId, tokenAssetId, msg.sender, @@ -524,8 +526,6 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus ); } - address zkChain = zkChainMap.get(_request.chainId); - if (_request.secondBridgeAddress <= BRIDGEHUB_MIN_SECOND_BRIDGE_ADDRESS) { revert AddressTooLow(_request.secondBridgeAddress); } @@ -543,9 +543,9 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus revert WrongMagicValue(uint256(TWO_BRIDGES_MAGIC_VALUE), uint256(outputRequest.magicValue)); } - address refundRecipient = AddressAliasHelper.actualRefundRecipient(_request.refundRecipient, msg.sender); - - canonicalTxHash = IZKChain(zkChain).bridgehubRequestL2Transaction( + canonicalTxHash = _sendRequest( + _request.chainId, + _request.refundRecipient, BridgehubL2TransactionRequest({ sender: _request.secondBridgeAddress, contractL2: outputRequest.l2Contract, @@ -555,7 +555,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus l2GasLimit: _request.l2GasLimit, l2GasPerPubdataByteLimit: _request.l2GasPerPubdataByteLimit, factoryDeps: outputRequest.factoryDeps, - refundRecipient: refundRecipient + refundRecipient: address(0) }) ); @@ -566,6 +566,23 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus ); } + /// @notice This function is used to send a request to the ZK chain. + /// @param _chainId the chainId of the chain + /// @param _refundRecipient the refund recipient + /// @param _request the request + /// @return canonicalTxHash the canonical transaction hash + function _sendRequest( + uint256 _chainId, + address _refundRecipient, + BridgehubL2TransactionRequest memory _request + ) internal returns (bytes32 canonicalTxHash) { + address refundRecipient = AddressAliasHelper.actualRefundRecipient(_refundRecipient, msg.sender); + _request.refundRecipient = refundRecipient; + address zkChain = zkChainMap.get(_chainId); + + canonicalTxHash = IZKChain(zkChain).bridgehubRequestL2Transaction(_request); + } + /// @notice Used to forward a transaction on the gateway to the chains mailbox (from L1). /// @param _chainId the chainId of the chain /// @param _canonicalTxHash the canonical transaction hash @@ -669,100 +686,103 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @param _data the data for the migration function bridgeBurn( uint256 _settlementChainId, - uint256, // mintValue + uint256, // msgValue bytes32 _assetId, address _prevMsgSender, bytes calldata _data ) external payable override onlyAssetRouter whenMigrationsNotPaused returns (bytes memory bridgehubMintData) { require(whitelistedSettlementLayers[_settlementChainId], "BH: SL not whitelisted"); - BridgehubBurnCTMAssetData memory bridgeData = abi.decode(_data, (BridgehubBurnCTMAssetData)); - require(_assetId == ctmAssetIdFromChainId(bridgeData.chainId), "BH: assetInfo 1"); - require(settlementLayer[bridgeData.chainId] == block.chainid, "BH: not current SL"); - settlementLayer[bridgeData.chainId] = _settlementChainId; + BridgehubBurnCTMAssetData memory bridgehubData = abi.decode(_data, (BridgehubBurnCTMAssetData)); + require(_assetId == ctmAssetIdFromChainId(bridgehubData.chainId), "BH: assetInfo 1"); + require(settlementLayer[bridgehubData.chainId] == block.chainid, "BH: not current SL"); + settlementLayer[bridgehubData.chainId] = _settlementChainId; - address zkChain = zkChainMap.get(bridgeData.chainId); + address zkChain = zkChainMap.get(bridgehubData.chainId); require(zkChain != address(0), "BH: zkChain not registered"); require(_prevMsgSender == IZKChain(zkChain).getAdmin(), "BH: incorrect sender"); - bytes memory ctmMintData = IChainTypeManager(chainTypeManager[bridgeData.chainId]).forwardedBridgeBurn( - bridgeData.chainId, - bridgeData.ctmData + bytes memory ctmMintData = IChainTypeManager(chainTypeManager[bridgehubData.chainId]).forwardedBridgeBurn( + bridgehubData.chainId, + bridgehubData.ctmData ); bytes memory chainMintData = IZKChain(zkChain).forwardedBridgeBurn( zkChainMap.get(_settlementChainId), _prevMsgSender, - bridgeData.chainData + bridgehubData.chainData ); BridgehubMintCTMAssetData memory bridgeMintStruct = BridgehubMintCTMAssetData({ - chainId: bridgeData.chainId, - baseTokenAssetId: baseTokenAssetId[bridgeData.chainId], + chainId: bridgehubData.chainId, + baseTokenAssetId: baseTokenAssetId[bridgehubData.chainId], ctmData: ctmMintData, chainData: chainMintData }); bridgehubMintData = abi.encode(bridgeMintStruct); - emit MigrationStarted(bridgeData.chainId, _assetId, _settlementChainId); + emit MigrationStarted(bridgehubData.chainId, _assetId, _settlementChainId); } + /// @dev IL1AssetHandler interface, used to receive a chain on the settlement layer. + /// @param _assetId the assetId of the chain's STM + /// @param _bridgehubMintData the data for the mint function bridgeMint( uint256, // originChainId bytes32 _assetId, bytes calldata _bridgehubMintData ) external payable override onlyAssetRouter whenMigrationsNotPaused { - BridgehubMintCTMAssetData memory bridgeData = abi.decode(_bridgehubMintData, (BridgehubMintCTMAssetData)); + BridgehubMintCTMAssetData memory bridgehubData = abi.decode(_bridgehubMintData, (BridgehubMintCTMAssetData)); address ctm = ctmAssetIdToAddress[_assetId]; require(ctm != address(0), "BH: assetInfo 2"); - require(settlementLayer[bridgeData.chainId] != block.chainid, "BH: already current SL"); + require(settlementLayer[bridgehubData.chainId] != block.chainid, "BH: already current SL"); - settlementLayer[bridgeData.chainId] = block.chainid; - chainTypeManager[bridgeData.chainId] = ctm; - baseTokenAssetId[bridgeData.chainId] = bridgeData.baseTokenAssetId; + settlementLayer[bridgehubData.chainId] = block.chainid; + chainTypeManager[bridgehubData.chainId] = ctm; + baseTokenAssetId[bridgehubData.chainId] = bridgehubData.baseTokenAssetId; // To keep `assetIdIsRegistered` consistent, we'll also automatically register the base token. // It is assumed that if the bridging happened, the token was approved on L1 already. - assetIdIsRegistered[bridgeData.baseTokenAssetId] = true; + assetIdIsRegistered[bridgehubData.baseTokenAssetId] = true; - address zkChain = getZKChain(bridgeData.chainId); + address zkChain = getZKChain(bridgehubData.chainId); bool contractAlreadyDeployed = zkChain != address(0); if (!contractAlreadyDeployed) { - zkChain = IChainTypeManager(ctm).forwardedBridgeMint(bridgeData.chainId, bridgeData.ctmData); + zkChain = IChainTypeManager(ctm).forwardedBridgeMint(bridgehubData.chainId, bridgehubData.ctmData); require(zkChain != address(0), "BH: chain not registered"); - _registerNewZKChain(bridgeData.chainId, zkChain); - messageRoot.addNewChain(bridgeData.chainId); + _registerNewZKChain(bridgehubData.chainId, zkChain); + messageRoot.addNewChain(bridgehubData.chainId); } - IZKChain(zkChain).forwardedBridgeMint(bridgeData.chainData, contractAlreadyDeployed); + IZKChain(zkChain).forwardedBridgeMint(bridgehubData.chainData, contractAlreadyDeployed); - emit MigrationFinalized(bridgeData.chainId, _assetId, zkChain); + emit MigrationFinalized(bridgehubData.chainId, _assetId, zkChain); } /// @dev IL1AssetHandler interface, used to undo a failed migration of a chain. - /// @param _chainId the chainId of the chain + // / @param _chainId the chainId of the chain /// @param _assetId the assetId of the chain's CTM /// @param _data the data for the recovery. function bridgeRecoverFailedTransfer( - uint256 _chainId, + uint256, bytes32 _assetId, address _depositSender, bytes calldata _data ) external payable override onlyAssetRouter onlyL1 { - BridgehubBurnCTMAssetData memory ctmAssetData = abi.decode(_data, (BridgehubBurnCTMAssetData)); + BridgehubBurnCTMAssetData memory bridgehubData = abi.decode(_data, (BridgehubBurnCTMAssetData)); - delete settlementLayer[_chainId]; + delete settlementLayer[bridgehubData.chainId]; - IChainTypeManager(chainTypeManager[_chainId]).forwardedBridgeRecoverFailedTransfer({ - _chainId: _chainId, + IChainTypeManager(chainTypeManager[bridgehubData.chainId]).forwardedBridgeRecoverFailedTransfer({ + _chainId: bridgehubData.chainId, _assetInfo: _assetId, _depositSender: _depositSender, - _ctmData: ctmAssetData.ctmData + _ctmData: bridgehubData.ctmData }); - IZKChain(getZKChain(_chainId)).forwardedBridgeRecoverFailedTransfer({ - _chainId: _chainId, + IZKChain(getZKChain(bridgehubData.chainId)).forwardedBridgeRecoverFailedTransfer({ + _chainId: bridgehubData.chainId, _assetInfo: _assetId, _prevMsgSender: _depositSender, - _chainData: ctmAssetData.chainData + _chainData: bridgehubData.chainData }); } @@ -798,4 +818,9 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus function getHyperchain(uint256 _chainId) public view returns (address) { return getZKChain(_chainId); } + + /// @notice return the asset router + function sharedBridge() public view returns (address) { + return assetRouter; + } } diff --git a/l1-contracts/contracts/bridgehub/CTMDeploymentTracker.sol b/l1-contracts/contracts/bridgehub/CTMDeploymentTracker.sol index 29cc14aaf..340d753a9 100644 --- a/l1-contracts/contracts/bridgehub/CTMDeploymentTracker.sol +++ b/l1-contracts/contracts/bridgehub/CTMDeploymentTracker.sol @@ -7,10 +7,10 @@ pragma solidity 0.8.24; import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/access/Ownable2StepUpgradeable.sol"; import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/security/PausableUpgradeable.sol"; -import {L2TransactionRequestTwoBridgesInner} from "./IBridgehub.sol"; +import {IBridgehub, L2TransactionRequestTwoBridgesInner} from "./IBridgehub.sol"; import {ICTMDeploymentTracker} from "./ICTMDeploymentTracker.sol"; -import {IBridgehub, IL1AssetRouter} from "../bridge/interfaces/IL1AssetRouter.sol"; +import {IAssetRouterBase} from "../bridge/asset-router/IAssetRouterBase.sol"; import {ReentrancyGuard} from "../common/ReentrancyGuard.sol"; import {TWO_BRIDGES_MAGIC_VALUE} from "../common/Config.sol"; import {L2_BRIDGEHUB_ADDR} from "../common/L2ContractAddresses.sol"; @@ -23,7 +23,7 @@ contract CTMDeploymentTracker is ICTMDeploymentTracker, ReentrancyGuard, Ownable IBridgehub public immutable override BRIDGE_HUB; /// @dev Bridgehub smart contract that is used to operate with L2 via asynchronous L2 <-> L1 communication. - IL1AssetRouter public immutable override L1_ASSET_ROUTER; + IAssetRouterBase public immutable override L1_ASSET_ROUTER; /// @dev The encoding version of the data. bytes1 internal constant ENCODING_VERSION = 0x01; @@ -44,7 +44,7 @@ contract CTMDeploymentTracker is ICTMDeploymentTracker, ReentrancyGuard, Ownable /// @dev Contract is expected to be used as proxy implementation on L1. /// @dev Initialize the implementation to prevent Parity hack. - constructor(IBridgehub _bridgehub, IL1AssetRouter _sharedBridge) reentrancyGuardInitializer { + constructor(IBridgehub _bridgehub, IAssetRouterBase _sharedBridge) reentrancyGuardInitializer { _disableInitializers(); BRIDGE_HUB = _bridgehub; L1_ASSET_ROUTER = _sharedBridge; diff --git a/l1-contracts/contracts/bridgehub/IBridgehub.sol b/l1-contracts/contracts/bridgehub/IBridgehub.sol index 04b5fe48e..73f02527f 100644 --- a/l1-contracts/contracts/bridgehub/IBridgehub.sol +++ b/l1-contracts/contracts/bridgehub/IBridgehub.sol @@ -2,11 +2,11 @@ // We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; -import {IL1AssetRouter} from "../bridge/interfaces/IL1AssetRouter.sol"; import {L2Message, L2Log, TxStatus} from "../common/Messaging.sol"; import {IL1AssetHandler} from "../bridge/interfaces/IL1AssetHandler.sol"; import {ICTMDeploymentTracker} from "./ICTMDeploymentTracker.sol"; import {IMessageRoot} from "./IMessageRoot.sol"; +import {IAssetHandler} from "../bridge/interfaces/IAssetHandler.sol"; struct L2TransactionRequestDirect { uint256 chainId; @@ -55,7 +55,7 @@ struct BridgehubBurnCTMAssetData { /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev -interface IBridgehub is IL1AssetHandler { +interface IBridgehub is IAssetHandler, IL1AssetHandler { /// @notice pendingAdmin is changed /// @dev Also emitted when new admin is accepted and in this case, `newPendingAdmin` would be zero address event NewPendingAdmin(address indexed oldPendingAdmin, address indexed newPendingAdmin); @@ -104,7 +104,7 @@ interface IBridgehub is IL1AssetHandler { function baseTokenAssetId(uint256 _chainId) external view returns (bytes32); - function sharedBridge() external view returns (IL1AssetRouter); + function sharedBridge() external view returns (address); function messageRoot() external view returns (IMessageRoot); diff --git a/l1-contracts/contracts/bridgehub/ICTMDeploymentTracker.sol b/l1-contracts/contracts/bridgehub/ICTMDeploymentTracker.sol index 6e2b74dd3..c4de4d7f4 100644 --- a/l1-contracts/contracts/bridgehub/ICTMDeploymentTracker.sol +++ b/l1-contracts/contracts/bridgehub/ICTMDeploymentTracker.sol @@ -3,7 +3,7 @@ pragma solidity 0.8.24; import {L2TransactionRequestTwoBridgesInner, IBridgehub} from "./IBridgehub.sol"; -import {IL1AssetRouter} from "../bridge/interfaces/IL1AssetRouter.sol"; +import {IAssetRouterBase} from "../bridge/asset-router/IAssetRouterBase.sol"; import {IL1AssetDeploymentTracker} from "../bridge/interfaces/IL1AssetDeploymentTracker.sol"; /// @author Matter Labs @@ -18,7 +18,7 @@ interface ICTMDeploymentTracker is IL1AssetDeploymentTracker { function BRIDGE_HUB() external view returns (IBridgehub); - function L1_ASSET_ROUTER() external view returns (IL1AssetRouter); + function L1_ASSET_ROUTER() external view returns (IAssetRouterBase); function registerCTMAssetOnL1(address _ctmAddress) external; diff --git a/l1-contracts/contracts/common/L1ContractErrors.sol b/l1-contracts/contracts/common/L1ContractErrors.sol index b78bd53e3..99a632c53 100644 --- a/l1-contracts/contracts/common/L1ContractErrors.sol +++ b/l1-contracts/contracts/common/L1ContractErrors.sol @@ -25,10 +25,20 @@ error RemovingPermanentRestriction(); error UnallowedImplementation(bytes32 implementationHash); // 0x1ff9d522 error AddressAlreadyUsed(address addr); +// +error AddressAlreadySet(address addr); // 0x86bb51b8 error AddressHasNoCode(address); +// +error AddressMismatch(address expected, address supplied); // 0x1eee5481 error AddressTooLow(address); +// +error AmountMustBeGreaterThanZero(); +// +error AssetHandlerDoesNotExist(bytes32 assetId); +// +error AssetIdMismatch(bytes32 expected, bytes32 supplied); // 0x0bfcef28 error AlreadyWhitelisted(address); // 0x6afd6c20 @@ -45,6 +55,8 @@ error BatchNumberMismatch(uint256 expectedBatchNumber, uint256 providedBatchNumb error BlobHashCommitmentError(uint256 index, bool blobHashEmpty, bool blobCommitmentEmpty); // 0x6cf12312 error BridgeHubAlreadyRegistered(); +// +error BridgeMintNotImplemented(); // 0xcf102c5a error CalldataLengthTooBig(); // 0xe85392f9 @@ -61,6 +73,8 @@ error ChainIdTooBig(); error DelegateCallFailed(bytes returnData); // 0x0a8ed92c error DenominatorIsZero(); +// +error DeployFailed(); // 0xc7c9660f error DepositDoesNotExist(); // 0xad2fa98e @@ -75,14 +89,23 @@ error DiamondAlreadyFrozen(); error DiamondFreezeIncorrectState(); // 0xa7151b9a error DiamondNotFrozen(); +// +error EmptyAddress(); // 0xfc7ab1d3 error EmptyBlobVersionHash(uint256 index); +// +error EmptyBytes32(); // 0x95b66fe9 error EmptyDeposit(); +// +error ETHDepositNotSupported(); +// +error FailedToTransferTokens(address tokenContract, address to, uint256 amount); // 0xac4a3f98 error FacetExists(bytes4 selector, address); // 0x79e12cc3 error FacetIsFrozen(bytes4 func); +error FunctionNotSupported(); // 0xc91cf3b1 error GasPerPubdataMismatch(); // 0x6d4a7df8 @@ -99,16 +122,22 @@ error HashedLogIsDefault(); error HashMismatch(bytes32 expected, bytes32 actual); // 0xb615c2b1 error ZKChainLimitReached(); +// +error InsufficientAllowance(uint256 providedAllowance, uint256 requiredAmount); // 0x826fb11e error InsufficientChainBalance(); // 0x356680b7 error InsufficientFunds(); +// +error InvalidCaller(address); // 0x7a47c9a2 error InvalidChainId(); // 0x4fbe5dba error InvalidDelay(); // 0x0af806e0 error InvalidHash(); +// +error InvalidInput(); // 0xc1780bd6 error InvalidLogSender(address sender, uint256 logKey); // 0xd8e9405c @@ -189,6 +218,8 @@ error NonEmptyMsgValue(); error NonIncreasingTimestamp(); // 0x0105f9c0 error NonSequentialBatch(); +// +error NonSequentialVersion(); // 0x4ef79e5a error NonZeroAddress(address); // 0xdd629f86 @@ -307,8 +338,14 @@ error UndefinedDiamondCutAction(); error UnexpectedNumberOfFactoryDeps(); // 0x6aa39880 error UnexpectedSystemLog(uint256 logKey); +// +error UnimplementedMessage(string); // 0xf093c2e5 error UpgradeBatchNumberIsNotZero(); +// +error UnsupportedEncodingVersion(); +// +error UnsupportedPaymasterFlow(); // 0x47b3b145 error ValidateTxnNotEnoughGas(); // 0x626ade30 diff --git a/l1-contracts/contracts/common/L2ContractAddresses.sol b/l1-contracts/contracts/common/L2ContractAddresses.sol index 3cef5f560..0a98d0395 100644 --- a/l1-contracts/contracts/common/L2ContractAddresses.sol +++ b/l1-contracts/contracts/common/L2ContractAddresses.sol @@ -44,6 +44,26 @@ address constant L2_BRIDGEHUB_ADDR = address(0x10002); /// @dev the address of the l2 asse3t router. address constant L2_ASSET_ROUTER_ADDR = address(0x10003); +/** + * @author Matter Labs + * @custom:security-contact security@matterlabs.dev + * @notice Smart contract for sending arbitrary length messages to L1 + * @dev by default ZkSync can send fixed-length messages on L1. + * A fixed length message has 4 parameters `senderAddress`, `isService`, `key`, `value`, + * the first one is taken from the context, the other three are chosen by the sender. + * @dev To send a variable-length message we use this trick: + * - This system contract accepts an arbitrary length message and sends a fixed length message with + * parameters `senderAddress == this`, `isService == true`, `key == msg.sender`, `value == keccak256(message)`. + * - The contract on L1 accepts all sent messages and if the message came from this system contract + * it requires that the preimage of `value` be provided. + */ +interface IL2Messenger { + /// @notice Sends an arbitrary length message to L1. + /// @param _message The variable length message to be sent to L1. + /// @return Returns the keccak256 hashed value of the message. + function sendToL1(bytes memory _message) external returns (bytes32); +} + /// @dev An l2 system contract address, used in the assetId calculation for native assets. /// This is needed for automatic bridging, i.e. without deploying the AssetHandler contract, /// if the assetId can be calculated with this address then it is in fact an NTV asset @@ -51,3 +71,15 @@ address constant L2_NATIVE_TOKEN_VAULT_ADDR = address(0x10004); /// @dev the address of the l2 asse3t router. address constant L2_MESSAGE_ROOT_ADDR = address(0x10005); + +/// @dev the offset for the system contracts +uint160 constant SYSTEM_CONTRACTS_OFFSET = 0x8000; // 2^15 + +/// @dev the address of the deployer system contract +address constant DEPLOYER_SYSTEM_CONTRACT = address(SYSTEM_CONTRACTS_OFFSET + 0x06); + +/// @dev the address of the l2 messenger system contract +IL2Messenger constant L2_MESSENGER = IL2Messenger(address(SYSTEM_CONTRACTS_OFFSET + 0x08)); + +/// @dev the address of the msg value system contract +address constant MSG_VALUE_SYSTEM_CONTRACT = address(SYSTEM_CONTRACTS_OFFSET + 0x09); diff --git a/l1-contracts/contracts/common/libraries/DataEncoding.sol b/l1-contracts/contracts/common/libraries/DataEncoding.sol index 435390f5f..04e271de8 100644 --- a/l1-contracts/contracts/common/libraries/DataEncoding.sol +++ b/l1-contracts/contracts/common/libraries/DataEncoding.sol @@ -3,6 +3,9 @@ pragma solidity 0.8.24; import {L2_NATIVE_TOKEN_VAULT_ADDR} from "../L2ContractAddresses.sol"; +import {LEGACY_ENCODING_VERSION, NEW_ENCODING_VERSION} from "../../bridge/asset-router/IAssetRouterBase.sol"; +import {INativeTokenVault} from "../../bridge/ntv/INativeTokenVault.sol"; +import {UnsupportedEncodingVersion} from "../L1ContractErrors.sol"; /** * @author Matter Labs @@ -87,4 +90,31 @@ library DataEncoding { function encodeNTVAssetId(uint256 _chainId, address _tokenAddress) internal pure returns (bytes32) { return keccak256(abi.encode(_chainId, L2_NATIVE_TOKEN_VAULT_ADDR, _tokenAddress)); } + + /// @dev Encodes the transaction data hash using either the latest encoding standard or the legacy standard. + /// @param _encodingVersion EncodingVersion. + /// @param _prevMsgSender The address of the entity that initiated the deposit. + /// @param _assetId The unique identifier of the deposited L1 token. + /// @param _nativeTokenVault The address of the token, only used if the encoding version is legacy. + /// @param _transferData The encoded transfer data, which includes both the deposit amount and the address of the L2 receiver. + /// @return txDataHash The resulting encoded transaction data hash. + function encodeTxDataHash( + bytes1 _encodingVersion, + address _prevMsgSender, + bytes32 _assetId, + address _nativeTokenVault, + bytes memory _transferData + ) internal view returns (bytes32 txDataHash) { + if (_encodingVersion == LEGACY_ENCODING_VERSION) { + address tokenAddress = INativeTokenVault(_nativeTokenVault).tokenAddress(_assetId); + (uint256 depositAmount, ) = abi.decode(_transferData, (uint256, address)); + txDataHash = keccak256(abi.encode(_prevMsgSender, tokenAddress, depositAmount)); + } else if (_encodingVersion == NEW_ENCODING_VERSION) { + // Similarly to calldata, the txDataHash is collision-resistant. + // In the legacy data hash, the first encoded variable was the address, which is padded with zeros during `abi.encode`. + txDataHash = keccak256(bytes.concat(_encodingVersion, abi.encode(_prevMsgSender, _assetId, _transferData))); + } else { + revert UnsupportedEncodingVersion(); + } + } } diff --git a/l1-contracts/contracts/common/libraries/L2ContractHelper.sol b/l1-contracts/contracts/common/libraries/L2ContractHelper.sol index 93d786936..2d1a26c1f 100644 --- a/l1-contracts/contracts/common/libraries/L2ContractHelper.sol +++ b/l1-contracts/contracts/common/libraries/L2ContractHelper.sol @@ -5,6 +5,38 @@ pragma solidity ^0.8.21; import {BytecodeError, MalformedBytecode, LengthIsNotDivisibleBy32} from "../L1ContractErrors.sol"; import {UncheckedMath} from "./UncheckedMath.sol"; +import {L2_MESSENGER} from "../L2ContractAddresses.sol"; + +/** + * @author Matter Labs + * @custom:security-contact security@matterlabs.dev + * @notice Interface for the contract that is used to deploy contracts on L2. + */ +interface IContractDeployer { + /// @notice A struct that describes a forced deployment on an address. + /// @param bytecodeHash The bytecode hash to put on an address. + /// @param newAddress The address on which to deploy the bytecodehash to. + /// @param callConstructor Whether to run the constructor on the force deployment. + /// @param value The `msg.value` with which to initialize a contract. + /// @param input The constructor calldata. + struct ForceDeployment { + bytes32 bytecodeHash; + address newAddress; + bool callConstructor; + uint256 value; + bytes input; + } + + /// @notice This method is to be used only during an upgrade to set bytecodes on specific addresses. + /// @param _deployParams A set of parameters describing force deployment. + function forceDeployOnAddresses(ForceDeployment[] calldata _deployParams) external payable; + + /// @notice Creates a new contract at a determined address using the `CREATE2` salt on L2 + /// @param _salt a unique value to create the deterministic address of the new contract + /// @param _bytecodeHash the bytecodehash of the new contract to be deployed + /// @param _input the calldata to be sent to the constructor of the new contract + function create2(bytes32 _salt, bytes32 _bytecodeHash, bytes calldata _input) external returns (address); +} /** * @author Matter Labs @@ -17,6 +49,13 @@ library L2ContractHelper { /// @dev The prefix used to create CREATE2 addresses. bytes32 private constant CREATE2_PREFIX = keccak256("zksyncCreate2"); + /// @notice Sends L2 -> L1 arbitrary-long message through the system contract messenger. + /// @param _message Data to be sent to L1. + /// @return keccak256 hash of the sent message. + function sendMessageToL1(bytes memory _message) internal returns (bytes32) { + return L2_MESSENGER.sendToL1(_message); + } + /// @notice Validate the bytecode format and calculate its hash. /// @param _bytecode The bytecode to hash. /// @return hashedBytecode The 32-byte hash of the bytecode. diff --git a/l1-contracts/contracts/common/libraries/SystemContractsCaller.sol b/l1-contracts/contracts/common/libraries/SystemContractsCaller.sol new file mode 100644 index 000000000..b6bf0c54a --- /dev/null +++ b/l1-contracts/contracts/common/libraries/SystemContractsCaller.sol @@ -0,0 +1,145 @@ +// SPDX-License-Identifier: MIT + +// solhint-disable one-contract-per-file + +pragma solidity 0.8.24; + +import {MSG_VALUE_SYSTEM_CONTRACT} from "../L2ContractAddresses.sol"; + +address constant SYSTEM_CALL_CALL_ADDRESS = address((1 << 16) - 11); +/// @dev If the bitwise AND of the extraAbi[2] param when calling the MSG_VALUE_SIMULATOR +/// is non-zero, the call will be assumed to be a system one. +uint256 constant MSG_VALUE_SIMULATOR_IS_SYSTEM_BIT = 1; + +/// @notice The way to forward the calldata: +/// - Use the current heap (i.e. the same as on EVM). +/// - Use the auxiliary heap. +/// - Forward via a pointer +/// @dev Note, that currently, users do not have access to the auxiliary +/// heap and so the only type of forwarding that will be used by the users +/// are UseHeap and ForwardFatPointer for forwarding a slice of the current calldata +/// to the next call. +enum CalldataForwardingMode { + UseHeap, + ForwardFatPointer, + UseAuxHeap +} + +/// @notice Error thrown a cast from uint256 to u32 is not possible. +error U32CastOverflow(); + +library Utils { + function safeCastToU32(uint256 _x) internal pure returns (uint32) { + if (_x > type(uint32).max) { + revert U32CastOverflow(); + } + + return uint32(_x); + } +} + +/// @notice The library contains the functions to make system calls. +/// @dev A more detailed description of the library and its methods can be found in the `system-contracts` repo. +library SystemContractsCaller { + function systemCall(uint32 gasLimit, address to, uint256 value, bytes memory data) internal returns (bool success) { + address callAddr = SYSTEM_CALL_CALL_ADDRESS; + + uint32 dataStart; + assembly { + dataStart := add(data, 0x20) + } + uint32 dataLength = uint32(Utils.safeCastToU32(data.length)); + + uint256 farCallAbi = getFarCallABI({ + dataOffset: 0, + memoryPage: 0, + dataStart: dataStart, + dataLength: dataLength, + gasPassed: gasLimit, + // Only rollup is supported for now + shardId: 0, + forwardingMode: CalldataForwardingMode.UseHeap, + isConstructorCall: false, + isSystemCall: true + }); + + if (value == 0) { + // Doing the system call directly + assembly { + success := call(to, callAddr, 0, 0, farCallAbi, 0, 0) + } + } else { + address msgValueSimulator = MSG_VALUE_SYSTEM_CONTRACT; + // We need to supply the mask to the MsgValueSimulator to denote + // that the call should be a system one. + uint256 forwardMask = MSG_VALUE_SIMULATOR_IS_SYSTEM_BIT; + + assembly { + success := call(msgValueSimulator, callAddr, value, to, farCallAbi, forwardMask, 0) + } + } + } + + function systemCallWithReturndata( + uint32 gasLimit, + address to, + uint128 value, + bytes memory data + ) internal returns (bool success, bytes memory returnData) { + success = systemCall(gasLimit, to, value, data); + + uint256 size; + assembly { + size := returndatasize() + } + + returnData = new bytes(size); + assembly { + returndatacopy(add(returnData, 0x20), 0, size) + } + } + + function getFarCallABI( + uint32 dataOffset, + uint32 memoryPage, + uint32 dataStart, + uint32 dataLength, + uint32 gasPassed, + uint8 shardId, + CalldataForwardingMode forwardingMode, + bool isConstructorCall, + bool isSystemCall + ) internal pure returns (uint256 farCallAbi) { + // Fill in the call parameter fields + farCallAbi = getFarCallABIWithEmptyFatPointer({ + gasPassed: gasPassed, + shardId: shardId, + forwardingMode: forwardingMode, + isConstructorCall: isConstructorCall, + isSystemCall: isSystemCall + }); + // Fill in the fat pointer fields + farCallAbi |= dataOffset; + farCallAbi |= (uint256(memoryPage) << 32); + farCallAbi |= (uint256(dataStart) << 64); + farCallAbi |= (uint256(dataLength) << 96); + } + + function getFarCallABIWithEmptyFatPointer( + uint32 gasPassed, + uint8 shardId, + CalldataForwardingMode forwardingMode, + bool isConstructorCall, + bool isSystemCall + ) internal pure returns (uint256 farCallAbiWithEmptyFatPtr) { + farCallAbiWithEmptyFatPtr |= (uint256(gasPassed) << 192); + farCallAbiWithEmptyFatPtr |= (uint256(forwardingMode) << 224); + farCallAbiWithEmptyFatPtr |= (uint256(shardId) << 232); + if (isConstructorCall) { + farCallAbiWithEmptyFatPtr |= (1 << 240); + } + if (isSystemCall) { + farCallAbiWithEmptyFatPtr |= (1 << 248); + } + } +} diff --git a/l1-contracts/contracts/dev-contracts/DummyL1ERC20Bridge.sol b/l1-contracts/contracts/dev-contracts/DummyL1ERC20Bridge.sol index 6e4b290d8..5ca21d4ba 100644 --- a/l1-contracts/contracts/dev-contracts/DummyL1ERC20Bridge.sol +++ b/l1-contracts/contracts/dev-contracts/DummyL1ERC20Bridge.sol @@ -3,15 +3,17 @@ pragma solidity 0.8.24; import {L1ERC20Bridge} from "../bridge/L1ERC20Bridge.sol"; -import {IL1AssetRouter} from "../bridge/interfaces/IL1AssetRouter.sol"; -import {IL1NativeTokenVault} from "../bridge/interfaces/IL1NativeTokenVault.sol"; +import {IL1AssetRouter} from "../bridge/asset-router/IL1AssetRouter.sol"; +import {IL1NativeTokenVault} from "../bridge/ntv/IL1NativeTokenVault.sol"; +import {IL1Nullifier} from "../bridge/interfaces/IL1Nullifier.sol"; contract DummyL1ERC20Bridge is L1ERC20Bridge { constructor( + IL1Nullifier _l1Nullifier, IL1AssetRouter _l1SharedBridge, IL1NativeTokenVault _l1NativeTokenVault, uint256 _eraChainId - ) L1ERC20Bridge(_l1SharedBridge, _l1NativeTokenVault, _eraChainId) {} + ) L1ERC20Bridge(_l1Nullifier, _l1SharedBridge, _l1NativeTokenVault, _eraChainId) {} function setValues(address _l2SharedBridge, address _l2TokenBeacon, bytes32 _l2TokenProxyBytecodeHash) external { l2Bridge = _l2SharedBridge; diff --git a/l1-contracts/contracts/dev-contracts/WETH9.sol b/l1-contracts/contracts/dev-contracts/WETH9.sol index e094ba89e..5ab311b13 100644 --- a/l1-contracts/contracts/dev-contracts/WETH9.sol +++ b/l1-contracts/contracts/dev-contracts/WETH9.sol @@ -30,7 +30,17 @@ contract WETH9 { function withdraw(uint256 wad) public { require(balanceOf[msg.sender] >= wad, "weth9, 1"); balanceOf[msg.sender] -= wad; - payable(msg.sender).transfer(wad); + // this is a hack so that zkfoundry works, but we are deploying WETH9 on L2 as well. + // payable(msg.sender).transfer(wad); + bool callSuccess; + address sender = msg.sender; + // Low-level assembly call, to avoid any memory copying (save gas) + assembly { + callSuccess := call(gas(), sender, wad, 0, 0, 0, 0) + } + if (!callSuccess) { + require(false, "Withdraw failed"); + } emit Withdrawal(msg.sender, wad); } diff --git a/l1-contracts/contracts/dev-contracts/test/DummyAdminFacetNoOverlap.sol b/l1-contracts/contracts/dev-contracts/test/DummyAdminFacetNoOverlap.sol index ce6eedf50..b66c76bf0 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummyAdminFacetNoOverlap.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummyAdminFacetNoOverlap.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.24; import {Diamond} from "../../state-transition/libraries/Diamond.sol"; import {ZKChainBase} from "../../state-transition/chain-deps/facets/ZKChainBase.sol"; -import {IL1AssetRouter} from "../../bridge/interfaces/IL1AssetRouter.sol"; +import {IL1AssetRouter} from "../../bridge/asset-router/IL1AssetRouter.sol"; import {DataEncoding} from "../../common/libraries/DataEncoding.sol"; /// selectors do not overlap with normal facet selectors (getName does not count) diff --git a/l1-contracts/contracts/dev-contracts/test/DummySharedBridge.sol b/l1-contracts/contracts/dev-contracts/test/DummySharedBridge.sol index aea6099cb..47a0586d8 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummySharedBridge.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummySharedBridge.sol @@ -7,11 +7,12 @@ import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; import {L2TransactionRequestTwoBridgesInner} from "../../bridgehub/IBridgehub.sol"; import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/security/PausableUpgradeable.sol"; import {TWO_BRIDGES_MAGIC_VALUE, ETH_TOKEN_ADDRESS} from "../../common/Config.sol"; -import {IL1NativeTokenVault} from "../../bridge/interfaces/IL1NativeTokenVault.sol"; +import {IL1NativeTokenVault} from "../../bridge/ntv/L1NativeTokenVault.sol"; import {L2_NATIVE_TOKEN_VAULT_ADDR} from "../../common/L2ContractAddresses.sol"; import {SafeERC20} from "@openzeppelin/contracts-v4/token/ERC20/utils/SafeERC20.sol"; import {IL2Bridge} from "../../bridge/interfaces/IL2Bridge.sol"; -import {IL2BridgeLegacy} from "../../bridge/interfaces/IL2BridgeLegacy.sol"; +import {IL2SharedBridgeLegacy} from "../../bridge/interfaces/IL2SharedBridgeLegacy.sol"; +import {IL2SharedBridgeLegacyFunctions} from "../../bridge/interfaces/IL2SharedBridgeLegacyFunctions.sol"; contract DummySharedBridge is PausableUpgradeable { using SafeERC20 for IERC20; @@ -32,7 +33,6 @@ contract DummySharedBridge is PausableUpgradeable { mapping(uint256 chainId => mapping(address l1Token => uint256 balance)) public chainBalance; /// @dev Indicates whether the hyperbridging is enabled for a given chain. - mapping(uint256 chainId => bool enabled) internal hyperbridgingEnabled; address l1ReceiverReturnInFinalizeWithdrawal; address l1TokenReturnInFinalizeWithdrawal; @@ -127,8 +127,8 @@ contract DummySharedBridge is PausableUpgradeable { uint16 _l2TxNumberInBatch, bytes calldata _message, bytes32[] calldata _merkleProof - ) external { - (address l1Receiver, address l1Token, uint256 amount) = _parseL2WithdrawalMessage(_message); + ) external returns (address l1Receiver, address l1Token, uint256 amount) { + (l1Receiver, l1Token, amount) = _parseL2WithdrawalMessage(_message); if (l1Token == address(1)) { bool callSuccess; @@ -152,9 +152,7 @@ contract DummySharedBridge is PausableUpgradeable { // Dummy bridge supports only working with ETH for simplicity. require(msg.value == _amount, "L1AR: msg.value not equal to amount"); - if (!hyperbridgingEnabled[_chainId]) { - chainBalance[_chainId][address(1)] += _amount; - } + chainBalance[_chainId][address(1)] += _amount; // Note that we don't save the deposited amount, as this is for the base token, which gets sent to the refundRecipient if the tx fails emit BridgehubDepositBaseTokenInitiated(_chainId, _prevMsgSender, _assetId, _amount); @@ -192,7 +190,7 @@ contract DummySharedBridge is PausableUpgradeable { } bytes memory l2TxCalldata = abi.encodeCall( - IL2BridgeLegacy.finalizeDeposit, + IL2SharedBridgeLegacyFunctions.finalizeDeposit, (_prevMsgSender, _l2Receiver, _l1Token, amount, new bytes(0)) ); bytes32 txDataHash = keccak256(abi.encode(_prevMsgSender, _l1Token, amount)); diff --git a/l1-contracts/contracts/dev-contracts/test/L1ERC20BridgeTest.sol b/l1-contracts/contracts/dev-contracts/test/L1ERC20BridgeTest.sol index ea65333c5..2f8eda079 100644 --- a/l1-contracts/contracts/dev-contracts/test/L1ERC20BridgeTest.sol +++ b/l1-contracts/contracts/dev-contracts/test/L1ERC20BridgeTest.sol @@ -3,13 +3,17 @@ pragma solidity 0.8.24; import {L1ERC20Bridge} from "../../bridge/L1ERC20Bridge.sol"; -import {IL1NativeTokenVault} from "../../bridge/interfaces/IL1NativeTokenVault.sol"; -import {IBridgehub, IL1AssetRouter} from "../../bridge/interfaces/IL1AssetRouter.sol"; +import {IL1NativeTokenVault} from "../../bridge/ntv/IL1NativeTokenVault.sol"; +import {IBridgehub} from "../../bridgehub/IBridgehub.sol"; +import {IL1AssetRouter} from "../../bridge/asset-router/IL1AssetRouter.sol"; +import {IL1Nullifier} from "../../bridge/interfaces/IL1Nullifier.sol"; /// @author Matter Labs contract L1ERC20BridgeTest is L1ERC20Bridge { // add this to be excluded from coverage report function test() internal virtual {} - constructor(IBridgehub _zkSync) L1ERC20Bridge(IL1AssetRouter(address(0)), IL1NativeTokenVault(address(0)), 1) {} + constructor( + IBridgehub _zkSync + ) L1ERC20Bridge(IL1Nullifier(address(0)), IL1AssetRouter(address(0)), IL1NativeTokenVault(address(0)), 1) {} } diff --git a/l1-contracts/contracts/state-transition/ChainTypeManager.sol b/l1-contracts/contracts/state-transition/ChainTypeManager.sol index 8fc62b922..62df92419 100644 --- a/l1-contracts/contracts/state-transition/ChainTypeManager.sol +++ b/l1-contracts/contracts/state-transition/ChainTypeManager.sol @@ -400,7 +400,7 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg /// @notice called by Bridgehub when a chain registers /// @param _chainId the chain's id /// @param _baseTokenAssetId the base token asset id used to pay for gas fees - /// @param _sharedBridge the shared bridge address, used as base token bridge + /// @param _assetRouter the shared bridge address, used as base token bridge /// @param _admin the chain's admin address /// @param _initData the diamond cut data, force deployments and factoryDeps encoded /// @param _factoryDeps the factory dependencies used for the genesis upgrade @@ -408,7 +408,7 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg function createNewChain( uint256 _chainId, bytes32 _baseTokenAssetId, - address _sharedBridge, + address _assetRouter, address _admin, bytes calldata _initData, bytes[] calldata _factoryDeps @@ -416,7 +416,7 @@ contract ChainTypeManager is IChainTypeManager, ReentrancyGuard, Ownable2StepUpg (bytes memory _diamondCut, bytes memory _forceDeploymentData) = abi.decode(_initData, (bytes, bytes)); // solhint-disable-next-line func-named-parameters - zkChainAddress = _deployNewChain(_chainId, _baseTokenAssetId, _sharedBridge, _admin, _diamondCut); + zkChainAddress = _deployNewChain(_chainId, _baseTokenAssetId, _assetRouter, _admin, _diamondCut); { // check input diff --git a/l1-contracts/contracts/state-transition/IChainTypeManager.sol b/l1-contracts/contracts/state-transition/IChainTypeManager.sol index 26f27a1ee..b5202e975 100644 --- a/l1-contracts/contracts/state-transition/IChainTypeManager.sol +++ b/l1-contracts/contracts/state-transition/IChainTypeManager.sol @@ -115,7 +115,7 @@ interface IChainTypeManager { function createNewChain( uint256 _chainId, bytes32 _baseTokenAssetId, - address _sharedBridge, + address _assetRouter, address _admin, bytes calldata _initData, bytes[] calldata _factoryDeps diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol index d0cbd36fa..48b6dd76d 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol @@ -25,8 +25,10 @@ import {ZKChainBase} from "./ZKChainBase.sol"; import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA, L1_GAS_PER_PUBDATA_BYTE, L2_L1_LOGS_TREE_DEFAULT_LEAF_HASH, PRIORITY_OPERATION_L2_TX_TYPE, PRIORITY_EXPIRATION, MAX_NEW_FACTORY_DEPS, SETTLEMENT_LAYER_RELAY_SENDER, SUPPORTED_PROOF_METADATA_VERSION} from "../../../common/Config.sol"; import {L2_BOOTLOADER_ADDRESS, L2_TO_L1_MESSENGER_SYSTEM_CONTRACT_ADDR, L2_BRIDGEHUB_ADDR} from "../../../common/L2ContractAddresses.sol"; -import {IL1AssetRouter} from "../../../bridge/interfaces/IL1AssetRouter.sol"; +import {IL1AssetRouter} from "../../../bridge/asset-router/IL1AssetRouter.sol"; +import {IBridgehub} from "../../../bridgehub/IBridgehub.sol"; +import {IChainTypeManager} from "../../IChainTypeManager.sol"; import {MerklePathEmpty, OnlyEraSupported, BatchNotExecuted, HashedLogIsDefault, BaseTokenGasPriceDenominatorNotSet, TransactionNotAllowed, GasPerPubdataMismatch, TooManyFactoryDeps, MsgValueTooLow} from "../../../common/L1ContractErrors.sol"; // While formally the following import is not used, it is needed to inherit documentation from it @@ -604,7 +606,7 @@ contract MailboxFacet is ZKChainBase, IMailbox { uint16 _l2TxNumberInBatch, bytes calldata _message, bytes32[] calldata _merkleProof - ) external nonReentrant { + ) external nonReentrant onlyL1 { if (s.chainId != ERA_CHAIN_ID) { revert OnlyEraSupported(); } diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IZKChainBase.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IZKChainBase.sol index 0338baa04..06f0c9784 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IZKChainBase.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IZKChainBase.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @title The interface of the ZKsync contract, responsible for the main ZKsync logic. diff --git a/l1-contracts/contracts/state-transition/l2-deps/ISystemContext.sol b/l1-contracts/contracts/state-transition/l2-deps/ISystemContext.sol index b8319f7c4..8448cb4e4 100644 --- a/l1-contracts/contracts/state-transition/l2-deps/ISystemContext.sol +++ b/l1-contracts/contracts/state-transition/l2-deps/ISystemContext.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @author Matter Labs diff --git a/l1-contracts/contracts/state-transition/libraries/PriorityTree.sol b/l1-contracts/contracts/state-transition/libraries/PriorityTree.sol index 809850804..71d6d9df1 100644 --- a/l1-contracts/contracts/state-transition/libraries/PriorityTree.sol +++ b/l1-contracts/contracts/state-transition/libraries/PriorityTree.sol @@ -98,14 +98,14 @@ library PriorityTree { } /// @notice Reinitialize the tree from a commitment on L1. - function checkL1Reinit(Tree storage _tree, PriorityTreeCommitment memory _commitment) internal { + function checkL1Reinit(Tree storage _tree, PriorityTreeCommitment memory _commitment) internal view { require(_tree.startIndex == _commitment.startIndex, "PT: invalid start index"); require(_tree.unprocessedIndex >= _commitment.unprocessedIndex, "PT: invalid unprocessed index"); require(_tree.tree._nextLeafIndex >= _commitment.nextLeafIndex, "PT: invalid next leaf index"); } /// @notice Reinitialize the tree from a commitment on GW. - function checkGWReinit(Tree storage _tree, PriorityTreeCommitment memory _commitment) internal { + function checkGWReinit(Tree storage _tree, PriorityTreeCommitment memory _commitment) internal view { require(_tree.startIndex == _commitment.startIndex, "PT: invalid start index"); require(_tree.unprocessedIndex <= _commitment.unprocessedIndex, "PT: invalid unprocessed index"); require(_tree.tree._nextLeafIndex <= _commitment.nextLeafIndex, "PT: invalid next leaf index"); diff --git a/l1-contracts/contracts/transactionFilterer/GatewayTransactionFilterer.sol b/l1-contracts/contracts/transactionFilterer/GatewayTransactionFilterer.sol index d1d236ac5..81556f221 100644 --- a/l1-contracts/contracts/transactionFilterer/GatewayTransactionFilterer.sol +++ b/l1-contracts/contracts/transactionFilterer/GatewayTransactionFilterer.sol @@ -9,6 +9,7 @@ import {AlreadyWhitelisted, InvalidSelector, NotWhitelisted, ZeroAddress} from " import {ITransactionFilterer} from "../state-transition/chain-interfaces/ITransactionFilterer.sol"; import {IBridgehub} from "../bridgehub/IBridgehub.sol"; import {IL2Bridge} from "../bridge/interfaces/IL2Bridge.sol"; +import {IAssetRouterBase} from "../bridge/asset-router/IAssetRouterBase.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev @@ -81,11 +82,14 @@ contract GatewayTransactionFilterer is ITransactionFilterer, ReentrancyGuard, Ow ) external view returns (bool) { if (sender == L1_ASSET_ROUTER) { bytes4 l2TxSelector = bytes4(l2Calldata[:4]); - if (IL2Bridge.finalizeDeposit.selector != l2TxSelector) { + if ( + (IAssetRouterBase.finalizeDeposit.selector != l2TxSelector) && + (IL2Bridge.finalizeDeposit.selector != l2TxSelector) + ) { revert InvalidSelector(l2TxSelector); } - (bytes32 decodedAssetId, ) = abi.decode(l2Calldata[4:], (bytes32, bytes)); + (, bytes32 decodedAssetId, ) = abi.decode(l2Calldata[4:], (uint256, bytes32, bytes)); address stmAddress = BRIDGE_HUB.ctmAssetIdToAddress(decodedAssetId); return (stmAddress != address(0)); } diff --git a/l1-contracts/deploy-scripts/DeployL1.s.sol b/l1-contracts/deploy-scripts/DeployL1.s.sol index d3ff94227..46a1d152e 100644 --- a/l1-contracts/deploy-scripts/DeployL1.s.sol +++ b/l1-contracts/deploy-scripts/DeployL1.s.sol @@ -7,6 +7,7 @@ import {Script, console2 as console} from "forge-std/Script.sol"; import {stdToml} from "forge-std/StdToml.sol"; import {ProxyAdmin} from "@openzeppelin/contracts-v4/proxy/transparent/ProxyAdmin.sol"; import {TransparentUpgradeableProxy} from "@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol"; +import {UpgradeableBeacon} from "@openzeppelin/contracts-v4/proxy/beacon/UpgradeableBeacon.sol"; import {Utils} from "./Utils.sol"; import {Multicall3} from "contracts/dev-contracts/Multicall3.sol"; import {Verifier} from "contracts/state-transition/Verifier.sol"; @@ -20,7 +21,7 @@ import {ValidatorTimelock} from "contracts/state-transition/ValidatorTimelock.so import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; import {MessageRoot} from "contracts/bridgehub/MessageRoot.sol"; import {CTMDeploymentTracker} from "contracts/bridgehub/CTMDeploymentTracker.sol"; -import {L1NativeTokenVault} from "contracts/bridge/L1NativeTokenVault.sol"; +import {L1NativeTokenVault} from "contracts/bridge/ntv/L1NativeTokenVault.sol"; import {ExecutorFacet} from "contracts/state-transition/chain-deps/facets/Executor.sol"; import {AdminFacet} from "contracts/state-transition/chain-deps/facets/Admin.sol"; import {MailboxFacet} from "contracts/state-transition/chain-deps/facets/Mailbox.sol"; @@ -32,15 +33,20 @@ import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.so import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; import {InitializeDataNewChain as DiamondInitializeDataNewChain} from "contracts/state-transition/chain-interfaces/IDiamondInit.sol"; import {FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; -import {L1AssetRouter} from "contracts/bridge/L1AssetRouter.sol"; +import {L1AssetRouter} from "contracts/bridge/asset-router/L1AssetRouter.sol"; import {L1ERC20Bridge} from "contracts/bridge/L1ERC20Bridge.sol"; +import {L1Nullifier} from "contracts/bridge/L1Nullifier.sol"; import {DiamondProxy} from "contracts/state-transition/chain-deps/DiamondProxy.sol"; -import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; -import {IL1NativeTokenVault} from "contracts/bridge/interfaces/IL1NativeTokenVault.sol"; +import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; +import {INativeTokenVault} from "contracts/bridge/ntv/INativeTokenVault.sol"; +import {BridgedStandardERC20} from "contracts/bridge/BridgedStandardERC20.sol"; import {AddressHasNoCode} from "./ZkSyncScriptErrors.sol"; +import {IL1Nullifier} from "contracts/bridge/L1Nullifier.sol"; +import {IL1NativeTokenVault} from "contracts/bridge/ntv/IL1NativeTokenVault.sol"; import {ICTMDeploymentTracker} from "contracts/bridgehub/ICTMDeploymentTracker.sol"; import {IMessageRoot} from "contracts/bridgehub/IMessageRoot.sol"; +import {IAssetRouterBase} from "contracts/bridge/asset-router/IAssetRouterBase.sol"; contract DeployL1Script is Script { using stdToml for string; @@ -99,6 +105,10 @@ contract DeployL1Script is Script { address erc20BridgeProxy; address sharedBridgeImplementation; address sharedBridgeProxy; + address l1NullifierImplementation; + address l1NullifierProxy; + address bridgedStandardERC20Implementation; + address bridgedTokenBeacon; } // solhint-disable-next-line gas-struct-packing @@ -168,7 +178,10 @@ contract DeployL1Script is Script { deployBridgehubContract(); deployMessageRootContract(); + deployL1NullifierContracts(); deploySharedBridgeContracts(); + deployBridgedStandardERC20Implementation(); + deployBridgedTokenBeacon(); deployL1NativeTokenVaultImplementation(); deployL1NativeTokenVaultProxy(); deployErc20BridgeImplementation(); @@ -196,6 +209,14 @@ contract DeployL1Script is Script { return addresses.bridges.sharedBridgeProxy; } + function getNativeTokenVaultProxyAddress() public view returns (address) { + return addresses.vaults.l1NativeTokenVaultProxy; + } + + function getL1NullifierProxyAddress() public view returns (address) { + return addresses.bridges.l1NullifierProxy; + } + function getOwnerAddress() public view returns (address) { return config.ownerAddress; } @@ -643,6 +664,33 @@ contract DeployL1Script is Script { deploySharedBridgeProxy(); } + function deployL1NullifierContracts() internal { + deployL1NullifierImplementation(); + deployL1NullifierProxy(); + } + + function deployL1NullifierImplementation() internal { + bytes memory bytecode = abi.encodePacked( + type(L1Nullifier).creationCode, + // solhint-disable-next-line func-named-parameters + abi.encode(addresses.bridgehub.bridgehubProxy, config.eraChainId, addresses.stateTransition.diamondProxy) + ); + address contractAddress = deployViaCreate2(bytecode); + console.log("L1NullifierImplementation deployed at:", contractAddress); + addresses.bridges.l1NullifierImplementation = contractAddress; + } + + function deployL1NullifierProxy() internal { + bytes memory initCalldata = abi.encodeCall(L1Nullifier.initialize, (config.deployerAddress, 1, 1, 1, 0)); + bytes memory bytecode = abi.encodePacked( + type(TransparentUpgradeableProxy).creationCode, + abi.encode(addresses.bridges.l1NullifierImplementation, addresses.transparentProxyAdmin, initCalldata) + ); + address contractAddress = deployViaCreate2(bytecode); + console.log("L1NullifierProxy deployed at:", contractAddress); + addresses.bridges.l1NullifierProxy = contractAddress; + } + function deploySharedBridgeImplementation() internal { bytes memory bytecode = abi.encodePacked( type(L1AssetRouter).creationCode, @@ -650,6 +698,7 @@ contract DeployL1Script is Script { abi.encode( config.tokens.tokenWethAddress, addresses.bridgehub.bridgehubProxy, + addresses.bridges.l1NullifierProxy, config.eraChainId, addresses.stateTransition.diamondProxy ) @@ -660,7 +709,7 @@ contract DeployL1Script is Script { } function deploySharedBridgeProxy() internal { - bytes memory initCalldata = abi.encodeCall(L1AssetRouter.initialize, (config.deployerAddress, 1, 1, 1, 0)); + bytes memory initCalldata = abi.encodeCall(L1AssetRouter.initialize, (config.deployerAddress)); bytes memory bytecode = abi.encodePacked( type(TransparentUpgradeableProxy).creationCode, abi.encode(addresses.bridges.sharedBridgeImplementation, addresses.transparentProxyAdmin, initCalldata) @@ -687,7 +736,12 @@ contract DeployL1Script is Script { function deployErc20BridgeImplementation() internal { bytes memory bytecode = abi.encodePacked( type(L1ERC20Bridge).creationCode, - abi.encode(addresses.bridges.sharedBridgeProxy, addresses.vaults.l1NativeTokenVaultProxy, config.eraChainId) + abi.encode( + addresses.bridges.l1NullifierProxy, + addresses.bridges.sharedBridgeProxy, + addresses.vaults.l1NativeTokenVaultProxy, + config.eraChainId + ) ); address contractAddress = deployViaCreate2(bytecode); console.log("Erc20BridgeImplementation deployed at:", contractAddress); @@ -712,10 +766,40 @@ contract DeployL1Script is Script { console.log("SharedBridge updated with ERC20Bridge address"); } + function deployBridgedStandardERC20Implementation() internal { + bytes memory bytecode = abi.encodePacked( + type(BridgedStandardERC20).creationCode, + // solhint-disable-next-line func-named-parameters + abi.encode() + ); + address contractAddress = deployViaCreate2(bytecode); + console.log("BridgedStandardERC20Implementation deployed at:", contractAddress); + addresses.bridges.bridgedStandardERC20Implementation = contractAddress; + } + + function deployBridgedTokenBeacon() internal { + bytes memory bytecode = abi.encodePacked( + type(UpgradeableBeacon).creationCode, + // solhint-disable-next-line func-named-parameters + abi.encode(addresses.bridges.bridgedStandardERC20Implementation) + ); + UpgradeableBeacon beacon = new UpgradeableBeacon(addresses.bridges.bridgedStandardERC20Implementation); + address contractAddress = address(beacon); + beacon.transferOwnership(config.ownerAddress); + console.log("BridgedTokenBeacon deployed at:", contractAddress); + addresses.bridges.bridgedTokenBeacon = contractAddress; + } + function deployL1NativeTokenVaultImplementation() internal { bytes memory bytecode = abi.encodePacked( type(L1NativeTokenVault).creationCode, - abi.encode(config.tokens.tokenWethAddress, addresses.bridges.sharedBridgeProxy, config.eraChainId) + // solhint-disable-next-line func-named-parameters + abi.encode( + config.tokens.tokenWethAddress, + addresses.bridges.sharedBridgeProxy, + config.eraChainId, + addresses.bridges.l1NullifierProxy + ) ); address contractAddress = deployViaCreate2(bytecode); console.log("L1NativeTokenVaultImplementation deployed at:", contractAddress); @@ -723,7 +807,10 @@ contract DeployL1Script is Script { } function deployL1NativeTokenVaultProxy() internal { - bytes memory initCalldata = abi.encodeCall(L1NativeTokenVault.initialize, config.ownerAddress); + bytes memory initCalldata = abi.encodeCall( + L1NativeTokenVault.initialize, + (config.ownerAddress, addresses.bridges.bridgedTokenBeacon) + ); bytes memory bytecode = abi.encodePacked( type(TransparentUpgradeableProxy).creationCode, abi.encode(addresses.vaults.l1NativeTokenVaultImplementation, addresses.transparentProxyAdmin, initCalldata) @@ -733,10 +820,16 @@ contract DeployL1Script is Script { addresses.vaults.l1NativeTokenVaultProxy = contractAddress; IL1AssetRouter sharedBridge = IL1AssetRouter(addresses.bridges.sharedBridgeProxy); + IL1Nullifier l1Nullifier = IL1Nullifier(addresses.bridges.l1NullifierProxy); // Ownable ownable = Ownable(addresses.bridges.sharedBridgeProxy); vm.broadcast(msg.sender); - sharedBridge.setNativeTokenVault(IL1NativeTokenVault(addresses.vaults.l1NativeTokenVaultProxy)); + sharedBridge.setNativeTokenVault(INativeTokenVault(addresses.vaults.l1NativeTokenVaultProxy)); + vm.broadcast(msg.sender); + l1Nullifier.setL1NativeTokenVault(IL1NativeTokenVault(addresses.vaults.l1NativeTokenVaultProxy)); + vm.broadcast(msg.sender); + l1Nullifier.setL1AssetRouter(addresses.bridges.sharedBridgeProxy); + // bytes memory data = abi.encodeCall(sharedBridge.setNativeTokenVault, (IL1NativeTokenVault(addresses.vaults.l1NativeTokenVaultProxy))); // Utils.executeUpgrade({ // _governor: ownable.owner(), diff --git a/l1-contracts/deploy-scripts/DeployL2Contracts.sol b/l1-contracts/deploy-scripts/DeployL2Contracts.sol index 550357739..1e147b56a 100644 --- a/l1-contracts/deploy-scripts/DeployL2Contracts.sol +++ b/l1-contracts/deploy-scripts/DeployL2Contracts.sol @@ -8,7 +8,7 @@ import {stdToml} from "forge-std/StdToml.sol"; import {Utils} from "./Utils.sol"; import {L2ContractHelper} from "contracts/common/libraries/L2ContractHelper.sol"; import {AddressAliasHelper} from "contracts/vendor/AddressAliasHelper.sol"; -// import {L1AssetRouter} from "contracts/bridge/L1AssetRouter.sol"; +// import {L1AssetRouter} from "contracts/bridge/asset-router/L1AssetRouter.sol"; contract DeployL2Script is Script { using stdToml for string; @@ -75,21 +75,19 @@ contract DeployL2Script is Script { function loadContracts() internal { //HACK: Meanwhile we are not integrated foundry zksync we use contracts that has been built using hardhat contracts.l2StandardErc20FactoryBytecode = Utils.readHardhatBytecode( - "/../l2-contracts/artifacts-zk/@openzeppelin/contracts-v4/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.json" + "/artifacts-zk/@openzeppelin/contracts-v4/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.json" ); contracts.beaconProxy = Utils.readHardhatBytecode( - "/../l2-contracts/artifacts-zk/@openzeppelin/contracts-v4/proxy/beacon/BeaconProxy.sol/BeaconProxy.json" + "/artifacts-zk/@openzeppelin/contracts-v4/proxy/beacon/BeaconProxy.sol/BeaconProxy.json" ); contracts.l2StandardErc20Bytecode = Utils.readHardhatBytecode( - "/../l2-contracts/artifacts-zk/contracts/bridge/L2StandardERC20.sol/L2StandardERC20.json" + "/artifacts-zk/contracts/bridge/BridgedStandardERC20.sol/BridgedStandardERC20.json" ); - contracts.l2SharedBridgeBytecode = Utils.readFoundryBytecode( - "/../l2-contracts/zkout/L2SharedBridge.sol/L2SharedBridge.json" - ); + contracts.l2SharedBridgeBytecode = Utils.readFoundryBytecode("/zkout/L2SharedBridge.sol/L2SharedBridge.json"); contracts.l2SharedBridgeProxyBytecode = Utils.readHardhatBytecode( - "/../l2-contracts/artifacts-zk/@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json" + "/artifacts-zk/@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json" ); contracts.forceDeployUpgrader = Utils.readFoundryBytecode( "/../l2-contracts/zkout/ForceDeployUpgrader.sol/ForceDeployUpgrader.json" diff --git a/l1-contracts/deploy-scripts/Gateway.s.sol b/l1-contracts/deploy-scripts/Gateway.s.sol index c4daba99c..d5e4c78ea 100644 --- a/l1-contracts/deploy-scripts/Gateway.s.sol +++ b/l1-contracts/deploy-scripts/Gateway.s.sol @@ -17,12 +17,12 @@ import {GatewayTransactionFilterer} from "contracts/transactionFilterer/GatewayT // import {Governance} from "contracts/governance/Governance.sol"; // import {Utils} from "./Utils.sol"; // import {PubdataPricingMode} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; -// import {IL1NativeTokenVault} from "contracts/bridge/interfaces/IL1NativeTokenVault.sol"; +// import {IL1NativeTokenVault} from "contracts/bridge/ntv/IL1NativeTokenVault.sol"; import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA} from "contracts/common/Config.sol"; import {L2TransactionRequestTwoBridgesOuter} from "contracts/bridgehub/IBridgehub.sol"; import {L2_BRIDGEHUB_ADDR} from "contracts/common/L2ContractAddresses.sol"; -// import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; +// import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; contract GatewayScript is Script { using stdToml for string; diff --git a/l1-contracts/deploy-scripts/GenerateForceDeploymentsData.s.sol b/l1-contracts/deploy-scripts/GenerateForceDeploymentsData.s.sol index b16a9cdfc..3d5a1c042 100644 --- a/l1-contracts/deploy-scripts/GenerateForceDeploymentsData.s.sol +++ b/l1-contracts/deploy-scripts/GenerateForceDeploymentsData.s.sol @@ -48,17 +48,17 @@ contract GenerateForceDeploymentsData is Script { function loadContracts() internal { //HACK: Meanwhile we are not integrated foundry zksync we use contracts that has been built using hardhat contracts.l2StandardErc20FactoryBytecode = Utils.readHardhatBytecode( - "/../l2-contracts/artifacts-zk/@openzeppelin/contracts-v4/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.json" + "/artifacts-zk/@openzeppelin/contracts-v4/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.json" ); contracts.l2TokenProxyBytecode = Utils.readHardhatBytecode( - "/../l2-contracts/artifacts-zk/@openzeppelin/contracts-v4/proxy/beacon/BeaconProxy.sol/BeaconProxy.json" + "/artifacts-zk/@openzeppelin/contracts-v4/proxy/beacon/BeaconProxy.sol/BeaconProxy.json" ); contracts.l2StandardErc20Bytecode = Utils.readHardhatBytecode( - "/../l2-contracts/artifacts-zk/contracts/bridge/L2StandardERC20.sol/L2StandardERC20.json" + "/artifacts-zk/contracts/bridge/BridgedStandardERC20.sol/BridgedStandardERC20.json" ); contracts.l2AssetRouterBytecode = Utils.readHardhatBytecode( - "/../l2-contracts/artifacts-zk/contracts/bridge/L2AssetRouter.sol/L2AssetRouter.json" + "/artifacts-zk/contracts/bridge/asset-router/L2AssetRouter.sol/L2AssetRouter.json" ); contracts.bridgehubBytecode = Utils.readHardhatBytecode( "/../l1-contracts/artifacts-zk/contracts/bridgehub/Bridgehub.sol/Bridgehub.json" @@ -67,7 +67,7 @@ contract GenerateForceDeploymentsData is Script { "/../l1-contracts/artifacts-zk/contracts/bridgehub/MessageRoot.sol/MessageRoot.json" ); contracts.l2NtvBytecode = Utils.readHardhatBytecode( - "/../l2-contracts/artifacts-zk/contracts/bridge/L2NativeTokenVault.sol/L2NativeTokenVault.json" + "/artifacts-zk/contracts/bridge/ntv/L2NativeTokenVault.sol/L2NativeTokenVault.json" ); } diff --git a/l1-contracts/deploy-scripts/RegisterZKChain.s.sol b/l1-contracts/deploy-scripts/RegisterZKChain.s.sol index f5e3fa147..63c230741 100644 --- a/l1-contracts/deploy-scripts/RegisterZKChain.s.sol +++ b/l1-contracts/deploy-scripts/RegisterZKChain.s.sol @@ -16,9 +16,11 @@ import {ChainAdmin} from "contracts/governance/ChainAdmin.sol"; import {AccessControlRestriction} from "contracts/governance/AccessControlRestriction.sol"; import {Utils} from "./Utils.sol"; import {PubdataPricingMode} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; -import {IL1NativeTokenVault} from "contracts/bridge/interfaces/IL1NativeTokenVault.sol"; +import {INativeTokenVault} from "contracts/bridge/ntv/INativeTokenVault.sol"; import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; +import {ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; + contract RegisterZKChainScript is Script { using stdToml for string; @@ -152,11 +154,11 @@ contract RegisterZKChainScript is Script { } function registerTokenOnNTV() internal { - IL1NativeTokenVault ntv = IL1NativeTokenVault(config.nativeTokenVault); + INativeTokenVault ntv = INativeTokenVault(config.nativeTokenVault); // Ownable ownable = Ownable(config.nativeTokenVault); bytes32 baseTokenAssetId = DataEncoding.encodeNTVAssetId(block.chainid, config.baseToken); config.baseTokenAssetId = baseTokenAssetId; - if (ntv.tokenAddress(baseTokenAssetId) != address(0)) { + if (ntv.tokenAddress(baseTokenAssetId) != address(0) || config.baseToken == ETH_TOKEN_ADDRESS) { console.log("Token already registered on NTV"); } else { // bytes memory data = abi.encodeCall(ntv.registerToken, (config.baseToken)); diff --git a/l1-contracts/foundry.toml b/l1-contracts/foundry.toml index 616d6e3d6..c2e651106 100644 --- a/l1-contracts/foundry.toml +++ b/l1-contracts/foundry.toml @@ -17,11 +17,13 @@ fs_permissions = [ { access = "read", path = "./script-config" }, { access = "read-write", path = "./script-out" }, { access = "read", path = "./out" }, - { access = "read", path = "./test/foundry/integration/deploy-scripts/script-config/" }, - { access = "read-write", path = "./test/foundry/integration/deploy-scripts/script-out/" }, + { access = "read", path = "./test/foundry/l1/integration/deploy-scripts/script-config/" }, + { access = "read-write", path = "./test/foundry/l1/integration/deploy-scripts/script-out/" }, + { access = "read", path = "zkout" }, ] ignored_error_codes = ["missing-receive-ether", "code-size"] ignored_warnings_from = ["test", "contracts/dev-contracts"] +suppressed_warnings = ["txorigin"] remappings = [ "forge-std/=lib/forge-std/src/", "murky/=lib/murky/src/", @@ -33,3 +35,6 @@ remappings = [ ] optimizer = true optimizer_runs = 9999999 +[profile.default.zksync] +enable_eravm_extensions = true +zksolc = "1.5.3" diff --git a/l1-contracts/hardhat.config.ts b/l1-contracts/hardhat.config.ts index fc8b7b1d7..f19968b51 100644 --- a/l1-contracts/hardhat.config.ts +++ b/l1-contracts/hardhat.config.ts @@ -13,19 +13,6 @@ if (!process.env.CHAIN_ETH_NETWORK) { require("dotenv").config(); } -const COMPILER_VERSION = "1.5.0"; -const PRE_RELEASE_VERSION = "prerelease-a167aa3-code4rena"; -function getZksolcUrl(): string { - // @ts-ignore - const platform = { darwin: "macosx", linux: "linux", win32: "windows" }[process.platform]; - // @ts-ignore - const toolchain = { linux: "-musl", win32: "-gnu", darwin: "" }[process.platform]; - const arch = process.arch === "x64" ? "amd64" : process.arch; - const ext = process.platform === "win32" ? ".exe" : ""; - - return `https://github.com/matter-labs/era-compiler-solidity/releases/download/${PRE_RELEASE_VERSION}/zksolc-${platform}-${arch}${toolchain}-v${COMPILER_VERSION}${ext}`; -} - // These are L2/ETH networks defined by environment in `dev.env` of zksync-era default development environment // const DEFAULT_L2_NETWORK = "http://127.0.0.1:3050"; const DEFAULT_ETH_NETWORK = "http://127.0.0.1:8545"; @@ -58,7 +45,7 @@ export default { zksolc: { compilerSource: "binary", settings: { - compilerPath: getZksolcUrl(), + // compilerPath: getZksolcUrl(), isSystem: true, }, }, diff --git a/l1-contracts/package.json b/l1-contracts/package.json index fab7c8cbf..6d68729e2 100644 --- a/l1-contracts/package.json +++ b/l1-contracts/package.json @@ -58,9 +58,10 @@ "clean": "hardhat clean && CONTRACTS_BASE_NETWORK_ZKSYNC=true hardhat clean", "clean:foundry": "forge clean", "test": "yarn workspace da-contracts build && hardhat test test/unit_tests/*.spec.ts --network hardhat", - "test:foundry": "forge test --ffi", + "test:foundry": "forge test --ffi --match-path 'test/foundry/l1/*'", + "test:zkfoundry": "forge test --zksync --match-path 'test/foundry/l2/*'", "test:fork": "TEST_CONTRACTS_FORK=1 yarn run hardhat test test/unit_tests/*.fork.ts --network hardhat", - "coverage:foundry": "forge coverage --ffi", + "coverage:foundry": "forge coverage --ffi --match-path 'test/foundry/l1/*' --no-match-coverage 'contracts/bridge/.*L2.*.sol'", "deploy-no-build": "ts-node scripts/deploy.ts", "register-zk-chain": "ts-node scripts/register-zk-chain.ts", "deploy-weth-bridges": "ts-node scripts/deploy-weth-bridges.ts", diff --git a/l1-contracts/scripts/initialize-l2-weth-token.ts b/l1-contracts/scripts/initialize-l2-weth-token.ts index 4bf9dd933..7cb09f075 100644 --- a/l1-contracts/scripts/initialize-l2-weth-token.ts +++ b/l1-contracts/scripts/initialize-l2-weth-token.ts @@ -16,7 +16,7 @@ const provider = web3Provider(); const testConfigPath = path.join(process.env.ZKSYNC_HOME as string, "etc/test_config/constant"); const ethTestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eth.json`, { encoding: "utf-8" })); -const contractArtifactsPath = path.join(process.env.ZKSYNC_HOME as string, "contracts/l2-contracts/artifacts-zk/"); +const contractArtifactsPath = path.join(process.env.ZKSYNC_HOME as string, "contracts/l1-contracts/artifacts-zk/"); const l2BridgeArtifactsPath = path.join(contractArtifactsPath, "contracts/bridge/"); const openzeppelinTransparentProxyArtifactsPath = path.join( contractArtifactsPath, diff --git a/l1-contracts/scripts/sync-layer.ts b/l1-contracts/scripts/sync-layer.ts index f48af69ac..c463ef38d 100644 --- a/l1-contracts/scripts/sync-layer.ts +++ b/l1-contracts/scripts/sync-layer.ts @@ -325,7 +325,7 @@ async function registerSLContractsOnL1(deployer: Deployer) { l1Bridgehub.interface.encodeFunctionData("registerSettlementLayer", [chainId, true]) ); - console.log("Registering Bridgehub counter part on the Gateway", receipt1.transactionHash); + console.log("Registering Gateway as settlement layer on the L1", receipt1.transactionHash); const gasPrice = (await deployer.deployWallet.provider.getGasPrice()).mul(GAS_MULTIPLIER); const value = ( @@ -367,6 +367,7 @@ async function registerSLContractsOnL1(deployer: Deployer) { ]) ); const l2TxHash = zkUtils.getL2HashFromPriorityOp(receipt2, gatewayAddress); + console.log("CTM asset registered in L2SharedBridge on SL tx hash: ", receipt2.transactionHash); console.log("CTM asset registered in L2SharedBridge on SL l2 tx hash: ", l2TxHash); const l2CTMAddress = getAddressFromEnv("GATEWAY_STATE_TRANSITION_PROXY_ADDR"); @@ -379,6 +380,8 @@ async function registerSLContractsOnL1(deployer: Deployer) { l1Bridgehub.interface.encodeFunctionData("addChainTypeManager", [l2CTMAddress]), priorityTxMaxGasLimit ); + const l2TxHash2dot5 = zkUtils.getL2HashFromPriorityOp(receipt3, gatewayAddress); + console.log(`L2 CTM ,l2 txHash: ${l2TxHash2dot5}`); console.log(`L2 CTM address ${l2CTMAddress} registered on gateway, txHash: ${receipt3.transactionHash}`); // Setting the corresponding CTM address on L2. @@ -401,7 +404,8 @@ async function registerSLContractsOnL1(deployer: Deployer) { ]) ); const l2TxHash3 = zkUtils.getL2HashFromPriorityOp(receipt4, gatewayAddress); - console.log("CTM asset registered in L2 Bridgehub on SL", l2TxHash3); + console.log("CTM asset registered in L2 Bridgehub on SL", receipt4.transactionHash); + console.log("CTM asset registered in L2 Bridgehub on SL l2TxHash", l2TxHash3); } // TODO: maybe move it to SDK diff --git a/l1-contracts/src.ts/deploy-process.ts b/l1-contracts/src.ts/deploy-process.ts index 905886fe7..c0f8fd712 100644 --- a/l1-contracts/src.ts/deploy-process.ts +++ b/l1-contracts/src.ts/deploy-process.ts @@ -117,7 +117,9 @@ export async function registerZKChain( if (!(await deployer.bridgehubContract(deployer.deployWallet).assetIdIsRegistered(baseTokenAssetId))) { await deployer.registerTokenBridgehub(baseTokenAddress, useGovernance); } - await deployer.registerTokenInNativeTokenVault(baseTokenAddress); + if (baseTokenAddress !== ADDRESS_ONE) { + await deployer.registerTokenInNativeTokenVault(baseTokenAddress); + } await deployer.registerZKChain( encodeNTVAssetId(deployer.l1ChainId, ethers.utils.hexZeroPad(baseTokenAddress, 32)), validiumMode, diff --git a/l1-contracts/src.ts/deploy-utils-zk.ts b/l1-contracts/src.ts/deploy-utils-zk.ts index d5aac58f9..ec9b50a03 100644 --- a/l1-contracts/src.ts/deploy-utils-zk.ts +++ b/l1-contracts/src.ts/deploy-utils-zk.ts @@ -14,7 +14,7 @@ import { ethersWalletToZkWallet, readBytecode, readInterface } from "./utils"; export const BUILT_IN_ZKSYNC_CREATE2_FACTORY = "0x0000000000000000000000000000000000010000"; const contractsHome = process.env.ZKSYNC_HOME ? path.join(process.env.ZKSYNC_HOME as string, "contracts/") : "../"; -const contractArtifactsPath = path.join(contractsHome, "l2-contracts/artifacts-zk/"); +const contractArtifactsPath = path.join(contractsHome, "l1-contracts/artifacts-zk/"); const openzeppelinBeaconProxyArtifactsPath = path.join( contractArtifactsPath, "@openzeppelin/contracts-v4/proxy/beacon" @@ -24,7 +24,7 @@ export const L2_STANDARD_ERC20_PROXY_FACTORY_BYTECODE = readBytecode( openzeppelinBeaconProxyArtifactsPath, "UpgradeableBeacon" ); -export const L2_STANDARD_ERC20_IMPLEMENTATION_BYTECODE = readBytecode(L2_SHARED_BRIDGE_PATH, "L2StandardERC20"); +export const L2_STANDARD_ERC20_IMPLEMENTATION_BYTECODE = readBytecode(L2_SHARED_BRIDGE_PATH, "BridgedStandardERC20"); export const L2_STANDARD_TOKEN_PROXY_BYTECODE = readBytecode(openzeppelinBeaconProxyArtifactsPath, "BeaconProxy"); export async function deployViaCreate2( diff --git a/l1-contracts/src.ts/deploy-utils.ts b/l1-contracts/src.ts/deploy-utils.ts index 1f2f265f7..d9e7264c1 100644 --- a/l1-contracts/src.ts/deploy-utils.ts +++ b/l1-contracts/src.ts/deploy-utils.ts @@ -122,6 +122,8 @@ export interface DeployedAddresses { DiamondProxy: string; }; Bridges: { + L1NullifierImplementation: string; + L1NullifierProxy: string; ERC20BridgeImplementation: string; ERC20BridgeProxy: string; SharedBridgeImplementation: string; @@ -132,6 +134,8 @@ export interface DeployedAddresses { L2NativeTokenVaultProxy: string; NativeTokenVaultImplementation: string; NativeTokenVaultProxy: string; + BridgedStandardERC20Implementation: string; + BridgedTokenBeacon: string; }; BaseTokenAssetId: string; BaseToken: string; @@ -181,6 +185,8 @@ export function deployedAddressesFromEnv(): DeployedAddresses { DiamondProxy: getAddressFromEnv("CONTRACTS_DIAMOND_PROXY_ADDR"), }, Bridges: { + L1NullifierImplementation: getAddressFromEnv("CONTRACTS_L1_NULLIFIER_IMPL_ADDR"), + L1NullifierProxy: getAddressFromEnv("CONTRACTS_L1_NULLIFIER_PROXY_ADDR"), ERC20BridgeImplementation: getAddressFromEnv("CONTRACTS_L1_ERC20_BRIDGE_IMPL_ADDR"), ERC20BridgeProxy: getAddressFromEnv("CONTRACTS_L1_ERC20_BRIDGE_PROXY_ADDR"), SharedBridgeImplementation: getAddressFromEnv("CONTRACTS_L1_SHARED_BRIDGE_IMPL_ADDR"), @@ -191,6 +197,8 @@ export function deployedAddressesFromEnv(): DeployedAddresses { L2SharedBridgeProxy: getAddressFromEnv("CONTRACTS_L2_SHARED_BRIDGE_ADDR"), NativeTokenVaultImplementation: getAddressFromEnv("CONTRACTS_L1_NATIVE_TOKEN_VAULT_IMPL_ADDR"), NativeTokenVaultProxy: getAddressFromEnv("CONTRACTS_L1_NATIVE_TOKEN_VAULT_PROXY_ADDR"), + BridgedStandardERC20Implementation: getAddressFromEnv("CONTRACTS_L1_BRIDGED_STANDARD_ERC20_IMPL_ADDR"), + BridgedTokenBeacon: getAddressFromEnv("CONTRACTS_L1_BRIDGED_TOKEN_BEACON_ADDR"), }, RollupL1DAValidator: getAddressFromEnv("CONTRACTS_L1_ROLLUP_DA_VALIDATOR"), ValidiumL1DAValidator: getAddressFromEnv("CONTRACTS_L1_VALIDIUM_DA_VALIDATOR"), diff --git a/l1-contracts/src.ts/deploy.ts b/l1-contracts/src.ts/deploy.ts index e2f238269..2b18b096d 100644 --- a/l1-contracts/src.ts/deploy.ts +++ b/l1-contracts/src.ts/deploy.ts @@ -49,9 +49,7 @@ import { readBytecode, applyL1ToL2Alias, BRIDGEHUB_CTM_ASSET_DATA_ABI_STRING, - // priorityTxMaxGasLimit, encodeNTVAssetId, - ETH_ADDRESS_IN_CONTRACTS, L2_MESSAGE_ROOT_ADDRESS, } from "./utils"; import type { ChainAdminCall } from "./utils"; @@ -72,8 +70,8 @@ import { BridgehubFactory, ChainAdminFactory, ERC20Factory, ChainTypeManagerFact import { IL1AssetRouterFactory } from "../typechain/IL1AssetRouterFactory"; import { IL1NativeTokenVaultFactory } from "../typechain/IL1NativeTokenVaultFactory"; +import { IL1NullifierFactory } from "../typechain/IL1NullifierFactory"; import { ICTMDeploymentTrackerFactory } from "../typechain/ICTMDeploymentTrackerFactory"; - import { TestnetERC20TokenFactory } from "../typechain/TestnetERC20TokenFactory"; import { RollupL1DAValidatorFactory } from "../../da-contracts/typechain/RollupL1DAValidatorFactory"; @@ -189,11 +187,11 @@ export class Deployer { let messageRootZKBytecode = ethers.constants.HashZero; if (process.env.CHAIN_ETH_NETWORK != "hardhat") { bridgehubZKBytecode = readBytecode("./artifacts-zk/contracts/bridgehub", "Bridgehub"); - assetRouterZKBytecode = readBytecode("../l2-contracts/artifacts-zk/contracts/bridge", "L2AssetRouter"); - nativeTokenVaultZKBytecode = readBytecode("../l2-contracts/artifacts-zk/contracts/bridge", "L2NativeTokenVault"); + assetRouterZKBytecode = readBytecode("./artifacts-zk/contracts/bridge/asset-router", "L2AssetRouter"); + nativeTokenVaultZKBytecode = readBytecode("./artifacts-zk/contracts/bridge/ntv", "L2NativeTokenVault"); messageRootZKBytecode = readBytecode("./artifacts-zk/contracts/bridgehub", "MessageRoot"); const l2TokenProxyBytecode = readBytecode( - "../l2-contracts/artifacts-zk/@openzeppelin/contracts-v4/proxy/beacon", + "./artifacts-zk/@openzeppelin/contracts-v4/proxy/beacon", "BeaconProxy" ); l2TokenProxyBytecodeHash = ethers.utils.hexlify(hashL2Bytecode(l2TokenProxyBytecode)); @@ -224,13 +222,15 @@ export class Deployer { [getNumberFromEnv("ETH_CLIENT_CHAIN_ID"), eraChainId, this.addresses.Bridges.SharedBridgeProxy, ADDRESS_ONE] ), }; + const tokens = getTokens(); + const l1WethToken = tokens.find((token: { symbol: string }) => token.symbol == "WETH")!.address; const ntvDeployment = { bytecodeHash: ethers.utils.hexlify(hashL2Bytecode(nativeTokenVaultZKBytecode)), newAddress: L2_NATIVE_TOKEN_VAULT_ADDRESS, callConstructor: true, value: 0, input: ethers.utils.defaultAbiCoder.encode( - ["uint256", "address", "bytes32", "address", "address", "bool"], + ["uint256", "address", "bytes32", "address", "address", "bool", "address"], [ getNumberFromEnv("ETH_CLIENT_CHAIN_ID"), applyL1ToL2Alias(this.addresses.Governance), @@ -238,6 +238,7 @@ export class Deployer { ethers.constants.AddressZero, ethers.constants.AddressZero, false, + l1WethToken, ] ), }; @@ -249,7 +250,7 @@ export class Deployer { input: ethers.utils.defaultAbiCoder.encode(["address"], [L2_BRIDGEHUB_ADDRESS]), }; - const forceDeployments = [bridgehubDeployment, assetRouterDeployment, ntvDeployment, messageRootDeployment]; + const forceDeployments = [messageRootDeployment, bridgehubDeployment, assetRouterDeployment, ntvDeployment]; return ethers.utils.defaultAbiCoder.encode([FORCE_DEPLOYMENT_ABI_STRING], [forceDeployments]); } @@ -676,7 +677,12 @@ export class Deployer { const eraChainId = getNumberFromEnv("CONTRACTS_ERA_CHAIN_ID"); const contractAddress = await this.deployViaCreate2( dummy ? "DummyL1ERC20Bridge" : "L1ERC20Bridge", - [this.addresses.Bridges.SharedBridgeProxy, this.addresses.Bridges.NativeTokenVaultProxy, eraChainId], + [ + this.addresses.Bridges.L1NullifierProxy, + this.addresses.Bridges.SharedBridgeProxy, + this.addresses.Bridges.NativeTokenVaultProxy, + eraChainId, + ], create2Salt, ethTxOptions ); @@ -837,6 +843,44 @@ export class Deployer { this.addresses.Bridges.ERC20BridgeProxy = contractAddress; } + public async deployL1NullifierImplementation(create2Salt: string, ethTxOptions: ethers.providers.TransactionRequest) { + // const tokens = getTokens(); + // const l1WethToken = tokens.find((token: { symbol: string }) => token.symbol == "WETH")!.address; + const eraChainId = getNumberFromEnv("CONTRACTS_ERA_CHAIN_ID"); + const eraDiamondProxy = getAddressFromEnv("CONTRACTS_ERA_DIAMOND_PROXY_ADDR"); + const contractAddress = await this.deployViaCreate2( + "L1Nullifier", + [this.addresses.Bridgehub.BridgehubProxy, eraChainId, eraDiamondProxy], + create2Salt, + ethTxOptions + ); + + if (this.verbose) { + console.log(`CONTRACTS_L1_NULLIFIER_IMPL_ADDR=${contractAddress}`); + } + + this.addresses.Bridges.L1NullifierImplementation = contractAddress; + } + + public async deployL1NullifierProxy(create2Salt: string, ethTxOptions: ethers.providers.TransactionRequest) { + const initCalldata = new Interface(hardhat.artifacts.readArtifactSync("L1Nullifier").abi).encodeFunctionData( + "initialize", + [this.addresses.Governance, 1, 1, 1, 0] + ); + const contractAddress = await this.deployViaCreate2( + "TransparentUpgradeableProxy", + [this.addresses.Bridges.L1NullifierImplementation, this.addresses.TransparentProxyAdmin, initCalldata], + create2Salt, + ethTxOptions + ); + + if (this.verbose) { + console.log(`CONTRACTS_L1_NULLIFIER_PROXY_ADDR=${contractAddress}`); + } + + this.addresses.Bridges.L1NullifierProxy = contractAddress; + } + public async deploySharedBridgeImplementation( create2Salt: string, ethTxOptions: ethers.providers.TransactionRequest @@ -847,7 +891,13 @@ export class Deployer { const eraDiamondProxy = getAddressFromEnv("CONTRACTS_ERA_DIAMOND_PROXY_ADDR"); const contractAddress = await this.deployViaCreate2( "L1AssetRouter", - [l1WethToken, this.addresses.Bridgehub.BridgehubProxy, eraChainId, eraDiamondProxy], + [ + l1WethToken, + this.addresses.Bridgehub.BridgehubProxy, + this.addresses.Bridges.L1NullifierProxy, + eraChainId, + eraDiamondProxy, + ], create2Salt, ethTxOptions ); @@ -863,7 +913,7 @@ export class Deployer { public async deploySharedBridgeProxy(create2Salt: string, ethTxOptions: ethers.providers.TransactionRequest) { const initCalldata = new Interface(hardhat.artifacts.readArtifactSync("L1AssetRouter").abi).encodeFunctionData( "initialize", - [this.addresses.Governance, 1, 1, 1, 0] + [this.addresses.Governance] ); const contractAddress = await this.deployViaCreate2( "@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol:TransparentUpgradeableProxy", @@ -879,17 +929,54 @@ export class Deployer { this.addresses.Bridges.SharedBridgeProxy = contractAddress; } + public async deployBridgedStandardERC20Implementation( + create2Salt: string, + ethTxOptions: ethers.providers.TransactionRequest + ) { + const contractAddress = await this.deployViaCreate2("BridgedStandardERC20", [], create2Salt, ethTxOptions); + + if (this.verbose) { + // console.log(`With era chain id ${eraChainId}`); + console.log(`CONTRACTS_L1_BRIDGED_STANDARD_ERC20_IMPL_ADDR=${contractAddress}`); + } + + this.addresses.Bridges.BridgedStandardERC20Implementation = contractAddress; + } + + public async deployBridgedTokenBeacon(create2Salt: string, ethTxOptions: ethers.providers.TransactionRequest) { + /// Note we cannot use create2 as the deployer is the owner. + ethTxOptions.gasLimit ??= 10_000_000; + const contractFactory = await hardhat.ethers.getContractFactory( + "@openzeppelin/contracts-v4/proxy/beacon/UpgradeableBeacon.sol:UpgradeableBeacon", + { + signer: this.deployWallet, + } + ); + const beacon = await contractFactory.deploy( + ...[this.addresses.Bridges.BridgedStandardERC20Implementation, ethTxOptions] + ); + const rec = await beacon.deployTransaction.wait(); + + if (this.verbose) { + console.log("Beacon deployed with tx hash", rec.transactionHash); + console.log(`CONTRACTS_L1_BRIDGED_TOKEN_BEACON_ADDR=${beacon.address}`); + } + + this.addresses.Bridges.BridgedTokenBeacon = beacon.address; + + await beacon.transferOwnership(this.addresses.Governance); + } + public async deployNativeTokenVaultImplementation( create2Salt: string, ethTxOptions: ethers.providers.TransactionRequest ) { - // const eraChainId = getNumberFromEnv("CONTRACTS_ERA_CHAIN_ID"); + const eraChainId = getNumberFromEnv("CONTRACTS_ERA_CHAIN_ID"); const tokens = getTokens(); const l1WethToken = tokens.find((token: { symbol: string }) => token.symbol == "WETH")!.address; - const contractAddress = await this.deployViaCreate2( "L1NativeTokenVault", - [l1WethToken, this.addresses.Bridges.SharedBridgeProxy], + [l1WethToken, this.addresses.Bridges.SharedBridgeProxy, eraChainId, this.addresses.Bridges.L1NullifierProxy], create2Salt, ethTxOptions ); @@ -905,7 +992,7 @@ export class Deployer { public async deployNativeTokenVaultProxy(create2Salt: string, ethTxOptions: ethers.providers.TransactionRequest) { const initCalldata = new Interface(hardhat.artifacts.readArtifactSync("L1NativeTokenVault").abi).encodeFunctionData( "initialize", - [this.addresses.Governance] + [this.addresses.Governance, this.addresses.Bridges.BridgedTokenBeacon] ); const contractAddress = await this.deployViaCreate2( "TransparentUpgradeableProxy", @@ -920,14 +1007,32 @@ export class Deployer { this.addresses.Bridges.NativeTokenVaultProxy = contractAddress; - const sharedBridge = this.defaultSharedBridge(this.deployWallet); - const data = await sharedBridge.interface.encodeFunctionData("setNativeTokenVault", [ + const nullifier = this.l1NullifierContract(this.deployWallet); + const assetRouter = this.defaultSharedBridge(this.deployWallet); + + const data = await assetRouter.interface.encodeFunctionData("setNativeTokenVault", [ this.addresses.Bridges.NativeTokenVaultProxy, ]); await this.executeUpgrade(this.addresses.Bridges.SharedBridgeProxy, 0, data); if (this.verbose) { console.log("Native token vault set in shared bridge"); } + + const data2 = await nullifier.interface.encodeFunctionData("setL1NativeTokenVault", [ + this.addresses.Bridges.NativeTokenVaultProxy, + ]); + await this.executeUpgrade(this.addresses.Bridges.L1NullifierProxy, 0, data2); + if (this.verbose) { + console.log("Native token vault set in nullifier"); + } + + const data3 = await nullifier.interface.encodeFunctionData("setL1AssetRouter", [ + this.addresses.Bridges.SharedBridgeProxy, + ]); + await this.executeUpgrade(this.addresses.Bridges.L1NullifierProxy, 0, data3); + if (this.verbose) { + console.log("Asset router set in nullifier"); + } } public async deployCTMDeploymentTrackerImplementation( @@ -997,14 +1102,6 @@ export class Deployer { if (this.verbose) { console.log("Shared bridge was registered in Bridgehub"); } - - /// registering ETH as a valid token, with address 1. - const baseTokenAssetId = encodeNTVAssetId(this.l1ChainId, ETH_ADDRESS_IN_CONTRACTS); - const upgradeData2 = bridgehub.interface.encodeFunctionData("addTokenAssetId", [baseTokenAssetId]); - await this.executeUpgrade(this.addresses.Bridgehub.BridgehubProxy, 0, upgradeData2); - if (this.verbose) { - console.log("ETH token asset id registered in Bridgehub"); - } } public async registerTokenBridgehub(tokenAddress: string, useGovernance: boolean = false) { @@ -1191,7 +1288,9 @@ export class Deployer { // The ctmAssetIFromChainId gives us a unique 'asset' identifier for a given chain. const chainAssetId = await bridgehub.ctmAssetIdFromChainId(this.chainId); - console.log("Chain asset id is: ", chainAssetId); + if (this.verbose) { + console.log("Chain asset id is: ", chainAssetId); + } let sharedBridgeData = ethers.utils.defaultAbiCoder.encode( ["bytes32", "bytes"], @@ -1228,7 +1327,7 @@ export class Deployer { } public async finishMoveChainToL1(synclayerChainId: number) { - const sharedBridge = this.defaultSharedBridge(this.deployWallet); + const nullifier = this.l1NullifierContract(this.deployWallet); // const baseTokenAmount = ethers.utils.parseEther("1"); // const chainData = new ethers.utils.AbiCoder().encode(["uint256", "bytes"], [ADDRESS_ONE, "0x"]); // todo // const bridgehubData = new ethers.utils.AbiCoder().encode(["uint256", "bytes"], [this.chainId, chainData]); @@ -1244,7 +1343,7 @@ export class Deployer { const l2TxNumberInBatch = 1; const message = ethers.utils.defaultAbiCoder.encode(["bytes32", "bytes"], []); const merkleProof = ["0x00"]; - const tx = await sharedBridge.finalizeWithdrawal( + const tx = await nullifier.finalizeWithdrawal( synclayerChainId, l2BatchNumber, l2MsgIndex, @@ -1268,7 +1367,6 @@ export class Deployer { predefinedChainId?: string, useGovernance: boolean = false ) { - console.log(baseTokenAssetId); const txOptions = this.isZkMode() ? {} : { gasLimit: 10_000_000 }; nonce = nonce ? parseInt(nonce) : await this.deployWallet.getTransactionCount(); @@ -1447,9 +1545,16 @@ export class Deployer { public async deploySharedBridgeContracts(create2Salt: string, gasPrice?: BigNumberish, nonce?) { nonce = nonce ? parseInt(nonce) : await this.deployWallet.getTransactionCount(); + await this.deployL1NullifierImplementation(create2Salt, { gasPrice, nonce: nonce }); + await this.deployL1NullifierProxy(create2Salt, { gasPrice, nonce: nonce + 1 }); + + nonce = nonce + 2; await this.deploySharedBridgeImplementation(create2Salt, { gasPrice, nonce: nonce }); await this.deploySharedBridgeProxy(create2Salt, { gasPrice, nonce: nonce + 1 }); - await this.deployNativeTokenVaultImplementation(create2Salt, { gasPrice, nonce: nonce + 2 }); + nonce = nonce + 2; + await this.deployBridgedStandardERC20Implementation(create2Salt, { gasPrice, nonce: nonce }); + await this.deployBridgedTokenBeacon(create2Salt, { gasPrice, nonce: nonce + 1 }); + await this.deployNativeTokenVaultImplementation(create2Salt, { gasPrice, nonce: nonce + 3 }); await this.deployNativeTokenVaultProxy(create2Salt, { gasPrice }); await this.deployCTMDeploymentTrackerImplementation(create2Salt, { gasPrice }); await this.deployCTMDeploymentTrackerProxy(create2Salt, { gasPrice }); @@ -1596,6 +1701,10 @@ export class Deployer { return IL1AssetRouterFactory.connect(this.addresses.Bridges.SharedBridgeProxy, signerOrProvider); } + public l1NullifierContract(signerOrProvider: Signer | providers.Provider) { + return IL1NullifierFactory.connect(this.addresses.Bridges.L1NullifierProxy, signerOrProvider); + } + public nativeTokenVault(signerOrProvider: Signer | providers.Provider) { return IL1NativeTokenVaultFactory.connect(this.addresses.Bridges.NativeTokenVaultProxy, signerOrProvider); } diff --git a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml deleted file mode 100644 index d814b1100..000000000 --- a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml +++ /dev/null @@ -1,56 +0,0 @@ -create2_factory_addr = "0x4e59b44847b379578588920cA78FbF26c0B4956C" -create2_factory_salt = "0x00000000000000000000000000000000000000000000000000000000000000ff" -deployer_addr = "0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496" -era_chain_id = 9 -force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000000000000000000000000000000000000000044057a1f541e2810b602ab7b7e8693b11637725d8593c147036bcbd6a39f92685db00000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9c156a211e2be8ddc2c09d615b68d676891959b66e884c1bb87d052129cbd33aa00000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000001c935eb77922a6cd5b9a2c90cc75dc6b2205bf70c196b94e11ec12c908d85d0a400000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9554b5e8820768894caf758e182b80205d2a55d217795c711cc044cf83539f66000000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000000120f7429ef6dabd06c8f10849cc6590798b232fd69a4748c7d43c05d8984976c00000000000000000000000000000000000000000000000000000000000100050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010002" -l1_chain_id = 31337 -multicall3_addr = "0x0cbaE56294C5e394648A323238F6428bD0D0Bc35" -owner_address = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" - -[contracts_config] -diamond_cut_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000003f7f7d7ff6f56b740065e7847364a71c862766610000000000000000000000000000000000000000000000000000000000000d8000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009e00000000000000000000000000000000000000000000000000000000000000be000000000000000000000000060ea3b1444f8b0679a7952464676682b915e975900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db865000000000000000000000000000000000000000000000000000000000000000000000000000000004ddc445c3ce03a1d5a3afd2db83bcdd2ef23c75d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002e06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000022c5cf230000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000946ebad100000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000000000000000000000000000762a0212978b65456fb5894d4e2304fcb586366f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000d077255100000000000000000000000000000000000000000000000000000000ddcc9eec00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab700000000000000000000000000000000000000000000000000000000000000000000000000000000093836714630aa112946f59ab96b55bbcc6f223c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040f23da4300000000000000000000000000000000000000000000000000000000e12a61370000000000000000000000000000000000000000000000000000000098f8196200000000000000000000000000000000000000000000000000000000cf02827d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000773c73f5bb8e67672e89d70c17f2a72efede1707000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" -diamond_init_batch_overhead_l1_gas = 1000000 -diamond_init_max_l2_gas_per_batch = 80000000 -diamond_init_max_pubdata_per_batch = 120000 -diamond_init_minimal_l2_gas_price = 250000000 -diamond_init_priority_tx_max_pubdata = 99000 -diamond_init_pubdata_pricing_mode = 0 -force_deployments_data = "0x00" -priority_tx_max_gas_limit = 80000000 -recursion_circuits_set_vks_hash = "0x0000000000000000000000000000000000000000000000000000000000000000" -recursion_leaf_level_vk_hash = "0x0000000000000000000000000000000000000000000000000000000000000000" -recursion_node_level_vk_hash = "0x0000000000000000000000000000000000000000000000000000000000000000" - -[deployed_addresses] -blob_versioned_hash_retriever_addr = "0xA4cB26d6933D2c3E76718D30de8547bCDF8dD241" -governance_addr = "0x1A1f85cb95be3a3684D77bf774b58055bD32C937" -native_token_vault_addr = "0x989cfAeC0dc117aeDC07214354b87e4D2111576f" -transparent_proxy_admin_addr = "0x4f559F30f5eB88D635FDe1548C4267DB8FaB0351" -validator_timelock_addr = "0x118c6472E53FE71DCDFa7Def302eFA97c89a9fb5" - -[deployed_addresses.bridgehub] -bridgehub_implementation_addr = "0xCC492cFda50ac96AbdD1EEAbADc1592d1Ad0F919" -bridgehub_proxy_addr = "0x7fa8C3590E5B8a661dFdF2f80Eeb63FC8eF8d75c" -ctm_deployment_tracker_implementation_addr = "0x01D8E20da1C7922C6665e669C2ab0faF87E2112E" -ctm_deployment_tracker_proxy_addr = "0x90Bd8fECCFAc74A7bd80CE92CBFE9C3d41EA22dE" -message_root_implementation_addr = "0x5D8dfB5052A39Ec48459185f0A3bdc5Cc2D398D8" -message_root_proxy_addr = "0xc041eD26369228342771DbEFFccC945b3AE39634" - -[deployed_addresses.bridges] -erc20_bridge_implementation_addr = "0x792C3873689e1C7fAD832BEE71EFde5b3a96Bc75" -erc20_bridge_proxy_addr = "0xe48A3910d1Ce2a3B2Dd4c882695647B53aaE2C2A" -shared_bridge_implementation_addr = "0xDBc1c67DfC2f4EFCF275Edf56fbe0aE4198309Ba" -shared_bridge_proxy_addr = "0xaA3d7997Ed6E5810735908B149827CB9D05ac055" - -[deployed_addresses.state_transition] -admin_facet_addr = "0x60EA3B1444F8b0679A7952464676682B915e9759" -default_upgrade_addr = "0x73dc8F82EB3841e9686cF851885a20E7eCC0a55e" -diamond_init_addr = "0x3f7F7d7ff6f56B740065E7847364A71C86276661" -diamond_proxy_addr = "0x0000000000000000000000000000000000000000" -executor_facet_addr = "0x093836714630AA112946F59Ab96b55bBCc6f223C" -genesis_upgrade_addr = "0x43d15D60832EC0bBcd2AEFDa0F7753150D7c99B2" -getters_facet_addr = "0x4dDc445C3cE03a1D5A3afD2dB83Bcdd2Ef23C75D" -mailbox_facet_addr = "0x762a0212978b65456Fb5894d4E2304FcB586366f" -state_transition_implementation_addr = "0xEeBD46649B10448378A5D82D18f615Cb1dC7D6B6" -state_transition_proxy_addr = "0xEe2311976DF44E9337fCF9dd42819dDE98Ca28D8" -verifier_addr = "0x773C73f5bB8E67672E89D70c17F2a72EfEDe1707" diff --git a/l1-contracts/test/foundry/l1/integration/AssetRouterTest.t.sol b/l1-contracts/test/foundry/l1/integration/AssetRouterTest.t.sol new file mode 100644 index 000000000..de9a21f0f --- /dev/null +++ b/l1-contracts/test/foundry/l1/integration/AssetRouterTest.t.sol @@ -0,0 +1,188 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.8.24; + +import "forge-std/console.sol"; + +import {Test} from "forge-std/Test.sol"; +import {Vm} from "forge-std/Vm.sol"; + +import {L2TransactionRequestDirect, L2TransactionRequestTwoBridgesOuter} from "contracts/bridgehub/IBridgehub.sol"; +import {TestnetERC20Token} from "contracts/dev-contracts/TestnetERC20Token.sol"; +import {MailboxFacet} from "contracts/state-transition/chain-deps/facets/Mailbox.sol"; +import {GettersFacet} from "contracts/state-transition/chain-deps/facets/Getters.sol"; +import {IMailbox} from "contracts/state-transition/chain-interfaces/IMailbox.sol"; +import {IExecutor} from "contracts/state-transition/chain-interfaces/IExecutor.sol"; +import {L1ContractDeployer} from "./_SharedL1ContractDeployer.t.sol"; +import {TokenDeployer} from "./_SharedTokenDeployer.t.sol"; +import {ZKChainDeployer} from "./_SharedZKChainDeployer.t.sol"; +import {L2TxMocker} from "./_SharedL2TxMocker.t.sol"; +import {ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; +import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA, DEFAULT_L2_LOGS_TREE_ROOT_HASH, EMPTY_STRING_KECCAK} from "contracts/common/Config.sol"; +import {L2CanonicalTransaction, L2Message} from "contracts/common/Messaging.sol"; +import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; +import {L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR} from "contracts/common/L2ContractAddresses.sol"; +import {IL1ERC20Bridge} from "contracts/bridge/interfaces/IL1ERC20Bridge.sol"; +import {IZKChain} from "contracts/state-transition/chain-interfaces/IZKChain.sol"; +import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.sol"; +import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; +import {IL1NativeTokenVault} from "contracts/bridge/ntv/IL1NativeTokenVault.sol"; +import {IL1Nullifier, FinalizeL1DepositParams} from "contracts/bridge/interfaces/IL1Nullifier.sol"; +import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; +import {IAssetRouterBase, LEGACY_ENCODING_VERSION, NEW_ENCODING_VERSION} from "contracts/bridge/asset-router/IAssetRouterBase.sol"; +import {L2_ASSET_ROUTER_ADDR, L2_NATIVE_TOKEN_VAULT_ADDR} from "contracts/common/L2ContractAddresses.sol"; +import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; +import {BridgeHelper} from "contracts/bridge/BridgeHelper.sol"; +import {BridgedStandardERC20, NonSequentialVersion} from "contracts/bridge/BridgedStandardERC20.sol"; +import {IBridgedStandardToken} from "contracts/bridge/BridgedStandardERC20.sol"; +import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; + +contract AssetRouterTest is L1ContractDeployer, ZKChainDeployer, TokenDeployer, L2TxMocker { + uint256 constant TEST_USERS_COUNT = 10; + address[] public users; + address[] public l2ContractAddresses; + bytes32 public l2TokenAssetId; + address public tokenL1Address; + // generate MAX_USERS addresses and append it to users array + function _generateUserAddresses() internal { + require(users.length == 0, "Addresses already generated"); + + for (uint256 i = 0; i < TEST_USERS_COUNT; i++) { + address newAddress = makeAddr(string(abi.encode("account", i))); + users.push(newAddress); + } + } + + function prepare() public { + _generateUserAddresses(); + + _deployL1Contracts(); + _deployTokens(); + _registerNewTokens(tokens); + + _deployEra(); + // _deployHyperchain(ETH_TOKEN_ADDRESS); + // _deployHyperchain(ETH_TOKEN_ADDRESS); + // _deployHyperchain(tokens[0]); + // _deployHyperchain(tokens[0]); + // _deployHyperchain(tokens[1]); + // _deployHyperchain(tokens[1]); + + for (uint256 i = 0; i < zkChainIds.length; i++) { + address contractAddress = makeAddr(string(abi.encode("contract", i))); + l2ContractAddresses.push(contractAddress); + + _addL2ChainContract(zkChainIds[i], contractAddress); + } + } + + function setUp() public { + prepare(); + } + + function depositToL1(address _tokenAddress) public { + vm.mockCall( + address(bridgeHub), + abi.encodeWithSelector(IBridgehub.proveL2MessageInclusion.selector), + abi.encode(true) + ); + uint256 chainId = eraZKChainId; + l2TokenAssetId = DataEncoding.encodeNTVAssetId(chainId, address(1)); + bytes memory transferData = DataEncoding.encodeBridgeMintData({ + _prevMsgSender: ETH_TOKEN_ADDRESS, + _l2Receiver: address(this), + _l1Token: ETH_TOKEN_ADDRESS, + _amount: 100, + _erc20Metadata: BridgeHelper.getERC20Getters(_tokenAddress) + }); + l1Nullifier.finalizeDeposit( + FinalizeL1DepositParams({ + chainId: chainId, + l2BatchNumber: 1, + l2MessageIndex: 1, + l2Sender: L2_ASSET_ROUTER_ADDR, + l2TxNumberInBatch: 1, + message: abi.encodePacked( + IAssetRouterBase.finalizeDeposit.selector, + chainId, + l2TokenAssetId, + transferData + ), + merkleProof: new bytes32[](0) + }) + ); + tokenL1Address = l1NativeTokenVault.tokenAddress(l2TokenAssetId); + } + + function test_DepositToL1_Success() public { + depositToL1(ETH_TOKEN_ADDRESS); + } + + function test_BridgeTokenFunctions() public { + depositToL1(ETH_TOKEN_ADDRESS); + BridgedStandardERC20 bridgedToken = BridgedStandardERC20(l1NativeTokenVault.tokenAddress(l2TokenAssetId)); + assertEq(bridgedToken.name(), "Ether"); + assertEq(bridgedToken.symbol(), "ETH"); + assertEq(bridgedToken.decimals(), 18); + } + + function test_reinitBridgedToken_Success() public { + depositToL1(ETH_TOKEN_ADDRESS); + BridgedStandardERC20 bridgedToken = BridgedStandardERC20(l1NativeTokenVault.tokenAddress(l2TokenAssetId)); + address owner = l1NativeTokenVault.owner(); + vm.broadcast(owner); + bridgedToken.reinitializeToken( + BridgedStandardERC20.ERC20Getters({ignoreName: false, ignoreSymbol: false, ignoreDecimals: false}), + "TestnetERC20Token", + "TST", + 2 + ); + } + + function test_reinitBridgedToken_WrongVersion() public { + depositToL1(ETH_TOKEN_ADDRESS); + BridgedStandardERC20 bridgedToken = BridgedStandardERC20(l1NativeTokenVault.tokenAddress(l2TokenAssetId)); + vm.expectRevert(NonSequentialVersion.selector); + bridgedToken.reinitializeToken( + BridgedStandardERC20.ERC20Getters({ignoreName: false, ignoreSymbol: false, ignoreDecimals: false}), + "TestnetERC20Token", + "TST", + 3 + ); + } + + /// @dev We should not test this on the L1, but to get coverage we do. + function test_BridgeTokenBurn() public { + depositToL1(ETH_TOKEN_ADDRESS); + BridgedStandardERC20 bridgedToken = BridgedStandardERC20(l1NativeTokenVault.tokenAddress(l2TokenAssetId)); + vm.store(address(bridgedToken), bytes32(uint256(207)), bytes32(0)); + vm.broadcast(L2_NATIVE_TOKEN_VAULT_ADDR); // kl todo call ntv, or even assetRouter/bridgehub + bridgedToken.bridgeBurn(address(this), 100); + } + + function test_DepositToL1AndWithdraw() public { + depositToL1(ETH_TOKEN_ADDRESS); + bytes memory secondBridgeCalldata = bytes.concat( + NEW_ENCODING_VERSION, + abi.encode(l2TokenAssetId, abi.encode(uint256(100), address(this))) + ); + IERC20(tokenL1Address).approve(address(l1NativeTokenVault), 100); + console.log("kl todo 6", tokenL1Address); + console.logBytes32(l2TokenAssetId); + bridgeHub.requestL2TransactionTwoBridges{value: 250000000000100}( + L2TransactionRequestTwoBridgesOuter({ + chainId: eraZKChainId, + mintValue: 250000000000100, + l2Value: 0, + l2GasLimit: 1000000, + l2GasPerPubdataByteLimit: REQUIRED_L2_GAS_PRICE_PER_PUBDATA, + refundRecipient: address(0), + secondBridgeAddress: address(sharedBridge), + secondBridgeValue: 0, + secondBridgeCalldata: secondBridgeCalldata + }) + ); + } + + // add this to be excluded from coverage report + function test() internal override {} +} diff --git a/l1-contracts/test/foundry/integration/BridgeHubInvariantTests.t.sol b/l1-contracts/test/foundry/l1/integration/BridgeHubInvariantTests.t.sol similarity index 97% rename from l1-contracts/test/foundry/integration/BridgeHubInvariantTests.t.sol rename to l1-contracts/test/foundry/l1/integration/BridgeHubInvariantTests.t.sol index df97219f3..f7bd23b28 100644 --- a/l1-contracts/test/foundry/integration/BridgeHubInvariantTests.t.sol +++ b/l1-contracts/test/foundry/l1/integration/BridgeHubInvariantTests.t.sol @@ -486,8 +486,8 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe bytes32[] memory merkleProof = new bytes32[](1); _setSharedBridgeIsWithdrawalFinalized(currentChainId, l2BatchNumber, l2MessageIndex, false); - uint256 beforeChainBalance = sharedBridge.chainBalance(currentChainId, currentTokenAddress); - uint256 beforeBalance = currentToken.balanceOf(sharedBridgeProxyAddress); + uint256 beforeChainBalance = l1Nullifier.__DEPRECATED_chainBalance(currentChainId, currentTokenAddress); + uint256 beforeBalance = currentToken.balanceOf(address(sharedBridge)); if (beforeChainBalance < amountToWithdraw) { vm.expectRevert("L1AR: not enough funds 2"); @@ -534,10 +534,10 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe // check if the balance was updated correctly if (beforeChainBalance > amountToWithdraw) { assertEq( - beforeChainBalance - sharedBridge.chainBalance(currentChainId, currentTokenAddress), + beforeChainBalance - l1Nullifier.__DEPRECATED_chainBalance(currentChainId, currentTokenAddress), amountToWithdraw ); - assertEq(beforeBalance - currentToken.balanceOf(sharedBridgeProxyAddress), amountToWithdraw); + assertEq(beforeBalance - currentToken.balanceOf(address(sharedBridge)), amountToWithdraw); } } @@ -548,8 +548,8 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe bytes32[] memory merkleProof = new bytes32[](1); _setSharedBridgeIsWithdrawalFinalized(currentChainId, l2BatchNumber, l2MessageIndex, false); - uint256 beforeChainBalance = sharedBridge.chainBalance(currentChainId, currentTokenAddress); - uint256 beforeBalance = sharedBridgeProxyAddress.balance; + uint256 beforeChainBalance = l1Nullifier.__DEPRECATED_chainBalance(currentChainId, currentTokenAddress); + uint256 beforeBalance = address(sharedBridge).balance; if (beforeChainBalance < amountToWithdraw) { vm.expectRevert("L1AR: not enough funds 2"); @@ -590,10 +590,10 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe // check if the balance was updated correctly if (beforeChainBalance > amountToWithdraw) { assertEq( - beforeChainBalance - sharedBridge.chainBalance(currentChainId, currentTokenAddress), + beforeChainBalance - l1Nullifier.__DEPRECATED_chainBalance(currentChainId, currentTokenAddress), amountToWithdraw ); - assertEq(beforeBalance - sharedBridgeProxyAddress.balance, amountToWithdraw); + assertEq(beforeBalance - address(sharedBridge).balance, amountToWithdraw); } } @@ -644,7 +644,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe function getAddressesToExclude() public returns (address[] memory) { addressesToExclude.push(bridgehubProxyAddress); - addressesToExclude.push(sharedBridgeProxyAddress); + addressesToExclude.push(address(sharedBridge)); for (uint256 i = 0; i < users.length; i++) { addressesToExclude.push(users[i]); diff --git a/l1-contracts/test/foundry/integration/BridgehubTests.t.sol b/l1-contracts/test/foundry/l1/integration/BridgehubTests.t.sol similarity index 97% rename from l1-contracts/test/foundry/integration/BridgehubTests.t.sol rename to l1-contracts/test/foundry/l1/integration/BridgehubTests.t.sol index fb1262ed4..4e262ad50 100644 --- a/l1-contracts/test/foundry/integration/BridgehubTests.t.sol +++ b/l1-contracts/test/foundry/l1/integration/BridgehubTests.t.sol @@ -486,8 +486,8 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe bytes32[] memory merkleProof = new bytes32[](1); _setSharedBridgeIsWithdrawalFinalized(currentChainId, l2BatchNumber, l2MessageIndex, false); - uint256 beforeChainBalance = sharedBridge.chainBalance(currentChainId, currentTokenAddress); - uint256 beforeBalance = currentToken.balanceOf(sharedBridgeProxyAddress); + uint256 beforeChainBalance = l1Nullifier.__DEPRECATED_chainBalance(currentChainId, currentTokenAddress); + uint256 beforeBalance = currentToken.balanceOf(address(sharedBridge)); if (beforeChainBalance < amountToWithdraw) { vm.expectRevert("L1AR: not enough funds 2"); @@ -534,10 +534,10 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe // check if the balance was updated correctly if (beforeChainBalance > amountToWithdraw) { assertEq( - beforeChainBalance - sharedBridge.chainBalance(currentChainId, currentTokenAddress), + beforeChainBalance - l1Nullifier.__DEPRECATED_chainBalance(currentChainId, currentTokenAddress), amountToWithdraw ); - assertEq(beforeBalance - currentToken.balanceOf(sharedBridgeProxyAddress), amountToWithdraw); + assertEq(beforeBalance - currentToken.balanceOf(address(sharedBridge)), amountToWithdraw); } } @@ -548,8 +548,8 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe bytes32[] memory merkleProof = new bytes32[](1); _setSharedBridgeIsWithdrawalFinalized(currentChainId, l2BatchNumber, l2MessageIndex, false); - uint256 beforeChainBalance = sharedBridge.chainBalance(currentChainId, currentTokenAddress); - uint256 beforeBalance = sharedBridgeProxyAddress.balance; + uint256 beforeChainBalance = l1Nullifier.__DEPRECATED_chainBalance(currentChainId, currentTokenAddress); + uint256 beforeBalance = address(sharedBridge).balance; if (beforeChainBalance < amountToWithdraw) { vm.expectRevert("L1AR: not enough funds 2"); @@ -590,10 +590,10 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe // check if the balance was updated correctly if (beforeChainBalance > amountToWithdraw) { assertEq( - beforeChainBalance - sharedBridge.chainBalance(currentChainId, currentTokenAddress), + beforeChainBalance - l1Nullifier.__DEPRECATED_chainBalance(currentChainId, currentTokenAddress), amountToWithdraw ); - assertEq(beforeBalance - sharedBridgeProxyAddress.balance, amountToWithdraw); + assertEq(beforeBalance - address(sharedBridge).balance, amountToWithdraw); } } @@ -644,7 +644,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe function getAddressesToExclude() public returns (address[] memory) { addressesToExclude.push(bridgehubProxyAddress); - addressesToExclude.push(sharedBridgeProxyAddress); + addressesToExclude.push(address(sharedBridge)); for (uint256 i = 0; i < users.length; i++) { addressesToExclude.push(users[i]); diff --git a/l1-contracts/test/foundry/integration/DeploymentTest.t.sol b/l1-contracts/test/foundry/l1/integration/DeploymentTest.t.sol similarity index 100% rename from l1-contracts/test/foundry/integration/DeploymentTest.t.sol rename to l1-contracts/test/foundry/l1/integration/DeploymentTest.t.sol diff --git a/l1-contracts/test/foundry/integration/GatewayTests.t.sol b/l1-contracts/test/foundry/l1/integration/GatewayTests.t.sol similarity index 97% rename from l1-contracts/test/foundry/integration/GatewayTests.t.sol rename to l1-contracts/test/foundry/l1/integration/GatewayTests.t.sol index ee2b9ab0b..9224e3341 100644 --- a/l1-contracts/test/foundry/integration/GatewayTests.t.sol +++ b/l1-contracts/test/foundry/l1/integration/GatewayTests.t.sol @@ -23,7 +23,7 @@ import {L2Message} from "contracts/common/Messaging.sol"; import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; import {L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR} from "contracts/common/L2ContractAddresses.sol"; import {IL1ERC20Bridge} from "contracts/bridge/interfaces/IL1ERC20Bridge.sol"; -import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; +import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; import {Ownable} from "@openzeppelin/contracts-v4/access/Ownable.sol"; import {IZKChain} from "contracts/state-transition/chain-interfaces/IZKChain.sol"; @@ -167,7 +167,7 @@ contract GatewayTests is L1ContractDeployer, ZKChainDeployer, TokenDeployer, L2T } address chainAdmin = IZKChain(bridgehub.getZKChain(migratingChainId)).getAdmin(); - IL1AssetRouter assetRouter = bridgehub.sharedBridge(); + IL1AssetRouter assetRouter = IL1AssetRouter(address(bridgehub.sharedBridge())); bytes32 l2TxHash = keccak256("l2TxHash"); uint256 l2BatchNumber = 5; uint256 l2MessageIndex = 0; @@ -201,7 +201,7 @@ contract GatewayTests is L1ContractDeployer, ZKChainDeployer, TokenDeployer, L2T vm.stopBroadcast(); vm.startBroadcast(); - assetRouter.bridgeRecoverFailedTransfer({ + l1Nullifier.bridgeRecoverFailedTransfer({ _chainId: migratingChainId, _depositSender: chainAdmin, _assetId: assetId, diff --git a/l1-contracts/test/foundry/integration/_SharedGatewayDeployer.t.sol b/l1-contracts/test/foundry/l1/integration/_SharedGatewayDeployer.t.sol similarity index 60% rename from l1-contracts/test/foundry/integration/_SharedGatewayDeployer.t.sol rename to l1-contracts/test/foundry/l1/integration/_SharedGatewayDeployer.t.sol index 6ebc81b2a..11b320367 100644 --- a/l1-contracts/test/foundry/integration/_SharedGatewayDeployer.t.sol +++ b/l1-contracts/test/foundry/l1/integration/_SharedGatewayDeployer.t.sol @@ -10,15 +10,15 @@ contract GatewayDeployer is L1ContractDeployer { GatewayScript gatewayScript; function _initializeGatewayScript() internal { - vm.setEnv("L1_CONFIG", "/test/foundry/integration/deploy-scripts/script-config/config-deploy-l1.toml"); - vm.setEnv("L1_OUTPUT", "/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml"); + vm.setEnv("L1_CONFIG", "/test/foundry/l1/integration/deploy-scripts/script-config/config-deploy-l1.toml"); + vm.setEnv("L1_OUTPUT", "/test/foundry/l1/integration/deploy-scripts/script-out/output-deploy-l1.toml"); vm.setEnv( "ZK_CHAIN_CONFIG", - "/test/foundry/integration/deploy-scripts/script-out/output-deploy-zk-chain-10.toml" + "/test/foundry/l1/integration/deploy-scripts/script-out/output-deploy-zk-chain-10.toml" ); vm.setEnv( "GATEWAY_CONFIG", - "/test/foundry/integration/deploy-scripts/script-out/output-deploy-zk-chain-11.toml" + "/test/foundry/l1/integration/deploy-scripts/script-out/output-deploy-zk-chain-11.toml" ); gatewayScript = new GatewayScript(); diff --git a/l1-contracts/test/foundry/integration/_SharedL1ContractDeployer.t.sol b/l1-contracts/test/foundry/l1/integration/_SharedL1ContractDeployer.t.sol similarity index 69% rename from l1-contracts/test/foundry/integration/_SharedL1ContractDeployer.t.sol rename to l1-contracts/test/foundry/l1/integration/_SharedL1ContractDeployer.t.sol index 27c8f8bbe..49c6e5c43 100644 --- a/l1-contracts/test/foundry/integration/_SharedL1ContractDeployer.t.sol +++ b/l1-contracts/test/foundry/l1/integration/_SharedL1ContractDeployer.t.sol @@ -7,7 +7,9 @@ import {StdStorage, stdStorage} from "forge-std/Test.sol"; import {DeployL1Script} from "deploy-scripts/DeployL1.s.sol"; import {GenerateForceDeploymentsData} from "deploy-scripts/GenerateForceDeploymentsData.s.sol"; import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; -import {L1AssetRouter} from "contracts/bridge/L1AssetRouter.sol"; +import {L1AssetRouter} from "contracts/bridge/asset-router/L1AssetRouter.sol"; +import {L1Nullifier} from "contracts/bridge/L1Nullifier.sol"; +import {L1NativeTokenVault} from "contracts/bridge/ntv/L1NativeTokenVault.sol"; import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; contract L1ContractDeployer is Test { @@ -17,22 +19,23 @@ contract L1ContractDeployer is Test { address bridgehubOwnerAddress; Bridgehub bridgeHub; - address public sharedBridgeProxyAddress; L1AssetRouter public sharedBridge; + L1Nullifier public l1Nullifier; + L1NativeTokenVault public l1NativeTokenVault; DeployL1Script l1Script; GenerateForceDeploymentsData forceDeploymentsScript; function _deployL1Contracts() internal { - vm.setEnv("L1_CONFIG", "/test/foundry/integration/deploy-scripts/script-config/config-deploy-l1.toml"); - vm.setEnv("L1_OUTPUT", "/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml"); + vm.setEnv("L1_CONFIG", "/test/foundry/l1/integration/deploy-scripts/script-config/config-deploy-l1.toml"); + vm.setEnv("L1_OUTPUT", "/test/foundry/l1/integration/deploy-scripts/script-out/output-deploy-l1.toml"); vm.setEnv( "ZK_CHAIN_CONFIG", - "/test/foundry/integration/deploy-scripts/script-out/output-deploy-zk-chain-era.toml" + "/test/foundry/l1/integration/deploy-scripts/script-out/output-deploy-zk-chain-era.toml" ); vm.setEnv( "FORCE_DEPLOYMENTS_CONFIG", - "/test/foundry/integration/deploy-scripts/script-config/generate-force-deployments-data.toml" + "/test/foundry/l1/integration/deploy-scripts/script-config/generate-force-deployments-data.toml" ); forceDeploymentsScript = new GenerateForceDeploymentsData(); l1Script = new DeployL1Script(); @@ -42,9 +45,15 @@ contract L1ContractDeployer is Test { bridgehubProxyAddress = l1Script.getBridgehubProxyAddress(); bridgeHub = Bridgehub(bridgehubProxyAddress); - sharedBridgeProxyAddress = l1Script.getSharedBridgeProxyAddress(); + address sharedBridgeProxyAddress = l1Script.getSharedBridgeProxyAddress(); sharedBridge = L1AssetRouter(sharedBridgeProxyAddress); + address l1NullifierProxyAddress = l1Script.getL1NullifierProxyAddress(); + l1Nullifier = L1Nullifier(l1NullifierProxyAddress); + + address l1NativeTokenVaultProxyAddress = l1Script.getNativeTokenVaultProxyAddress(); + l1NativeTokenVault = L1NativeTokenVault(payable(l1NativeTokenVaultProxyAddress)); + _acceptOwnership(); _setEraBatch(); @@ -81,8 +90,8 @@ contract L1ContractDeployer is Test { function _setSharedBridgeChainBalance(uint256 _chainId, address _token, uint256 _value) internal { stdstore - .target(address(sharedBridge)) - .sig(sharedBridge.chainBalance.selector) + .target(address(l1Nullifier)) + .sig(l1Nullifier.__DEPRECATED_chainBalance.selector) .with_key(_chainId) .with_key(_token) .checked_write(_value); @@ -95,8 +104,8 @@ contract L1ContractDeployer is Test { bool _isFinalized ) internal { stdstore - .target(address(sharedBridge)) - .sig(sharedBridge.isWithdrawalFinalized.selector) + .target(address(l1Nullifier)) + .sig(l1Nullifier.isWithdrawalFinalized.selector) .with_key(_chainId) .with_key(_l2BatchNumber) .with_key(_l2ToL1MessageNumber) diff --git a/l1-contracts/test/foundry/integration/_SharedL2TxMocker.t.sol b/l1-contracts/test/foundry/l1/integration/_SharedL2TxMocker.t.sol similarity index 100% rename from l1-contracts/test/foundry/integration/_SharedL2TxMocker.t.sol rename to l1-contracts/test/foundry/l1/integration/_SharedL2TxMocker.t.sol diff --git a/l1-contracts/test/foundry/integration/_SharedTokenDeployer.t.sol b/l1-contracts/test/foundry/l1/integration/_SharedTokenDeployer.t.sol similarity index 77% rename from l1-contracts/test/foundry/integration/_SharedTokenDeployer.t.sol rename to l1-contracts/test/foundry/l1/integration/_SharedTokenDeployer.t.sol index bbfcb4090..8696fd2a6 100644 --- a/l1-contracts/test/foundry/integration/_SharedTokenDeployer.t.sol +++ b/l1-contracts/test/foundry/l1/integration/_SharedTokenDeployer.t.sol @@ -9,7 +9,10 @@ contract TokenDeployer is Test { DeployErc20Script private deployScript; function _deployTokens() internal { - vm.setEnv("TOKENS_CONFIG", "/test/foundry/integration/deploy-scripts/script-config/config-deploy-erc20.toml"); + vm.setEnv( + "TOKENS_CONFIG", + "/test/foundry/l1/integration/deploy-scripts/script-config/config-deploy-erc20.toml" + ); deployScript = new DeployErc20Script(); deployScript.run(); diff --git a/l1-contracts/test/foundry/integration/_SharedZKChainDeployer.t.sol b/l1-contracts/test/foundry/l1/integration/_SharedZKChainDeployer.t.sol similarity index 96% rename from l1-contracts/test/foundry/integration/_SharedZKChainDeployer.t.sol rename to l1-contracts/test/foundry/l1/integration/_SharedZKChainDeployer.t.sol index 96dc99c0a..27bebd98e 100644 --- a/l1-contracts/test/foundry/integration/_SharedZKChainDeployer.t.sol +++ b/l1-contracts/test/foundry/l1/integration/_SharedZKChainDeployer.t.sol @@ -28,7 +28,7 @@ contract ZKChainDeployer is L1ContractDeployer { function _deployEra() internal { vm.setEnv( "ZK_CHAIN_CONFIG", - "/test/foundry/integration/deploy-scripts/script-out/output-deploy-zk-chain-era.toml" + "/test/foundry/l1/integration/deploy-scripts/script-out/output-deploy-zk-chain-era.toml" ); deployScript = new RegisterZKChainScript(); @@ -42,7 +42,7 @@ contract ZKChainDeployer is L1ContractDeployer { vm.setEnv( "ZK_CHAIN_CONFIG", string.concat( - "/test/foundry/integration/deploy-scripts/script-out/output-deploy-zk-chain-", + "/test/foundry/l1/integration/deploy-scripts/script-out/output-deploy-zk-chain-", Strings.toString(currentZKChainId), ".toml" ) diff --git a/l1-contracts/test/foundry/integration/deploy-scripts/script-config/config-deploy-erc20.toml b/l1-contracts/test/foundry/l1/integration/deploy-scripts/script-config/config-deploy-erc20.toml similarity index 100% rename from l1-contracts/test/foundry/integration/deploy-scripts/script-config/config-deploy-erc20.toml rename to l1-contracts/test/foundry/l1/integration/deploy-scripts/script-config/config-deploy-erc20.toml diff --git a/l1-contracts/test/foundry/integration/deploy-scripts/script-config/config-deploy-l1.toml b/l1-contracts/test/foundry/l1/integration/deploy-scripts/script-config/config-deploy-l1.toml similarity index 100% rename from l1-contracts/test/foundry/integration/deploy-scripts/script-config/config-deploy-l1.toml rename to l1-contracts/test/foundry/l1/integration/deploy-scripts/script-config/config-deploy-l1.toml diff --git a/l1-contracts/test/foundry/integration/deploy-scripts/script-config/generate-force-deployments-data.toml b/l1-contracts/test/foundry/l1/integration/deploy-scripts/script-config/generate-force-deployments-data.toml similarity index 100% rename from l1-contracts/test/foundry/integration/deploy-scripts/script-config/generate-force-deployments-data.toml rename to l1-contracts/test/foundry/l1/integration/deploy-scripts/script-config/generate-force-deployments-data.toml diff --git a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/.gitkeep b/l1-contracts/test/foundry/l1/integration/deploy-scripts/script-out/.gitkeep similarity index 100% rename from l1-contracts/test/foundry/integration/deploy-scripts/script-out/.gitkeep rename to l1-contracts/test/foundry/l1/integration/deploy-scripts/script-out/.gitkeep diff --git a/l1-contracts/test/foundry/unit/concrete/AddressAliasHelper/_AddressAliasHelper_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/AddressAliasHelper/_AddressAliasHelper_Shared.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/AddressAliasHelper/_AddressAliasHelper_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/AddressAliasHelper/_AddressAliasHelper_Shared.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/AddressAliasHelper/applyL1ToL2Alias.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/AddressAliasHelper/applyL1ToL2Alias.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/AddressAliasHelper/applyL1ToL2Alias.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/AddressAliasHelper/applyL1ToL2Alias.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/AddressAliasHelper/undoL1ToL2Alias.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/AddressAliasHelper/undoL1ToL2Alias.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/AddressAliasHelper/undoL1ToL2Alias.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/AddressAliasHelper/undoL1ToL2Alias.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Bridgehub/Initialize.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/Initialize.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Bridgehub/Initialize.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/Initialize.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Bridgehub/MessageRoot.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/MessageRoot.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Bridgehub/MessageRoot.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/MessageRoot.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Bridgehub/_Bridgehub_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/_Bridgehub_Shared.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Bridgehub/_Bridgehub_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/_Bridgehub_Shared.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol similarity index 99% rename from l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol index ca92a4ba1..f122b8739 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol @@ -14,9 +14,11 @@ import {DummyChainTypeManagerWBH} from "contracts/dev-contracts/test/DummyChainT import {DummyZKChain} from "contracts/dev-contracts/test/DummyZKChain.sol"; import {DummySharedBridge} from "contracts/dev-contracts/test/DummySharedBridge.sol"; import {DummyBridgehubSetter} from "contracts/dev-contracts/test/DummyBridgehubSetter.sol"; -import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; -import {L1AssetRouter} from "contracts/bridge/L1AssetRouter.sol"; -import {L1NativeTokenVault} from "contracts/bridge/L1NativeTokenVault.sol"; +import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; +import {L1AssetRouter} from "contracts/bridge/asset-router/L1AssetRouter.sol"; +import {L1NativeTokenVault} from "contracts/bridge/ntv/L1NativeTokenVault.sol"; +import {L1Nullifier} from "contracts/bridge/L1Nullifier.sol"; +import {IL1Nullifier} from "contracts/bridge/L1Nullifier.sol"; import {L2Message, L2Log, TxStatus, BridgehubL2TransactionRequest} from "contracts/common/Messaging.sol"; import {L2_NATIVE_TOKEN_VAULT_ADDR} from "contracts/common/L2ContractAddresses.sol"; @@ -27,6 +29,7 @@ import {IMessageRoot} from "contracts/bridgehub/IMessageRoot.sol"; import {L2TransactionRequestTwoBridgesInner} from "contracts/bridgehub/IBridgehub.sol"; import {ETH_TOKEN_ADDRESS, REQUIRED_L2_GAS_PRICE_PER_PUBDATA, MAX_NEW_FACTORY_DEPS, TWO_BRIDGES_MAGIC_VALUE} from "contracts/common/Config.sol"; import {L1ERC20Bridge} from "contracts/bridge/L1ERC20Bridge.sol"; +import {IAssetRouterBase} from "contracts/bridge/asset-router/IAssetRouterBase.sol"; import {ZeroChainId, AddressTooLow, ChainIdTooBig, WrongMagicValue, SharedBridgeNotSet, TokenNotRegistered, BridgeHubAlreadyRegistered, MsgValueMismatch, SlotOccupied, CTMAlreadyRegistered, TokenAlreadyRegistered, Unauthorized, NonEmptyMsgValue, CTMNotRegistered, InvalidChainId} from "contracts/common/L1ContractErrors.sol"; contract ExperimentalBridgeTest is Test { @@ -43,9 +46,11 @@ contract ExperimentalBridgeTest is Test { L1AssetRouter sharedBridge; address sharedBridgeAddress; address secondBridgeAddress; + address l1NullifierAddress; L1AssetRouter secondBridge; TestnetERC20Token testToken; L1NativeTokenVault ntv; + L1Nullifier l1Nullifier; bytes32 tokenAssetId; @@ -99,13 +104,13 @@ contract ExperimentalBridgeTest is Test { mockSharedBridge = new DummySharedBridge(keccak256("0xabc")); mockSecondSharedBridge = new DummySharedBridge(keccak256("0xdef")); - ntv = new L1NativeTokenVault(weth, IL1AssetRouter(address(mockSharedBridge))); + ntv = new L1NativeTokenVault(weth, address(mockSharedBridge), eraChainId, IL1Nullifier(address(0))); mockSharedBridge.setNativeTokenVault(ntv); mockSecondSharedBridge.setNativeTokenVault(ntv); testToken = new TestnetERC20Token("ZKSTT", "ZkSync Test Token", 18); testTokenAddress = address(testToken); vm.prank(address(ntv)); - ntv.registerToken(ETH_TOKEN_ADDRESS); + // ntv.registerToken(ETH_TOKEN_ADDRESS); ntv.registerToken(address(testToken)); tokenAssetId = DataEncoding.encodeNTVAssetId(block.chainid, address(testToken)); diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/ClaimFailedDeposit.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/ClaimFailedDeposit.t.sol similarity index 91% rename from l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/ClaimFailedDeposit.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/ClaimFailedDeposit.t.sol index e1954b138..aecde91f8 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/ClaimFailedDeposit.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/ClaimFailedDeposit.t.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.24; import {L1Erc20BridgeTest} from "./_L1Erc20Bridge_Shared.t.sol"; import {StdStorage, stdStorage} from "forge-std/Test.sol"; -import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; +import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; import {EmptyDeposit} from "contracts/common/L1ContractErrors.sol"; contract ClaimFailedDepositTest is L1Erc20BridgeTest { diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/Deposit.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/Deposit.t.sol similarity index 98% rename from l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/Deposit.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/Deposit.t.sol index 57c715ff7..3e4d305f6 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/Deposit.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/Deposit.t.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.24; import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; import {L1Erc20BridgeTest} from "./_L1Erc20Bridge_Shared.t.sol"; -import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; +import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; import {EmptyDeposit, ValueMismatch, TokensWithFeesNotSupported} from "contracts/common/L1ContractErrors.sol"; contract DepositTest is L1Erc20BridgeTest { diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/FinalizeWithdrawal.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/FinalizeWithdrawal.sol similarity index 69% rename from l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/FinalizeWithdrawal.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/FinalizeWithdrawal.sol index 2c9deb50d..71a837564 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/FinalizeWithdrawal.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/FinalizeWithdrawal.sol @@ -3,9 +3,12 @@ pragma solidity 0.8.24; import {L1Erc20BridgeTest} from "./_L1Erc20Bridge_Shared.t.sol"; -import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; +import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; import {StdStorage, stdStorage} from "forge-std/Test.sol"; import {WithdrawalAlreadyFinalized} from "contracts/common/L1ContractErrors.sol"; +import {IL1Nullifier} from "contracts/bridge/L1Nullifier.sol"; +import {FinalizeL1DepositParams} from "contracts/bridge/interfaces/IL1Nullifier.sol"; +import {L2_ASSET_ROUTER_ADDR} from "contracts/common/L2ContractAddresses.sol"; contract FinalizeWithdrawalTest is L1Erc20BridgeTest { using stdStorage for StdStorage; @@ -43,24 +46,25 @@ contract FinalizeWithdrawalTest is L1Erc20BridgeTest { uint256 amount = 999; assertFalse(bridge.isWithdrawalFinalized(l2BatchNumber, l2MessageIndex)); - + FinalizeL1DepositParams memory finalizeWithdrawalParams = FinalizeL1DepositParams({ + chainId: eraChainId, + l2BatchNumber: l2BatchNumber, + l2MessageIndex: l2MessageIndex, + l2Sender: L2_ASSET_ROUTER_ADDR, + l2TxNumberInBatch: uint16(txNumberInBatch), + message: "", + merkleProof: merkleProof + }); vm.mockCall( - sharedBridgeAddress, - abi.encodeWithSelector( - IL1AssetRouter.finalizeWithdrawalLegacyErc20Bridge.selector, - l2BatchNumber, - l2MessageIndex, - txNumberInBatch, - "", - merkleProof - ), + l1NullifierAddress, + abi.encodeWithSelector(IL1Nullifier.finalizeWithdrawalLegacyContracts.selector, finalizeWithdrawalParams), abi.encode(alice, address(token), amount) ); vm.prank(alice); // solhint-disable-next-line func-named-parameters - vm.expectEmit(true, true, true, true, address(bridge)); - emit WithdrawalFinalized(alice, address(token), amount); + // vm.expectEmit(true, true, true, true, address(bridge)); + // emit WithdrawalFinalized(alice, address(token), amount); bridge.finalizeWithdrawal({ _l2BatchNumber: l2BatchNumber, diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/Getters.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/Getters.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/Getters.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/Getters.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/Initialization.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/Initialization.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/Initialization.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/Initialization.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/Reentrancy.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/Reentrancy.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/Reentrancy.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/Reentrancy.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/_L1Erc20Bridge_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/_L1Erc20Bridge_Shared.t.sol similarity index 62% rename from l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/_L1Erc20Bridge_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/_L1Erc20Bridge_Shared.t.sol index d2fceca34..fb0c30c58 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/_L1Erc20Bridge_Shared.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/_L1Erc20Bridge_Shared.t.sol @@ -6,14 +6,16 @@ import {StdStorage, stdStorage} from "forge-std/Test.sol"; import {Test} from "forge-std/Test.sol"; import {L1ERC20Bridge} from "contracts/bridge/L1ERC20Bridge.sol"; -import {L1NativeTokenVault} from "contracts/bridge/L1NativeTokenVault.sol"; -import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; +import {L1NativeTokenVault} from "contracts/bridge/ntv/L1NativeTokenVault.sol"; +import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; import {TestnetERC20Token} from "contracts/dev-contracts/TestnetERC20Token.sol"; import {FeeOnTransferToken} from "contracts/dev-contracts/FeeOnTransferToken.sol"; import {ReenterL1ERC20Bridge} from "contracts/dev-contracts/test/ReenterL1ERC20Bridge.sol"; import {DummySharedBridge} from "contracts/dev-contracts/test/DummySharedBridge.sol"; import {Utils} from "../../Utils/Utils.sol"; -import {IL1NativeTokenVault} from "contracts/bridge/interfaces/IL1NativeTokenVault.sol"; +import {ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; +import {IL1NativeTokenVault} from "contracts/bridge/ntv/IL1NativeTokenVault.sol"; +import {IL1Nullifier} from "contracts/bridge/L1Nullifier.sol"; contract L1Erc20BridgeTest is Test { L1ERC20Bridge internal bridge; @@ -26,24 +28,41 @@ contract L1Erc20BridgeTest is Test { address internal randomSigner; address internal alice; address sharedBridgeAddress; + address l1NullifierAddress; bytes32 internal dummyL2DepositTxHash; + uint256 eraChainId = 9; constructor() { randomSigner = makeAddr("randomSigner"); dummyL2DepositTxHash = Utils.randomBytes32("dummyL2DepositTxHash"); sharedBridgeAddress = makeAddr("sharedBridgeAddress"); alice = makeAddr("alice"); + l1NullifierAddress = makeAddr("l1NullifierAddress"); - uint256 eraChainId = 9; - bridge = new L1ERC20Bridge(IL1AssetRouter(sharedBridgeAddress), IL1NativeTokenVault(address(1)), eraChainId); + bridge = new L1ERC20Bridge( + IL1Nullifier(l1NullifierAddress), + IL1AssetRouter(sharedBridgeAddress), + IL1NativeTokenVault(address(1)), + eraChainId + ); address weth = makeAddr("weth"); - L1NativeTokenVault ntv = new L1NativeTokenVault(weth, IL1AssetRouter(sharedBridgeAddress)); + L1NativeTokenVault ntv = new L1NativeTokenVault( + weth, + sharedBridgeAddress, + eraChainId, + IL1Nullifier(l1NullifierAddress) + ); vm.store(address(bridge), bytes32(uint256(212)), bytes32(0)); reenterL1ERC20Bridge = new ReenterL1ERC20Bridge(); - bridgeReenterItself = new L1ERC20Bridge(IL1AssetRouter(address(reenterL1ERC20Bridge)), ntv, eraChainId); + bridgeReenterItself = new L1ERC20Bridge( + IL1Nullifier(address(reenterL1ERC20Bridge)), + IL1AssetRouter(address(reenterL1ERC20Bridge)), + ntv, + eraChainId + ); reenterL1ERC20Bridge.setBridge(bridgeReenterItself); token = new TestnetERC20Token("TestnetERC20Token", "TET", 18); diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeBase.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeBase.t.sol similarity index 89% rename from l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeBase.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeBase.t.sol index 8ca28af74..6c6d2deca 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeBase.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeBase.t.sol @@ -9,13 +9,15 @@ import {ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; import {L2Message, TxStatus} from "contracts/common/Messaging.sol"; import {IMailbox} from "contracts/state-transition/chain-interfaces/IMailbox.sol"; -import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; +import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; +import {IAssetRouterBase} from "contracts/bridge/asset-router/IAssetRouterBase.sol"; import {IL1AssetHandler} from "contracts/bridge/interfaces/IL1AssetHandler.sol"; import {IL1BaseTokenAssetHandler} from "contracts/bridge/interfaces/IL1BaseTokenAssetHandler.sol"; import {L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR, L2_ASSET_ROUTER_ADDR} from "contracts/common/L2ContractAddresses.sol"; import {IGetters} from "contracts/state-transition/chain-interfaces/IGetters.sol"; -import {L1NativeTokenVault} from "contracts/bridge/L1NativeTokenVault.sol"; +import {L1NativeTokenVault} from "contracts/bridge/ntv/L1NativeTokenVault.sol"; import {StdStorage, stdStorage} from "forge-std/Test.sol"; +import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; contract L1AssetRouterTestBase is L1AssetRouterTest { using stdStorage for StdStorage; @@ -113,7 +115,7 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { function test_bridgehubConfirmL2Transaction() public { // solhint-disable-next-line func-named-parameters - vm.expectEmit(true, true, true, false, address(sharedBridge)); + vm.expectEmit(true, true, true, false, address(l1Nullifier)); bytes32 txDataHash = keccak256(abi.encode(alice, address(token), amount)); emit BridgehubDepositFinalized(chainId, txDataHash, txHash); vm.prank(bridgehubAddress); @@ -123,7 +125,7 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { function test_claimFailedDeposit_Erc() public { bytes32 txDataHash = keccak256(abi.encode(alice, address(token), amount)); _setSharedBridgeDepositHappened(chainId, txHash, txDataHash); - require(sharedBridge.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); + require(l1Nullifier.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); vm.mockCall( bridgehubAddress, @@ -145,14 +147,13 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { vm.expectEmit(true, true, true, false, address(sharedBridge)); emit ClaimedFailedDepositAssetRouter({ chainId: chainId, - to: alice, assetId: tokenAssetId, assetData: abi.encode(bytes32(0)) }); - sharedBridge.claimFailedDeposit({ + l1Nullifier.claimFailedDeposit({ _chainId: chainId, _depositSender: alice, - _l1Asset: address(token), + _l1Token: address(token), _amount: amount, _l2TxHash: txHash, _l2BatchNumber: l2BatchNumber, @@ -165,7 +166,7 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { function test_claimFailedDeposit_Eth() public { bytes32 txDataHash = keccak256(abi.encode(alice, ETH_TOKEN_ADDRESS, amount)); _setSharedBridgeDepositHappened(chainId, txHash, txDataHash); - require(sharedBridge.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); + require(l1Nullifier.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); vm.mockCall( bridgehubAddress, @@ -187,14 +188,13 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { vm.expectEmit(true, true, true, false, address(sharedBridge)); emit ClaimedFailedDepositAssetRouter({ chainId: chainId, - to: alice, assetId: ETH_TOKEN_ASSET_ID, assetData: abi.encode(bytes32(0)) }); - sharedBridge.claimFailedDeposit({ + l1Nullifier.claimFailedDeposit({ _chainId: chainId, _depositSender: alice, - _l1Asset: ETH_TOKEN_ADDRESS, + _l1Token: ETH_TOKEN_ADDRESS, _amount: amount, _l2TxHash: txHash, _l2BatchNumber: l2BatchNumber, @@ -208,7 +208,7 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { bytes memory transferData = abi.encode(amount, alice); bytes32 txDataHash = keccak256(abi.encode(alice, ETH_TOKEN_ADDRESS, amount)); _setSharedBridgeDepositHappened(chainId, txHash, txDataHash); - require(sharedBridge.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); + require(l1Nullifier.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); vm.mockCall( bridgehubAddress, @@ -230,11 +230,10 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { vm.expectEmit(true, true, true, false, address(sharedBridge)); emit ClaimedFailedDepositAssetRouter({ chainId: chainId, - to: alice, assetId: ETH_TOKEN_ASSET_ID, assetData: abi.encode(bytes32(0)) }); - sharedBridge.bridgeRecoverFailedTransfer({ + l1Nullifier.bridgeRecoverFailedTransfer({ _chainId: chainId, _depositSender: alice, _assetId: ETH_TOKEN_ASSET_ID, @@ -271,7 +270,7 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { // solhint-disable-next-line func-named-parameters vm.expectEmit(true, true, true, false, address(sharedBridge)); - emit WithdrawalFinalizedAssetRouter(chainId, ETH_TOKEN_ASSET_ID, message); + emit DepositFinalizedAssetRouter(chainId, ETH_TOKEN_ASSET_ID, message); sharedBridge.finalizeWithdrawal({ _chainId: chainId, _l2BatchNumber: l2BatchNumber, @@ -285,7 +284,8 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { function test_finalizeWithdrawal_ErcOnEth() public { _setNativeTokenVaultChainBalance(chainId, address(token), amount); bytes memory message = abi.encodePacked( - IL1AssetRouter.finalizeWithdrawal.selector, + IAssetRouterBase.finalizeDeposit.selector, + chainId, tokenAssetId, abi.encode(amount, alice) ); @@ -311,7 +311,7 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { // solhint-disable-next-line func-named-parameters vm.expectEmit(true, true, true, false, address(sharedBridge)); - emit WithdrawalFinalizedAssetRouter(chainId, tokenAssetId, message); + emit DepositFinalizedAssetRouter(chainId, tokenAssetId, message); sharedBridge.finalizeWithdrawal({ _chainId: chainId, _l2BatchNumber: l2BatchNumber, @@ -330,7 +330,8 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { vm.prank(bridgehubAddress); bytes memory message = abi.encodePacked( - IL1AssetRouter.finalizeWithdrawal.selector, + IAssetRouterBase.finalizeDeposit.selector, + chainId, ETH_TOKEN_ASSET_ID, abi.encode(amount, alice) ); @@ -356,7 +357,7 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { // solhint-disable-next-line func-named-parameters vm.expectEmit(true, true, true, false, address(sharedBridge)); - emit WithdrawalFinalizedAssetRouter(chainId, ETH_TOKEN_ASSET_ID, message); + emit DepositFinalizedAssetRouter(chainId, ETH_TOKEN_ASSET_ID, message); sharedBridge.finalizeWithdrawal({ _chainId: chainId, _l2BatchNumber: l2BatchNumber, @@ -372,7 +373,8 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { vm.prank(bridgehubAddress); bytes memory message = abi.encodePacked( - IL1AssetRouter.finalizeWithdrawal.selector, + IAssetRouterBase.finalizeDeposit.selector, + chainId, tokenAssetId, abi.encode(amount, alice) ); @@ -397,8 +399,9 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { ); // solhint-disable-next-line func-named-parameters - vm.expectEmit(true, true, true, false, address(sharedBridge)); - emit WithdrawalFinalizedAssetRouter(chainId, tokenAssetId, message); + vm.expectEmit(true, true, true, true, address(sharedBridge)); + emit DepositFinalizedAssetRouter(chainId, tokenAssetId, abi.encode(amount, alice)); + sharedBridge.finalizeWithdrawal({ _chainId: chainId, _l2BatchNumber: l2BatchNumber, @@ -411,7 +414,8 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { function test_finalizeWithdrawal_NonBaseErcOnErc() public { bytes memory message = abi.encodePacked( - IL1AssetRouter.finalizeWithdrawal.selector, + IAssetRouterBase.finalizeDeposit.selector, + chainId, tokenAssetId, abi.encode(amount, alice) ); @@ -443,7 +447,7 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { // solhint-disable-next-line func-named-parameters vm.expectEmit(true, true, true, false, address(sharedBridge)); - emit WithdrawalFinalizedAssetRouter(chainId, tokenAssetId, message); + emit DepositFinalizedAssetRouter(chainId, tokenAssetId, message); sharedBridge.finalizeWithdrawal({ _chainId: chainId, _l2BatchNumber: l2BatchNumber, @@ -455,22 +459,23 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { } function test_safeTransferFundsFromSharedBridge_Erc() public { - uint256 startBalanceNtv = nativeTokenVault.chainBalance(chainId, address(token)); + bytes32 assetId = DataEncoding.encodeNTVAssetId(block.chainid, address(token)); + uint256 startBalanceNtv = nativeTokenVault.chainBalance(chainId, assetId); // solhint-disable-next-line func-named-parameters vm.expectEmit(true, true, false, true, address(token)); - emit IERC20.Transfer(address(sharedBridge), address(nativeTokenVault), amount); + emit IERC20.Transfer(address(l1Nullifier), address(nativeTokenVault), amount); nativeTokenVault.transferFundsFromSharedBridge(address(token)); nativeTokenVault.updateChainBalancesFromSharedBridge(address(token), chainId); - uint256 endBalanceNtv = nativeTokenVault.chainBalance(chainId, address(token)); + uint256 endBalanceNtv = nativeTokenVault.chainBalance(chainId, assetId); assertEq(endBalanceNtv - startBalanceNtv, amount); } function test_safeTransferFundsFromSharedBridge_Eth() public { uint256 startEthBalanceNtv = address(nativeTokenVault).balance; - uint256 startBalanceNtv = nativeTokenVault.chainBalance(chainId, ETH_TOKEN_ADDRESS); + uint256 startBalanceNtv = nativeTokenVault.chainBalance(chainId, ETH_TOKEN_ASSET_ID); nativeTokenVault.transferFundsFromSharedBridge(ETH_TOKEN_ADDRESS); nativeTokenVault.updateChainBalancesFromSharedBridge(ETH_TOKEN_ADDRESS, chainId); - uint256 endBalanceNtv = nativeTokenVault.chainBalance(chainId, ETH_TOKEN_ADDRESS); + uint256 endBalanceNtv = nativeTokenVault.chainBalance(chainId, ETH_TOKEN_ASSET_ID); uint256 endEthBalanceNtv = address(nativeTokenVault).balance; assertEq(endBalanceNtv - startBalanceNtv, amount); assertEq(endEthBalanceNtv - startEthBalanceNtv, amount); diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol similarity index 90% rename from l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol index 2602fa12f..cee827b37 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol @@ -8,15 +8,16 @@ import {L1AssetRouterTest} from "./_L1SharedBridge_Shared.t.sol"; import {TransparentUpgradeableProxy} from "@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol"; import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; -import {L1AssetRouter} from "contracts/bridge/L1AssetRouter.sol"; -import {L1NativeTokenVault} from "contracts/bridge/L1NativeTokenVault.sol"; +import {L1AssetRouter} from "contracts/bridge/asset-router/L1AssetRouter.sol"; +import {L1NativeTokenVault} from "contracts/bridge/ntv/L1NativeTokenVault.sol"; import {ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; import {L2Message, TxStatus} from "contracts/common/Messaging.sol"; import {IMailbox} from "contracts/state-transition/chain-interfaces/IMailbox.sol"; import {IL1ERC20Bridge} from "contracts/bridge/interfaces/IL1ERC20Bridge.sol"; -import {IL1NativeTokenVault} from "contracts/bridge/interfaces/IL1NativeTokenVault.sol"; -import {L1NativeTokenVault} from "contracts/bridge/L1NativeTokenVault.sol"; +import {IL1NativeTokenVault} from "contracts/bridge/ntv/IL1NativeTokenVault.sol"; +import {INativeTokenVault} from "contracts/bridge/ntv/INativeTokenVault.sol"; +import {L1NativeTokenVault} from "contracts/bridge/ntv/L1NativeTokenVault.sol"; import {L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR} from "contracts/common/L2ContractAddresses.sol"; import {IGetters} from "contracts/state-transition/chain-interfaces/IGetters.sol"; import {AddressAlreadyUsed, WithdrawFailed, Unauthorized, AssetIdNotSupported, SharedBridgeKey, SharedBridgeValueNotSet, L2WithdrawalMessageWrongLength, InsufficientChainBalance, ZeroAddress, ValueMismatch, NonEmptyMsgValue, DepositExists, ValueMismatch, NonEmptyMsgValue, TokenNotSupported, EmptyDeposit, L2BridgeNotDeployed, DepositIncorrectAmount, InvalidProof, NoFundsTransferred, InsufficientFunds, DepositDoesNotExist, WithdrawalAlreadyFinalized, InsufficientFunds, MalformedMessage, InvalidSelector, TokensWithFeesNotSupported} from "contracts/common/L1ContractErrors.sol"; @@ -49,18 +50,18 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { address(nativeTokenVaultImpl), admin, // solhint-disable-next-line func-named-parameters - abi.encodeWithSelector(L1NativeTokenVault.initialize.selector, address(0)) + abi.encodeWithSelector(L1NativeTokenVault.initialize.selector, address(0), address(0)) ); } function test_transferTokenToNTV_wrongCaller() public { - vm.expectRevert("L1AR: not NTV"); - sharedBridge.transferTokenToNTV(address(token)); + vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, address(this))); + l1Nullifier.transferTokenToNTV(address(token)); } function test_nullifyChainBalanceByNTV_wrongCaller() public { - vm.expectRevert("L1AR: not NTV"); - sharedBridge.nullifyChainBalanceByNTV(chainId, address(token)); + vm.expectRevert("L1N: not NTV"); + l1Nullifier.nullifyChainBalanceByNTV(chainId, address(token)); } function test_registerToken_noCode() public { @@ -84,15 +85,15 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { function test_setNativeTokenVault_alreadySet() public { vm.prank(owner); - vm.expectRevert("L1AR: native token vault already set"); - sharedBridge.setNativeTokenVault(IL1NativeTokenVault(address(0))); + vm.expectRevert("AR: native token v already set"); + sharedBridge.setNativeTokenVault(INativeTokenVault(address(0))); } function test_setNativeTokenVault_emptyAddressProvided() public { stdstore.target(address(sharedBridge)).sig(sharedBridge.nativeTokenVault.selector).checked_write(address(0)); vm.prank(owner); - vm.expectRevert("L1AR: native token vault 0"); - sharedBridge.setNativeTokenVault(IL1NativeTokenVault(address(0))); + vm.expectRevert("AR: native token vault 0"); + sharedBridge.setNativeTokenVault(INativeTokenVault(address(0))); } // function test_setAssetHandlerAddressOnCounterpart_notOwnerOrADT() public { @@ -101,7 +102,7 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { // address refundRecipient = address(0); // vm.prank(alice); - // vm.expectRevert("L1AR: only ADT or owner"); + // vm.expectRevert("L1N: only ADT or owner"); // sharedBridge.setAssetHandlerAddressOnCounterpart( // eraChainId, // mintValue, @@ -116,26 +117,26 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { // function test_transferFundsToSharedBridge_Eth_CallFailed() public { // vm.mockCall(address(nativeTokenVault), "0x", abi.encode("")); // vm.prank(address(nativeTokenVault)); - // vm.expectRevert("L1AR: eth transfer failed"); + // vm.expectRevert("L1N: eth transfer failed"); // nativeTokenVault.transferFundsFromSharedBridge(ETH_TOKEN_ADDRESS); // } // function test_transferFundsToSharedBridge_Eth_CallFailed() public { // vm.mockCall(address(nativeTokenVault), "0x", abi.encode("")); // vm.prank(address(nativeTokenVault)); - // vm.expectRevert("L1AR: eth transfer failed"); + // vm.expectRevert("L1N: eth transfer failed"); // nativeTokenVault.transferFundsFromSharedBridge(ETH_TOKEN_ADDRESS); // } function test_transferFundsToSharedBridge_Eth_0_AmountTransferred() public { - vm.deal(address(sharedBridge), 0); + vm.deal(address(l1Nullifier), 0); vm.prank(address(nativeTokenVault)); vm.expectRevert(abi.encodeWithSelector(NoFundsTransferred.selector)); nativeTokenVault.transferFundsFromSharedBridge(ETH_TOKEN_ADDRESS); } function test_transferFundsToSharedBridge_Erc_0_AmountTransferred() public { - vm.prank(address(sharedBridge)); + vm.prank(address(l1Nullifier)); token.transfer(address(1), amount); vm.prank(address(nativeTokenVault)); vm.expectRevert("NTV: 0 amount to transfer"); @@ -291,7 +292,7 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { bytes memory transferData = abi.encode(amount, alice); bytes32 txDataHash = keccak256(abi.encode(alice, ETH_TOKEN_ADDRESS, amount)); _setSharedBridgeDepositHappened(chainId, txHash, txDataHash); - require(sharedBridge.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); + require(l1Nullifier.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); vm.mockCall( bridgehubAddress, @@ -310,7 +311,7 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { ); vm.expectRevert("NTV: claimFailedDeposit failed, no funds or cannot transfer to receiver"); - sharedBridge.bridgeRecoverFailedTransfer({ + l1Nullifier.bridgeRecoverFailedTransfer({ _chainId: chainId, _depositSender: alice, _assetId: ETH_TOKEN_ASSET_ID, @@ -324,12 +325,12 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { } function test_bridgeRecoverFailedTransfer_invalidChainID() public { - vm.store(address(sharedBridge), bytes32(isWithdrawalFinalizedStorageLocation - 5), bytes32(uint256(0))); + vm.store(address(l1Nullifier), bytes32(isWithdrawalFinalizedStorageLocation - 5), bytes32(uint256(0))); bytes memory transferData = abi.encode(amount, alice); bytes32 txDataHash = keccak256(abi.encode(alice, ETH_TOKEN_ADDRESS, amount)); _setSharedBridgeDepositHappened(chainId, txHash, txDataHash); - require(sharedBridge.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); + require(l1Nullifier.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); vm.mockCall( bridgehubAddress, @@ -350,7 +351,7 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { vm.expectRevert( abi.encodeWithSelector(SharedBridgeValueNotSet.selector, SharedBridgeKey.LegacyBridgeLastDepositBatch) ); - sharedBridge.bridgeRecoverFailedTransfer({ + l1Nullifier.bridgeRecoverFailedTransfer({ _chainId: eraChainId, _depositSender: alice, _assetId: ETH_TOKEN_ASSET_ID, @@ -364,13 +365,14 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { } function test_bridgeRecoverFailedTransfer_eraLegacyDeposit() public { - vm.store(address(sharedBridge), bytes32(isWithdrawalFinalizedStorageLocation - 5), bytes32(uint256(2))); + vm.store(address(l1Nullifier), bytes32(isWithdrawalFinalizedStorageLocation - 5), bytes32(uint256(2))); - uint256 l2BatchNumber = 1; + uint256 l2BatchNumber = 0; bytes memory transferData = abi.encode(amount, alice); bytes32 txDataHash = keccak256(abi.encode(alice, ETH_TOKEN_ADDRESS, amount)); - _setSharedBridgeDepositHappened(chainId, txHash, txDataHash); - require(sharedBridge.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); + _setSharedBridgeDepositHappened(eraChainId, txHash, txDataHash); + require(l1Nullifier.depositHappened(eraChainId, txHash) == txDataHash, "Deposit not set"); + console.log("txDataHash", uint256(txDataHash)); vm.mockCall( bridgehubAddress, @@ -388,8 +390,13 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { abi.encode(true) ); - vm.expectRevert("L1AR: legacy cFD"); - sharedBridge.bridgeRecoverFailedTransfer({ + vm.expectRevert("L1N: legacy cFD"); + vm.mockCall( + address(bridgehubAddress), + abi.encodeWithSelector(IBridgehub.proveL1ToL2TransactionStatus.selector), + abi.encode(true) + ); + l1Nullifier.bridgeRecoverFailedTransfer({ _chainId: eraChainId, _depositSender: alice, _assetId: ETH_TOKEN_ASSET_ID, @@ -410,10 +417,10 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { ); vm.prank(bridgehubAddress); vm.expectRevert(abi.encodeWithSelector(InvalidProof.selector)); - sharedBridge.claimFailedDeposit({ + l1Nullifier.claimFailedDeposit({ _chainId: chainId, _depositSender: alice, - _l1Asset: ETH_TOKEN_ADDRESS, + _l1Token: ETH_TOKEN_ADDRESS, _amount: amount, _l2TxHash: txHash, _l2BatchNumber: l2BatchNumber, @@ -443,10 +450,10 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { bytes32 txDataHash = keccak256(abi.encode(alice, ETH_TOKEN_ADDRESS, 0)); _setSharedBridgeDepositHappened(chainId, txHash, txDataHash); vm.expectRevert(abi.encodeWithSelector((NoFundsTransferred.selector))); - sharedBridge.claimFailedDeposit({ + l1Nullifier.claimFailedDeposit({ _chainId: chainId, _depositSender: alice, - _l1Asset: ETH_TOKEN_ADDRESS, + _l1Token: ETH_TOKEN_ADDRESS, _amount: 0, _l2TxHash: txHash, _l2BatchNumber: l2BatchNumber, @@ -476,10 +483,10 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { ); vm.expectRevert(DepositDoesNotExist.selector); - sharedBridge.claimFailedDeposit({ + l1Nullifier.claimFailedDeposit({ _chainId: chainId, _depositSender: alice, - _l1Asset: ETH_TOKEN_ADDRESS, + _l1Token: ETH_TOKEN_ADDRESS, _amount: amount, _l2TxHash: txHash, _l2BatchNumber: l2BatchNumber, @@ -494,7 +501,7 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { bytes32 txDataHash = keccak256(abi.encode(alice, ETH_TOKEN_ADDRESS, amount)); _setSharedBridgeDepositHappened(chainId, txHash, txDataHash); - require(sharedBridge.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); + require(l1Nullifier.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); vm.mockCall( bridgehubAddress, @@ -513,10 +520,10 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { ); vm.expectRevert(InsufficientChainBalance.selector); - sharedBridge.claimFailedDeposit({ + l1Nullifier.claimFailedDeposit({ _chainId: chainId, _depositSender: alice, - _l1Asset: ETH_TOKEN_ADDRESS, + _l1Token: ETH_TOKEN_ADDRESS, _amount: amount, _l2TxHash: txHash, _l2BatchNumber: l2BatchNumber, @@ -528,6 +535,7 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { function test_finalizeWithdrawal_EthOnEth_legacyTxFinalizedInSharedBridge() public { vm.deal(address(sharedBridge), amount); + vm.deal(address(nativeTokenVault), amount); uint256 legacyBatchNumber = 0; vm.mockCall( @@ -537,7 +545,7 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { ); vm.store( - address(sharedBridge), + address(l1Nullifier), keccak256( abi.encode( l2MessageIndex, @@ -571,8 +579,9 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { } function test_finalizeWithdrawal_EthOnEth_diamondUpgradeFirstBatchNotSet() public { - vm.store(address(sharedBridge), bytes32(isWithdrawalFinalizedStorageLocation - 7), bytes32(uint256(0))); - vm.deal(address(sharedBridge), amount); + vm.store(address(l1Nullifier), bytes32(isWithdrawalFinalizedStorageLocation - 7), bytes32(uint256(0))); + vm.deal(address(l1Nullifier), amount); + vm.deal(address(nativeTokenVault), amount); bytes memory message = abi.encodePacked( IL1ERC20Bridge.finalizeWithdrawal.selector, @@ -595,8 +604,8 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { } function test_finalizeWithdrawal_TokenOnEth_legacyTokenWithdrawal() public { - vm.store(address(sharedBridge), bytes32(isWithdrawalFinalizedStorageLocation - 6), bytes32(uint256(5))); - vm.deal(address(sharedBridge), amount); + vm.store(address(l1Nullifier), bytes32(isWithdrawalFinalizedStorageLocation - 6), bytes32(uint256(5))); + vm.deal(address(nativeTokenVault), amount); bytes memory message = abi.encodePacked( IL1ERC20Bridge.finalizeWithdrawal.selector, @@ -604,7 +613,7 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { address(token), amount ); - vm.expectRevert("L1AR: legacy token withdrawal"); + vm.expectRevert("L1N: legacy token withdrawal"); sharedBridge.finalizeWithdrawal({ _chainId: eraChainId, @@ -659,7 +668,7 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { ), abi.encode(true) ); - _setNativeTokenVaultChainBalance(chainId, ETH_TOKEN_ADDRESS, 0); + _setNativeTokenVaultChainBalance(chainId, ETH_TOKEN_ADDRESS, 1); vm.expectRevert(InsufficientChainBalance.selector); sharedBridge.finalizeWithdrawal({ diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeHyperEnabled.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeHyperEnabled.t.sol similarity index 89% rename from l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeHyperEnabled.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeHyperEnabled.t.sol index acf185191..c0ad80ff5 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeHyperEnabled.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeHyperEnabled.t.sol @@ -7,7 +7,8 @@ import {ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; import {L2Message, TxStatus} from "contracts/common/Messaging.sol"; import {IMailbox} from "contracts/state-transition/chain-interfaces/IMailbox.sol"; -import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; +import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; +import {IAssetRouterBase} from "contracts/bridge/asset-router/IAssetRouterBase.sol"; import {L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR, L2_ASSET_ROUTER_ADDR} from "contracts/common/L2ContractAddresses.sol"; // note, this should be the same as where hyper is disabled @@ -59,7 +60,7 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { sharedBridge.bridgehubDeposit{value: amount}({ _chainId: chainId, _prevMsgSender: alice, - _l2Value: 0, + _value: amount, _data: abi.encode(ETH_TOKEN_ADDRESS, amount, bob) }); } @@ -83,7 +84,7 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { function test_bridgehubConfirmL2Transaction() public { // solhint-disable-next-line func-named-parameters - vm.expectEmit(true, true, true, true, address(sharedBridge)); + vm.expectEmit(true, true, true, true, address(l1Nullifier)); bytes32 txDataHash = keccak256(abi.encode(alice, address(token), amount)); emit BridgehubDepositFinalized(chainId, txDataHash, txHash); vm.prank(bridgehubAddress); @@ -96,7 +97,7 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { // storing depositHappened[chainId][l2TxHash] = txDataHash. bytes32 txDataHash = keccak256(abi.encode(alice, address(token), amount)); _setSharedBridgeDepositHappened(chainId, txHash, txDataHash); - require(sharedBridge.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); + require(l1Nullifier.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); _setNativeTokenVaultChainBalance(chainId, address(token), amount); @@ -118,12 +119,12 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { // solhint-disable-next-line func-named-parameters vm.expectEmit(true, true, true, false, address(sharedBridge)); - emit ClaimedFailedDepositAssetRouter(chainId, alice, tokenAssetId, abi.encode(bytes32(0))); + emit ClaimedFailedDepositAssetRouter(chainId, tokenAssetId, abi.encode(bytes32(0))); vm.prank(bridgehubAddress); - sharedBridge.claimFailedDeposit({ + l1Nullifier.claimFailedDeposit({ _chainId: chainId, _depositSender: alice, - _l1Asset: address(token), + _l1Token: address(token), _amount: amount, _l2TxHash: txHash, _l2BatchNumber: l2BatchNumber, @@ -137,7 +138,7 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { // storing depositHappened[chainId][l2TxHash] = txDataHash. bytes32 txDataHash = keccak256(abi.encode(alice, ETH_TOKEN_ADDRESS, amount)); _setSharedBridgeDepositHappened(chainId, txHash, txDataHash); - require(sharedBridge.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); + require(l1Nullifier.depositHappened(chainId, txHash) == txDataHash, "Deposit not set"); // Bridgehub bridgehub = new Bridgehub(); // vm.store(address(bridgehub), bytes32(uint256(5 +2)), bytes32(uint256(31337))); @@ -161,12 +162,12 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { // solhint-disable-next-line func-named-parameters vm.expectEmit(true, true, true, false, address(sharedBridge)); - emit ClaimedFailedDepositAssetRouter(chainId, alice, ETH_TOKEN_ASSET_ID, abi.encode(bytes32(0))); + emit ClaimedFailedDepositAssetRouter(chainId, ETH_TOKEN_ASSET_ID, abi.encode(bytes32(0))); vm.prank(bridgehubAddress); - sharedBridge.claimFailedDeposit({ + l1Nullifier.claimFailedDeposit({ _chainId: chainId, _depositSender: alice, - _l1Asset: ETH_TOKEN_ADDRESS, + _l1Token: ETH_TOKEN_ADDRESS, _amount: amount, _l2TxHash: txHash, _l2BatchNumber: l2BatchNumber, @@ -202,7 +203,7 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { // solhint-disable-next-line func-named-parameters vm.expectEmit(true, true, true, false, address(sharedBridge)); - emit WithdrawalFinalizedAssetRouter(chainId, ETH_TOKEN_ASSET_ID, message); + emit DepositFinalizedAssetRouter(chainId, ETH_TOKEN_ASSET_ID, message); sharedBridge.finalizeWithdrawal({ _chainId: chainId, _l2BatchNumber: l2BatchNumber, @@ -217,7 +218,8 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { _setBaseTokenAssetId(ETH_TOKEN_ASSET_ID); bytes memory message = abi.encodePacked( - IL1AssetRouter.finalizeWithdrawal.selector, + IAssetRouterBase.finalizeDeposit.selector, + chainId, tokenAssetId, abi.encode(amount, alice) ); @@ -243,7 +245,7 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { // solhint-disable-next-line func-named-parameters vm.expectEmit(true, true, true, false, address(sharedBridge)); - emit WithdrawalFinalizedAssetRouter(chainId, tokenAssetId, message); + emit DepositFinalizedAssetRouter(chainId, tokenAssetId, message); sharedBridge.finalizeWithdrawal({ _chainId: chainId, _l2BatchNumber: l2BatchNumber, @@ -258,7 +260,8 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { _setBaseTokenAssetId(tokenAssetId); bytes memory message = abi.encodePacked( - IL1AssetRouter.finalizeWithdrawal.selector, + IAssetRouterBase.finalizeDeposit.selector, + chainId, ETH_TOKEN_ASSET_ID, abi.encode(amount, alice) ); @@ -284,7 +287,7 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { // solhint-disable-next-line func-named-parameters vm.expectEmit(true, true, true, false, address(sharedBridge)); - emit WithdrawalFinalizedAssetRouter(chainId, ETH_TOKEN_ASSET_ID, message); + emit DepositFinalizedAssetRouter(chainId, ETH_TOKEN_ASSET_ID, message); sharedBridge.finalizeWithdrawal({ _chainId: chainId, _l2BatchNumber: l2BatchNumber, @@ -299,7 +302,8 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { _setBaseTokenAssetId(tokenAssetId); bytes memory message = abi.encodePacked( - IL1AssetRouter.finalizeWithdrawal.selector, + IAssetRouterBase.finalizeDeposit.selector, + chainId, tokenAssetId, abi.encode(amount, alice) ); @@ -325,7 +329,7 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { // solhint-disable-next-line func-named-parameters vm.expectEmit(true, true, true, false, address(sharedBridge)); - emit WithdrawalFinalizedAssetRouter(chainId, tokenAssetId, message); + emit DepositFinalizedAssetRouter(chainId, tokenAssetId, message); sharedBridge.finalizeWithdrawal({ _chainId: chainId, _l2BatchNumber: l2BatchNumber, @@ -338,7 +342,8 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { function test_finalizeWithdrawal_NonBaseErcOnErc2() public { bytes memory message = abi.encodePacked( - IL1AssetRouter.finalizeWithdrawal.selector, + IAssetRouterBase.finalizeDeposit.selector, + chainId, tokenAssetId, abi.encode(amount, alice) ); @@ -365,7 +370,7 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { // solhint-disable-next-line func-named-parameters vm.expectEmit(true, true, true, false, address(sharedBridge)); - emit WithdrawalFinalizedAssetRouter(chainId, tokenAssetId, message); + emit DepositFinalizedAssetRouter(chainId, tokenAssetId, message); sharedBridge.finalizeWithdrawal({ _chainId: chainId, _l2BatchNumber: l2BatchNumber, diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeLegacy.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeLegacy.t.sol similarity index 79% rename from l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeLegacy.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeLegacy.t.sol index 4b36365a5..cd3192ea5 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeLegacy.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeLegacy.t.sol @@ -11,6 +11,7 @@ import {L2Message, TxStatus} from "contracts/common/Messaging.sol"; import {IMailbox} from "contracts/state-transition/chain-interfaces/IMailbox.sol"; import {IL1ERC20Bridge} from "contracts/bridge/interfaces/IL1ERC20Bridge.sol"; import {L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR, L2_ASSET_ROUTER_ADDR} from "contracts/common/L2ContractAddresses.sol"; +import {FinalizeL1DepositParams} from "contracts/bridge/interfaces/IL1Nullifier.sol"; contract L1AssetRouterLegacyTest is L1AssetRouterTest { function test_depositLegacyERC20Bridge() public { @@ -82,15 +83,18 @@ contract L1AssetRouterLegacyTest is L1AssetRouterTest { // solhint-disable-next-line func-named-parameters vm.expectEmit(true, true, true, false, address(sharedBridge)); - emit WithdrawalFinalizedAssetRouter(eraChainId, ETH_TOKEN_ASSET_ID, message); + emit DepositFinalizedAssetRouter(eraChainId, ETH_TOKEN_ASSET_ID, message); vm.prank(l1ERC20BridgeAddress); - sharedBridge.finalizeWithdrawalLegacyErc20Bridge({ - _l2BatchNumber: l2BatchNumber, - _l2MessageIndex: l2MessageIndex, - _l2TxNumberInBatch: l2TxNumberInBatch, - _message: message, - _merkleProof: merkleProof + FinalizeL1DepositParams memory finalizeWithdrawalParams = FinalizeL1DepositParams({ + chainId: eraChainId, + l2BatchNumber: l2BatchNumber, + l2MessageIndex: l2MessageIndex, + l2Sender: L2_ASSET_ROUTER_ADDR, + l2TxNumberInBatch: l2TxNumberInBatch, + message: message, + merkleProof: merkleProof }); + l1Nullifier.finalizeWithdrawalLegacyContracts(finalizeWithdrawalParams); } function test_finalizeWithdrawalLegacyErc20Bridge_ErcOnEth() public { @@ -131,14 +135,17 @@ contract L1AssetRouterLegacyTest is L1AssetRouterTest { ); // solhint-disable-next-line func-named-parameters vm.expectEmit(true, true, false, false, address(sharedBridge)); - emit WithdrawalFinalizedAssetRouter(eraChainId, tokenAssetId, message); + emit DepositFinalizedAssetRouter(eraChainId, tokenAssetId, new bytes(0)); // kl todo vm.prank(l1ERC20BridgeAddress); - sharedBridge.finalizeWithdrawalLegacyErc20Bridge({ - _l2BatchNumber: l2BatchNumber, - _l2MessageIndex: l2MessageIndex, - _l2TxNumberInBatch: l2TxNumberInBatch, - _message: message, - _merkleProof: merkleProof + FinalizeL1DepositParams memory finalizeWithdrawalParams = FinalizeL1DepositParams({ + chainId: eraChainId, + l2BatchNumber: l2BatchNumber, + l2MessageIndex: l2MessageIndex, + l2Sender: L2_ASSET_ROUTER_ADDR, + l2TxNumberInBatch: l2TxNumberInBatch, + message: message, + merkleProof: merkleProof }); + l1Nullifier.finalizeWithdrawalLegacyContracts(finalizeWithdrawalParams); } } diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol similarity index 78% rename from l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol index ed7ffbc9c..07fcf97f9 100644 --- a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol @@ -7,12 +7,14 @@ import "forge-std/console.sol"; import {TransparentUpgradeableProxy} from "@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol"; -import {L1AssetRouter} from "contracts/bridge/L1AssetRouter.sol"; -import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; +import {L1AssetRouter} from "contracts/bridge/asset-router/L1AssetRouter.sol"; +import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; import {TestnetERC20Token} from "contracts/dev-contracts/TestnetERC20Token.sol"; -import {L1NativeTokenVault} from "contracts/bridge/L1NativeTokenVault.sol"; -import {IL1NativeTokenVault} from "contracts/bridge/interfaces/IL1NativeTokenVault.sol"; +import {L1NativeTokenVault} from "contracts/bridge/ntv/L1NativeTokenVault.sol"; +import {L1Nullifier} from "contracts/bridge/L1Nullifier.sol"; +import {IL1NativeTokenVault} from "contracts/bridge/ntv/IL1NativeTokenVault.sol"; +import {INativeTokenVault} from "contracts/bridge/ntv/INativeTokenVault.sol"; import {IL1AssetHandler} from "contracts/bridge/interfaces/IL1AssetHandler.sol"; import {IL1BaseTokenAssetHandler} from "contracts/bridge/interfaces/IL1BaseTokenAssetHandler.sol"; import {ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; @@ -43,14 +45,9 @@ contract L1AssetRouterTest is Test { bytes32 indexed l2DepositTxHash ); - event WithdrawalFinalizedAssetRouter(uint256 indexed chainId, bytes32 indexed assetId, bytes assetData); + event DepositFinalizedAssetRouter(uint256 indexed chainId, bytes32 indexed assetId, bytes assetData); - event ClaimedFailedDepositAssetRouter( - uint256 indexed chainId, - address indexed to, - bytes32 indexed assetId, - bytes assetData - ); + event ClaimedFailedDepositAssetRouter(uint256 indexed chainId, bytes32 indexed assetId, bytes assetData); event LegacyDepositInitiated( uint256 indexed chainId, @@ -65,10 +62,13 @@ contract L1AssetRouterTest is Test { L1AssetRouter sharedBridge; L1NativeTokenVault nativeTokenVaultImpl; L1NativeTokenVault nativeTokenVault; + L1Nullifier l1NullifierImpl; + L1Nullifier l1Nullifier; address bridgehubAddress; address l1ERC20BridgeAddress; address l1WethAddress; address l2SharedBridge; + address l1NullifierAddress; TestnetERC20Token token; bytes32 tokenAssetId; uint256 eraPostUpgradeFirstBatch; @@ -123,36 +123,58 @@ contract L1AssetRouterTest is Test { eraErc20BridgeAddress = makeAddr("eraErc20BridgeAddress"); token = new TestnetERC20Token("TestnetERC20Token", "TET", 18); + l1NullifierImpl = new L1Nullifier({ + _bridgehub: IBridgehub(bridgehubAddress), + _eraChainId: eraChainId, + _eraDiamondProxy: eraDiamondProxy + }); + TransparentUpgradeableProxy l1NullifierProxy = new TransparentUpgradeableProxy( + address(l1NullifierImpl), + admin, + abi.encodeWithSelector(L1Nullifier.initialize.selector, owner, 1, 1, 1, 0) + ); + l1Nullifier = L1Nullifier(payable(l1NullifierProxy)); sharedBridgeImpl = new L1AssetRouter({ _l1WethAddress: l1WethAddress, - _bridgehub: IBridgehub(bridgehubAddress), + _bridgehub: bridgehubAddress, + _l1Nullifier: address(l1Nullifier), _eraChainId: eraChainId, _eraDiamondProxy: eraDiamondProxy }); TransparentUpgradeableProxy sharedBridgeProxy = new TransparentUpgradeableProxy( address(sharedBridgeImpl), admin, - abi.encodeWithSelector(L1AssetRouter.initialize.selector, owner, 1, 1, 1, 0) + abi.encodeWithSelector(L1AssetRouter.initialize.selector, owner) ); sharedBridge = L1AssetRouter(payable(sharedBridgeProxy)); nativeTokenVaultImpl = new L1NativeTokenVault({ _l1WethAddress: l1WethAddress, - _l1SharedBridge: IL1AssetRouter(address(sharedBridge)) + _l1AssetRouter: address(sharedBridge), + _eraChainId: eraChainId, + _l1Nullifier: l1Nullifier }); + address tokenBeacon = makeAddr("tokenBeacon"); TransparentUpgradeableProxy nativeTokenVaultProxy = new TransparentUpgradeableProxy( address(nativeTokenVaultImpl), admin, - abi.encodeWithSelector(L1NativeTokenVault.initialize.selector, owner) + abi.encodeWithSelector(L1NativeTokenVault.initialize.selector, owner, tokenBeacon) ); nativeTokenVault = L1NativeTokenVault(payable(nativeTokenVaultProxy)); + + vm.prank(owner); + l1Nullifier.setL1AssetRouter(address(sharedBridge)); + vm.prank(owner); + l1Nullifier.setL1NativeTokenVault(nativeTokenVault); + vm.prank(owner); + l1Nullifier.setL1Erc20Bridge(l1ERC20BridgeAddress); vm.prank(owner); sharedBridge.setL1Erc20Bridge(l1ERC20BridgeAddress); tokenAssetId = DataEncoding.encodeNTVAssetId(block.chainid, address(token)); vm.prank(owner); - sharedBridge.setNativeTokenVault(IL1NativeTokenVault(address(nativeTokenVault))); + sharedBridge.setNativeTokenVault(INativeTokenVault(address(nativeTokenVault))); vm.prank(address(nativeTokenVault)); nativeTokenVault.registerToken(address(token)); - nativeTokenVault.registerToken(ETH_TOKEN_ADDRESS); + // nativeTokenVault.registerToken(ETH_TOKEN_ADDRESS); vm.store( address(sharedBridge), @@ -199,14 +221,18 @@ contract L1AssetRouterTest is Test { vm.deal(bridgehubAddress, amount); vm.deal(address(sharedBridge), amount); + vm.deal(address(l1Nullifier), amount); vm.deal(address(nativeTokenVault), amount); token.mint(alice, amount); token.mint(address(sharedBridge), amount); token.mint(address(nativeTokenVault), amount); + token.mint(address(l1Nullifier), amount); vm.prank(alice); token.approve(address(sharedBridge), amount); vm.prank(alice); token.approve(address(nativeTokenVault), amount); + vm.prank(alice); + token.approve(address(l1Nullifier), amount); _setBaseTokenAssetId(ETH_TOKEN_ASSET_ID); _setNativeTokenVaultChainBalance(chainId, address(token), amount); @@ -225,26 +251,27 @@ contract L1AssetRouterTest is Test { function _setSharedBridgeDepositHappened(uint256 _chainId, bytes32 _txHash, bytes32 _txDataHash) internal { stdstore - .target(address(sharedBridge)) - .sig(sharedBridge.depositHappened.selector) + .target(address(l1Nullifier)) + .sig(l1Nullifier.depositHappened.selector) .with_key(_chainId) .with_key(_txHash) .checked_write(_txDataHash); } function _setNativeTokenVaultChainBalance(uint256 _chainId, address _token, uint256 _value) internal { + bytes32 assetId = DataEncoding.encodeNTVAssetId(block.chainid, _token); stdstore .target(address(nativeTokenVault)) .sig(nativeTokenVault.chainBalance.selector) .with_key(_chainId) - .with_key(_token) + .with_key(assetId) .checked_write(_value); } function _setSharedBridgeChainBalance(uint256 _chainId, address _token, uint256 _value) internal { stdstore - .target(address(sharedBridge)) - .sig(sharedBridge.chainBalance.selector) + .target(address(l1Nullifier)) + .sig(l1Nullifier.__DEPRECATED_chainBalance.selector) .with_key(_chainId) .with_key(_token) .checked_write(_value); diff --git a/l1-contracts/test/foundry/unit/concrete/DiamondCut/FacetCut.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/DiamondCut/FacetCut.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/DiamondCut/FacetCut.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/DiamondCut/FacetCut.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/DiamondCut/Initialization.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/DiamondCut/Initialization.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/DiamondCut/Initialization.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/DiamondCut/Initialization.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/DiamondCut/UpgradeLogic.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/DiamondCut/UpgradeLogic.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/DiamondCut/UpgradeLogic.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/DiamondCut/UpgradeLogic.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/DiamondCut/_DiamondCut_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/DiamondCut/_DiamondCut_Shared.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/DiamondCut/_DiamondCut_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/DiamondCut/_DiamondCut_Shared.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Executor/Authorization.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Executor/Authorization.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Executor/Authorization.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Executor/Authorization.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Executor/Committing.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Executor/Committing.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Executor/Committing.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Executor/Committing.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Executor/Executing.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Executor/Executing.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Executor/Executing.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Executor/Executing.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Executor/ExecutorProof.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Executor/ExecutorProof.t.sol similarity index 99% rename from l1-contracts/test/foundry/unit/concrete/Executor/ExecutorProof.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Executor/ExecutorProof.t.sol index 5de5cc670..af6e9f3a5 100644 --- a/l1-contracts/test/foundry/unit/concrete/Executor/ExecutorProof.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Executor/ExecutorProof.t.sol @@ -3,8 +3,8 @@ pragma solidity 0.8.24; import {Test} from "forge-std/Test.sol"; -import {Utils} from "foundry-test/unit/concrete/Utils/Utils.sol"; -import {UtilsFacet} from "foundry-test/unit/concrete/Utils/UtilsFacet.sol"; +import {Utils} from "foundry-test/l1/unit/concrete/Utils/Utils.sol"; +import {UtilsFacet} from "foundry-test/l1/unit/concrete/Utils/UtilsFacet.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; import {ExecutorFacet} from "contracts/state-transition/chain-deps/facets/Executor.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/Executor/Proving.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Executor/Proving.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Executor/Proving.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Executor/Proving.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Executor/Reverting.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Executor/Reverting.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Executor/Reverting.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Executor/Reverting.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Executor/_Executor_Shared.t.sol similarity index 98% rename from l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Executor/_Executor_Shared.t.sol index 07aab22c7..b4d46e842 100644 --- a/l1-contracts/test/foundry/unit/concrete/Executor/_Executor_Shared.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Executor/_Executor_Shared.t.sol @@ -27,7 +27,8 @@ import {MessageRoot} from "contracts/bridgehub/MessageRoot.sol"; import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; import {RollupL1DAValidator} from "da-contracts/RollupL1DAValidator.sol"; -import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; +import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; +import {IAssetRouterBase} from "contracts/bridge/asset-router/IAssetRouterBase.sol"; import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; bytes32 constant EMPTY_PREPUBLISHED_COMMITMENT = 0x0000000000000000000000000000000000000000000000000000000000000000; diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Governance/AccessControlRestriction.t.sol similarity index 99% rename from l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Governance/AccessControlRestriction.t.sol index 645f2ae5f..1cd471413 100644 --- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/AccessControlRestriction.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Governance/AccessControlRestriction.t.sol @@ -9,7 +9,7 @@ import {IChainAdmin} from "contracts/governance/IChainAdmin.sol"; import {ChainAdmin} from "contracts/governance/ChainAdmin.sol"; import {AccessControlRestriction} from "contracts/governance/AccessControlRestriction.sol"; import {IAccessControlRestriction} from "contracts/governance/IAccessControlRestriction.sol"; -import {Utils} from "test/foundry/unit/concrete/Utils/Utils.sol"; +import {Utils} from "test/foundry/l1/unit/concrete/Utils/Utils.sol"; import {NoCallsProvided, AccessToFallbackDenied, AccessToFunctionDenied} from "contracts/common/L1ContractErrors.sol"; import {Call} from "contracts/governance/Common.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/Authorization.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Governance/Authorization.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/governance/Governance/Authorization.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Governance/Authorization.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Governance/ChainAdmin.t.sol similarity index 98% rename from l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Governance/ChainAdmin.t.sol index 567c6d999..27624d503 100644 --- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/ChainAdmin.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Governance/ChainAdmin.t.sol @@ -10,7 +10,7 @@ import {ChainAdmin} from "contracts/governance/ChainAdmin.sol"; import {GettersFacet} from "contracts/state-transition/chain-deps/facets/Getters.sol"; import {Call} from "contracts/governance/Common.sol"; import {NoCallsProvided, RestrictionWasAlreadyPresent, RestrictionWasNotPresent, AccessToFallbackDenied, AccessToFunctionDenied} from "contracts/common/L1ContractErrors.sol"; -import {Utils} from "test/foundry/unit/concrete/Utils/Utils.sol"; +import {Utils} from "test/foundry/l1/unit/concrete/Utils/Utils.sol"; contract ChainAdminTest is Test { ChainAdmin internal chainAdmin; diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/Executing.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Governance/Executing.t.sol similarity index 99% rename from l1-contracts/test/foundry/unit/concrete/governance/Governance/Executing.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Governance/Executing.t.sol index 09d6c0267..9a1e5eeb2 100644 --- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/Executing.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Governance/Executing.t.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.24; import {StdStorage, stdStorage} from "forge-std/Test.sol"; -import {Utils} from "../../Utils/Utils.sol"; +import {Utils} from "../Utils/Utils.sol"; import {GovernanceTest} from "./_Governance_Shared.t.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/Fallback.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Governance/Fallback.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/governance/Governance/Fallback.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Governance/Fallback.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/OperationStatus.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Governance/OperationStatus.t.sol similarity index 99% rename from l1-contracts/test/foundry/unit/concrete/governance/Governance/OperationStatus.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Governance/OperationStatus.t.sol index 9b4ee36e9..131bb6465 100644 --- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/OperationStatus.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Governance/OperationStatus.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import {Utils} from "../../Utils/Utils.sol"; +import {Utils} from "../Utils/Utils.sol"; import {GovernanceTest} from "./_Governance_Shared.t.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Governance/PermanentRestriction.t.sol similarity index 98% rename from l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Governance/PermanentRestriction.t.sol index 9d16611d1..e6c089a56 100644 --- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/PermanentRestriction.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Governance/PermanentRestriction.t.sol @@ -15,7 +15,7 @@ import {IAdmin} from "contracts/state-transition/chain-interfaces/IAdmin.sol"; import {AccessControlRestriction} from "contracts/governance/AccessControlRestriction.sol"; import {ChainAdmin} from "contracts/governance/ChainAdmin.sol"; import {IChainAdmin} from "contracts/governance/IChainAdmin.sol"; -import {ChainTypeManagerTest} from "test/foundry/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol"; +import {ChainTypeManagerTest} from "test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol"; import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; import {ICTMDeploymentTracker} from "contracts/bridgehub/ICTMDeploymentTracker.sol"; import {IMessageRoot} from "contracts/bridgehub/IMessageRoot.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/Reentrancy.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Governance/Reentrancy.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/governance/Governance/Reentrancy.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Governance/Reentrancy.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/SelfUpgrades.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Governance/SelfUpgrades.t.sol similarity index 97% rename from l1-contracts/test/foundry/unit/concrete/governance/Governance/SelfUpgrades.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Governance/SelfUpgrades.t.sol index a37acf150..04a909f57 100644 --- a/l1-contracts/test/foundry/unit/concrete/governance/Governance/SelfUpgrades.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Governance/SelfUpgrades.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import {Utils} from "../../Utils/Utils.sol"; +import {Utils} from "../Utils/Utils.sol"; import {GovernanceTest} from "./_Governance_Shared.t.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/governance/Governance/_Governance_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Governance/_Governance_Shared.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/governance/Governance/_Governance_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Governance/_Governance_Shared.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol b/l1-contracts/test/foundry/l1/unit/concrete/Utils/Utils.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Utils/Utils.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Utils/Utils.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Utils/Utils.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Utils/Utils.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Utils/Utils.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Utils/Utils.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Utils/UtilsFacet.sol b/l1-contracts/test/foundry/l1/unit/concrete/Utils/UtilsFacet.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Utils/UtilsFacet.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Utils/UtilsFacet.sol diff --git a/l1-contracts/test/foundry/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/ValidatorTimelock/ValidatorTimelock.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Verifier/Verifier.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Verifier/Verifier.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Verifier/Verifier.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Verifier/Verifier.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/Verifier/VerifierRecursive.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Verifier/VerifierRecursive.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/Verifier/VerifierRecursive.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/Verifier/VerifierRecursive.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/common/libraries/FullMerkle/PushNewLeaf.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/FullMerkle/PushNewLeaf.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/common/libraries/FullMerkle/PushNewLeaf.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/common/libraries/FullMerkle/PushNewLeaf.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/common/libraries/FullMerkle/Root.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/FullMerkle/Root.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/common/libraries/FullMerkle/Root.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/common/libraries/FullMerkle/Root.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/common/libraries/FullMerkle/Setup.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/FullMerkle/Setup.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/common/libraries/FullMerkle/Setup.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/common/libraries/FullMerkle/Setup.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/common/libraries/FullMerkle/UpdateAllLeaves.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/FullMerkle/UpdateAllLeaves.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/common/libraries/FullMerkle/UpdateAllLeaves.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/common/libraries/FullMerkle/UpdateAllLeaves.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/common/libraries/FullMerkle/UpdateAllNodesAtHeight.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/FullMerkle/UpdateAllNodesAtHeight.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/common/libraries/FullMerkle/UpdateAllNodesAtHeight.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/common/libraries/FullMerkle/UpdateAllNodesAtHeight.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/common/libraries/FullMerkle/UpdateLeaf.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/FullMerkle/UpdateLeaf.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/common/libraries/FullMerkle/UpdateLeaf.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/common/libraries/FullMerkle/UpdateLeaf.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/common/libraries/FullMerkle/_FullMerkle_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/FullMerkle/_FullMerkle_Shared.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/common/libraries/FullMerkle/_FullMerkle_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/common/libraries/FullMerkle/_FullMerkle_Shared.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/common/libraries/IncrementalMerkle/IncrementalMerkle.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/IncrementalMerkle/IncrementalMerkle.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/common/libraries/IncrementalMerkle/IncrementalMerkle.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/common/libraries/IncrementalMerkle/IncrementalMerkle.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/common/libraries/Merkle/Merkle.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/Merkle/Merkle.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/common/libraries/Merkle/Merkle.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/common/libraries/Merkle/Merkle.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/common/libraries/Merkle/MerkleTreeNoSort.sol b/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/Merkle/MerkleTreeNoSort.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/common/libraries/Merkle/MerkleTreeNoSort.sol rename to l1-contracts/test/foundry/l1/unit/concrete/common/libraries/Merkle/MerkleTreeNoSort.sol diff --git a/l1-contracts/test/foundry/unit/concrete/common/libraries/UncheckedMath/UncheckedAdd.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/UncheckedMath/UncheckedAdd.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/common/libraries/UncheckedMath/UncheckedAdd.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/common/libraries/UncheckedMath/UncheckedAdd.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/common/libraries/UncheckedMath/UncheckedInc.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/UncheckedMath/UncheckedInc.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/common/libraries/UncheckedMath/UncheckedInc.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/common/libraries/UncheckedMath/UncheckedInc.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/common/libraries/UncheckedMath/_UncheckedMath_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/UncheckedMath/_UncheckedMath_Shared.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/common/libraries/UncheckedMath/_UncheckedMath_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/common/libraries/UncheckedMath/_UncheckedMath_Shared.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/common/libraries/UnsafeBytes/UnsafeBytes.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/UnsafeBytes/UnsafeBytes.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/common/libraries/UnsafeBytes/UnsafeBytes.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/common/libraries/UnsafeBytes/UnsafeBytes.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/Admin.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/Admin.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/Admin.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/Admin.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/CreateNewChain.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/CreateNewChain.t.sol similarity index 97% rename from l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/CreateNewChain.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/CreateNewChain.t.sol index 6ed3cc5d3..81659b682 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/CreateNewChain.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/CreateNewChain.t.sol @@ -32,7 +32,7 @@ contract createNewChainTest is ChainTypeManagerTest { chainContractAddress.createNewChain({ _chainId: chainId, _baseTokenAssetId: DataEncoding.encodeNTVAssetId(block.chainid, baseToken), - _sharedBridge: sharedBridge, + _assetRouter: sharedBridge, _admin: admin, _initData: abi.encode(abi.encode(initialDiamondCutData), bytes("")), _factoryDeps: new bytes[](0) diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/FreezeChain.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/FreezeChain.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/FreezeChain.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/FreezeChain.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetChainCreationParams.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/SetChainCreationParams.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetChainCreationParams.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/SetChainCreationParams.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetNewVersionUpgrade.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/SetNewVersionUpgrade.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetNewVersionUpgrade.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/SetNewVersionUpgrade.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetUpgradeDiamondCut.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/SetUpgradeDiamondCut.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetUpgradeDiamondCut.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/SetUpgradeDiamondCut.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetValidatorTimelock.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/SetValidatorTimelock.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/SetValidatorTimelock.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/SetValidatorTimelock.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/StateTransitionOwnerZero.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/StateTransitionOwnerZero.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/StateTransitionOwnerZero.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/StateTransitionOwnerZero.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol similarity index 97% rename from l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol index 90cc6efc0..6980aa52f 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol @@ -7,9 +7,10 @@ import {Test} from "forge-std/Test.sol"; import {TransparentUpgradeableProxy} from "@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol"; import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; -import {Utils} from "foundry-test/unit/concrete/Utils/Utils.sol"; + +import {Utils} from "foundry-test/l1/unit/concrete/Utils/Utils.sol"; import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; -import {UtilsFacet} from "foundry-test/unit/concrete/Utils/UtilsFacet.sol"; +import {UtilsFacet} from "foundry-test/l1/unit/concrete/Utils/UtilsFacet.sol"; import {AdminFacet} from "contracts/state-transition/chain-deps/facets/Admin.sol"; import {ExecutorFacet} from "contracts/state-transition/chain-deps/facets/Executor.sol"; import {GettersFacet} from "contracts/state-transition/chain-deps/facets/Getters.sol"; @@ -145,7 +146,7 @@ contract ChainTypeManagerTest is Test { chainContractAddress.createNewChain({ _chainId: chainId, _baseTokenAssetId: DataEncoding.encodeNTVAssetId(block.chainid, baseToken), - _sharedBridge: sharedBridge, + _assetRouter: sharedBridge, _admin: newChainAdmin, _initData: abi.encode(abi.encode(_diamondCut), bytes("")), _factoryDeps: new bytes[](0) diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondInit/Initialize.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/DiamondInit/Initialize.t.sol similarity index 97% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondInit/Initialize.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/DiamondInit/Initialize.t.sol index 7b17fbce2..cfc826fa5 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondInit/Initialize.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/DiamondInit/Initialize.t.sol @@ -2,8 +2,8 @@ pragma solidity 0.8.24; import {DiamondInitTest} from "./_DiamondInit_Shared.t.sol"; -import {Utils} from "foundry-test/unit/concrete/Utils/Utils.sol"; -import {UtilsFacet} from "foundry-test/unit/concrete/Utils/UtilsFacet.sol"; +import {Utils} from "foundry-test/l1/unit/concrete/Utils/Utils.sol"; +import {UtilsFacet} from "foundry-test/l1/unit/concrete/Utils/UtilsFacet.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; import {DiamondInit} from "contracts/state-transition/chain-deps/DiamondInit.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondInit/_DiamondInit_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/DiamondInit/_DiamondInit_Shared.t.sol similarity index 84% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondInit/_DiamondInit_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/DiamondInit/_DiamondInit_Shared.t.sol index 8a50fd5d5..79d0145dd 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondInit/_DiamondInit_Shared.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/DiamondInit/_DiamondInit_Shared.t.sol @@ -3,8 +3,8 @@ pragma solidity 0.8.24; import {Test} from "forge-std/Test.sol"; -import {Utils} from "foundry-test/unit/concrete/Utils/Utils.sol"; -import {UtilsFacet} from "foundry-test/unit/concrete/Utils/UtilsFacet.sol"; +import {Utils} from "foundry-test/l1/unit/concrete/Utils/Utils.sol"; +import {UtilsFacet} from "foundry-test/l1/unit/concrete/Utils/UtilsFacet.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; import {TestnetVerifier} from "contracts/state-transition/TestnetVerifier.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondProxy/DiamondProxy.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/DiamondProxy/DiamondProxy.t.sol similarity index 97% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondProxy/DiamondProxy.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/DiamondProxy/DiamondProxy.t.sol index 3b73c990a..d58d81ae5 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/DiamondProxy/DiamondProxy.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/DiamondProxy/DiamondProxy.t.sol @@ -3,8 +3,8 @@ pragma solidity 0.8.24; import {Test} from "forge-std/Test.sol"; -import {Utils} from "foundry-test/unit/concrete/Utils/Utils.sol"; -import {UtilsFacet} from "foundry-test/unit/concrete/Utils/UtilsFacet.sol"; +import {Utils} from "foundry-test/l1/unit/concrete/Utils/Utils.sol"; +import {UtilsFacet} from "foundry-test/l1/unit/concrete/Utils/UtilsFacet.sol"; import {InitializeData} from "contracts/state-transition/chain-interfaces/IDiamondInit.sol"; import {DiamondInit} from "contracts/state-transition/chain-deps/DiamondInit.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/AcceptAdmin.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/AcceptAdmin.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/AcceptAdmin.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/AcceptAdmin.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/ChangeFeeParams.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ExecuteUpgrade.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/ExecuteUpgrade.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/ExecuteUpgrade.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/ExecuteUpgrade.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/FreezeDiamond.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/FreezeDiamond.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/FreezeDiamond.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/FreezeDiamond.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetPendingGovernor.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/SetPendingGovernor.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetPendingGovernor.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/SetPendingGovernor.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetPorterAvailability.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/SetPorterAvailability.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetPorterAvailability.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/SetPorterAvailability.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetPriorityTxMaxGasLimit.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/SetPriorityTxMaxGasLimit.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetPriorityTxMaxGasLimit.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/SetPriorityTxMaxGasLimit.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetTransactionFilterer.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/SetTransactionFilterer.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetTransactionFilterer.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/SetTransactionFilterer.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetValidator.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/SetValidator.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/SetValidator.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/SetValidator.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/UnfreezeDiamond.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/UnfreezeDiamond.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/UnfreezeDiamond.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/UnfreezeDiamond.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/UpgradeChainFromVersion.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/UpgradeChainFromVersion.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/UpgradeChainFromVersion.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/UpgradeChainFromVersion.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/_Admin_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/_Admin_Shared.t.sol similarity index 93% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/_Admin_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/_Admin_Shared.t.sol index 97c275f40..7c45f8e8b 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Admin/_Admin_Shared.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Admin/_Admin_Shared.t.sol @@ -3,8 +3,8 @@ pragma solidity 0.8.24; import {Test} from "forge-std/Test.sol"; -import {Utils} from "foundry-test/unit/concrete/Utils/Utils.sol"; -import {UtilsFacet} from "foundry-test/unit/concrete/Utils/UtilsFacet.sol"; +import {Utils} from "foundry-test/l1/unit/concrete/Utils/Utils.sol"; +import {UtilsFacet} from "foundry-test/l1/unit/concrete/Utils/UtilsFacet.sol"; import {AdminFacet} from "contracts/state-transition/chain-deps/facets/Admin.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyBridgehub.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Base/OnlyBridgehub.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyBridgehub.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Base/OnlyBridgehub.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernor.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernor.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernor.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernor.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernorOrStateTransitionManager.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernorOrStateTransitionManager.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernorOrStateTransitionManager.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Base/OnlyGovernorOrStateTransitionManager.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyStateTransitionManager.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Base/OnlyStateTransitionManager.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyStateTransitionManager.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Base/OnlyStateTransitionManager.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyValidator.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Base/OnlyValidator.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/OnlyValidator.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Base/OnlyValidator.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol similarity index 95% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol index b486875fa..be93c91df 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Base/_Base_Shared.t.sol @@ -3,8 +3,8 @@ pragma solidity 0.8.24; import {Test} from "forge-std/Test.sol"; -import {Utils} from "foundry-test/unit/concrete/Utils/Utils.sol"; -import {UtilsFacet} from "foundry-test/unit/concrete/Utils/UtilsFacet.sol"; +import {Utils} from "foundry-test/l1/unit/concrete/Utils/Utils.sol"; +import {UtilsFacet} from "foundry-test/l1/unit/concrete/Utils/UtilsFacet.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; import {ZKChainBase} from "contracts/state-transition/chain-deps/facets/Admin.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/FacetAddress.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/FacetAddress.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/FacetAddress.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/FacetAddress.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/FacetAddresses.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/FacetAddresses.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/FacetAddresses.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/FacetAddresses.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/FacetFunctionSelectors.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/FacetFunctionSelectors.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/FacetFunctionSelectors.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/FacetFunctionSelectors.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/Facets.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/Facets.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/Facets.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/Facets.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetAdmin.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetAdmin.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetAdmin.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetAdmin.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetBaseToken.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetBaseToken.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetBaseToken.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetBaseToken.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetBaseTokenBridge.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetBaseTokenBridge.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetBaseTokenBridge.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetBaseTokenBridge.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetBridgehub.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetBridgehub.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetBridgehub.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetBridgehub.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetFirstUnprocessedPriorityTx.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetFirstUnprocessedPriorityTx.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetFirstUnprocessedPriorityTx.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetFirstUnprocessedPriorityTx.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2BootloaderBytecodeHash.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2BootloaderBytecodeHash.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2BootloaderBytecodeHash.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2BootloaderBytecodeHash.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2DefaultAccountBytecodeHash.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2DefaultAccountBytecodeHash.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2DefaultAccountBytecodeHash.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2DefaultAccountBytecodeHash.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2SystemContractsUpgradeBatchNumber.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2SystemContractsUpgradeBatchNumber.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2SystemContractsUpgradeBatchNumber.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2SystemContractsUpgradeBatchNumber.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2SystemContractsUpgradeBlockNumber.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2SystemContractsUpgradeBlockNumber.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2SystemContractsUpgradeBlockNumber.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2SystemContractsUpgradeBlockNumber.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2SystemContractsUpgradeTxHash.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2SystemContractsUpgradeTxHash.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2SystemContractsUpgradeTxHash.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetL2SystemContractsUpgradeTxHash.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetPendingAdmin.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetPendingAdmin.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetPendingAdmin.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetPendingAdmin.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetPriorityQueueSize.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetPriorityQueueSize.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetPriorityQueueSize.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetPriorityQueueSize.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetPriorityTxMaxGasLimit.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetPriorityTxMaxGasLimit.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetPriorityTxMaxGasLimit.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetPriorityTxMaxGasLimit.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetProtocolVersion.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetProtocolVersion.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetProtocolVersion.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetProtocolVersion.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetStateTransitionManager.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetStateTransitionManager.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetStateTransitionManager.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetStateTransitionManager.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBatchesCommitted.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBatchesCommitted.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBatchesCommitted.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBatchesCommitted.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBatchesExecuted.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBatchesExecuted.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBatchesExecuted.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBatchesExecuted.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBatchesVerified.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBatchesVerified.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBatchesVerified.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBatchesVerified.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBlocksCommitted.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBlocksCommitted.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBlocksCommitted.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBlocksCommitted.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBlocksExecuted.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBlocksExecuted.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBlocksExecuted.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBlocksExecuted.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBlocksVerified.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBlocksVerified.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBlocksVerified.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalBlocksVerified.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalPriorityTxs.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalPriorityTxs.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalPriorityTxs.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetTotalPriorityTxs.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetVerifier.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetVerifier.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetVerifier.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetVerifier.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetVerifierParams.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetVerifierParams.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/GetVerifierParams.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/GetVerifierParams.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/IsDiamondStorageFrozen.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/IsDiamondStorageFrozen.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/IsDiamondStorageFrozen.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/IsDiamondStorageFrozen.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/IsEthWithdrawalFinalized.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/IsEthWithdrawalFinalized.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/IsEthWithdrawalFinalized.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/IsEthWithdrawalFinalized.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/IsFacetFreezable.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/IsFacetFreezable.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/IsFacetFreezable.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/IsFacetFreezable.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/IsFunctionFreezable.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/IsFunctionFreezable.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/IsFunctionFreezable.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/IsFunctionFreezable.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/IsValidator.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/IsValidator.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/IsValidator.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/IsValidator.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/L2LogsRootHash.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/L2LogsRootHash.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/L2LogsRootHash.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/L2LogsRootHash.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/StoredBatchHash.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/StoredBatchHash.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/StoredBatchHash.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/StoredBatchHash.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/StoredBlockHash.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/StoredBlockHash.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/StoredBlockHash.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/StoredBlockHash.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/_Getters_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/_Getters_Shared.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Getters/_Getters_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Getters/_Getters_Shared.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/BaseMailboxTests.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/BaseMailboxTests.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/BaseMailboxTests.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/BaseMailboxTests.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/BridgehubRequestL2Transaction.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/BridgehubRequestL2Transaction.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/BridgehubRequestL2Transaction.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/BridgehubRequestL2Transaction.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/FinalizeWithdrawal.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/FinalizeWithdrawal.t.sol similarity index 93% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/FinalizeWithdrawal.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/FinalizeWithdrawal.t.sol index 5eb56bb79..c71721c79 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/FinalizeWithdrawal.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/FinalizeWithdrawal.t.sol @@ -4,9 +4,9 @@ pragma solidity 0.8.24; import {MailboxTest} from "./_Mailbox_Shared.t.sol"; import {DummyBridgehub} from "contracts/dev-contracts/test/DummyBridgehub.sol"; -import {L1AssetRouter} from "contracts/bridge/L1AssetRouter.sol"; +import {L1AssetRouter} from "contracts/bridge/asset-router/L1AssetRouter.sol"; import {IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; -import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; +import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; import {DummySharedBridge} from "contracts/dev-contracts/test/DummySharedBridge.sol"; import {OnlyEraSupported} from "contracts/common/L1ContractErrors.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/ProvingL2LogsInclusion.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/ProvingL2LogsInclusion.t.sol similarity index 99% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/ProvingL2LogsInclusion.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/ProvingL2LogsInclusion.t.sol index 5b2d879f0..e04335d04 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/ProvingL2LogsInclusion.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/ProvingL2LogsInclusion.t.sol @@ -13,7 +13,7 @@ import {MurkyBase} from "murky/common/MurkyBase.sol"; import {MerkleTest} from "contracts/dev-contracts/test/MerkleTest.sol"; import {TxStatus} from "contracts/state-transition/chain-deps/facets/Mailbox.sol"; import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; -import {MerkleTreeNoSort} from "test/foundry/unit/concrete/common/libraries/Merkle/MerkleTreeNoSort.sol"; +import {MerkleTreeNoSort} from "test/foundry/l1/unit/concrete/common/libraries/Merkle/MerkleTreeNoSort.sol"; contract MailboxL2LogsProve is MailboxTest { bytes32[] elements; diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/RequestL2Transaction.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/RequestL2Transaction.t.sol similarity index 98% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/RequestL2Transaction.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/RequestL2Transaction.t.sol index 29e3cbefa..85bcd8be8 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/RequestL2Transaction.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/RequestL2Transaction.t.sol @@ -8,7 +8,7 @@ import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA, MAX_NEW_FACTORY_DEPS, ETH_TOKEN_ADDRE import {TransactionFiltererTrue} from "contracts/dev-contracts/test/DummyTransactionFiltererTrue.sol"; import {TransactionFiltererFalse} from "contracts/dev-contracts/test/DummyTransactionFiltererFalse.sol"; import {FeeParams, PubdataPricingMode} from "contracts/state-transition/chain-deps/ZKChainStorage.sol"; -import {IL1AssetRouter} from "contracts/bridge/interfaces/IL1AssetRouter.sol"; +import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; import {DummySharedBridge} from "contracts/dev-contracts/test/DummySharedBridge.sol"; import {OnlyEraSupported, TooManyFactoryDeps, MsgValueTooLow, GasPerPubdataMismatch} from "contracts/common/L1ContractErrors.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/_Mailbox_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/_Mailbox_Shared.t.sol similarity index 93% rename from l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/_Mailbox_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/_Mailbox_Shared.t.sol index 105b84ae1..b1ef215d8 100644 --- a/l1-contracts/test/foundry/unit/concrete/state-transition/chain-deps/facets/Mailbox/_Mailbox_Shared.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/chain-deps/facets/Mailbox/_Mailbox_Shared.t.sol @@ -3,8 +3,8 @@ pragma solidity 0.8.24; import {Test} from "forge-std/Test.sol"; -import {Utils} from "foundry-test/unit/concrete/Utils/Utils.sol"; -import {UtilsFacet} from "foundry-test/unit/concrete/Utils/UtilsFacet.sol"; +import {Utils} from "foundry-test/l1/unit/concrete/Utils/Utils.sol"; +import {UtilsFacet} from "foundry-test/l1/unit/concrete/Utils/UtilsFacet.sol"; import {GettersFacet} from "contracts/state-transition/chain-deps/facets/Getters.sol"; import {MailboxFacet} from "contracts/state-transition/chain-deps/facets/Mailbox.sol"; import {GettersFacet} from "contracts/state-transition/chain-deps/facets/Getters.sol"; diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/data-availability/CalldataDA.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/data-availability/CalldataDA.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/data-availability/CalldataDA.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/data-availability/CalldataDA.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/data-availability/RelayedSLDAValidator.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/data-availability/RelayedSLDAValidator.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/data-availability/RelayedSLDAValidator.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/data-availability/RelayedSLDAValidator.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/libraries/PriorityQueue/OnEmptyQueue.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/PriorityQueue/OnEmptyQueue.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/libraries/PriorityQueue/OnEmptyQueue.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/PriorityQueue/OnEmptyQueue.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/libraries/PriorityQueue/PopOperations.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/PriorityQueue/PopOperations.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/libraries/PriorityQueue/PopOperations.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/PriorityQueue/PopOperations.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/libraries/PriorityQueue/PushOperations.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/PriorityQueue/PushOperations.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/libraries/PriorityQueue/PushOperations.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/PriorityQueue/PushOperations.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/libraries/PriorityQueue/_PriorityQueue_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/PriorityQueue/_PriorityQueue_Shared.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/libraries/PriorityQueue/_PriorityQueue_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/PriorityQueue/_PriorityQueue_Shared.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/libraries/PriorityTree/PriorityTree.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/PriorityTree/PriorityTree.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/libraries/PriorityTree/PriorityTree.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/PriorityTree/PriorityTree.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/libraries/PriorityTree/_PriorityTree_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/PriorityTree/_PriorityTree_Shared.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/libraries/PriorityTree/_PriorityTree_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/PriorityTree/_PriorityTree_Shared.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/libraries/TransactionValidator/ValidateL1L2Tx.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/TransactionValidator/ValidateL1L2Tx.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/libraries/TransactionValidator/ValidateL1L2Tx.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/TransactionValidator/ValidateL1L2Tx.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/libraries/TransactionValidator/ValidateUpgradeTransaction.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/TransactionValidator/ValidateUpgradeTransaction.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/libraries/TransactionValidator/ValidateUpgradeTransaction.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/TransactionValidator/ValidateUpgradeTransaction.t.sol diff --git a/l1-contracts/test/foundry/unit/concrete/state-transition/libraries/TransactionValidator/_TransactionValidator_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/TransactionValidator/_TransactionValidator_Shared.t.sol similarity index 100% rename from l1-contracts/test/foundry/unit/concrete/state-transition/libraries/TransactionValidator/_TransactionValidator_Shared.t.sol rename to l1-contracts/test/foundry/l1/unit/concrete/state-transition/libraries/TransactionValidator/_TransactionValidator_Shared.t.sol diff --git a/l2-contracts/test/foundry/unit/erc20/L2Erc20BridgeTest.t.sol b/l1-contracts/test/foundry/l2/unit/erc20/L2Erc20BridgeTest.t.sol similarity index 58% rename from l2-contracts/test/foundry/unit/erc20/L2Erc20BridgeTest.t.sol rename to l1-contracts/test/foundry/l2/unit/erc20/L2Erc20BridgeTest.t.sol index f3af1882d..1b9535108 100644 --- a/l2-contracts/test/foundry/unit/erc20/L2Erc20BridgeTest.t.sol +++ b/l1-contracts/test/foundry/l2/unit/erc20/L2Erc20BridgeTest.t.sol @@ -5,18 +5,20 @@ pragma solidity ^0.8.20; // solhint-disable gas-custom-errors import {Test} from "forge-std/Test.sol"; +import "forge-std/console.sol"; -import {L2StandardERC20} from "contracts/bridge/L2StandardERC20.sol"; -import {L2AssetRouter} from "contracts/bridge/L2AssetRouter.sol"; +import {BridgedStandardERC20} from "contracts/bridge/BridgedStandardERC20.sol"; +import {L2AssetRouter} from "contracts/bridge/asset-router/L2AssetRouter.sol"; +import {IL2NativeTokenVault} from "contracts/bridge/ntv/IL2NativeTokenVault.sol"; import {UpgradeableBeacon} from "@openzeppelin/contracts-v4/proxy/beacon/UpgradeableBeacon.sol"; import {BeaconProxy} from "@openzeppelin/contracts-v4/proxy/beacon/BeaconProxy.sol"; -import {L2_ASSET_ROUTER, L2_NATIVE_TOKEN_VAULT} from "contracts/L2ContractHelper.sol"; +import {L2_ASSET_ROUTER_ADDR, L2_NATIVE_TOKEN_VAULT_ADDR} from "contracts/common/L2ContractAddresses.sol"; import {AddressAliasHelper} from "contracts/vendor/AddressAliasHelper.sol"; -import {Utils} from "../utils/Utils.sol"; +import {L2Utils} from "../utils/L2Utils.sol"; contract L2Erc20BridgeTest is Test { // We need to emulate a L1->L2 transaction from the L1 bridge to L2 counterpart. @@ -27,9 +29,10 @@ contract L2Erc20BridgeTest is Test { // The owner of the beacon and the native token vault address internal ownerWallet = address(2); - L2StandardERC20 internal standardErc20Impl; + BridgedStandardERC20 internal standardErc20Impl; UpgradeableBeacon internal beacon; + BeaconProxy internal proxy; uint256 internal constant L1_CHAIN_ID = 9; uint256 internal ERA_CHAIN_ID = 270; @@ -44,22 +47,21 @@ contract L2Erc20BridgeTest is Test { function setUp() public { aliasedL1BridgeWallet = AddressAliasHelper.applyL1ToL2Alias(l1BridgeWallet); - standardErc20Impl = new L2StandardERC20(); - + standardErc20Impl = new BridgedStandardERC20(); beacon = new UpgradeableBeacon(address(standardErc20Impl)); beacon.transferOwnership(ownerWallet); // One of the purposes of deploying it here is to publish its bytecode - BeaconProxy proxy = new BeaconProxy(address(beacon), new bytes(0)); - + BeaconProxy beaconProxy = new BeaconProxy(address(beacon), new bytes(0)); + proxy = beaconProxy; bytes32 beaconProxyBytecodeHash; assembly { - beaconProxyBytecodeHash := extcodehash(proxy) + beaconProxyBytecodeHash := extcodehash(beaconProxy) } - Utils.initSystemContracts(); - Utils.forceDeployAssetRouter(L1_CHAIN_ID, ERA_CHAIN_ID, l1BridgeWallet, address(0)); - Utils.forceDeployNativeTokenVault({ + L2Utils.initSystemContracts(); + L2Utils.forceDeployAssetRouter(L1_CHAIN_ID, ERA_CHAIN_ID, l1BridgeWallet, address(0)); + L2Utils.forceDeployNativeTokenVault({ _l1ChainId: L1_CHAIN_ID, _aliasedOwner: ownerWallet, _l2TokenProxyBytecodeHash: beaconProxyBytecodeHash, @@ -71,19 +73,19 @@ contract L2Erc20BridgeTest is Test { function performDeposit(address depositor, address receiver, uint256 amount) internal { vm.prank(aliasedL1BridgeWallet); - L2AssetRouter(address(L2_ASSET_ROUTER)).finalizeDeposit({ + L2AssetRouter(L2_ASSET_ROUTER_ADDR).finalizeDeposit({ _l1Sender: depositor, _l2Receiver: receiver, _l1Token: L1_TOKEN_ADDRESS, _amount: amount, - _data: Utils.encodeTokenData(TOKEN_DEFAULT_NAME, TOKEN_DEFAULT_SYMBOL, TOKEN_DEFAULT_DECIMALS) + _data: L2Utils.encodeTokenData(TOKEN_DEFAULT_NAME, TOKEN_DEFAULT_SYMBOL, TOKEN_DEFAULT_DECIMALS) }); } function initializeTokenByDeposit() internal returns (address l2TokenAddress) { performDeposit(makeAddr("someDepositor"), makeAddr("someReeiver"), 1); - l2TokenAddress = L2_NATIVE_TOKEN_VAULT.l2TokenAddress(L1_TOKEN_ADDRESS); + l2TokenAddress = IL2NativeTokenVault(L2_NATIVE_TOKEN_VAULT_ADDR).l2TokenAddress(L1_TOKEN_ADDRESS); require(l2TokenAddress != address(0), "Token not initialized"); } @@ -93,36 +95,36 @@ contract L2Erc20BridgeTest is Test { performDeposit(depositor, receiver, 100); - address l2TokenAddress = L2_NATIVE_TOKEN_VAULT.l2TokenAddress(L1_TOKEN_ADDRESS); + address l2TokenAddress = IL2NativeTokenVault(L2_NATIVE_TOKEN_VAULT_ADDR).l2TokenAddress(L1_TOKEN_ADDRESS); - assertEq(L2StandardERC20(l2TokenAddress).balanceOf(receiver), 100); - assertEq(L2StandardERC20(l2TokenAddress).totalSupply(), 100); - assertEq(L2StandardERC20(l2TokenAddress).name(), TOKEN_DEFAULT_NAME); - assertEq(L2StandardERC20(l2TokenAddress).symbol(), TOKEN_DEFAULT_SYMBOL); - assertEq(L2StandardERC20(l2TokenAddress).decimals(), TOKEN_DEFAULT_DECIMALS); + assertEq(BridgedStandardERC20(l2TokenAddress).balanceOf(receiver), 100); + assertEq(BridgedStandardERC20(l2TokenAddress).totalSupply(), 100); + assertEq(BridgedStandardERC20(l2TokenAddress).name(), TOKEN_DEFAULT_NAME); + assertEq(BridgedStandardERC20(l2TokenAddress).symbol(), TOKEN_DEFAULT_SYMBOL); + assertEq(BridgedStandardERC20(l2TokenAddress).decimals(), TOKEN_DEFAULT_DECIMALS); } function test_governanceShouldBeAbleToReinitializeToken() public { address l2TokenAddress = initializeTokenByDeposit(); - L2StandardERC20.ERC20Getters memory getters = L2StandardERC20.ERC20Getters({ + BridgedStandardERC20.ERC20Getters memory getters = BridgedStandardERC20.ERC20Getters({ ignoreName: false, ignoreSymbol: false, ignoreDecimals: false }); vm.prank(ownerWallet); - L2StandardERC20(l2TokenAddress).reinitializeToken(getters, "TestTokenNewName", "TTN", 2); - assertEq(L2StandardERC20(l2TokenAddress).name(), "TestTokenNewName"); - assertEq(L2StandardERC20(l2TokenAddress).symbol(), "TTN"); + BridgedStandardERC20(l2TokenAddress).reinitializeToken(getters, "TestTokenNewName", "TTN", 2); + assertEq(BridgedStandardERC20(l2TokenAddress).name(), "TestTokenNewName"); + assertEq(BridgedStandardERC20(l2TokenAddress).symbol(), "TTN"); // The decimals should stay the same - assertEq(L2StandardERC20(l2TokenAddress).decimals(), 18); + assertEq(BridgedStandardERC20(l2TokenAddress).decimals(), 18); } function test_governanceShouldNotBeAbleToSkipInitializerVersions() public { address l2TokenAddress = initializeTokenByDeposit(); - L2StandardERC20.ERC20Getters memory getters = L2StandardERC20.ERC20Getters({ + BridgedStandardERC20.ERC20Getters memory getters = BridgedStandardERC20.ERC20Getters({ ignoreName: false, ignoreSymbol: false, ignoreDecimals: false @@ -130,6 +132,6 @@ contract L2Erc20BridgeTest is Test { vm.expectRevert(); vm.prank(ownerWallet); - L2StandardERC20(l2TokenAddress).reinitializeToken(getters, "TestTokenNewName", "TTN", 20); + BridgedStandardERC20(l2TokenAddress).reinitializeToken(getters, "TestTokenNewName", "TTN", 20); } } diff --git a/l2-contracts/test/foundry/unit/utils/Utils.sol b/l1-contracts/test/foundry/l2/unit/utils/L2Utils.sol similarity index 81% rename from l2-contracts/test/foundry/unit/utils/Utils.sol rename to l1-contracts/test/foundry/l2/unit/utils/L2Utils.sol index 609f0f26f..2c46774f4 100644 --- a/l2-contracts/test/foundry/unit/utils/Utils.sol +++ b/l1-contracts/test/foundry/l2/unit/utils/L2Utils.sol @@ -4,12 +4,17 @@ pragma solidity ^0.8.20; import {Vm} from "forge-std/Vm.sol"; -import {IContractDeployer, DEPLOYER_SYSTEM_CONTRACT, L2ContractHelper, L2_ASSET_ROUTER, L2_NATIVE_TOKEN_VAULT} from "contracts/L2ContractHelper.sol"; +import {DEPLOYER_SYSTEM_CONTRACT, L2_ASSET_ROUTER_ADDR, L2_NATIVE_TOKEN_VAULT_ADDR} from "contracts/common/L2ContractAddresses.sol"; +import {IContractDeployer, L2ContractHelper} from "contracts/common/libraries/L2ContractHelper.sol"; -import {L2AssetRouter} from "contracts/bridge/L2AssetRouter.sol"; -import {L2NativeTokenVault} from "contracts/bridge/L2NativeTokenVault.sol"; +import {L2AssetRouter} from "contracts/bridge/asset-router/L2AssetRouter.sol"; +import {L2NativeTokenVault} from "contracts/bridge/ntv/L2NativeTokenVault.sol"; -library Utils { +import {ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; + +import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; + +library L2Utils { address internal constant VM_ADDRESS = address(uint160(uint256(keccak256("hevm cheat code")))); Vm internal constant vm = Vm(VM_ADDRESS); @@ -65,21 +70,22 @@ library Utils { address _legacySharedBridge ) internal { // to ensure that the bytecode is known + bytes32 ethAssetId = DataEncoding.encodeNTVAssetId(_l1ChainId, ETH_TOKEN_ADDRESS); { - new L2AssetRouter(_l1ChainId, _eraChainId, _l1AssetRouter, _legacySharedBridge); + new L2AssetRouter(_l1ChainId, _eraChainId, _l1AssetRouter, _legacySharedBridge, ethAssetId); } bytes memory bytecode = readEraBytecode("L2AssetRouter"); - bytes32 bytecodehash = L2ContractHelper.hashL2BytecodeMemory(bytecode); + bytes32 bytecodehash = L2ContractHelper.hashL2Bytecode(bytecode); IContractDeployer.ForceDeployment[] memory deployments = new IContractDeployer.ForceDeployment[](1); deployments[0] = IContractDeployer.ForceDeployment({ bytecodeHash: bytecodehash, - newAddress: address(L2_ASSET_ROUTER), + newAddress: L2_ASSET_ROUTER_ADDR, callConstructor: true, value: 0, - input: abi.encode(_l1ChainId, _eraChainId, _l1AssetRouter, _legacySharedBridge) + input: abi.encode(_l1ChainId, _eraChainId, _l1AssetRouter, _legacySharedBridge, ethAssetId) }); vm.prank(L2_FORCE_DEPLOYER_ADDR); @@ -102,25 +108,28 @@ library Utils { bool _contractsDeployedAlready ) internal { // to ensure that the bytecode is known + bytes32 ethAssetId = DataEncoding.encodeNTVAssetId(_l1ChainId, ETH_TOKEN_ADDRESS); { new L2NativeTokenVault({ _l1ChainId: _l1ChainId, _aliasedOwner: _aliasedOwner, _l2TokenProxyBytecodeHash: _l2TokenProxyBytecodeHash, _legacySharedBridge: _legacySharedBridge, - _l2TokenBeacon: _l2TokenBeacon, - _contractsDeployedAlready: _contractsDeployedAlready + _bridgedTokenBeacon: _l2TokenBeacon, + _contractsDeployedAlready: _contractsDeployedAlready, + _wethToken: address(0), + _baseTokenAssetId: ethAssetId }); } bytes memory bytecode = readEraBytecode("L2NativeTokenVault"); - bytes32 bytecodehash = L2ContractHelper.hashL2BytecodeMemory(bytecode); + bytes32 bytecodehash = L2ContractHelper.hashL2Bytecode(bytecode); IContractDeployer.ForceDeployment[] memory deployments = new IContractDeployer.ForceDeployment[](1); deployments[0] = IContractDeployer.ForceDeployment({ bytecodeHash: bytecodehash, - newAddress: address(L2_NATIVE_TOKEN_VAULT), + newAddress: L2_NATIVE_TOKEN_VAULT_ADDR, callConstructor: true, value: 0, // solhint-disable-next-line func-named-parameters @@ -130,7 +139,9 @@ library Utils { _l2TokenProxyBytecodeHash, _legacySharedBridge, _l2TokenBeacon, - _contractsDeployedAlready + _contractsDeployedAlready, + address(0), + ethAssetId ) }); diff --git a/l2-contracts/test/foundry/unit/weth/WETH.t.sol b/l1-contracts/test/foundry/l2/unit/weth/WETH.t.sol similarity index 93% rename from l2-contracts/test/foundry/unit/weth/WETH.t.sol rename to l1-contracts/test/foundry/l2/unit/weth/WETH.t.sol index ab5f8a214..6cbc44fa7 100644 --- a/l2-contracts/test/foundry/unit/weth/WETH.t.sol +++ b/l1-contracts/test/foundry/l2/unit/weth/WETH.t.sol @@ -7,7 +7,7 @@ import {Test} from "forge-std/Test.sol"; import {L2WrappedBaseToken} from "contracts/bridge/L2WrappedBaseToken.sol"; import {TransparentUpgradeableProxy} from "@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol"; -import {Unauthorized, UnimplementedMessage, BRIDGE_MINT_NOT_IMPLEMENTED} from "contracts/errors/L2ContractErrors.sol"; +import {Unauthorized, UnimplementedMessage, BridgeMintNotImplemented} from "contracts/common/L1ContractErrors.sol"; contract WethTest is Test { L2WrappedBaseToken internal weth; @@ -101,7 +101,7 @@ contract WethTest is Test { } function test_revertWhenCallingBridgeMint() public { - vm.expectRevert(abi.encodeWithSelector(UnimplementedMessage.selector, BRIDGE_MINT_NOT_IMPLEMENTED)); + vm.expectRevert(abi.encodeWithSelector(BridgeMintNotImplemented.selector)); vm.prank(l2BridgeAddress); weth.bridgeMint(address(1), 1); } diff --git a/l1-contracts/test/unit_tests/initial_deployment_test.spec.ts b/l1-contracts/test/unit_tests/initial_deployment_test.spec.ts index 9fb6089a1..d670f9306 100644 --- a/l1-contracts/test/unit_tests/initial_deployment_test.spec.ts +++ b/l1-contracts/test/unit_tests/initial_deployment_test.spec.ts @@ -3,8 +3,14 @@ import * as ethers from "ethers"; import { Wallet } from "ethers"; import * as hardhat from "hardhat"; -import type { Bridgehub, ChainTypeManager } from "../../typechain"; -import { BridgehubFactory, ChainTypeManagerFactory } from "../../typechain"; +import type { Bridgehub, ChainTypeManager, L1NativeTokenVault, L1AssetRouter, L1Nullifier } from "../../typechain"; +import { + BridgehubFactory, + ChainTypeManagerFactory, + L1NativeTokenVaultFactory, + L1AssetRouterFactory, + L1NullifierFactory, +} from "../../typechain"; import { initialTestnetDeploymentProcess } from "../../src.ts/deploy-test-process"; import { ethTestConfig } from "../../src.ts/utils"; @@ -13,12 +19,15 @@ import type { Deployer } from "../../src.ts/deploy"; describe("Initial deployment test", function () { let bridgehub: Bridgehub; - let stateTransition: ChainTypeManager; + let chainTypeManager: ChainTypeManager; let owner: ethers.Signer; let deployer: Deployer; // const MAX_CODE_LEN_WORDS = (1 << 16) - 1; // const MAX_CODE_LEN_BYTES = MAX_CODE_LEN_WORDS * 32; // let forwarder: Forwarder; + let l1NativeTokenVault: L1NativeTokenVault; + let l1AssetRouter: L1AssetRouter; + let l1Nullifier: L1Nullifier; let chainId = process.env.CHAIN_ETH_ZKSYNC_NETWORK_ID || 270; before(async () => { @@ -47,22 +56,48 @@ describe("Initial deployment test", function () { // await deploySharedBridgeOnL2ThroughL1(deployer, chainId.toString(), gasPrice); bridgehub = BridgehubFactory.connect(deployer.addresses.Bridgehub.BridgehubProxy, deployWallet); - stateTransition = ChainTypeManagerFactory.connect( + chainTypeManager = ChainTypeManagerFactory.connect( deployer.addresses.StateTransition.StateTransitionProxy, deployWallet ); + l1NativeTokenVault = L1NativeTokenVaultFactory.connect( + deployer.addresses.Bridges.NativeTokenVaultProxy, + deployWallet + ); + l1AssetRouter = L1AssetRouterFactory.connect(deployer.addresses.Bridges.SharedBridgeProxy, deployWallet); + l1Nullifier = L1NullifierFactory.connect(deployer.addresses.Bridges.L1NullifierProxy, deployWallet); }); it("Check addresses", async () => { + const bridgehubAddress1 = deployer.addresses.Bridgehub.BridgehubProxy; + const bridgehubAddress2 = await l1AssetRouter.BRIDGE_HUB(); + const bridgehubAddress3 = await chainTypeManager.BRIDGE_HUB(); + expect(bridgehubAddress1.toLowerCase()).equal(bridgehubAddress2.toLowerCase()); + expect(bridgehubAddress1.toLowerCase()).equal(bridgehubAddress3.toLowerCase()); + const chainTypeManagerAddress1 = deployer.addresses.StateTransition.StateTransitionProxy; const chainTypeManagerAddress2 = await bridgehub.chainTypeManager(chainId); expect(chainTypeManagerAddress1.toLowerCase()).equal(chainTypeManagerAddress2.toLowerCase()); - const stateTransitionAddress1 = deployer.addresses.StateTransition.DiamondProxy; - const stateTransitionAddress2 = await stateTransition.getZKChain(chainId); - expect(stateTransitionAddress1.toLowerCase()).equal(stateTransitionAddress2.toLowerCase()); - - const stateTransitionAddress3 = await bridgehub.getZKChain(chainId); - expect(stateTransitionAddress1.toLowerCase()).equal(stateTransitionAddress3.toLowerCase()); + const chainAddress2 = await chainTypeManager.getZKChain(chainId); + const chainAddress1 = deployer.addresses.StateTransition.DiamondProxy; + expect(chainAddress1.toLowerCase()).equal(chainAddress2.toLowerCase()); + + const chainAddress3 = await bridgehub.getZKChain(chainId); + expect(chainAddress1.toLowerCase()).equal(chainAddress3.toLowerCase()); + + const assetRouterAddress1 = deployer.addresses.Bridges.SharedBridgeProxy; + const assetRouterAddress2 = await bridgehub.sharedBridge(); + const assetRouterAddress3 = await l1NativeTokenVault.ASSET_ROUTER(); + const assetRouterAddress4 = await l1Nullifier.l1AssetRouter(); + expect(assetRouterAddress1.toLowerCase()).equal(assetRouterAddress2.toLowerCase()); + expect(assetRouterAddress1.toLowerCase()).equal(assetRouterAddress3.toLowerCase()); + expect(assetRouterAddress1.toLowerCase()).equal(assetRouterAddress4.toLowerCase()); + + const ntvAddress1 = deployer.addresses.Bridges.NativeTokenVaultProxy; + const ntvAddress2 = await l1Nullifier.l1NativeTokenVault(); + const ntvAddress3 = await l1AssetRouter.nativeTokenVault(); + expect(ntvAddress1.toLowerCase()).equal(ntvAddress2.toLowerCase()); + expect(ntvAddress1.toLowerCase()).equal(ntvAddress3.toLowerCase()); }); }); diff --git a/l1-contracts/test/unit_tests/legacy_era_test.spec.ts b/l1-contracts/test/unit_tests/legacy_era_test.spec.ts index 80c201f62..c5e97afc7 100644 --- a/l1-contracts/test/unit_tests/legacy_era_test.spec.ts +++ b/l1-contracts/test/unit_tests/legacy_era_test.spec.ts @@ -11,6 +11,7 @@ import { MailboxFacetFactory, GettersFacetFactory, MockExecutorFacetFactory, + L1NullifierFactory, } from "../../typechain"; import type { IL1ERC20Bridge } from "../../typechain/IL1ERC20Bridge"; import { IL1ERC20BridgeFactory } from "../../typechain/IL1ERC20BridgeFactory"; @@ -104,6 +105,7 @@ describe("Legacy Era tests", function () { const sharedBridge = await sharedBridgeFactory.deploy( l1WethToken, deployer.addresses.Bridgehub.BridgehubProxy, + deployer.addresses.Bridges.L1NullifierProxy, deployer.chainId, deployer.addresses.StateTransition.DiamondProxy ); @@ -121,6 +123,13 @@ describe("Legacy Era tests", function () { console.log("L1AssetRouter upgrade sent for testing"); } + const setL1Erc20BridgeCalldata = L1NullifierFactory.connect( + deployer.addresses.Bridges.L1NullifierProxy, + deployWallet + ).interface.encodeFunctionData("setL1Erc20Bridge", [l1ERC20Bridge.address]); + + await deployer.executeUpgrade(deployer.addresses.Bridges.L1NullifierProxy, 0, setL1Erc20BridgeCalldata); + mailbox = MailboxFacetFactory.connect(deployer.addresses.StateTransition.DiamondProxy, deployWallet); getter = GettersFacetFactory.connect(deployer.addresses.StateTransition.DiamondProxy, deployWallet); @@ -209,7 +218,7 @@ describe("Legacy Era tests", function () { const revertReason = await getCallRevertReason( l1ERC20Bridge.connect(randomSigner).finalizeWithdrawal(0, 0, 0, l2ToL1message, []) ); - expect(revertReason).contains("L1AR: legacy eth withdrawal"); + expect(revertReason).contains("L1N: legacy eth withdrawal"); }); it("Should revert on finalizing a withdrawal with wrong proof", async () => { diff --git a/l2-contracts/contracts/L2ContractHelper.sol b/l2-contracts/contracts/L2ContractHelper.sol index 56afdca9e..620e9b3ee 100644 --- a/l2-contracts/contracts/L2ContractHelper.sol +++ b/l2-contracts/contracts/L2ContractHelper.sol @@ -3,8 +3,6 @@ pragma solidity ^0.8.20; import {EfficientCall} from "@matterlabs/zksync-contracts/l2/system-contracts/libraries/EfficientCall.sol"; -import {IL2AssetRouter} from "./bridge/interfaces/IL2AssetRouter.sol"; -import {IL2NativeTokenVault} from "./bridge/interfaces/IL2NativeTokenVault.sol"; import {MalformedBytecode, BytecodeError} from "./errors/L2ContractErrors.sol"; /** @@ -115,11 +113,6 @@ address constant DEPLOYER_SYSTEM_CONTRACT = address(SYSTEM_CONTRACTS_OFFSET + 0x address constant L2_BRIDGEHUB_ADDRESS = address(USER_CONTRACTS_OFFSET + 0x02); -IL2AssetRouter constant L2_ASSET_ROUTER = IL2AssetRouter(address(USER_CONTRACTS_OFFSET + 0x03)); - -/// @dev The contract responsible for handling tokens native to a single chain. -IL2NativeTokenVault constant L2_NATIVE_TOKEN_VAULT = IL2NativeTokenVault(address(USER_CONTRACTS_OFFSET + 0x04)); - uint256 constant L1_CHAIN_ID = 1; IL2Messenger constant L2_MESSENGER = IL2Messenger(address(SYSTEM_CONTRACTS_OFFSET + 0x08)); diff --git a/l2-contracts/contracts/bridge/L2NativeTokenVault.sol b/l2-contracts/contracts/bridge/L2NativeTokenVault.sol deleted file mode 100644 index e556ddc6c..000000000 --- a/l2-contracts/contracts/bridge/L2NativeTokenVault.sol +++ /dev/null @@ -1,261 +0,0 @@ -// SPDX-License-Identifier: MIT - -pragma solidity 0.8.24; - -import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/access/Ownable2StepUpgradeable.sol"; -import {BeaconProxy} from "@openzeppelin/contracts-v4/proxy/beacon/BeaconProxy.sol"; -import {UpgradeableBeacon} from "@openzeppelin/contracts-v4/proxy/beacon/UpgradeableBeacon.sol"; - -import {IL2StandardToken} from "./interfaces/IL2StandardToken.sol"; -import {IL2NativeTokenVault} from "./interfaces/IL2NativeTokenVault.sol"; -import {IL2SharedBridgeLegacy} from "./interfaces/IL2SharedBridgeLegacy.sol"; - -import {L2StandardERC20} from "./L2StandardERC20.sol"; -import {L2ContractHelper, DEPLOYER_SYSTEM_CONTRACT, L2_ASSET_ROUTER, IContractDeployer} from "../L2ContractHelper.sol"; -import {SystemContractsCaller} from "../SystemContractsCaller.sol"; -import {DataEncoding} from "../common/libraries/DataEncoding.sol"; - -import {EmptyAddress, EmptyBytes32, AddressMismatch, AssetIdMismatch, DeployFailed, AmountMustBeGreaterThanZero, InvalidCaller} from "../errors/L2ContractErrors.sol"; - -/// @author Matter Labs -/// @custom:security-contact security@matterlabs.dev -/// @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 L2NativeTokenVault is IL2NativeTokenVault, Ownable2StepUpgradeable { - /// @dev Chain ID of L1 for bridging reasons. - uint256 public immutable L1_CHAIN_ID; - - /// @dev The address of the L2 legacy shared bridge. - IL2SharedBridgeLegacy public L2_LEGACY_SHARED_BRIDGE; - - /// @dev Bytecode hash of the proxy for tokens deployed by the bridge. - bytes32 internal l2TokenProxyBytecodeHash; - - /// @dev Contract that stores the implementation address for token. - /// @dev For more details see https://docs.openzeppelin.com/contracts/3.x/api/proxy#UpgradeableBeacon. - UpgradeableBeacon public l2TokenBeacon; - - mapping(bytes32 assetId => address tokenAddress) public override tokenAddress; - - modifier onlyBridge() { - if (msg.sender != address(L2_ASSET_ROUTER)) { - revert InvalidCaller(msg.sender); - // Only L2 bridge can call this method - } - _; - } - - /// @notice Initializes the bridge contract for later use. - /// @param _l1ChainId The L1 chain id differs between mainnet and testnets. - /// @param _l2TokenProxyBytecodeHash The bytecode hash of the proxy for tokens deployed by the bridge. - /// @param _aliasedOwner The address of the governor contract. - /// @param _legacySharedBridge The address of the L2 legacy shared bridge. - /// @param _l2TokenBeacon The address of the L2 token beacon for legacy chains. - /// @param _contractsDeployedAlready Ensures beacon proxy for standard ERC20 has not been deployed. - constructor( - uint256 _l1ChainId, - address _aliasedOwner, - bytes32 _l2TokenProxyBytecodeHash, - address _legacySharedBridge, - address _l2TokenBeacon, - bool _contractsDeployedAlready - ) { - L1_CHAIN_ID = _l1ChainId; - L2_LEGACY_SHARED_BRIDGE = IL2SharedBridgeLegacy(_legacySharedBridge); - - _disableInitializers(); - if (_l2TokenProxyBytecodeHash == bytes32(0)) { - revert EmptyBytes32(); - } - if (_aliasedOwner == address(0)) { - revert EmptyAddress(); - } - - l2TokenProxyBytecodeHash = _l2TokenProxyBytecodeHash; - _transferOwnership(_aliasedOwner); - - if (_contractsDeployedAlready) { - if (_l2TokenBeacon == address(0)) { - revert EmptyAddress(); - } - l2TokenBeacon = UpgradeableBeacon(_l2TokenBeacon); - } else { - address l2StandardToken = address(new L2StandardERC20{salt: bytes32(0)}()); - l2TokenBeacon = new UpgradeableBeacon{salt: bytes32(0)}(l2StandardToken); - l2TokenBeacon.transferOwnership(owner()); - emit L2TokenBeaconUpdated(_l2TokenBeacon, _l2TokenProxyBytecodeHash); - } - } - - function setLegacyTokenAssetId(address _l2TokenAddress) public { - address l1TokenAddress = L2_LEGACY_SHARED_BRIDGE.l1TokenAddress(_l2TokenAddress); - bytes32 assetId = DataEncoding.encodeNTVAssetId(L1_CHAIN_ID, l1TokenAddress); - tokenAddress[assetId] = _l2TokenAddress; - } - - /// @notice Used when the chain receives a transfer from L1 Shared Bridge and correspondingly mints the asset. - /// @param _chainId The chainId that the message is from. - /// @param _assetId The assetId of the asset being bridged. - /// @param _data The abi.encoded transfer data. - function bridgeMint(uint256 _chainId, bytes32 _assetId, bytes calldata _data) external payable override onlyBridge { - address token = tokenAddress[_assetId]; - ( - address _l1Sender, - address _l2Receiver, - address originToken, - uint256 _amount, - bytes memory erc20Data - ) = DataEncoding.decodeBridgeMintData(_data); - - if (token == address(0)) { - address expectedToken = calculateCreate2TokenAddress(originToken); - bytes32 expectedAssetId = DataEncoding.encodeNTVAssetId(L1_CHAIN_ID, originToken); - if (_assetId != expectedAssetId) { - // Make sure that a NativeTokenVault sent the message - revert AssetIdMismatch(expectedAssetId, _assetId); - } - address l1LegacyToken; - if (address(L2_LEGACY_SHARED_BRIDGE) != address(0)) { - l1LegacyToken = L2_LEGACY_SHARED_BRIDGE.l1TokenAddress(expectedToken); - } - if (l1LegacyToken != address(0)) { - /// token is a legacy token, no need to deploy - if (l1LegacyToken != originToken) { - revert AddressMismatch(originToken, l1LegacyToken); - } - } else { - address deployedToken = _deployL2Token(originToken, erc20Data); - if (deployedToken != expectedToken) { - revert AddressMismatch(expectedToken, deployedToken); - } - } - tokenAddress[_assetId] = expectedToken; - token = expectedToken; - } - - IL2StandardToken(token).bridgeMint(_l2Receiver, _amount); - /// backwards compatible event - emit FinalizeDeposit(_l1Sender, _l2Receiver, token, _amount); - emit BridgeMint({ - chainId: _chainId, - assetId: _assetId, - sender: _l1Sender, - l2Receiver: _l2Receiver, - amount: _amount - }); - } - - /// @notice Burns wrapped tokens and returns the calldata for L2 -> L1 message. - /// @dev In case of native token vault _data is the tuple of _depositAmount and _l2Receiver. - /// @param _chainId The chainId that the message will be sent to. - /// @param _mintValue The L1 base token value bridged. - /// @param _assetId The L2 assetId of the asset being bridged. - /// @param _prevMsgSender The original caller of the shared bridge. - /// @param _data The abi.encoded transfer data. - /// @return l1BridgeMintData The calldata used by l1 asset handler to unlock tokens for recipient. - function bridgeBurn( - uint256 _chainId, - uint256 _mintValue, - bytes32 _assetId, - address _prevMsgSender, - bytes calldata _data - ) external payable override onlyBridge returns (bytes memory l1BridgeMintData) { - (uint256 _amount, address _l1Receiver) = abi.decode(_data, (uint256, address)); - if (_amount == 0) { - // "Amount cannot be zero"); - revert AmountMustBeGreaterThanZero(); - } - - address l2Token = tokenAddress[_assetId]; - IL2StandardToken(l2Token).bridgeBurn(_prevMsgSender, _amount); - - /// backwards compatible event - emit WithdrawalInitiated(_prevMsgSender, _l1Receiver, l2Token, _amount); - emit BridgeBurn({ - chainId: _chainId, - assetId: _assetId, - l2Sender: _prevMsgSender, - receiver: _l1Receiver, - mintValue: _mintValue, - amount: _amount - }); - l1BridgeMintData = _data; - } - - /// @notice Calculates L2 wrapped token address corresponding to L1 token counterpart. - /// @param _l1Token The address of token on L1. - /// @return expectedToken The address of token on L2. - function l2TokenAddress(address _l1Token) public view override returns (address expectedToken) { - bytes32 expectedAssetId = DataEncoding.encodeNTVAssetId(L1_CHAIN_ID, _l1Token); - expectedToken = tokenAddress[expectedAssetId]; - } - - /// @notice Deploys and initializes the L2 token for the L1 counterpart. - /// @param _l1Token The address of token on L1. - /// @param _erc20Data The ERC20 metadata of the token deployed. - /// @return The address of the beacon proxy (L2 wrapped / bridged token). - function _deployL2Token(address _l1Token, bytes memory _erc20Data) internal returns (address) { - bytes32 salt = _getCreate2Salt(_l1Token); - - BeaconProxy l2Token; - if (address(L2_LEGACY_SHARED_BRIDGE) == address(0)) { - // Deploy the beacon proxy for the L2 token - l2Token = _deployBeaconProxy(salt); - } else { - // Deploy the beacon proxy for the L2 token - address l2TokenAddr = L2_LEGACY_SHARED_BRIDGE.deployBeaconProxy(salt); - l2Token = BeaconProxy(payable(l2TokenAddr)); - } - L2StandardERC20(address(l2Token)).bridgeInitialize(_l1Token, _erc20Data); - - return address(l2Token); - } - - /// @notice Deploys the beacon proxy for the L2 token, while using ContractDeployer system contract. - /// @dev This function uses raw call to ContractDeployer to make sure that exactly `l2TokenProxyBytecodeHash` is used - /// for the code of the proxy. - /// @param salt The salt used for beacon proxy deployment of L2 wrapped token. - /// @return proxy The beacon proxy, i.e. L2 wrapped / bridged token. - function _deployBeaconProxy(bytes32 salt) internal returns (BeaconProxy proxy) { - (bool success, bytes memory returndata) = SystemContractsCaller.systemCallWithReturndata( - uint32(gasleft()), - DEPLOYER_SYSTEM_CONTRACT, - 0, - abi.encodeCall( - IContractDeployer.create2, - (salt, l2TokenProxyBytecodeHash, abi.encode(address(l2TokenBeacon), "")) - ) - ); - - // The deployment should be successful and return the address of the proxy - if (!success) { - revert DeployFailed(); - } - proxy = BeaconProxy(abi.decode(returndata, (address))); - } - - /// @notice Calculates L2 wrapped token address given the currently stored beacon proxy bytecode hash and beacon address. - /// @param _l1Token The address of token on L1. - /// @return Address of an L2 token counterpart. - function calculateCreate2TokenAddress(address _l1Token) public view returns (address) { - bytes32 constructorInputHash = keccak256(abi.encode(address(l2TokenBeacon), "")); - bytes32 salt = _getCreate2Salt(_l1Token); - address deployerAddress = address(L2_LEGACY_SHARED_BRIDGE) == address(0) - ? address(this) - : address(L2_LEGACY_SHARED_BRIDGE); - return - L2ContractHelper.computeCreate2Address( - deployerAddress, - salt, - l2TokenProxyBytecodeHash, - constructorInputHash - ); - } - - /// @notice Converts the L1 token address to the create2 salt of deployed L2 token. - /// @param _l1Token The address of token on L1. - /// @return salt The salt used to compute address of wrapped token on L2 and for beacon proxy deployment. - function _getCreate2Salt(address _l1Token) internal pure returns (bytes32 salt) { - salt = bytes32(uint256(uint160(_l1Token))); - } -} diff --git a/l2-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol b/l2-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol deleted file mode 100644 index 84c9a3363..000000000 --- a/l2-contracts/contracts/bridge/interfaces/IL1AssetRouter.sol +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. -pragma solidity ^0.8.20; - -/// @title L1 Bridge contract interface -/// @author Matter Labs -/// @custom:security-contact security@matterlabs.dev -interface IL1AssetRouter { - function finalizeWithdrawal( - uint256 _chainId, - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes calldata _message, - bytes32[] calldata _merkleProof - ) external; -} diff --git a/l2-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol b/l2-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol deleted file mode 100644 index ed76b84b1..000000000 --- a/l2-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. -pragma solidity ^0.8.20; - -/// @author Matter Labs -/// @custom:security-contact security@matterlabs.dev -// note we use the IL1ERC20Bridge only to send L1<>L2 messages, -// and we use this interface so that when the switch happened the old messages could be processed -interface IL1ERC20Bridge { - function finalizeWithdrawal( - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes calldata _message, - bytes32[] calldata _merkleProof - ) external; -} diff --git a/l2-contracts/contracts/bridge/interfaces/IL2AssetHandler.sol b/l2-contracts/contracts/bridge/interfaces/IL2AssetHandler.sol deleted file mode 100644 index b19f4b420..000000000 --- a/l2-contracts/contracts/bridge/interfaces/IL2AssetHandler.sol +++ /dev/null @@ -1,34 +0,0 @@ -// SPDX-License-Identifier: MIT - -pragma solidity ^0.8.20; - -/// @author Matter Labs -/// @custom:security-contact security@matterlabs.dev -interface IL2AssetHandler { - event BridgeMint( - uint256 indexed chainId, - bytes32 indexed assetId, - address indexed sender, - address l2Receiver, - uint256 amount - ); - - event BridgeBurn( - uint256 indexed chainId, - bytes32 indexed assetId, - address indexed l2Sender, - address receiver, - uint256 mintValue, - uint256 amount - ); - - function bridgeMint(uint256 _chainId, bytes32 _assetId, bytes calldata _transferData) external payable; - - function bridgeBurn( - uint256 _chainId, - uint256 _mintValue, - bytes32 _assetId, - address _prevMsgSender, - bytes calldata _data - ) external payable returns (bytes memory _l1BridgeMintData); -} diff --git a/l2-contracts/contracts/bridge/interfaces/IL2AssetRouter.sol b/l2-contracts/contracts/bridge/interfaces/IL2AssetRouter.sol deleted file mode 100644 index 2fb8fc8b1..000000000 --- a/l2-contracts/contracts/bridge/interfaces/IL2AssetRouter.sol +++ /dev/null @@ -1,35 +0,0 @@ -// SPDX-License-Identifier: MIT - -pragma solidity ^0.8.20; - -/// @author Matter Labs -/// @custom:security-contact security@matterlabs.dev -interface IL2AssetRouter { - event FinalizeDepositSharedBridge(uint256 chainId, bytes32 indexed assetId, bytes assetData); - - event WithdrawalInitiatedSharedBridge( - uint256 chainId, - address indexed l2Sender, - bytes32 indexed assetId, - bytes assetData - ); - - event AssetHandlerRegisteredInitial( - bytes32 indexed assetId, - address indexed assetAddress, - bytes32 indexed additionalData, - address sender - ); - - event AssetHandlerRegistered(bytes32 indexed assetId, address indexed _assetAddress); - - function finalizeDeposit(bytes32 _assetId, bytes calldata _transferData) external; - - function withdraw(bytes32 _assetId, bytes calldata _transferData) external; - - function assetHandlerAddress(bytes32 _assetId) external view returns (address); - - function l1AssetRouter() external view returns (address); - - function withdrawLegacyBridge(address _l1Receiver, address _l2Token, uint256 _amount, address _sender) external; -} diff --git a/l2-contracts/contracts/common/libraries/DataEncoding.sol b/l2-contracts/contracts/common/libraries/DataEncoding.sol deleted file mode 100644 index be8a32210..000000000 --- a/l2-contracts/contracts/common/libraries/DataEncoding.sol +++ /dev/null @@ -1,90 +0,0 @@ -// SPDX-License-Identifier: MIT - -pragma solidity 0.8.24; - -import {L2_NATIVE_TOKEN_VAULT} from "../../L2ContractHelper.sol"; - -/** - * @author Matter Labs - * @custom:security-contact security@matterlabs.dev - * @notice Helper library for transfer data encoding and decoding to reduce possibility of errors. - */ -library DataEncoding { - /// @notice Abi.encodes the data required for bridgeMint on remote chain. - /// @param _prevMsgSender The address which initiated the transfer. - /// @param _l2Receiver The address which to receive tokens on remote chain. - /// @param _l1Token The transferred token address. - /// @param _amount The amount of token to be transferred. - /// @param _erc20Metadata The transferred token metadata. - /// @return The encoded bridgeMint data - function encodeBridgeMintData( - address _prevMsgSender, - address _l2Receiver, - address _l1Token, - uint256 _amount, - bytes memory _erc20Metadata - ) internal pure returns (bytes memory) { - // solhint-disable-next-line func-named-parameters - return abi.encode(_prevMsgSender, _l2Receiver, _l1Token, _amount, _erc20Metadata); - } - - /// @notice Function decoding transfer data previously encoded with this library. - /// @param _bridgeMintData The encoded bridgeMint data - /// @return _prevMsgSender The address which initiated the transfer. - /// @return _l2Receiver The address which to receive tokens on remote chain. - /// @return _parsedL1Token The transferred token address. - /// @return _amount The amount of token to be transferred. - /// @return _erc20Metadata The transferred token metadata. - function decodeBridgeMintData( - bytes memory _bridgeMintData - ) - internal - pure - returns ( - address _prevMsgSender, - address _l2Receiver, - address _parsedL1Token, - uint256 _amount, - bytes memory _erc20Metadata - ) - { - (_prevMsgSender, _l2Receiver, _parsedL1Token, _amount, _erc20Metadata) = abi.decode( - _bridgeMintData, - (address, address, address, uint256, bytes) - ); - } - - /// @notice Encodes the asset data by combining chain id, asset deployment tracker and asset data. - /// @param _chainId The id of the chain token is native to. - /// @param _assetData The asset data that has to be encoded. - /// @param _sender The asset deployment tracker address. - /// @return The encoded asset data. - function encodeAssetId(uint256 _chainId, bytes32 _assetData, address _sender) internal pure returns (bytes32) { - return keccak256(abi.encode(_chainId, _sender, _assetData)); - } - - /// @notice Encodes the asset data by combining chain id, asset deployment tracker and asset data. - /// @param _chainId The id of the chain token is native to. - /// @param _tokenAaddress The address of token that has to be encoded (asset data is the address itself). - /// @param _sender The asset deployment tracker address. - /// @return The encoded asset data. - function encodeAssetId(uint256 _chainId, address _tokenAaddress, address _sender) internal pure returns (bytes32) { - return keccak256(abi.encode(_chainId, _sender, _tokenAaddress)); - } - - /// @notice Encodes the asset data by combining chain id, NTV as asset deployment tracker and asset data. - /// @param _chainId The id of the chain token is native to. - /// @param _assetData The asset data that has to be encoded. - /// @return The encoded asset data. - function encodeNTVAssetId(uint256 _chainId, bytes32 _assetData) internal pure returns (bytes32) { - return keccak256(abi.encode(_chainId, L2_NATIVE_TOKEN_VAULT, _assetData)); - } - - /// @notice Encodes the asset data by combining chain id, NTV as asset deployment tracker and asset data. - /// @param _chainId The id of the chain token is native to. - /// @param _tokenAddress The address of token that has to be encoded (asset data is the address itself). - /// @return The encoded asset data. - function encodeNTVAssetId(uint256 _chainId, address _tokenAddress) internal pure returns (bytes32) { - return keccak256(abi.encode(_chainId, L2_NATIVE_TOKEN_VAULT, _tokenAddress)); - } -} diff --git a/l2-contracts/contracts/errors/L2ContractErrors.sol b/l2-contracts/contracts/errors/L2ContractErrors.sol index c7d5deffe..bb16f38c6 100644 --- a/l2-contracts/contracts/errors/L2ContractErrors.sol +++ b/l2-contracts/contracts/errors/L2ContractErrors.sol @@ -44,5 +44,3 @@ enum BytecodeError { } // 0xd92e233d error ZeroAddress(); - -string constant BRIDGE_MINT_NOT_IMPLEMENTED = "bridgeMint is not implemented! Use deposit/depositTo methods instead."; diff --git a/l2-contracts/contracts/verifier/chain-interfaces/IVerifier.sol b/l2-contracts/contracts/verifier/chain-interfaces/IVerifier.sol index 40a6903f4..fe5e2af2c 100644 --- a/l2-contracts/contracts/verifier/chain-interfaces/IVerifier.sol +++ b/l2-contracts/contracts/verifier/chain-interfaces/IVerifier.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.21; /// @notice Part of the configuration parameters of ZKP circuits diff --git a/l2-contracts/src/deploy-shared-bridge-on-l2-through-l1.ts b/l2-contracts/src/deploy-shared-bridge-on-l2-through-l1.ts deleted file mode 100644 index a84e18cb3..000000000 --- a/l2-contracts/src/deploy-shared-bridge-on-l2-through-l1.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { Command } from "commander"; - -import * as hre from "hardhat"; -import { L2_ASSET_ROUTER_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADDRESS } from "../../l1-contracts/src.ts/utils"; - -export const L2_STANDARD_TOKEN_PROXY_BYTECODE = hre.artifacts.readArtifactSync("BeaconProxy").bytecode; - -async function main() { - const program = new Command(); - - program.version("0.1.0").name("deploy-shared-bridge-on-l2-through-l1"); - - program - .option("--private-key ") - .option("--chain-id ") - .option("--local-legacy-bridge-testing") - .option("--gas-price ") - .option("--nonce ") - .option("--erc20-bridge ") - .option("--skip-initialize-chain-governance ") - .action(async () => { - console.log(`CONTRACTS_L2_NATIVE_TOKEN_VAULT_IMPL_ADDR=${L2_NATIVE_TOKEN_VAULT_ADDRESS}`); - console.log(`CONTRACTS_L2_NATIVE_TOKEN_VAULT_PROXY_ADDR=${L2_NATIVE_TOKEN_VAULT_ADDRESS}`); - console.log(`CONTRACTS_L2_SHARED_BRIDGE_IMPL_ADDR=${L2_ASSET_ROUTER_ADDRESS}`); - console.log(`CONTRACTS_L2_SHARED_BRIDGE_ADDR=${L2_ASSET_ROUTER_ADDRESS}`); - }); - - await program.parseAsync(process.argv); -} - -main() - .then(() => process.exit(0)) - .catch((err) => { - console.error("Error:", err); - process.exit(1); - }); diff --git a/system-contracts/SystemContractsHashes.json b/system-contracts/SystemContractsHashes.json index 16b617623..aba28da40 100644 --- a/system-contracts/SystemContractsHashes.json +++ b/system-contracts/SystemContractsHashes.json @@ -3,49 +3,49 @@ "contractName": "AccountCodeStorage", "bytecodePath": "artifacts-zk/contracts-preprocessed/AccountCodeStorage.sol/AccountCodeStorage.json", "sourceCodePath": "contracts-preprocessed/AccountCodeStorage.sol", - "bytecodeHash": "0x0100005dda7512d7cf8e4b0fa7494d06204ff2a1592c440afa7349ce69c8e2ee", + "bytecodeHash": "0x0100005d98c166be5bf169f5830a7fe56f591af62454527a598bf38b0a9f876c", "sourceCodeHash": "0x2e0e09d57a04bd1e722d8bf8c6423fdf3f8bca44e5e8c4f6684f987794be066e" }, { "contractName": "BootloaderUtilities", "bytecodePath": "artifacts-zk/contracts-preprocessed/BootloaderUtilities.sol/BootloaderUtilities.json", "sourceCodePath": "contracts-preprocessed/BootloaderUtilities.sol", - "bytecodeHash": "0x010007c752553baf259f8a7d7e922a2edc2368407f4058f7bc0d343b79d80b4b", + "bytecodeHash": "0x010007c79d04c5f1985588d02630c260c40edcbb2d663ed4c38c0a1242dc2bcc", "sourceCodeHash": "0x0f1213c4b95acb71f4ab5d4082cc1aeb2bd5017e1cccd46afc66e53268609d85" }, { "contractName": "ComplexUpgrader", "bytecodePath": "artifacts-zk/contracts-preprocessed/ComplexUpgrader.sol/ComplexUpgrader.json", "sourceCodePath": "contracts-preprocessed/ComplexUpgrader.sol", - "bytecodeHash": "0x0100004d569c11e11881dcd626bc1a3c84b56583f42de59c2d604a7117290e8f", + "bytecodeHash": "0x0100004d8b6a7af5d502b7790ebbf06a6ba21d0ca03ba3ff47d02dd33f4d619e", "sourceCodeHash": "0x796046a914fb676ba2bbd337b2924311ee2177ce54571c18a2c3945755c83614" }, { "contractName": "Compressor", "bytecodePath": "artifacts-zk/contracts-preprocessed/Compressor.sol/Compressor.json", "sourceCodePath": "contracts-preprocessed/Compressor.sol", - "bytecodeHash": "0x0100014bc3b9c9a9b7c295487b681aa0e72d42ac49b41585541631620717260c", + "bytecodeHash": "0x0100014bec423120b050d8095b9623455d9b4bca881b9a5f0f434de66574a4ff", "sourceCodeHash": "0x7240b5fb2ea8e184522e731fb14f764ebae52b8a69d1870a55daedac9a3ed617" }, { "contractName": "ContractDeployer", "bytecodePath": "artifacts-zk/contracts-preprocessed/ContractDeployer.sol/ContractDeployer.json", "sourceCodePath": "contracts-preprocessed/ContractDeployer.sol", - "bytecodeHash": "0x010004e528f72fa70ea57563d7aae31a1f8234b17a82b51ca69a689259778f91", + "bytecodeHash": "0x010004e5d3f30278f686e9ad273eb77fa4d41cfd87676e88f33a63cd36329c04", "sourceCodeHash": "0x92bc09da23ed9d86ba7a84f0dbf48503c99582ae58cdbebbdcc5f14ea1fcf014" }, { "contractName": "Create2Factory", "bytecodePath": "artifacts-zk/contracts-preprocessed/Create2Factory.sol/Create2Factory.json", "sourceCodePath": "contracts-preprocessed/Create2Factory.sol", - "bytecodeHash": "0x010000494541dfc0e1ac52f07b81bcdf32d4c22235ce1290c0f58f7cbaaeebcd", + "bytecodeHash": "0x01000049ca08dfa946db4521eed61e95a989bc52f15c81f4eaf051649e7b59af", "sourceCodeHash": "0x114d9322a9ca654989f3e0b3b21f1311dbc4db84f443d054cd414f6414d84de3" }, { "contractName": "DefaultAccount", "bytecodePath": "artifacts-zk/contracts-preprocessed/DefaultAccount.sol/DefaultAccount.json", "sourceCodePath": "contracts-preprocessed/DefaultAccount.sol", - "bytecodeHash": "0x0100055dd0e43606f94892eeebee66d2d8d640ca1960c7b0e8f92eb1be39c25d", + "bytecodeHash": "0x0100055d0b56db8580a7cb4191661efc4d56f7ab91831afed87fe98123d987b6", "sourceCodeHash": "0xebffe840ebbd9329edb1ebff8ca50f6935e7dabcc67194a896fcc2e968d46dfb" }, { @@ -59,63 +59,63 @@ "contractName": "ImmutableSimulator", "bytecodePath": "artifacts-zk/contracts-preprocessed/ImmutableSimulator.sol/ImmutableSimulator.json", "sourceCodePath": "contracts-preprocessed/ImmutableSimulator.sol", - "bytecodeHash": "0x01000039a6d70255b0fb51986fead4e5d1403f82aeffeb60f4f5193ac2c73e5e", + "bytecodeHash": "0x0100003920a44c0179abb18b63287a74e4c68d6dd4c015bed91b5aa8ec60f676", "sourceCodeHash": "0x9659e69f7db09e8f60a8bb95314b1ed26afcc689851665cf27f5408122f60c98" }, { "contractName": "KnownCodesStorage", "bytecodePath": "artifacts-zk/contracts-preprocessed/KnownCodesStorage.sol/KnownCodesStorage.json", "sourceCodePath": "contracts-preprocessed/KnownCodesStorage.sol", - "bytecodeHash": "0x0100006f44303b3cde1b11a732cb062c67ee72ca08c067467fe77ab56fb556e1", + "bytecodeHash": "0x0100006f4f236efe0359b2d01a2c396fe9c2f5d74252b1acbeed29d0610e1280", "sourceCodeHash": "0xb39b5b81168653e0c5062f7b8e1d6d15a4e186df3317f192f0cb2fc3a74f5448" }, { "contractName": "L1Messenger", "bytecodePath": "artifacts-zk/contracts-preprocessed/L1Messenger.sol/L1Messenger.json", "sourceCodePath": "contracts-preprocessed/L1Messenger.sol", - "bytecodeHash": "0x010001f763e336c61021351d698976205ffc128b78cf10cfc669079bae4a0361", + "bytecodeHash": "0x010001f7ce693213118f4780607b934fb0be4baece85ae52377a0279d0c027f5", "sourceCodeHash": "0x8d22a4019347a45cb0c27bed9e98f7033637a7bdcd90fafb1922caa48f2b05de" }, { "contractName": "L2BaseToken", "bytecodePath": "artifacts-zk/contracts-preprocessed/L2BaseToken.sol/L2BaseToken.json", "sourceCodePath": "contracts-preprocessed/L2BaseToken.sol", - "bytecodeHash": "0x0100010354ff01988b6d6ea47b218e30f576c989bcae6e49d1f65b5309c8c367", + "bytecodeHash": "0x01000103d8b1dbf62114dbf0fdb7b06e94d372346b1a99936deeb9250c7c264d", "sourceCodeHash": "0x8bdd2b4d0b53dba84c9f0af250bbaa2aad10b3de6747bba957f0bd3721090dfa" }, { "contractName": "L2GenesisUpgrade", "bytecodePath": "artifacts-zk/contracts-preprocessed/L2GenesisUpgrade.sol/L2GenesisUpgrade.json", "sourceCodePath": "contracts-preprocessed/L2GenesisUpgrade.sol", - "bytecodeHash": "0x010000d5ac9ab1a6beabd78c8b6cdf73bbeee76b406023743bf49e885fd770b0", + "bytecodeHash": "0x010000d5c6b00a5ad08e8990515dc11146b4150a2ab27008d78f1928159404b0", "sourceCodeHash": "0x15bb6f306f209b618ea5e52671757934d306dcb1d53be73ce49cd200ad485688" }, { "contractName": "MsgValueSimulator", "bytecodePath": "artifacts-zk/contracts-preprocessed/MsgValueSimulator.sol/MsgValueSimulator.json", "sourceCodePath": "contracts-preprocessed/MsgValueSimulator.sol", - "bytecodeHash": "0x0100005d16e1788320cc01670bc8917b49e8466ed451b9013041563bf2dc2bd8", + "bytecodeHash": "0x0100005d3053405421f29f79d8f9346697c19bbf4d0c1d3f357025ef4073d173", "sourceCodeHash": "0x082f3dcbc2fe4d93706c86aae85faa683387097d1b676e7ebd00f71ee0f13b71" }, { "contractName": "NonceHolder", "bytecodePath": "artifacts-zk/contracts-preprocessed/NonceHolder.sol/NonceHolder.json", "sourceCodePath": "contracts-preprocessed/NonceHolder.sol", - "bytecodeHash": "0x010000d959010a9617465fca2e8ac5cc9a35856455de7414247e8a7bfb49f80b", + "bytecodeHash": "0x010000d98fcd3f30ceba0dffe1981b7402ac80e15d7f8d07686c94a16d1aef50", "sourceCodeHash": "0xcd0c0366effebf2c98c58cf96322cc242a2d1c675620ef5514b7ed1f0a869edc" }, { "contractName": "PubdataChunkPublisher", "bytecodePath": "artifacts-zk/contracts-preprocessed/PubdataChunkPublisher.sol/PubdataChunkPublisher.json", "sourceCodePath": "contracts-preprocessed/PubdataChunkPublisher.sol", - "bytecodeHash": "0x01000049fb46caf3b58b691cf4198eb3f884082e4231d286924f60e2c5d63940", + "bytecodeHash": "0x010000496b83c897843f12da4672f6b3e549a949f7d2078b3f56c3221ed62a68", "sourceCodeHash": "0x04d3d2e4019081c87aae5c22a060d84ae2e9d631ebce59801ecce37b9c87e4c7" }, { "contractName": "SystemContext", "bytecodePath": "artifacts-zk/contracts-preprocessed/SystemContext.sol/SystemContext.json", "sourceCodePath": "contracts-preprocessed/SystemContext.sol", - "bytecodeHash": "0x010001a71e899b44c90f39304408c3a3b1f335a9b9ca720fbcd40cfb032b83cb", + "bytecodeHash": "0x010001a75638c20c20ae71722f6265db5258d2d70b8cdcbc3400c618b113dc5c", "sourceCodeHash": "0xb3b8c1f57928938ac590984442bc96c2c888282793014845d5ce2f90bbf2677f" }, { diff --git a/system-contracts/contracts/interfaces/IBridgehub.sol b/system-contracts/contracts/interfaces/IBridgehub.sol index 9fdacbf4a..210fc287a 100644 --- a/system-contracts/contracts/interfaces/IBridgehub.sol +++ b/system-contracts/contracts/interfaces/IBridgehub.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; /// @author Matter Labs diff --git a/system-contracts/contracts/interfaces/IL2DAValidator.sol b/system-contracts/contracts/interfaces/IL2DAValidator.sol index 4c8c6d4c4..02e5bf953 100644 --- a/system-contracts/contracts/interfaces/IL2DAValidator.sol +++ b/system-contracts/contracts/interfaces/IL2DAValidator.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; interface IL2DAValidator { diff --git a/system-contracts/contracts/interfaces/IL2GenesisUpgrade.sol b/system-contracts/contracts/interfaces/IL2GenesisUpgrade.sol index 2d50b8978..2b733cddb 100644 --- a/system-contracts/contracts/interfaces/IL2GenesisUpgrade.sol +++ b/system-contracts/contracts/interfaces/IL2GenesisUpgrade.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; interface IL2GenesisUpgrade { diff --git a/system-contracts/contracts/interfaces/IMessageRoot.sol b/system-contracts/contracts/interfaces/IMessageRoot.sol index 256d492ee..854508eb1 100644 --- a/system-contracts/contracts/interfaces/IMessageRoot.sol +++ b/system-contracts/contracts/interfaces/IMessageRoot.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -// We use a floating point pragma here so it can be used within other projects that interact with the zkSync ecosystem without using our exact pragma version. +// We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; interface IMessageRoot { From 84798689afaa7a9ffbc2d81d8bb86447b4b2ea94 Mon Sep 17 00:00:00 2001 From: kelemeno <34402761+kelemeno@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:21:02 +0100 Subject: [PATCH 41/53] chore: merge stable (#785) --- .../contracts/bridgehub/Bridgehub.sol | 150 +++++++++++++----- .../contracts/bridgehub/IBridgehub.sol | 4 + .../contracts/common/L1ContractErrors.sol | 22 ++- l1-contracts/deploy-scripts/Utils.sol | 5 +- .../foundry/l1/integration/GatewayTests.t.sol | 66 ++++++++ .../integration/_SharedZKChainDeployer.t.sol | 43 +++++ .../Bridgehub/experimental_bridge.t.sol | 6 +- 7 files changed, 248 insertions(+), 48 deletions(-) diff --git a/l1-contracts/contracts/bridgehub/Bridgehub.sol b/l1-contracts/contracts/bridgehub/Bridgehub.sol index f3d318fa3..c87940d81 100644 --- a/l1-contracts/contracts/bridgehub/Bridgehub.sol +++ b/l1-contracts/contracts/bridgehub/Bridgehub.sol @@ -23,7 +23,7 @@ import {BridgehubL2TransactionRequest, L2Message, L2Log, TxStatus} from "../comm import {AddressAliasHelper} from "../vendor/AddressAliasHelper.sol"; import {IMessageRoot} from "./IMessageRoot.sol"; import {ICTMDeploymentTracker} from "./ICTMDeploymentTracker.sol"; -import {AssetHandlerNotRegistered, ZKChainLimitReached, Unauthorized, CTMAlreadyRegistered, CTMNotRegistered, ZeroChainId, ChainIdTooBig, SharedBridgeNotSet, BridgeHubAlreadyRegistered, AddressTooLow, MsgValueMismatch, WrongMagicValue, ZeroAddress} from "../common/L1ContractErrors.sol"; +import {MigrationPaused, AssetIdAlreadyRegistered, ChainAlreadyLive, ChainNotLegacy, CTMNotRegistered, ChainIdNotRegistered, AssetHandlerNotRegistered, ZKChainLimitReached, CTMAlreadyRegistered, CTMNotRegistered, ZeroChainId, ChainIdTooBig, BridgeHubAlreadyRegistered, AddressTooLow, MsgValueMismatch, ZeroAddress, Unauthorized, SharedBridgeNotSet, WrongMagicValue, ChainIdAlreadyExists, ChainIdMismatch, ChainIdCantBeCurrentChain, EmptyAssetId, AssetIdNotSupported, IncorrectBridgeHubAddress} from "../common/L1ContractErrors.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev @@ -108,28 +108,38 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus } modifier onlyChainCTM(uint256 _chainId) { - require(msg.sender == chainTypeManager[_chainId], "BH: not chain CTM"); + if (msg.sender != chainTypeManager[_chainId]) { + revert Unauthorized(msg.sender); + } _; } modifier onlyL1() { - require(L1_CHAIN_ID == block.chainid, "BH: not L1"); + if (L1_CHAIN_ID != block.chainid) { + revert Unauthorized(msg.sender); + } _; } modifier onlySettlementLayerRelayedSender() { /// There is no sender for the wrapping, we use a virtual address. - require(msg.sender == SETTLEMENT_LAYER_RELAY_SENDER, "BH: not relayed senser"); + if (msg.sender != SETTLEMENT_LAYER_RELAY_SENDER) { + revert Unauthorized(msg.sender); + } _; } modifier onlyAssetRouter() { - require(msg.sender == assetRouter, "BH: not asset router"); + if (msg.sender != assetRouter) { + revert Unauthorized(msg.sender); + } _; } modifier whenMigrationsNotPaused() { - require(!migrationPaused, "BH: migrations paused"); + if (migrationPaused) { + revert MigrationPaused(); + } _; } @@ -218,11 +228,16 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @param _chainId The chainId of the legacy chain we are migrating. function setLegacyChainAddress(uint256 _chainId) external { address ctm = chainTypeManager[_chainId]; - require(ctm != address(0), "BH: chain not legacy"); - require(!zkChainMap.contains(_chainId), "BH: chain already migrated"); - /// Note we have to do this before CTM is upgraded. + if (ctm == address(0)) { + revert ChainNotLegacy(); + } + if (zkChainMap.contains(_chainId)) { + revert ChainAlreadyLive(); + } address chainAddress = IChainTypeManager(ctm).getZKChainLegacy(_chainId); - require(chainAddress != address(0), "BH: chain not legacy 2"); + if (chainAddress == address(0)) { + revert ChainNotLegacy(); + } _registerNewZKChain(_chainId, chainAddress); } @@ -260,7 +275,9 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @notice asset id can represent any token contract with the appropriate interface/functionality /// @param _baseTokenAssetId asset id of base token to be registered function addTokenAssetId(bytes32 _baseTokenAssetId) external onlyOwner { - require(!assetIdIsRegistered[_baseTokenAssetId], "BH: asset id already registered"); + if (assetIdIsRegistered[_baseTokenAssetId]) { + revert AssetIdAlreadyRegistered(); + } assetIdIsRegistered[_baseTokenAssetId] = true; emit BaseTokenAssetIdRegistered(_baseTokenAssetId); @@ -294,8 +311,12 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus address sender = L1_CHAIN_ID == block.chainid ? msg.sender : AddressAliasHelper.undoL1ToL2Alias(msg.sender); // This method can be accessed by l1CtmDeployer only - require(sender == address(l1CtmDeployer), "BH: not ctm deployer"); - require(chainTypeManagerIsRegistered[_assetAddress], "CTM not registered"); + if (sender != address(l1CtmDeployer)) { + revert Unauthorized(sender); + } + if (!chainTypeManagerIsRegistered[_assetAddress]) { + revert CTMNotRegistered(); + } bytes32 assetInfo = keccak256(abi.encode(L1_CHAIN_ID, sender, _additionalData)); ctmAssetIdToAddress[assetInfo] = _assetAddress; @@ -325,32 +346,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus bytes calldata _initData, bytes[] calldata _factoryDeps ) external onlyOwnerOrAdmin nonReentrant whenNotPaused onlyL1 returns (uint256) { - if (_chainId == 0) { - revert ZeroChainId(); - } - if (_chainId > type(uint48).max) { - revert ChainIdTooBig(); - } - require(_chainId != block.chainid, "BH: chain id must not match current chainid"); - if (_chainTypeManager == address(0)) { - revert ZeroAddress(); - } - if (_baseTokenAssetId == bytes32(0)) { - revert ZeroAddress(); - } - - if (!chainTypeManagerIsRegistered[_chainTypeManager]) { - revert CTMNotRegistered(); - } - - require(assetIdIsRegistered[_baseTokenAssetId], "BH: asset id not registered"); - - if (assetRouter == address(0)) { - revert SharedBridgeNotSet(); - } - if (chainTypeManager[_chainId] != address(0)) { - revert BridgeHubAlreadyRegistered(); - } + _validateChainParams({_chainId: _chainId, _assetId: _baseTokenAssetId, _chainTypeManager: _chainTypeManager}); chainTypeManager[_chainId] = _chainTypeManager; @@ -423,7 +419,9 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus function ctmAssetIdFromChainId(uint256 _chainId) public view override returns (bytes32) { address ctmAddress = chainTypeManager[_chainId]; - require(ctmAddress != address(0), "chain id not registered"); + if (ctmAddress == address(0)) { + revert ChainIdNotRegistered(_chainId); + } return ctmAssetId(chainTypeManager[_chainId]); } @@ -786,6 +784,78 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus }); } + /// @dev Registers an already deployed chain with the bridgehub + /// @param _chainId The chain Id of the chain + /// @param _zkChain Address of the zkChain + function registerAlreadyDeployedZKChain(uint256 _chainId, address _zkChain) external onlyOwner onlyL1 { + if (_zkChain == address(0)) { + revert ZeroAddress(); + } + if (zkChainMap.contains(_chainId)) { + revert ChainIdAlreadyExists(); + } + if (IZKChain(_zkChain).getChainId() != _chainId) { + revert ChainIdMismatch(); + } + + address ctm = IZKChain(_zkChain).getChainTypeManager(); + address chainAdmin = IZKChain(_zkChain).getAdmin(); + bytes32 chainBaseTokenAssetId = IZKChain(_zkChain).getBaseTokenAssetId(); + address bridgeHub = IZKChain(_zkChain).getBridgehub(); + + if (bridgeHub != address(this)) { + revert IncorrectBridgeHubAddress(bridgeHub); + } + + _validateChainParams({_chainId: _chainId, _assetId: chainBaseTokenAssetId, _chainTypeManager: ctm}); + + chainTypeManager[_chainId] = ctm; + + baseTokenAssetId[_chainId] = chainBaseTokenAssetId; + settlementLayer[_chainId] = block.chainid; + + _registerNewZKChain(_chainId, _zkChain); + messageRoot.addNewChain(_chainId); + + emit NewChain(_chainId, ctm, chainAdmin); + } + + function _validateChainParams(uint256 _chainId, bytes32 _assetId, address _chainTypeManager) internal view { + if (_chainId == 0) { + revert ZeroChainId(); + } + + if (_chainId > type(uint48).max) { + revert ChainIdTooBig(); + } + + if (_chainId == block.chainid) { + revert ChainIdCantBeCurrentChain(); + } + + if (_chainTypeManager == address(0)) { + revert ZeroAddress(); + } + if (_assetId == bytes32(0)) { + revert EmptyAssetId(); + } + + if (!chainTypeManagerIsRegistered[_chainTypeManager]) { + revert CTMNotRegistered(); + } + + if (!assetIdIsRegistered[_assetId]) { + revert AssetIdNotSupported(_assetId); + } + + if (assetRouter == address(0)) { + revert SharedBridgeNotSet(); + } + if (chainTypeManager[_chainId] != address(0)) { + revert BridgeHubAlreadyRegistered(); + } + } + /*////////////////////////////////////////////////////////////// PAUSE //////////////////////////////////////////////////////////////*/ diff --git a/l1-contracts/contracts/bridgehub/IBridgehub.sol b/l1-contracts/contracts/bridgehub/IBridgehub.sol index 73f02527f..440d6236a 100644 --- a/l1-contracts/contracts/bridgehub/IBridgehub.sol +++ b/l1-contracts/contracts/bridgehub/IBridgehub.sol @@ -116,6 +116,8 @@ interface IBridgehub is IAssetHandler, IL1AssetHandler { function migrationPaused() external view returns (bool); + function admin() external view returns (address); + /// Mailbox forwarder function proveL2MessageInclusion( @@ -224,4 +226,6 @@ interface IBridgehub is IAssetHandler, IL1AssetHandler { function L1_CHAIN_ID() external view returns (uint256); function setLegacyBaseTokenAssetId(uint256 _chainId) external; + + function registerAlreadyDeployedZKChain(uint256 _chainId, address _hyperchain) external; } diff --git a/l1-contracts/contracts/common/L1ContractErrors.sol b/l1-contracts/contracts/common/L1ContractErrors.sol index 99a632c53..7f2bc781d 100644 --- a/l1-contracts/contracts/common/L1ContractErrors.sol +++ b/l1-contracts/contracts/common/L1ContractErrors.sol @@ -39,8 +39,12 @@ error AmountMustBeGreaterThanZero(); error AssetHandlerDoesNotExist(bytes32 assetId); // error AssetIdMismatch(bytes32 expected, bytes32 supplied); +// +error AssetIdAlreadyRegistered(); // 0x0bfcef28 error AlreadyWhitelisted(address); +// 0x04a0b7e9 +error AssetIdNotSupported(bytes32 assetId); // 0x6afd6c20 error BadReturnData(); // 0x6ef9a972 @@ -65,6 +69,16 @@ error CanOnlyProcessOneBatch(); error CantExecuteUnprovenBatches(); // 0xe18cb383 error CantRevertExecutedBatch(); +// 0x24591d89 +error ChainIdAlreadyExists(); +// 0x717a1656 +error ChainIdCantBeCurrentChain(); +// 0xa179f8c9 +error ChainIdMismatch(); +// +error ChainIdNotRegistered(uint256 chainId); +// +error ChainNotLegacy(); // 0x78d2ed02 error ChainAlreadyLive(); // 0x8f620a06 @@ -91,6 +105,8 @@ error DiamondFreezeIncorrectState(); error DiamondNotFrozen(); // error EmptyAddress(); +// 0x2d4d012f +error EmptyAssetId(); // 0xfc7ab1d3 error EmptyBlobVersionHash(uint256 index); // @@ -124,6 +140,8 @@ error HashMismatch(bytes32 expected, bytes32 actual); error ZKChainLimitReached(); // error InsufficientAllowance(uint256 providedAllowance, uint256 requiredAmount); +// 0xdd381a4c +error IncorrectBridgeHubAddress(address bridgehub); // 0x826fb11e error InsufficientChainBalance(); // 0x356680b7 @@ -194,6 +212,8 @@ error MerkleIndexOutOfBounds(); error MerklePathEmpty(); // 0x1c500385 error MerklePathOutOfBounds(); +// +error MigrationPaused(); // 0xfa44b527 error MissingSystemLogs(uint256 expected, uint256 actual); // 0x4a094431 @@ -385,8 +405,6 @@ error IncorrectBatchBounds( uint256 processFromProvided, uint256 processToProvided ); -// 0x04a0b7e9 -error AssetIdNotSupported(bytes32 assetId); // 0x64107968 error AssetHandlerNotRegistered(bytes32 assetId); diff --git a/l1-contracts/deploy-scripts/Utils.sol b/l1-contracts/deploy-scripts/Utils.sol index 08c838ca8..7c387ac5f 100644 --- a/l1-contracts/deploy-scripts/Utils.sol +++ b/l1-contracts/deploy-scripts/Utils.sol @@ -5,8 +5,7 @@ pragma solidity 0.8.24; import {Vm} from "forge-std/Vm.sol"; -import {Bridgehub} from "contracts/bridgehub/Bridgehub.sol"; -import {L2TransactionRequestDirect} from "contracts/bridgehub/IBridgehub.sol"; +import {L2TransactionRequestDirect, IBridgehub} from "contracts/bridgehub/IBridgehub.sol"; import {IGovernance} from "contracts/governance/IGovernance.sol"; import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol"; import {Ownable} from "@openzeppelin/contracts-v4/access/Ownable.sol"; @@ -232,7 +231,7 @@ library Utils { address bridgehubAddress, address l1SharedBridgeProxy ) internal { - Bridgehub bridgehub = Bridgehub(bridgehubAddress); + IBridgehub bridgehub = IBridgehub(bridgehubAddress); uint256 gasPrice = bytesToUint256(vm.rpc("eth_gasPrice", "[]")); uint256 requiredValueToDeploy = bridgehub.l2TransactionBaseCost( diff --git a/l1-contracts/test/foundry/l1/integration/GatewayTests.t.sol b/l1-contracts/test/foundry/l1/integration/GatewayTests.t.sol index 9224e3341..331f0d2f4 100644 --- a/l1-contracts/test/foundry/l1/integration/GatewayTests.t.sol +++ b/l1-contracts/test/foundry/l1/integration/GatewayTests.t.sol @@ -31,6 +31,8 @@ import {IChainTypeManager} from "contracts/state-transition/IChainTypeManager.so import {AdminFacet} from "contracts/state-transition/chain-deps/facets/Admin.sol"; import {AddressAliasHelper} from "contracts/vendor/AddressAliasHelper.sol"; import {TxStatus} from "contracts/common/Messaging.sol"; +import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; +import {IncorrectBridgeHubAddress} from "contracts/common/L1ContractErrors.sol"; contract GatewayTests is L1ContractDeployer, ZKChainDeployer, TokenDeployer, L2TxMocker, GatewayDeployer { uint256 constant TEST_USERS_COUNT = 10; @@ -215,6 +217,70 @@ contract GatewayTests is L1ContractDeployer, ZKChainDeployer, TokenDeployer, L2T vm.stopBroadcast(); } + function test_registerAlreadyDeployedZKChain() public { + gatewayScript.registerGateway(); + IChainTypeManager stm = IChainTypeManager(l1Script.getCTM()); + IBridgehub bridgehub = IBridgehub(l1Script.getBridgehubProxyAddress()); + address owner = Ownable(address(bridgeHub)).owner(); + + { + uint256 chainId = currentZKChainId++; + bytes32 baseTokenAssetId = DataEncoding.encodeNTVAssetId(chainId, ETH_TOKEN_ADDRESS); + + address chain = _deployZkChain( + chainId, + baseTokenAssetId, + address(bridgehub.sharedBridge()), + owner, + stm.protocolVersion(), + stm.storedBatchZero(), + address(bridgehub) + ); + + address stmAddr = IZKChain(chain).getChainTypeManager(); + + vm.startBroadcast(owner); + bridgeHub.addChainTypeManager(stmAddr); + bridgeHub.addTokenAssetId(baseTokenAssetId); + bridgeHub.registerAlreadyDeployedZKChain(chainId, chain); + vm.stopBroadcast(); + + address bridgeHubStmForChain = bridgeHub.chainTypeManager(chainId); + bytes32 bridgeHubBaseAssetIdForChain = bridgeHub.baseTokenAssetId(chainId); + address bridgeHubChainAddressdForChain = bridgeHub.getZKChain(chainId); + address bhAddr = IZKChain(chain).getBridgehub(); + + assertEq(bridgeHubStmForChain, stmAddr); + assertEq(bridgeHubBaseAssetIdForChain, baseTokenAssetId); + assertEq(bridgeHubChainAddressdForChain, chain); + assertEq(bhAddr, address(bridgeHub)); + } + + { + uint256 chainId = currentZKChainId++; + bytes32 baseTokenAssetId = DataEncoding.encodeNTVAssetId(chainId, ETH_TOKEN_ADDRESS); + address chain = _deployZkChain( + chainId, + baseTokenAssetId, + address(bridgehub.sharedBridge()), + owner, + stm.protocolVersion(), + stm.storedBatchZero(), + address(bridgehub.sharedBridge()) + ); + + address stmAddr = IZKChain(chain).getChainTypeManager(); + + vm.startBroadcast(owner); + bridgeHub.addTokenAssetId(baseTokenAssetId); + vm.expectRevert( + abi.encodeWithSelector(IncorrectBridgeHubAddress.selector, address(bridgehub.sharedBridge())) + ); + bridgeHub.registerAlreadyDeployedZKChain(chainId, chain); + vm.stopBroadcast(); + } + } + function finishMoveChain() public { IBridgehub bridgehub = IBridgehub(l1Script.getBridgehubProxyAddress()); IChainTypeManager ctm = IChainTypeManager(l1Script.getCTM()); diff --git a/l1-contracts/test/foundry/l1/integration/_SharedZKChainDeployer.t.sol b/l1-contracts/test/foundry/l1/integration/_SharedZKChainDeployer.t.sol index 27bebd98e..747a6c311 100644 --- a/l1-contracts/test/foundry/l1/integration/_SharedZKChainDeployer.t.sol +++ b/l1-contracts/test/foundry/l1/integration/_SharedZKChainDeployer.t.sol @@ -1,13 +1,21 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; +import {StdStorage, stdStorage} from "forge-std/Test.sol"; + import {L1ContractDeployer} from "./_SharedL1ContractDeployer.t.sol"; import {RegisterZKChainScript} from "deploy-scripts/RegisterZKChain.s.sol"; import {ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; +import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; import "@openzeppelin/contracts-v4/utils/Strings.sol"; import {IZKChain} from "contracts/state-transition/chain-interfaces/IZKChain.sol"; +import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; +import {DiamondProxy} from "contracts/state-transition/chain-deps/DiamondProxy.sol"; +import {IDiamondInit} from "contracts/state-transition/chain-interfaces/IDiamondInit.sol"; contract ZKChainDeployer is L1ContractDeployer { + using stdStorage for StdStorage; + RegisterZKChainScript deployScript; struct ZKChainDescription { @@ -133,4 +141,39 @@ contract ZKChainDeployer is L1ContractDeployer { // add this to be excluded from coverage report function testZKChainDeployer() internal {} + + function _deployZkChain( + uint256 _chainId, + bytes32 _baseTokenAssetId, + address _sharedBridge, + address _admin, + uint256 _protocolVersion, + bytes32 _storedBatchZero, + address _bridgeHub + ) internal returns (address) { + Diamond.DiamondCutData memory diamondCut = abi.decode( + l1Script.getInitialDiamondCutData(), + (Diamond.DiamondCutData) + ); + bytes memory initData; + + { + initData = bytes.concat( + IDiamondInit.initialize.selector, + bytes32(_chainId), + bytes32(uint256(uint160(address(_bridgeHub)))), + bytes32(uint256(uint160(address(this)))), + bytes32(_protocolVersion), + bytes32(uint256(uint160(_admin))), + bytes32(uint256(uint160(address(0x1337)))), + _baseTokenAssetId, + bytes32(uint256(uint160(_sharedBridge))), + _storedBatchZero, + diamondCut.initCalldata + ); + } + diamondCut.initCalldata = initData; + DiamondProxy hyperchainContract = new DiamondProxy{salt: bytes32(0)}(block.chainid, diamondCut); + return address(hyperchainContract); + } } diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol index f122b8739..ce8d21311 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol @@ -30,7 +30,7 @@ import {L2TransactionRequestTwoBridgesInner} from "contracts/bridgehub/IBridgehu import {ETH_TOKEN_ADDRESS, REQUIRED_L2_GAS_PRICE_PER_PUBDATA, MAX_NEW_FACTORY_DEPS, TWO_BRIDGES_MAGIC_VALUE} from "contracts/common/Config.sol"; import {L1ERC20Bridge} from "contracts/bridge/L1ERC20Bridge.sol"; import {IAssetRouterBase} from "contracts/bridge/asset-router/IAssetRouterBase.sol"; -import {ZeroChainId, AddressTooLow, ChainIdTooBig, WrongMagicValue, SharedBridgeNotSet, TokenNotRegistered, BridgeHubAlreadyRegistered, MsgValueMismatch, SlotOccupied, CTMAlreadyRegistered, TokenAlreadyRegistered, Unauthorized, NonEmptyMsgValue, CTMNotRegistered, InvalidChainId} from "contracts/common/L1ContractErrors.sol"; +import {ZeroChainId, ChainAlreadyLive, AssetIdAlreadyRegistered, AddressTooLow, ChainIdTooBig, WrongMagicValue, SharedBridgeNotSet, TokenNotRegistered, BridgeHubAlreadyRegistered, MsgValueMismatch, SlotOccupied, CTMAlreadyRegistered, TokenAlreadyRegistered, Unauthorized, NonEmptyMsgValue, CTMNotRegistered, InvalidChainId} from "contracts/common/L1ContractErrors.sol"; contract ExperimentalBridgeTest is Test { using stdStorage for StdStorage; @@ -379,7 +379,7 @@ contract ExperimentalBridgeTest is Test { // An already registered token cannot be registered again vm.prank(bridgeOwner); - vm.expectRevert("BH: asset id already registered"); + vm.expectRevert(AssetIdAlreadyRegistered.selector); bridgeHub.addTokenAssetId(assetId); } @@ -412,7 +412,7 @@ contract ExperimentalBridgeTest is Test { // An already registered token cannot be registered again by randomCaller if (randomCaller != bridgeOwner) { vm.prank(bridgeOwner); - vm.expectRevert("BH: asset id already registered"); + vm.expectRevert(AssetIdAlreadyRegistered.selector); bridgeHub.addTokenAssetId(assetId); } } From d1b7e1612fbfc54fbad60471b6f4deaac88debf8 Mon Sep 17 00:00:00 2001 From: kelemeno <34402761+kelemeno@users.noreply.github.com> Date: Tue, 10 Sep 2024 14:12:52 +0100 Subject: [PATCH 42/53] Update l1-contracts/contracts/bridge/L1Nullifier.sol Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com> --- l1-contracts/contracts/bridge/L1Nullifier.sol | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/l1-contracts/contracts/bridge/L1Nullifier.sol b/l1-contracts/contracts/bridge/L1Nullifier.sol index 6e0bb6d7a..0cea0bfad 100644 --- a/l1-contracts/contracts/bridge/L1Nullifier.sol +++ b/l1-contracts/contracts/bridge/L1Nullifier.sol @@ -388,9 +388,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, function _finalizeDeposit( FinalizeL1DepositParams calldata _finalizeWithdrawalParams ) internal nonReentrant whenNotPaused { - bytes memory transferData; - bytes32 assetId; - (assetId, transferData) = _verifyAndGetWithdrawalData(_finalizeWithdrawalParams); + (bytes32 assetId, bytes memory transferData) = _verifyAndGetWithdrawalData(_finalizeWithdrawalParams); l1AssetRouter.finalizeDeposit(_finalizeWithdrawalParams.chainId, assetId, transferData); } From e741471449353bc52e6a077082098ec6f4ba127d Mon Sep 17 00:00:00 2001 From: kelemeno <34402761+kelemeno@users.noreply.github.com> Date: Tue, 10 Sep 2024 14:13:53 +0100 Subject: [PATCH 43/53] Update l1-contracts/contracts/bridge/asset-router/IL1AssetRouter.sol Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com> --- .../contracts/bridge/asset-router/IL1AssetRouter.sol | 5 ----- 1 file changed, 5 deletions(-) diff --git a/l1-contracts/contracts/bridge/asset-router/IL1AssetRouter.sol b/l1-contracts/contracts/bridge/asset-router/IL1AssetRouter.sol index 85427813e..dea235ff8 100644 --- a/l1-contracts/contracts/bridge/asset-router/IL1AssetRouter.sol +++ b/l1-contracts/contracts/bridge/asset-router/IL1AssetRouter.sol @@ -86,11 +86,6 @@ interface IL1AssetRouter is IAssetRouterBase { /// @param _depositSender The address of the entity that initiated the deposit. /// @param _assetId The unique identifier of the deposited L1 token. /// @param _assetData The encoded transfer data, which includes both the deposit amount and the address of the L2 receiver. Might include extra information. - // / @param _l2TxHash The L2 transaction hash of the failed deposit finalization. - // / @param _l2BatchNumber The L2 batch number where the deposit finalization was processed. - // / @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message. - // / @param _l2TxNumberInBatch The L2 transaction number in a batch, in which the log was sent. - // / @param _merkleProof The Merkle proof of the processing L1 -> L2 transaction with deposit finalization. /// @dev Processes claims of failed deposit, whether they originated from the legacy bridge or the current system. function bridgeRecoverFailedTransfer( uint256 _chainId, From a42b991843b4e32c5dd291a5701a6c78fa72d148 Mon Sep 17 00:00:00 2001 From: kelemeno <34402761+kelemeno@users.noreply.github.com> Date: Tue, 10 Sep 2024 16:07:41 +0100 Subject: [PATCH 44/53] fix: vlad issues (#788) --- .../contracts/bridge/L1ERC20Bridge.sol | 74 +++++++++---------- l1-contracts/contracts/bridge/L1Nullifier.sol | 66 ++++++++--------- 2 files changed, 66 insertions(+), 74 deletions(-) diff --git a/l1-contracts/contracts/bridge/L1ERC20Bridge.sol b/l1-contracts/contracts/bridge/L1ERC20Bridge.sol index ffdc45177..ced36cd36 100644 --- a/l1-contracts/contracts/bridge/L1ERC20Bridge.sol +++ b/l1-contracts/contracts/bridge/L1ERC20Bridge.sol @@ -85,43 +85,6 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { /// @dev Initializes the reentrancy guard. Expected to be used in the proxy. function initialize() external reentrancyGuardInitializer {} - /// @dev Withdraw funds from the initiated deposit, that failed when finalizing on L2. - /// @param _depositSender The address of the deposit initiator - /// @param _l1Token The address of the deposited L1 ERC20 token - /// @param _l2TxHash The L2 transaction hash of the failed deposit finalization - /// @param _l2BatchNumber The L2 batch number where the deposit finalization was processed - /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message - /// @param _l2TxNumberInBatch The L2 transaction number in a batch, in which the log was sent - /// @param _merkleProof The Merkle proof of the processing L1 -> L2 transaction with deposit finalization - function claimFailedDeposit( - address _depositSender, - address _l1Token, - bytes32 _l2TxHash, - uint256 _l2BatchNumber, - uint256 _l2MessageIndex, - uint16 _l2TxNumberInBatch, - bytes32[] calldata _merkleProof - ) external nonReentrant { - uint256 amount = depositAmount[_depositSender][_l1Token][_l2TxHash]; - // empty deposit - if (amount == 0) { - revert EmptyDeposit(); - } - delete depositAmount[_depositSender][_l1Token][_l2TxHash]; - - L1_NULLIFIER.claimFailedDepositLegacyErc20Bridge({ - _depositSender: _depositSender, - _l1Token: _l1Token, - _amount: amount, - _l2TxHash: _l2TxHash, - _l2BatchNumber: _l2BatchNumber, - _l2MessageIndex: _l2MessageIndex, - _l2TxNumberInBatch: _l2TxNumberInBatch, - _merkleProof: _merkleProof - }); - emit ClaimedFailedDeposit(_depositSender, _l1Token, amount); - } - /*////////////////////////////////////////////////////////////// ERA LEGACY FUNCTIONS //////////////////////////////////////////////////////////////*/ @@ -264,6 +227,43 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { return balanceAfter - balanceBefore; } + /// @dev Withdraw funds from the initiated deposit, that failed when finalizing on L2. + /// @param _depositSender The address of the deposit initiator + /// @param _l1Token The address of the deposited L1 ERC20 token + /// @param _l2TxHash The L2 transaction hash of the failed deposit finalization + /// @param _l2BatchNumber The L2 batch number where the deposit finalization was processed + /// @param _l2MessageIndex The position in the L2 logs Merkle tree of the l2Log that was sent with the message + /// @param _l2TxNumberInBatch The L2 transaction number in a batch, in which the log was sent + /// @param _merkleProof The Merkle proof of the processing L1 -> L2 transaction with deposit finalization + function claimFailedDeposit( + address _depositSender, + address _l1Token, + bytes32 _l2TxHash, + uint256 _l2BatchNumber, + uint256 _l2MessageIndex, + uint16 _l2TxNumberInBatch, + bytes32[] calldata _merkleProof + ) external nonReentrant { + uint256 amount = depositAmount[_depositSender][_l1Token][_l2TxHash]; + // empty deposit + if (amount == 0) { + revert EmptyDeposit(); + } + delete depositAmount[_depositSender][_l1Token][_l2TxHash]; + + L1_NULLIFIER.claimFailedDepositLegacyErc20Bridge({ + _depositSender: _depositSender, + _l1Token: _l1Token, + _amount: amount, + _l2TxHash: _l2TxHash, + _l2BatchNumber: _l2BatchNumber, + _l2MessageIndex: _l2MessageIndex, + _l2TxNumberInBatch: _l2TxNumberInBatch, + _merkleProof: _merkleProof + }); + emit ClaimedFailedDeposit(_depositSender, _l1Token, amount); + } + /*////////////////////////////////////////////////////////////// ERA LEGACY GETTERS //////////////////////////////////////////////////////////////*/ diff --git a/l1-contracts/contracts/bridge/L1Nullifier.sol b/l1-contracts/contracts/bridge/L1Nullifier.sol index 0cea0bfad..453e64840 100644 --- a/l1-contracts/contracts/bridge/L1Nullifier.sol +++ b/l1-contracts/contracts/bridge/L1Nullifier.sol @@ -299,7 +299,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, uint256 _l2MessageIndex, uint16 _l2TxNumberInBatch, bytes32[] calldata _merkleProof - ) public nonReentrant whenNotPaused { + ) public nonReentrant { _verifyAndClearFailedTransfer({ _chainId: _chainId, _depositSender: _depositSender, @@ -336,7 +336,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, uint256 _l2MessageIndex, uint16 _l2TxNumberInBatch, bytes32[] calldata _merkleProof - ) internal { + ) internal whenNotPaused { { bool proofValid = BRIDGE_HUB.proveL1ToL2TransactionStatus({ _chainId: _chainId, @@ -352,7 +352,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, } } - require(!_isEraLegacyDeposit(_chainId, _l2BatchNumber, _l2TxNumberInBatch), "L1N: legacy cFD"); + require(!_isPreSharedBridgeDepositOnEra(_chainId, _l2BatchNumber, _l2TxNumberInBatch), "L1N: legacy cFD"); { bytes32 dataHash = depositHappened[_chainId][_l2TxHash]; // Determine if the given dataHash matches the calculated legacy transaction hash. @@ -399,26 +399,17 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, function _verifyAndGetWithdrawalData( FinalizeL1DepositParams calldata _finalizeWithdrawalParams ) internal whenNotPaused returns (bytes32 assetId, bytes memory transferData) { - if ( - isWithdrawalFinalized[_finalizeWithdrawalParams.chainId][_finalizeWithdrawalParams.l2BatchNumber][ - _finalizeWithdrawalParams.l2MessageIndex - ] - ) { + uint256 chainId = _finalizeWithdrawalParams.chainId; + uint256 l2BatchNumber = _finalizeWithdrawalParams.l2BatchNumber; + uint256 l2MessageIndex = _finalizeWithdrawalParams.l2MessageIndex; + if (isWithdrawalFinalized[chainId][l2BatchNumber][l2MessageIndex]) { revert WithdrawalAlreadyFinalized(); } - isWithdrawalFinalized[_finalizeWithdrawalParams.chainId][_finalizeWithdrawalParams.l2BatchNumber][ - _finalizeWithdrawalParams.l2MessageIndex - ] = true; + isWithdrawalFinalized[chainId][l2BatchNumber][l2MessageIndex] = true; // Handling special case for withdrawal from ZKsync Era initiated before Shared Bridge. - require( - !_isEraLegacyEthWithdrawal(_finalizeWithdrawalParams.chainId, _finalizeWithdrawalParams.l2BatchNumber), - "L1N: legacy eth withdrawal" - ); - require( - !_isEraLegacyTokenWithdrawal(_finalizeWithdrawalParams.chainId, _finalizeWithdrawalParams.l2BatchNumber), - "L1N: legacy token withdrawal" - ); + require(!_isPreSharedBridgeEraEthWithdrawal(chainId, l2BatchNumber), "L1N: legacy eth withdrawal"); + require(!_isPreSharedBridgeEraTokenWithdrawal(chainId, l2BatchNumber), "L1N: legacy token withdrawal"); (assetId, transferData) = _verifyWithdrawal(_finalizeWithdrawalParams); } @@ -427,7 +418,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, /// @param _chainId The chain ID of the transaction to check. /// @param _l2BatchNumber The L2 batch number for the withdrawal. /// @return Whether withdrawal was initiated on ZKsync Era before diamond proxy upgrade. - function _isEraLegacyEthWithdrawal(uint256 _chainId, uint256 _l2BatchNumber) internal view returns (bool) { + function _isPreSharedBridgeEraEthWithdrawal(uint256 _chainId, uint256 _l2BatchNumber) internal view returns (bool) { if ((_chainId == ERA_CHAIN_ID) && eraPostDiamondUpgradeFirstBatch == 0) { revert SharedBridgeValueNotSet(SharedBridgeKey.PostUpgradeFirstBatch); } @@ -438,7 +429,10 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, /// @param _chainId The chain ID of the transaction to check. /// @param _l2BatchNumber The L2 batch number for the withdrawal. /// @return Whether withdrawal was initiated on ZKsync Era before Legacy Bridge upgrade. - function _isEraLegacyTokenWithdrawal(uint256 _chainId, uint256 _l2BatchNumber) internal view returns (bool) { + function _isPreSharedBridgeEraTokenWithdrawal( + uint256 _chainId, + uint256 _l2BatchNumber + ) internal view returns (bool) { if ((_chainId == ERA_CHAIN_ID) && eraPostLegacyBridgeUpgradeFirstBatch == 0) { revert SharedBridgeValueNotSet(SharedBridgeKey.LegacyBridgeFirstBatch); } @@ -446,18 +440,18 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, } /// @dev Determines if the provided data for a failed deposit corresponds to a legacy failed deposit. - /// @param _prevMsgSender The address of the entity that initiated the deposit. + /// @param _depositSender The address of the entity that initiated the deposit. /// @param _assetId The unique identifier of the deposited L1 token. /// @param _transferData The encoded transfer data, which includes both the deposit amount and the address of the L2 receiver. /// @param _expectedTxDataHash The nullifier data hash stored for the failed deposit. /// @return isLegacyTxDataHash True if the transaction is legacy, false otherwise. function _isLegacyTxDataHash( - address _prevMsgSender, + address _depositSender, bytes32 _assetId, bytes memory _transferData, bytes32 _expectedTxDataHash ) internal view returns (bool isLegacyTxDataHash) { - try this.encodeTxDataHash(LEGACY_ENCODING_VERSION, _prevMsgSender, _assetId, _transferData) returns ( + try this.encodeTxDataHash(LEGACY_ENCODING_VERSION, _depositSender, _assetId, _transferData) returns ( bytes32 txDataHash ) { return txDataHash == _expectedTxDataHash; @@ -471,7 +465,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, /// @param _l2BatchNumber The L2 batch number for the deposit where it was processed. /// @param _l2TxNumberInBatch The L2 transaction number in the batch, in which the deposit was processed. /// @return Whether deposit was initiated on ZKsync Era before Shared Bridge upgrade. - function _isEraLegacyDeposit( + function _isPreSharedBridgeDepositOnEra( uint256 _chainId, uint256 _l2BatchNumber, uint256 _l2TxNumberInBatch @@ -500,18 +494,16 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, L2Message memory l2ToL1Message; { bool baseTokenWithdrawal = (assetId == BRIDGE_HUB.baseTokenAssetId(_finalizeWithdrawalParams.chainId)); - if (baseTokenWithdrawal) { - require( - /// @dev for legacy function calls we hardcode the sender as the L2AssetRouter as we don't know if it is - /// a base token or erc20 token withdrawal beforehand, - /// so we have to allow that option even if we override it. - _finalizeWithdrawalParams.l2Sender == L2_ASSET_ROUTER_ADDR || - _finalizeWithdrawalParams.l2Sender == L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR || - _finalizeWithdrawalParams.l2Sender == - __DEPRECATED_l2BridgeAddress[_finalizeWithdrawalParams.chainId], - "L1N: wrong l2 sender" - ); - } + require( + /// @dev for legacy function calls we hardcode the sender as the L2AssetRouter as we don't know if it is + /// a base token or erc20 token withdrawal beforehand, + /// so we have to allow that option even if we override it. + _finalizeWithdrawalParams.l2Sender == L2_ASSET_ROUTER_ADDR || + _finalizeWithdrawalParams.l2Sender == L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR || + _finalizeWithdrawalParams.l2Sender == + __DEPRECATED_l2BridgeAddress[_finalizeWithdrawalParams.chainId], + "L1N: wrong l2 sender" + ); l2ToL1Message = L2Message({ txNumberInBatch: _finalizeWithdrawalParams.l2TxNumberInBatch, From 2508f36ecbfcb0f453332824a38fe79cf4e583ea Mon Sep 17 00:00:00 2001 From: Stanislav Bezkorovainyi Date: Tue, 10 Sep 2024 20:18:04 +0200 Subject: [PATCH 45/53] Recover some tests (#789) --- .../bridge/ntv/IL1NativeTokenVault.sol | 3 + .../bridge/ntv/L1NativeTokenVault.sol | 7 +- .../contracts/bridge/ntv/NativeTokenVault.sol | 15 +- .../contracts/bridgehub/Bridgehub.sol | 11 +- l1-contracts/deploy-scripts/DeployL1.s.sol | 3 + l1-contracts/src.ts/deploy.ts | 2 + .../Bridgehub/experimental_bridge.t.sol | 1856 +++++++++-------- .../_L1SharedBridge_Shared.t.sol | 2 +- .../unit/concrete/Executor/Committing.t.sol | 415 ++-- .../IncrementalMerkle/IncrementalMerkle.t.sol | 42 - 10 files changed, 1199 insertions(+), 1157 deletions(-) diff --git a/l1-contracts/contracts/bridge/ntv/IL1NativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/IL1NativeTokenVault.sol index 7d8a00444..f6f34bc10 100644 --- a/l1-contracts/contracts/bridge/ntv/IL1NativeTokenVault.sol +++ b/l1-contracts/contracts/bridge/ntv/IL1NativeTokenVault.sol @@ -14,5 +14,8 @@ interface IL1NativeTokenVault is INativeTokenVault { /// @notice The L1Nullifier contract function L1_NULLIFIER() external view returns (IL1Nullifier); + /// @notice Registers ETH token + function registerEthToken() external; + event TokenBeaconUpdated(address indexed l2TokenBeacon); } diff --git a/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol index 8e52bdb33..2e461418a 100644 --- a/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol +++ b/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol @@ -74,11 +74,14 @@ contract L1NativeTokenVault is IL1NativeTokenVault, IL1AssetHandler, NativeToken revert ZeroAddress(); } bridgedTokenBeacon = IBeacon(_bridgedTokenBeacon); - tokenAddress[BASE_TOKEN_ASSET_ID] = ETH_TOKEN_ADDRESS; - isTokenNative[BASE_TOKEN_ASSET_ID] = true; _transferOwnership(_owner); } + /// @inheritdoc IL1NativeTokenVault + function registerEthToken() external { + _unsafeRegisterNativeToken(ETH_TOKEN_ADDRESS); + } + /// @notice Transfers tokens from shared bridge as part of the migration process. /// The shared bridge becomes the L1Nullifier contract. /// @dev Both ETH and ERC20 tokens can be transferred. Exhausts balance of shared bridge after the first call. diff --git a/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol index 2ae2c9ba6..087ca70bf 100644 --- a/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol +++ b/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol @@ -89,10 +89,7 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 revert TokenNotSupported(WETH_TOKEN); } require(_nativeToken.code.length > 0, "NTV: empty token"); - bytes32 assetId = DataEncoding.encodeNTVAssetId(block.chainid, _nativeToken); - ASSET_ROUTER.setAssetHandlerAddressThisChain(bytes32(uint256(uint160(_nativeToken))), address(this)); - tokenAddress[assetId] = _nativeToken; - isTokenNative[assetId] = true; + _unsafeRegisterNativeToken(_nativeToken); } /*////////////////////////////////////////////////////////////// @@ -304,6 +301,16 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 return DataEncoding.encodeNTVAssetId(_chainId, _nativeToken); } + /// @notice Registers a native token address for the vault. + /// @dev It does not perform any checks for the correctnesss of the token contract. + /// @param _nativeToken The address of the token to be registered. + function _unsafeRegisterNativeToken(address _nativeToken) internal { + bytes32 assetId = DataEncoding.encodeNTVAssetId(block.chainid, _nativeToken); + ASSET_ROUTER.setAssetHandlerAddressThisChain(bytes32(uint256(uint160(_nativeToken))), address(this)); + tokenAddress[assetId] = _nativeToken; + isTokenNative[assetId] = true; + } + /*////////////////////////////////////////////////////////////// TOKEN DEPLOYER FUNCTIONS //////////////////////////////////////////////////////////////*/ diff --git a/l1-contracts/contracts/bridgehub/Bridgehub.sol b/l1-contracts/contracts/bridgehub/Bridgehub.sol index c87940d81..bbb1bbd73 100644 --- a/l1-contracts/contracts/bridgehub/Bridgehub.sol +++ b/l1-contracts/contracts/bridgehub/Bridgehub.sol @@ -495,10 +495,9 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus function requestL2TransactionTwoBridges( L2TransactionRequestTwoBridgesOuter calldata _request ) external payable override nonReentrant whenNotPaused onlyL1 returns (bytes32 canonicalTxHash) { - require( - _request.secondBridgeAddress > BRIDGEHUB_MIN_SECOND_BRIDGE_ADDRESS, - "BH: second bridge address too low" - ); // to avoid calls to precompiles + if (_request.secondBridgeAddress <= BRIDGEHUB_MIN_SECOND_BRIDGE_ADDRESS) { + revert AddressTooLow(_request.secondBridgeAddress); + } { bytes32 tokenAssetId = baseTokenAssetId[_request.chainId]; @@ -524,10 +523,6 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus ); } - if (_request.secondBridgeAddress <= BRIDGEHUB_MIN_SECOND_BRIDGE_ADDRESS) { - revert AddressTooLow(_request.secondBridgeAddress); - } - // slither-disable-next-line arbitrary-send-eth L2TransactionRequestTwoBridgesInner memory outputRequest = IL1AssetRouter(_request.secondBridgeAddress) .bridgehubDeposit{value: _request.secondBridgeValue}( diff --git a/l1-contracts/deploy-scripts/DeployL1.s.sol b/l1-contracts/deploy-scripts/DeployL1.s.sol index 46a1d152e..05e614f13 100644 --- a/l1-contracts/deploy-scripts/DeployL1.s.sol +++ b/l1-contracts/deploy-scripts/DeployL1.s.sol @@ -830,6 +830,9 @@ contract DeployL1Script is Script { vm.broadcast(msg.sender); l1Nullifier.setL1AssetRouter(addresses.bridges.sharedBridgeProxy); + vm.broadcast(msg.sender); + IL1NativeTokenVault(addresses.vaults.l1NativeTokenVaultProxy).registerEthToken(); + // bytes memory data = abi.encodeCall(sharedBridge.setNativeTokenVault, (IL1NativeTokenVault(addresses.vaults.l1NativeTokenVaultProxy))); // Utils.executeUpgrade({ // _governor: ownable.owner(), diff --git a/l1-contracts/src.ts/deploy.ts b/l1-contracts/src.ts/deploy.ts index 2b18b096d..c75a46e1f 100644 --- a/l1-contracts/src.ts/deploy.ts +++ b/l1-contracts/src.ts/deploy.ts @@ -1033,6 +1033,8 @@ export class Deployer { if (this.verbose) { console.log("Asset router set in nullifier"); } + + await (await this.nativeTokenVault(this.deployWallet).registerEthToken()).wait(); } public async deployCTMDeploymentTrackerImplementation( diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol index ce8d21311..caa375b96 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol @@ -26,15 +26,18 @@ import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; import {ICTMDeploymentTracker} from "contracts/bridgehub/ICTMDeploymentTracker.sol"; import {IMessageRoot} from "contracts/bridgehub/IMessageRoot.sol"; +import {MessageRoot} from "contracts/bridgehub/MessageRoot.sol"; import {L2TransactionRequestTwoBridgesInner} from "contracts/bridgehub/IBridgehub.sol"; import {ETH_TOKEN_ADDRESS, REQUIRED_L2_GAS_PRICE_PER_PUBDATA, MAX_NEW_FACTORY_DEPS, TWO_BRIDGES_MAGIC_VALUE} from "contracts/common/Config.sol"; import {L1ERC20Bridge} from "contracts/bridge/L1ERC20Bridge.sol"; import {IAssetRouterBase} from "contracts/bridge/asset-router/IAssetRouterBase.sol"; -import {ZeroChainId, ChainAlreadyLive, AssetIdAlreadyRegistered, AddressTooLow, ChainIdTooBig, WrongMagicValue, SharedBridgeNotSet, TokenNotRegistered, BridgeHubAlreadyRegistered, MsgValueMismatch, SlotOccupied, CTMAlreadyRegistered, TokenAlreadyRegistered, Unauthorized, NonEmptyMsgValue, CTMNotRegistered, InvalidChainId} from "contracts/common/L1ContractErrors.sol"; +import {AssetIdNotSupported, ZeroChainId, ChainAlreadyLive, AssetIdAlreadyRegistered, AddressTooLow, ChainIdTooBig, WrongMagicValue, SharedBridgeNotSet, TokenNotRegistered, BridgeHubAlreadyRegistered, MsgValueMismatch, SlotOccupied, CTMAlreadyRegistered, TokenAlreadyRegistered, Unauthorized, NonEmptyMsgValue, CTMNotRegistered, InvalidChainId} from "contracts/common/L1ContractErrors.sol"; +import {TransparentUpgradeableProxy} from "@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol"; contract ExperimentalBridgeTest is Test { using stdStorage for StdStorage; + address weth; Bridgehub bridgeHub; DummyBridgehubSetter dummyBridgehub; address public bridgeOwner; @@ -50,6 +53,7 @@ contract ExperimentalBridgeTest is Test { L1AssetRouter secondBridge; TestnetERC20Token testToken; L1NativeTokenVault ntv; + IMessageRoot messageRoot; L1Nullifier l1Nullifier; bytes32 tokenAssetId; @@ -67,6 +71,8 @@ contract ExperimentalBridgeTest is Test { uint256 eraChainId; + address deployerAddress; + event NewChain(uint256 indexed chainId, address chainTypeManager, address indexed chainGovernance); modifier useRandomToken(uint256 randomValue) { @@ -85,15 +91,18 @@ contract ExperimentalBridgeTest is Test { } else { testToken = testToken8; } + + tokenAssetId = DataEncoding.encodeNTVAssetId(block.chainid, address(testToken)); } function setUp() public { - eraChainId = 9; - uint256 l1ChainId = 1; + deployerAddress = makeAddr("DEPLOYER_ADDRESS"); + eraChainId = 320; + uint256 l1ChainId = block.chainid; bridgeOwner = makeAddr("BRIDGE_OWNER"); dummyBridgehub = new DummyBridgehubSetter(l1ChainId, bridgeOwner, type(uint256).max); bridgeHub = Bridgehub(address(dummyBridgehub)); - address weth = makeAddr("WETH"); + weth = makeAddr("WETH"); mockCTM = new DummyChainTypeManagerWBH(address(bridgeHub)); mockChainContract = new DummyZKChain(address(bridgeHub), eraChainId, block.chainid); @@ -102,40 +111,57 @@ contract ExperimentalBridgeTest is Test { address mockL1WethAddress = makeAddr("Weth"); address eraDiamondProxy = makeAddr("eraDiamondProxy"); + l1Nullifier = new L1Nullifier(bridgeHub, eraChainId, eraDiamondProxy); + l1NullifierAddress = address(l1Nullifier); + mockSharedBridge = new DummySharedBridge(keccak256("0xabc")); mockSecondSharedBridge = new DummySharedBridge(keccak256("0xdef")); - ntv = new L1NativeTokenVault(weth, address(mockSharedBridge), eraChainId, IL1Nullifier(address(0))); - mockSharedBridge.setNativeTokenVault(ntv); + + ntv = _deployNTV(address(mockSharedBridge)); + mockSecondSharedBridge.setNativeTokenVault(ntv); + testToken = new TestnetERC20Token("ZKSTT", "ZkSync Test Token", 18); testTokenAddress = address(testToken); - vm.prank(address(ntv)); - // ntv.registerToken(ETH_TOKEN_ADDRESS); ntv.registerToken(address(testToken)); tokenAssetId = DataEncoding.encodeNTVAssetId(block.chainid, address(testToken)); - // sharedBridge = new L1AssetRouter(mockL1WethAddress, bridgeHub, eraChainId, eraDiamondProxy); - // address defaultOwner = sharedBridge.owner(); - // vm.prank(defaultOwner); - // sharedBridge.transferOwnership(bridgeOwner); - // vm.prank(bridgeOwner); - // sharedBridge.acceptOwnership(); - - // secondBridge = new L1AssetRouter(mockL1WethAddress, bridgeHub, eraChainId, eraDiamondProxy); - // defaultOwner = secondBridge.owner(); - // vm.prank(defaultOwner); - // secondBridge.transferOwnership(bridgeOwner); - // vm.prank(bridgeOwner); - // secondBridge.acceptOwnership(); - - // sharedBridgeAddress = address(sharedBridge); - // secondBridgeAddress = address(secondBridge); + messageRoot = new MessageRoot(bridgeHub); + + sharedBridge = new L1AssetRouter( + mockL1WethAddress, + address(bridgeHub), + l1NullifierAddress, + eraChainId, + eraDiamondProxy + ); + address defaultOwner = sharedBridge.owner(); + vm.prank(defaultOwner); + sharedBridge.transferOwnership(bridgeOwner); + vm.prank(bridgeOwner); + sharedBridge.acceptOwnership(); + + secondBridge = new L1AssetRouter( + mockL1WethAddress, + address(bridgeHub), + l1NullifierAddress, + eraChainId, + eraDiamondProxy + ); + defaultOwner = secondBridge.owner(); + vm.prank(defaultOwner); + secondBridge.transferOwnership(bridgeOwner); + vm.prank(bridgeOwner); + secondBridge.acceptOwnership(); + + sharedBridgeAddress = address(sharedBridge); + secondBridgeAddress = address(secondBridge); testToken18 = new TestnetERC20Token("ZKSTT", "ZkSync Test Token", 18); testToken6 = new TestnetERC20Token("USDC", "USD Coin", 6); testToken8 = new TestnetERC20Token("WBTC", "Wrapped Bitcoin", 8); // test if the ownership of the bridgeHub is set correctly or not - address defaultOwner = bridgeHub.owner(); + defaultOwner = bridgeHub.owner(); // Now, the `reentrancyGuardInitializer` should prevent anyone from calling `initialize` since we have called the constructor of the contract vm.expectRevert(SlotOccupied.selector); @@ -162,6 +188,49 @@ contract ExperimentalBridgeTest is Test { assertEq(bridgeHub.owner(), bridgeOwner); } + function _deployNTV(address _sharedBridgeAddr) internal returns (L1NativeTokenVault addr) { + L1NativeTokenVault ntvImpl = new L1NativeTokenVault(weth, _sharedBridgeAddr, eraChainId, l1Nullifier); + TransparentUpgradeableProxy ntvProxy = new TransparentUpgradeableProxy( + address(ntvImpl), + address(bridgeOwner), + abi.encodeCall(ntvImpl.initialize, (bridgeOwner, address(0))) + ); + addr = L1NativeTokenVault(payable(ntvProxy)); + + vm.prank(bridgeOwner); + L1AssetRouter(_sharedBridgeAddr).setNativeTokenVault(addr); + + addr.registerEthToken(); + } + + function _useFullSharedBridge() internal { + ntv = _deployNTV(address(sharedBridge)); + + secondBridgeAddress = address(sharedBridge); + } + + function _useMockSharedBridge() internal { + sharedBridgeAddress = address(mockSharedBridge); + } + + function _initializeBridgehub() internal { + vm.prank(bridgeOwner); + bridgeHub.setPendingAdmin(deployerAddress); + vm.prank(deployerAddress); + bridgeHub.acceptAdmin(); + + vm.startPrank(bridgeOwner); + bridgeHub.addChainTypeManager(address(mockCTM)); + bridgeHub.addTokenAssetId(tokenAssetId); + bridgeHub.setAddresses(sharedBridgeAddress, ICTMDeploymentTracker(address(0)), messageRoot); + vm.stopPrank(); + + vm.prank(l1Nullifier.owner()); + l1Nullifier.setL1NativeTokenVault(ntv); + vm.prank(l1Nullifier.owner()); + l1Nullifier.setL1AssetRouter(sharedBridgeAddress); + } + function test_newPendingAdminReplacesPrevious(address randomDeployer, address otherRandomDeployer) public { vm.assume(randomDeployer != address(0)); vm.assume(otherRandomDeployer != address(0)); @@ -417,388 +486,380 @@ contract ExperimentalBridgeTest is Test { } } - // function test_setSharedBridge(address randomAddress) public { - // assertTrue( - // bridgeHub.sharedBridge() == IL1AssetRouter(address(0)), - // "This random address is not registered as sharedBridge" - // ); - - // vm.prank(bridgeOwner); - // bridgeHub.setSharedBridge(randomAddress); - - // assertTrue( - // bridgeHub.sharedBridge() == IL1AssetRouter(randomAddress), - // "after call from the bridgeowner, this randomAddress should be the registered sharedBridge" - // ); - // } - - // function test_setSharedBridge_cannotBeCalledByRandomAddress(address randomCaller, address randomAddress) public { - // if (randomCaller != bridgeOwner) { - // vm.prank(randomCaller); - // vm.expectRevert(bytes("Ownable: caller is not the owner")); - // bridgeHub.setSharedBridge(randomAddress); - // } - - // assertTrue( - // bridgeHub.sharedBridge() == IL1AssetRouter(address(0)), - // "This random address is not registered as sharedBridge" - // ); - - // vm.prank(bridgeOwner); - // bridgeHub.setSharedBridge(randomAddress); - - // assertTrue( - // bridgeHub.sharedBridge() == IL1AssetRouter(randomAddress), - // "after call from the bridgeowner, this randomAddress should be the registered sharedBridge" - // ); - // } - - // uint256 newChainId; - // address admin; - - // function test_pause_createNewChain( - // uint256 chainId, - // uint256 salt, - // uint256 randomValue - // ) public useRandomToken(randomValue) { - // chainId = bound(chainId, 1, type(uint48).max); - // address deployerAddress = makeAddr("DEPLOYER_ADDRESS"); - // admin = makeAddr("NEW_CHAIN_ADMIN"); - - // vm.prank(bridgeOwner); - // bridgeHub.pause(); - // vm.prank(bridgeOwner); - // bridgeHub.setPendingAdmin(deployerAddress); - // vm.prank(deployerAddress); - // bridgeHub.acceptAdmin(); - - // vm.expectRevert("Pausable: paused"); - // vm.prank(deployerAddress); - // bridgeHub.createNewChain({ - // _chainId: chainId, - // _chainTypeManager: address(mockCTM), - // _baseToken: address(testToken), - // _salt: salt, - // _admin: admin, - // _initData: bytes("") - // }); - - // vm.prank(bridgeOwner); - // bridgeHub.unpause(); - - // vm.expectRevert(CTMNotRegistered.selector); - // vm.prank(deployerAddress); - // bridgeHub.createNewChain({ - // _chainId: 1, - // _chainTypeManager: address(mockCTM), - // _baseToken: address(testToken), - // _salt: uint256(123), - // _admin: admin, - // _initData: bytes("") - // }); - // } - - // function test_RevertWhen_CTMNotRegisteredOnCreate( - // uint256 chainId, - // uint256 salt, - // uint256 randomValue - // ) public useRandomToken(randomValue) { - // chainId = bound(chainId, 1, type(uint48).max); - // address deployerAddress = makeAddr("DEPLOYER_ADDRESS"); - // admin = makeAddr("NEW_CHAIN_ADMIN"); - - // vm.prank(bridgeOwner); - // bridgeHub.setPendingAdmin(deployerAddress); - // vm.prank(deployerAddress); - // bridgeHub.acceptAdmin(); - - // chainId = bound(chainId, 1, type(uint48).max); - // vm.expectRevert(CTMNotRegistered.selector); - // vm.prank(deployerAddress); - // bridgeHub.createNewChain({ - // _chainId: chainId, - // _chainTypeManager: address(mockCTM), - // _baseToken: address(testToken), - // _salt: salt, - // _admin: admin, - // _initData: bytes("") - // }); - // } - - // function test_RevertWhen_wrongChainIdOnCreate( - // uint256 chainId, - // uint256 salt, - // uint256 randomValue - // ) public useRandomToken(randomValue) { - // chainId = bound(chainId, 1, type(uint48).max); - // address deployerAddress = makeAddr("DEPLOYER_ADDRESS"); - // admin = makeAddr("NEW_CHAIN_ADMIN"); - - // vm.prank(bridgeOwner); - // bridgeHub.setPendingAdmin(deployerAddress); - // vm.prank(deployerAddress); - // bridgeHub.acceptAdmin(); - - // chainId = bound(chainId, type(uint48).max + uint256(1), type(uint256).max); - // vm.expectRevert(ChainIdTooBig.selector); - // vm.prank(deployerAddress); - // bridgeHub.createNewChain({ - // _chainId: chainId, - // _chainTypeManager: address(mockCTM), - // _baseToken: address(testToken), - // _salt: salt, - // _admin: admin, - // _initData: bytes("") - // }); - - // chainId = 0; - // vm.expectRevert(ZeroChainId.selector); - // vm.prank(deployerAddress); - // bridgeHub.createNewChain({ - // _chainId: chainId, - // _chainTypeManager: address(mockCTM), - // _baseToken: address(testToken), - // _salt: salt, - // _admin: admin, - // _initData: bytes("") - // }); - // } - - // function test_RevertWhen_tokenNotRegistered( - // uint256 chainId, - // uint256 salt, - // uint256 randomValue - // ) public useRandomToken(randomValue) { - // chainId = bound(chainId, 1, type(uint48).max); - // address deployerAddress = makeAddr("DEPLOYER_ADDRESS"); - // admin = makeAddr("NEW_CHAIN_ADMIN"); - - // vm.prank(bridgeOwner); - // bridgeHub.setPendingAdmin(deployerAddress); - // vm.prank(deployerAddress); - // bridgeHub.acceptAdmin(); - - // vm.startPrank(bridgeOwner); - // bridgeHub.addChainTypeManager(address(mockCTM)); - // vm.stopPrank(); - - // vm.expectRevert(abi.encodeWithSelector(TokenNotRegistered.selector, address(testToken))); - // vm.prank(deployerAddress); - // bridgeHub.createNewChain({ - // _chainId: chainId, - // _chainTypeManager: address(mockCTM), - // _baseToken: address(testToken), - // _salt: salt, - // _admin: admin, - // _initData: bytes("") - // }); - // } - - // function test_RevertWhen_wethBridgeNotSet( - // uint256 chainId, - // uint256 salt, - // uint256 randomValue - // ) public useRandomToken(randomValue) { - // chainId = bound(chainId, 1, type(uint48).max); - // address deployerAddress = makeAddr("DEPLOYER_ADDRESS"); - // admin = makeAddr("NEW_CHAIN_ADMIN"); - - // vm.prank(bridgeOwner); - // bridgeHub.setPendingAdmin(deployerAddress); - // vm.prank(deployerAddress); - // bridgeHub.acceptAdmin(); - - // vm.startPrank(bridgeOwner); - // bridgeHub.addChainTypeManager(address(mockCTM)); - // bridgeHub.addToken(address(testToken)); - // vm.stopPrank(); - - // vm.expectRevert(SharedBridgeNotSet.selector); - // vm.prank(deployerAddress); - // bridgeHub.createNewChain({ - // _chainId: chainId, - // _chainTypeManager: address(mockCTM), - // _baseToken: address(testToken), - // _salt: salt, - // _admin: admin, - // _initData: bytes("") - // }); - // } - - // function test_RevertWhen_chainIdAlreadyRegistered( - // uint256 chainId, - // uint256 salt, - // uint256 randomValue - // ) public useRandomToken(randomValue) { - // address deployerAddress = makeAddr("DEPLOYER_ADDRESS"); - // admin = makeAddr("NEW_CHAIN_ADMIN"); - // vm.prank(bridgeOwner); - // bridgeHub.setPendingAdmin(deployerAddress); - // vm.prank(deployerAddress); - // bridgeHub.acceptAdmin(); - - // vm.startPrank(bridgeOwner); - // bridgeHub.addChainTypeManager(address(mockCTM)); - // bridgeHub.addToken(address(testToken)); - // bridgeHub.setSharedBridge(sharedBridgeAddress); - // vm.stopPrank(); - - // chainId = bound(chainId, 1, type(uint48).max); - // stdstore.target(address(bridgeHub)).sig("chainTypeManager(uint256)").with_key(chainId).checked_write( - // address(mockCTM) - // ); - - // vm.expectRevert(BridgeHubAlreadyRegistered.selector); - // vm.prank(deployerAddress); - // bridgeHub.createNewChain({ - // _chainId: chainId, - // _chainTypeManager: address(mockCTM), - // _baseToken: address(testToken), - // _salt: salt, - // _admin: admin, - // _initData: bytes("") - // }); - // } - - // function test_createNewChain( - // address randomCaller, - // uint256 chainId, - // bool isFreezable, - // bytes4[] memory mockSelectors, - // address mockInitAddress, - // bytes memory mockInitCalldata, - // uint256 salt, - // uint256 randomValue - // ) public useRandomToken(randomValue) { - // address deployerAddress = makeAddr("DEPLOYER_ADDRESS"); - // admin = makeAddr("NEW_CHAIN_ADMIN"); - // chainId = bound(chainId, 1, type(uint48).max); - - // vm.prank(bridgeOwner); - // bridgeHub.setPendingAdmin(deployerAddress); - // vm.prank(deployerAddress); - // bridgeHub.acceptAdmin(); - - // vm.startPrank(bridgeOwner); - // bridgeHub.addChainTypeManager(address(mockCTM)); - // bridgeHub.addToken(address(testToken)); - // bridgeHub.setSharedBridge(sharedBridgeAddress); - // vm.stopPrank(); - - // if (randomCaller != deployerAddress && randomCaller != bridgeOwner) { - // vm.prank(randomCaller); - // vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, randomCaller)); - // bridgeHub.createNewChain({ - // _chainId: chainId, - // _chainTypeManager: address(mockCTM), - // _baseToken: address(testToken), - // _salt: salt, - // _admin: admin, - // _initData: bytes("") - // }); - // } - - // vm.prank(mockCTM.owner()); - // bytes memory _newChainInitData = _createNewChainInitData( - // isFreezable, - // mockSelectors, - // mockInitAddress, - // mockInitCalldata - // ); - - // // bridgeHub.createNewChain => chainTypeManager.createNewChain => this function sets the stateTransition mapping - // // of `chainId`, let's emulate that using foundry cheatcodes or let's just use the extra function we introduced in our mockCTM - // mockCTM.setZKChain(chainId, address(mockChainContract)); - // assertTrue(mockCTM.getZKChain(chainId) == address(mockChainContract)); - - // vm.startPrank(deployerAddress); - // vm.mockCall( - // address(mockCTM), - // // solhint-disable-next-line func-named-parameters - // abi.encodeWithSelector( - // mockCTM.createNewChain.selector, - // chainId, - // address(testToken), - // sharedBridgeAddress, - // admin, - // _newChainInitData - // ), - // bytes("") - // ); - - // vm.expectEmit(true, true, true, true, address(bridgeHub)); - // emit NewChain(chainId, address(mockCTM), admin); - - // newChainId = bridgeHub.createNewChain({ - // _chainId: chainId, - // _chainTypeManager: address(mockCTM), - // _baseToken: address(testToken), - // _salt: uint256(chainId * 2), - // _admin: admin, - // _initData: _newChainInitData - // }); - - // vm.stopPrank(); - // vm.clearMockedCalls(); - - // assertTrue(bridgeHub.chainTypeManager(newChainId) == address(mockCTM)); - // assertTrue(bridgeHub.baseToken(newChainId) == testTokenAddress); - // } - - // function test_getZKChain(uint256 mockChainId) public { - // mockChainId = _setUpZKChainForChainId(mockChainId); - - // // Now the following statements should be true as well: - // assertTrue(bridgeHub.chainTypeManager(mockChainId) == address(mockCTM)); - // address returnedZKChain = bridgeHub.getZKChain(mockChainId); - - // assertEq(returnedZKChain, address(mockChainContract)); - // } - - // function test_proveL2MessageInclusion( - // uint256 mockChainId, - // uint256 mockBatchNumber, - // uint256 mockIndex, - // bytes32[] memory mockProof, - // uint16 randomTxNumInBatch, - // address randomSender, - // bytes memory randomData - // ) public { - // mockChainId = _setUpZKChainForChainId(mockChainId); - - // // Now the following statements should be true as well: - // assertTrue(bridgeHub.chainTypeManager(mockChainId) == address(mockCTM)); - // assertTrue(bridgeHub.getZKChain(mockChainId) == address(mockChainContract)); - - // // Creating a random L2Message::l2Message so that we pass the correct parameters to `proveL2MessageInclusion` - // L2Message memory l2Message = _createMockL2Message(randomTxNumInBatch, randomSender, randomData); - - // // Since we have used random data for the `bridgeHub.proveL2MessageInclusion` function which basically forwards the call - // // to the same function in the mailbox, we will mock the call to the mailbox to return true and see if it works. - // vm.mockCall( - // address(mockChainContract), - // // solhint-disable-next-line func-named-parameters - // abi.encodeWithSelector( - // mockChainContract.proveL2MessageInclusion.selector, - // mockBatchNumber, - // mockIndex, - // l2Message, - // mockProof - // ), - // abi.encode(true) - // ); - - // assertTrue( - // bridgeHub.proveL2MessageInclusion({ - // _chainId: mockChainId, - // _batchNumber: mockBatchNumber, - // _index: mockIndex, - // _message: l2Message, - // _proof: mockProof - // }) - // ); - // vm.clearMockedCalls(); - // } + function test_setAddresses(address randomAssetRouter, address randomCTMDeployer, address randomMessageRoot) public { + assertTrue(bridgeHub.sharedBridge() == address(0), "Shared bridge is already there"); + assertTrue(bridgeHub.l1CtmDeployer() == ICTMDeploymentTracker(address(0)), "L1 CTM deployer is already there"); + assertTrue(bridgeHub.messageRoot() == IMessageRoot(address(0)), "Message root is already there"); + + vm.prank(bridgeOwner); + bridgeHub.setAddresses( + randomAssetRouter, + ICTMDeploymentTracker(randomCTMDeployer), + IMessageRoot(randomMessageRoot) + ); + + assertTrue(bridgeHub.sharedBridge() == randomAssetRouter, "Shared bridge is already there"); + assertTrue( + bridgeHub.l1CtmDeployer() == ICTMDeploymentTracker(randomCTMDeployer), + "L1 CTM deployer is already there" + ); + assertTrue(bridgeHub.messageRoot() == IMessageRoot(randomMessageRoot), "Message root is already there"); + } + + function test_setAddresses_cannotBeCalledByRandomAddress( + address randomCaller, + address randomAssetRouter, + address randomCTMDeployer, + address randomMessageRoot + ) public { + vm.assume(randomCaller != bridgeOwner); + + vm.prank(randomCaller); + vm.expectRevert(bytes("Ownable: caller is not the owner")); + bridgeHub.setAddresses( + randomAssetRouter, + ICTMDeploymentTracker(randomCTMDeployer), + IMessageRoot(randomMessageRoot) + ); + + assertTrue(bridgeHub.sharedBridge() == address(0), "Shared bridge is already there"); + assertTrue(bridgeHub.l1CtmDeployer() == ICTMDeploymentTracker(address(0)), "L1 CTM deployer is already there"); + assertTrue(bridgeHub.messageRoot() == IMessageRoot(address(0)), "Message root is already there"); + } + + uint256 newChainId; + address admin; + + function test_pause_createNewChain( + uint256 chainId, + uint256 salt, + uint256 randomValue + ) public useRandomToken(randomValue) { + chainId = bound(chainId, 1, type(uint48).max); + vm.assume(chainId != block.chainid); + + admin = makeAddr("NEW_CHAIN_ADMIN"); + + vm.prank(bridgeOwner); + bridgeHub.pause(); + vm.prank(bridgeOwner); + bridgeHub.setPendingAdmin(deployerAddress); + vm.prank(deployerAddress); + bridgeHub.acceptAdmin(); + + // ntv.registerToken(address(testToken)); + + // bytes32 tokenAssetId = DataEncoding.encodeNTVAssetId(block.chainid, address(testToken)); + + // vm.prank(deployerAddress); + // bridgehub.addTokenAssetId(tokenAssetId); + + vm.expectRevert("Pausable: paused"); + vm.prank(deployerAddress); + bridgeHub.createNewChain({ + _chainId: chainId, + _chainTypeManager: address(mockCTM), + _baseTokenAssetId: tokenAssetId, + _salt: salt, + _admin: admin, + _initData: bytes(""), + _factoryDeps: new bytes[](0) + }); + + vm.prank(bridgeOwner); + bridgeHub.unpause(); + + vm.expectRevert(CTMNotRegistered.selector); + vm.prank(deployerAddress); + bridgeHub.createNewChain({ + _chainId: chainId, + _chainTypeManager: address(mockCTM), + _baseTokenAssetId: tokenAssetId, + _salt: salt, + _admin: admin, + _initData: bytes(""), + _factoryDeps: new bytes[](0) + }); + } + + function test_RevertWhen_CTMNotRegisteredOnCreate( + uint256 chainId, + uint256 salt, + uint256 randomValue + ) public useRandomToken(randomValue) { + chainId = bound(chainId, 1, type(uint48).max); + vm.assume(chainId != block.chainid); + + admin = makeAddr("NEW_CHAIN_ADMIN"); + + vm.prank(bridgeOwner); + bridgeHub.setPendingAdmin(deployerAddress); + vm.prank(deployerAddress); + bridgeHub.acceptAdmin(); + + chainId = bound(chainId, 1, type(uint48).max); + vm.expectRevert(CTMNotRegistered.selector); + vm.prank(deployerAddress); + bridgeHub.createNewChain({ + _chainId: chainId, + _chainTypeManager: address(mockCTM), + _baseTokenAssetId: tokenAssetId, + _salt: salt, + _admin: admin, + _initData: bytes(""), + _factoryDeps: new bytes[](0) + }); + } + + function test_RevertWhen_wrongChainIdOnCreate( + uint256 chainId, + uint256 salt, + uint256 randomValue + ) public useRandomToken(randomValue) { + chainId = bound(chainId, 1, type(uint48).max); + vm.assume(chainId != block.chainid); + + admin = makeAddr("NEW_CHAIN_ADMIN"); + + vm.prank(bridgeOwner); + bridgeHub.setPendingAdmin(deployerAddress); + vm.prank(deployerAddress); + bridgeHub.acceptAdmin(); + + chainId = bound(chainId, type(uint48).max + uint256(1), type(uint256).max); + vm.expectRevert(ChainIdTooBig.selector); + vm.prank(deployerAddress); + bridgeHub.createNewChain({ + _chainId: chainId, + _chainTypeManager: address(mockCTM), + _baseTokenAssetId: tokenAssetId, + _salt: salt, + _admin: admin, + _initData: bytes(""), + _factoryDeps: new bytes[](0) + }); + + chainId = 0; + vm.expectRevert(ZeroChainId.selector); + vm.prank(deployerAddress); + bridgeHub.createNewChain({ + _chainId: chainId, + _chainTypeManager: address(mockCTM), + _baseTokenAssetId: tokenAssetId, + _salt: salt, + _admin: admin, + _initData: bytes(""), + _factoryDeps: new bytes[](0) + }); + } + + function test_RevertWhen_assetIdNotRegistered( + uint256 chainId, + uint256 salt, + uint256 randomValue + ) public useRandomToken(randomValue) { + chainId = bound(chainId, 1, type(uint48).max); + vm.assume(chainId != block.chainid); + + admin = makeAddr("NEW_CHAIN_ADMIN"); + + vm.prank(bridgeOwner); + bridgeHub.setPendingAdmin(deployerAddress); + vm.prank(deployerAddress); + bridgeHub.acceptAdmin(); + + vm.startPrank(bridgeOwner); + bridgeHub.addChainTypeManager(address(mockCTM)); + vm.stopPrank(); + + vm.expectRevert(abi.encodeWithSelector(AssetIdNotSupported.selector, tokenAssetId)); + vm.prank(deployerAddress); + bridgeHub.createNewChain({ + _chainId: chainId, + _chainTypeManager: address(mockCTM), + _baseTokenAssetId: tokenAssetId, + _salt: salt, + _admin: admin, + _initData: bytes(""), + _factoryDeps: new bytes[](0) + }); + } + + function test_RevertWhen_wethBridgeNotSet( + uint256 chainId, + uint256 salt, + uint256 randomValue + ) public useRandomToken(randomValue) { + chainId = bound(chainId, 1, type(uint48).max); + vm.assume(chainId != block.chainid); + admin = makeAddr("NEW_CHAIN_ADMIN"); + + vm.prank(bridgeOwner); + bridgeHub.setPendingAdmin(deployerAddress); + vm.prank(deployerAddress); + bridgeHub.acceptAdmin(); + + vm.startPrank(bridgeOwner); + bridgeHub.addChainTypeManager(address(mockCTM)); + bridgeHub.addTokenAssetId(tokenAssetId); + vm.stopPrank(); + + vm.expectRevert(SharedBridgeNotSet.selector); + vm.prank(deployerAddress); + bridgeHub.createNewChain({ + _chainId: chainId, + _chainTypeManager: address(mockCTM), + _baseTokenAssetId: tokenAssetId, + _salt: salt, + _admin: admin, + _initData: bytes(""), + _factoryDeps: new bytes[](0) + }); + } + + function test_RevertWhen_chainIdAlreadyRegistered( + uint256 chainId, + uint256 salt, + uint256 randomValue + ) public useRandomToken(randomValue) { + admin = makeAddr("NEW_CHAIN_ADMIN"); + + _initializeBridgehub(); + + chainId = bound(chainId, 1, type(uint48).max); + vm.assume(chainId != block.chainid); + stdstore.target(address(bridgeHub)).sig("chainTypeManager(uint256)").with_key(chainId).checked_write( + address(mockCTM) + ); + + vm.expectRevert(BridgeHubAlreadyRegistered.selector); + vm.prank(deployerAddress); + bridgeHub.createNewChain({ + _chainId: chainId, + _chainTypeManager: address(mockCTM), + _baseTokenAssetId: tokenAssetId, + _salt: salt, + _admin: admin, + _initData: bytes(""), + _factoryDeps: new bytes[](0) + }); + } + + function test_createNewChain( + address randomCaller, + uint256 chainId, + bytes memory mockInitCalldata, + bytes[] memory factoryDeps, + uint256 salt, + uint256 randomValue, + address newChainAddress + ) public useRandomToken(randomValue) { + admin = makeAddr("NEW_CHAIN_ADMIN"); + chainId = bound(chainId, 1, type(uint48).max); + vm.assume(chainId != block.chainid); + vm.assume(randomCaller != deployerAddress && randomCaller != bridgeOwner); + + _initializeBridgehub(); + + vm.prank(randomCaller); + vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, randomCaller)); + bridgeHub.createNewChain({ + _chainId: chainId, + _chainTypeManager: address(mockCTM), + _baseTokenAssetId: tokenAssetId, + _salt: salt, + _admin: admin, + _initData: bytes(""), + _factoryDeps: factoryDeps + }); + + vm.prank(mockCTM.owner()); + + // bridgeHub.createNewChain => chainTypeManager.createNewChain => this function sets the stateTransition mapping + // of `chainId`, let's emulate that using foundry cheatcodes or let's just use the extra function we introduced in our mockCTM + mockCTM.setZKChain(chainId, address(mockChainContract)); + + vm.startPrank(deployerAddress); + vm.mockCall( + address(mockCTM), + // solhint-disable-next-line func-named-parameters + abi.encodeWithSelector( + mockCTM.createNewChain.selector, + chainId, + tokenAssetId, + sharedBridgeAddress, + admin, + mockInitCalldata, + factoryDeps + ), + abi.encode(newChainAddress) + ); + + vm.expectEmit(true, true, true, true, address(bridgeHub)); + emit NewChain(chainId, address(mockCTM), admin); + + bridgeHub.createNewChain({ + _chainId: chainId, + _chainTypeManager: address(mockCTM), + _baseTokenAssetId: tokenAssetId, + _salt: uint256(chainId * 2), + _admin: admin, + _initData: mockInitCalldata, + _factoryDeps: factoryDeps + }); + + vm.stopPrank(); + vm.clearMockedCalls(); + + assertTrue(bridgeHub.chainTypeManager(chainId) == address(mockCTM)); + assertTrue(bridgeHub.baseTokenAssetId(chainId) == tokenAssetId); + assertTrue(bridgeHub.getZKChain(chainId) == newChainAddress); + } + + function test_proveL2MessageInclusion( + uint256 mockChainId, + uint256 mockBatchNumber, + uint256 mockIndex, + bytes32[] memory mockProof, + uint16 randomTxNumInBatch, + address randomSender, + bytes memory randomData + ) public { + mockChainId = _setUpZKChainForChainId(mockChainId); + + // Now the following statements should be true as well: + assertTrue(bridgeHub.chainTypeManager(mockChainId) == address(mockCTM)); + assertTrue(bridgeHub.getZKChain(mockChainId) == address(mockChainContract)); + + // Creating a random L2Message::l2Message so that we pass the correct parameters to `proveL2MessageInclusion` + L2Message memory l2Message = _createMockL2Message(randomTxNumInBatch, randomSender, randomData); + + // Since we have used random data for the `bridgeHub.proveL2MessageInclusion` function which basically forwards the call + // to the same function in the mailbox, we will mock the call to the mailbox to return true and see if it works. + vm.mockCall( + address(mockChainContract), + // solhint-disable-next-line func-named-parameters + abi.encodeWithSelector( + mockChainContract.proveL2MessageInclusion.selector, + mockBatchNumber, + mockIndex, + l2Message, + mockProof + ), + abi.encode(true) + ); + + assertTrue( + bridgeHub.proveL2MessageInclusion({ + _chainId: mockChainId, + _batchNumber: mockBatchNumber, + _index: mockIndex, + _message: l2Message, + _proof: mockProof + }) + ); + vm.clearMockedCalls(); + } function test_proveL2LogInclusion( uint256 mockChainId, @@ -931,475 +992,480 @@ contract ExperimentalBridgeTest is Test { vm.clearMockedCalls(); } - // function _prepareETHL2TransactionDirectRequest( - // uint256 mockChainId, - // uint256 mockMintValue, - // address mockL2Contract, - // uint256 mockL2Value, - // bytes memory mockL2Calldata, - // uint256 mockL2GasLimit, - // uint256 mockL2GasPerPubdataByteLimit, - // bytes[] memory mockFactoryDeps, - // address randomCaller - // ) internal returns (L2TransactionRequestDirect memory l2TxnReqDirect) { - // if (mockFactoryDeps.length > MAX_NEW_FACTORY_DEPS) { - // mockFactoryDeps = _restrictArraySize(mockFactoryDeps, MAX_NEW_FACTORY_DEPS); - // } - - // l2TxnReqDirect = _createMockL2TransactionRequestDirect({ - // mockChainId: mockChainId, - // mockMintValue: mockMintValue, - // mockL2Contract: mockL2Contract, - // mockL2Value: mockL2Value, - // mockL2Calldata: mockL2Calldata, - // mockL2GasLimit: mockL2GasLimit, - // mockL2GasPerPubdataByteLimit: mockL2GasPerPubdataByteLimit, - // mockFactoryDeps: mockFactoryDeps, - // mockRefundRecipient: address(0) - // }); - - // l2TxnReqDirect.chainId = _setUpZKChainForChainId(l2TxnReqDirect.chainId); - - // assertTrue(!(bridgeHub.baseToken(l2TxnReqDirect.chainId) == ETH_TOKEN_ADDRESS)); - // _setUpBaseTokenForChainId(l2TxnReqDirect.chainId, true, address(0)); - // assertTrue(bridgeHub.baseToken(l2TxnReqDirect.chainId) == ETH_TOKEN_ADDRESS); - - // _setUpSharedBridge(); - // _setUpSharedBridgeL2(mockChainId); - - // assertTrue(bridgeHub.getZKChain(l2TxnReqDirect.chainId) == address(mockChainContract)); - // bytes32 canonicalHash = keccak256(abi.encode("CANONICAL_TX_HASH")); - - // vm.mockCall( - // address(mockChainContract), - // abi.encodeWithSelector(mockChainContract.bridgehubRequestL2Transaction.selector), - // abi.encode(canonicalHash) - // ); - - // mockChainContract.setFeeParams(); - // mockChainContract.setBaseTokenGasMultiplierPrice(uint128(1), uint128(1)); - // mockChainContract.setBridgeHubAddress(address(bridgeHub)); - // assertTrue(mockChainContract.getBridgeHubAddress() == address(bridgeHub)); - // } - - // function test_requestL2TransactionDirect_RevertWhen_incorrectETHParams( - // uint256 mockChainId, - // uint256 mockMintValue, - // address mockL2Contract, - // uint256 mockL2Value, - // uint256 msgValue, - // bytes memory mockL2Calldata, - // uint256 mockL2GasLimit, - // uint256 mockL2GasPerPubdataByteLimit, - // bytes[] memory mockFactoryDeps - // ) public { - // address randomCaller = makeAddr("RANDOM_CALLER"); - // vm.assume(msgValue != mockMintValue); - - // L2TransactionRequestDirect memory l2TxnReqDirect = _prepareETHL2TransactionDirectRequest({ - // mockChainId: mockChainId, - // mockMintValue: mockMintValue, - // mockL2Contract: mockL2Contract, - // mockL2Value: mockL2Value, - // mockL2Calldata: mockL2Calldata, - // mockL2GasLimit: mockL2GasLimit, - // mockL2GasPerPubdataByteLimit: mockL2GasPerPubdataByteLimit, - // mockFactoryDeps: mockFactoryDeps, - // randomCaller: randomCaller - // }); - - // vm.deal(randomCaller, msgValue); - // vm.expectRevert(abi.encodeWithSelector(MsgValueMismatch.selector, mockMintValue, msgValue)); - // vm.prank(randomCaller); - // bridgeHub.requestL2TransactionDirect{value: msgValue}(l2TxnReqDirect); - // } - - // function test_requestL2TransactionDirect_ETHCase( - // uint256 mockChainId, - // uint256 mockMintValue, - // address mockL2Contract, - // uint256 mockL2Value, - // bytes memory mockL2Calldata, - // uint256 mockL2GasLimit, - // uint256 mockL2GasPerPubdataByteLimit, - // bytes[] memory mockFactoryDeps, - // uint256 gasPrice - // ) public { - // address randomCaller = makeAddr("RANDOM_CALLER"); - // mockChainId = bound(mockChainId, 1, type(uint48).max); - - // L2TransactionRequestDirect memory l2TxnReqDirect = _prepareETHL2TransactionDirectRequest({ - // mockChainId: mockChainId, - // mockMintValue: mockMintValue, - // mockL2Contract: mockL2Contract, - // mockL2Value: mockL2Value, - // mockL2Calldata: mockL2Calldata, - // mockL2GasLimit: mockL2GasLimit, - // mockL2GasPerPubdataByteLimit: mockL2GasPerPubdataByteLimit, - // mockFactoryDeps: mockFactoryDeps, - // randomCaller: randomCaller - // }); - - // vm.deal(randomCaller, l2TxnReqDirect.mintValue); - // gasPrice = bound(gasPrice, 1_000, 50_000_000); - // vm.txGasPrice(gasPrice * 1 gwei); - // vm.prank(randomCaller); - // bytes32 canonicalHash = keccak256(abi.encode("CANONICAL_TX_HASH")); - // bytes32 resultantHash = bridgeHub.requestL2TransactionDirect{value: randomCaller.balance}(l2TxnReqDirect); - - // assertTrue(resultantHash == canonicalHash); - // } - - // function test_requestL2TransactionDirect_NonETHCase( - // uint256 mockChainId, - // uint256 mockMintValue, - // address mockL2Contract, - // uint256 mockL2Value, - // bytes memory mockL2Calldata, - // uint256 mockL2GasLimit, - // uint256 mockL2GasPerPubdataByteLimit, - // bytes[] memory mockFactoryDeps, - // uint256 gasPrice, - // uint256 randomValue - // ) public useRandomToken(randomValue) { - // address randomCaller = makeAddr("RANDOM_CALLER"); - // mockChainId = bound(mockChainId, 1, type(uint48).max); - - // if (mockFactoryDeps.length > MAX_NEW_FACTORY_DEPS) { - // mockFactoryDeps = _restrictArraySize(mockFactoryDeps, MAX_NEW_FACTORY_DEPS); - // } - - // L2TransactionRequestDirect memory l2TxnReqDirect = _createMockL2TransactionRequestDirect({ - // mockChainId: mockChainId, - // mockMintValue: mockMintValue, - // mockL2Contract: mockL2Contract, - // mockL2Value: mockL2Value, - // mockL2Calldata: mockL2Calldata, - // mockL2GasLimit: mockL2GasLimit, - // mockL2GasPerPubdataByteLimit: mockL2GasPerPubdataByteLimit, - // mockFactoryDeps: mockFactoryDeps, - // mockRefundRecipient: address(0) - // }); - - // l2TxnReqDirect.chainId = _setUpZKChainForChainId(l2TxnReqDirect.chainId); - - // _setUpBaseTokenForChainId(l2TxnReqDirect.chainId, false, address(testToken)); - // _setUpSharedBridge(); - // _setUpSharedBridgeL2(mockChainId); - - // assertTrue(bridgeHub.getZKChain(l2TxnReqDirect.chainId) == address(mockChainContract)); - // bytes32 canonicalHash = keccak256(abi.encode("CANONICAL_TX_HASH")); - - // vm.mockCall( - // address(mockChainContract), - // abi.encodeWithSelector(mockChainContract.bridgehubRequestL2Transaction.selector), - // abi.encode(canonicalHash) - // ); - - // mockChainContract.setFeeParams(); - // mockChainContract.setBaseTokenGasMultiplierPrice(uint128(1), uint128(1)); - // mockChainContract.setBridgeHubAddress(address(bridgeHub)); - // assertTrue(mockChainContract.getBridgeHubAddress() == address(bridgeHub)); - - // gasPrice = bound(gasPrice, 1_000, 50_000_000); - // vm.txGasPrice(gasPrice * 1 gwei); - - // vm.deal(randomCaller, 1 ether); - // vm.prank(randomCaller); - // vm.expectRevert(abi.encodeWithSelector(MsgValueMismatch.selector, 0, randomCaller.balance)); - // bytes32 resultantHash = bridgeHub.requestL2TransactionDirect{value: randomCaller.balance}(l2TxnReqDirect); - - // // Now, let's call the same function with zero msg.value - // testToken.mint(randomCaller, l2TxnReqDirect.mintValue); - // assertEq(testToken.balanceOf(randomCaller), l2TxnReqDirect.mintValue); - - // vm.prank(randomCaller); - // testToken.transfer(address(this), l2TxnReqDirect.mintValue); - // assertEq(testToken.balanceOf(address(this)), l2TxnReqDirect.mintValue); - // testToken.approve(sharedBridgeAddress, l2TxnReqDirect.mintValue); - - // resultantHash = bridgeHub.requestL2TransactionDirect(l2TxnReqDirect); - - // assertEq(canonicalHash, resultantHash); - // } - - // function test_requestTransactionTwoBridgesChecksMagicValue( - // uint256 chainId, - // uint256 mintValue, - // uint256 l2Value, - // uint256 l2GasLimit, - // uint256 l2GasPerPubdataByteLimit, - // address refundRecipient, - // uint256 secondBridgeValue, - // bytes memory secondBridgeCalldata, - // bytes32 magicValue - // ) public { - // chainId = bound(chainId, 1, type(uint48).max); - - // L2TransactionRequestTwoBridgesOuter memory l2TxnReq2BridgeOut = _createMockL2TransactionRequestTwoBridgesOuter({ - // chainId: chainId, - // mintValue: mintValue, - // l2Value: l2Value, - // l2GasLimit: l2GasLimit, - // l2GasPerPubdataByteLimit: l2GasPerPubdataByteLimit, - // refundRecipient: refundRecipient, - // secondBridgeValue: secondBridgeValue, - // secondBridgeCalldata: secondBridgeCalldata - // }); - - // l2TxnReq2BridgeOut.chainId = _setUpZKChainForChainId(l2TxnReq2BridgeOut.chainId); - - // _setUpBaseTokenForChainId(l2TxnReq2BridgeOut.chainId, true, address(0)); - // assertTrue(bridgeHub.baseToken(l2TxnReq2BridgeOut.chainId) == ETH_TOKEN_ADDRESS); - - // _setUpSharedBridge(); - // _setUpSharedBridgeL2(chainId); - - // assertTrue(bridgeHub.getZKChain(l2TxnReq2BridgeOut.chainId) == address(mockChainContract)); - - // uint256 callerMsgValue = l2TxnReq2BridgeOut.mintValue + l2TxnReq2BridgeOut.secondBridgeValue; - // address randomCaller = makeAddr("RANDOM_CALLER"); - // vm.deal(randomCaller, callerMsgValue); - - // if (magicValue != TWO_BRIDGES_MAGIC_VALUE) { - // L2TransactionRequestTwoBridgesInner memory request = L2TransactionRequestTwoBridgesInner({ - // magicValue: magicValue, - // l2Contract: makeAddr("L2_CONTRACT"), - // l2Calldata: new bytes(0), - // factoryDeps: new bytes[](0), - // txDataHash: bytes32(0) - // }); - - // vm.mockCall( - // secondBridgeAddress, - // abi.encodeWithSelector(IL1SharedBridge.bridgehubDeposit.selector), - // abi.encode(request) - // ); - - // vm.expectRevert(abi.encodeWithSelector(WrongMagicValue.selector, TWO_BRIDGES_MAGIC_VALUE, magicValue)); - // vm.prank(randomCaller); - // bridgeHub.requestL2TransactionTwoBridges{value: randomCaller.balance}(l2TxnReq2BridgeOut); - // } - // } - - // function test_requestL2TransactionTwoBridgesWrongBridgeAddress( - // uint256 chainId, - // uint256 mintValue, - // uint256 msgValue, - // uint256 l2Value, - // uint256 l2GasLimit, - // uint256 l2GasPerPubdataByteLimit, - // address refundRecipient, - // uint256 secondBridgeValue, - // uint160 secondBridgeAddressValue, - // bytes memory secondBridgeCalldata - // ) public { - // chainId = bound(chainId, 1, type(uint48).max); - - // L2TransactionRequestTwoBridgesOuter memory l2TxnReq2BridgeOut = _createMockL2TransactionRequestTwoBridgesOuter({ - // chainId: chainId, - // mintValue: mintValue, - // l2Value: l2Value, - // l2GasLimit: l2GasLimit, - // l2GasPerPubdataByteLimit: l2GasPerPubdataByteLimit, - // refundRecipient: refundRecipient, - // secondBridgeValue: secondBridgeValue, - // secondBridgeCalldata: secondBridgeCalldata - // }); - - // l2TxnReq2BridgeOut.chainId = _setUpZKChainForChainId(l2TxnReq2BridgeOut.chainId); - - // _setUpBaseTokenForChainId(l2TxnReq2BridgeOut.chainId, true, address(0)); - // assertTrue(bridgeHub.baseToken(l2TxnReq2BridgeOut.chainId) == ETH_TOKEN_ADDRESS); - - // _setUpSharedBridge(); - // _setUpSharedBridgeL2(chainId); - - // assertTrue(bridgeHub.getZKChain(l2TxnReq2BridgeOut.chainId) == address(mockChainContract)); - - // uint256 callerMsgValue = l2TxnReq2BridgeOut.mintValue + l2TxnReq2BridgeOut.secondBridgeValue; - // address randomCaller = makeAddr("RANDOM_CALLER"); - // vm.deal(randomCaller, callerMsgValue); - - // mockChainContract.setBridgeHubAddress(address(bridgeHub)); - - // bytes32 canonicalHash = keccak256(abi.encode("CANONICAL_TX_HASH")); - - // vm.mockCall( - // address(mockChainContract), - // abi.encodeWithSelector(mockChainContract.bridgehubRequestL2Transaction.selector), - // abi.encode(canonicalHash) - // ); - - // L2TransactionRequestTwoBridgesInner memory outputRequest = L2TransactionRequestTwoBridgesInner({ - // magicValue: TWO_BRIDGES_MAGIC_VALUE, - // l2Contract: address(0), - // l2Calldata: abi.encode(""), - // factoryDeps: new bytes[](0), - // txDataHash: bytes32("") - // }); - // secondBridgeAddressValue = uint160(bound(uint256(secondBridgeAddressValue), 0, uint256(type(uint16).max))); - // address secondBridgeAddress = address(secondBridgeAddressValue); - - // vm.mockCall( - // address(secondBridgeAddressValue), - // l2TxnReq2BridgeOut.secondBridgeValue, - // abi.encodeWithSelector( - // IL1SharedBridge.bridgehubDeposit.selector, - // l2TxnReq2BridgeOut.chainId, - // randomCaller, - // l2TxnReq2BridgeOut.l2Value, - // l2TxnReq2BridgeOut.secondBridgeCalldata - // ), - // abi.encode(outputRequest) - // ); - - // l2TxnReq2BridgeOut.secondBridgeAddress = address(secondBridgeAddressValue); - // vm.expectRevert(abi.encodeWithSelector(AddressTooLow.selector, secondBridgeAddress)); - // vm.prank(randomCaller); - // bridgeHub.requestL2TransactionTwoBridges{value: randomCaller.balance}(l2TxnReq2BridgeOut); - // } - - // function test_requestL2TransactionTwoBridges_ERC20ToNonBase( - // uint256 chainId, - // uint256 mintValue, - // uint256 l2Value, - // uint256 l2GasLimit, - // uint256 l2GasPerPubdataByteLimit, - // address l2Receiver, - // uint256 randomValue - // ) public useRandomToken(randomValue) { - // // create another token, to avoid base token - // TestnetERC20Token erc20Token = new TestnetERC20Token("ZKESTT", "ZkSync ERC Test Token", 18); - // address erc20TokenAddress = address(erc20Token); - // l2Value = bound(l2Value, 1, type(uint256).max); - // bytes memory secondBridgeCalldata = abi.encode(erc20TokenAddress, l2Value, l2Receiver); - - // chainId = _setUpZKChainForChainId(chainId); - - // L2TransactionRequestTwoBridgesOuter memory l2TxnReq2BridgeOut = _createMockL2TransactionRequestTwoBridgesOuter({ - // chainId: chainId, - // mintValue: mintValue, - // l2Value: 0, // not used - // l2GasLimit: l2GasLimit, - // l2GasPerPubdataByteLimit: l2GasPerPubdataByteLimit, - // refundRecipient: address(0), - // secondBridgeValue: 0, // not used cause we are using ERC20 - // secondBridgeCalldata: secondBridgeCalldata - // }); - - // address randomCaller = makeAddr("RANDOM_CALLER"); - // bytes32 canonicalHash = keccak256(abi.encode("CANONICAL_TX_HASH")); - - // _setUpBaseTokenForChainId(l2TxnReq2BridgeOut.chainId, false, address(testToken)); - // assertTrue(bridgeHub.baseToken(l2TxnReq2BridgeOut.chainId) == address(testToken)); - // _setUpSharedBridge(); - - // _setUpSharedBridgeL2(chainId); - // assertTrue(bridgeHub.getZKChain(l2TxnReq2BridgeOut.chainId) == address(mockChainContract)); - // mockChainContract.setBridgeHubAddress(address(bridgeHub)); - - // vm.mockCall( - // address(mockChainContract), - // abi.encodeWithSelector(mockChainContract.bridgehubRequestL2Transaction.selector), - // abi.encode(canonicalHash) - // ); - - // testToken.mint(randomCaller, l2TxnReq2BridgeOut.mintValue); - // erc20Token.mint(randomCaller, l2Value); - - // assertEq(testToken.balanceOf(randomCaller), l2TxnReq2BridgeOut.mintValue); - // assertEq(erc20Token.balanceOf(randomCaller), l2Value); - - // vm.startPrank(randomCaller); - // testToken.approve(sharedBridgeAddress, l2TxnReq2BridgeOut.mintValue); - // erc20Token.approve(secondBridgeAddress, l2Value); - // vm.stopPrank(); - // vm.prank(randomCaller); - // bytes32 resultHash = bridgeHub.requestL2TransactionTwoBridges(l2TxnReq2BridgeOut); - // assertEq(resultHash, canonicalHash); - - // assert(erc20Token.balanceOf(randomCaller) == 0); - // assert(testToken.balanceOf(randomCaller) == 0); - // assert(erc20Token.balanceOf(secondBridgeAddress) == l2Value); - // assert(testToken.balanceOf(sharedBridgeAddress) == l2TxnReq2BridgeOut.mintValue); - - // l2TxnReq2BridgeOut.secondBridgeValue = 1; - // testToken.mint(randomCaller, l2TxnReq2BridgeOut.mintValue); - // vm.startPrank(randomCaller); - // testToken.approve(sharedBridgeAddress, l2TxnReq2BridgeOut.mintValue); - // vm.expectRevert(abi.encodeWithSelector(MsgValueMismatch.selector, l2TxnReq2BridgeOut.secondBridgeValue, 0)); - // bridgeHub.requestL2TransactionTwoBridges(l2TxnReq2BridgeOut); - // vm.stopPrank(); - // } - - // function test_requestL2TransactionTwoBridges_ETHToNonBase( - // uint256 chainId, - // uint256 mintValue, - // uint256 msgValue, - // uint256 l2Value, - // uint256 l2GasLimit, - // uint256 l2GasPerPubdataByteLimit, - // address refundRecipient, - // uint256 secondBridgeValue, - // address l2Receiver, - // uint256 randomValue - // ) public useRandomToken(randomValue) { - // secondBridgeValue = bound(secondBridgeValue, 1, type(uint256).max); - // bytes memory secondBridgeCalldata = abi.encode(ETH_TOKEN_ADDRESS, 0, l2Receiver); - - // chainId = _setUpZKChainForChainId(chainId); - - // L2TransactionRequestTwoBridgesOuter memory l2TxnReq2BridgeOut = _createMockL2TransactionRequestTwoBridgesOuter({ - // chainId: chainId, - // mintValue: mintValue, - // l2Value: l2Value, - // l2GasLimit: l2GasLimit, - // l2GasPerPubdataByteLimit: l2GasPerPubdataByteLimit, - // refundRecipient: refundRecipient, - // secondBridgeValue: secondBridgeValue, - // secondBridgeCalldata: secondBridgeCalldata - // }); - - // _setUpBaseTokenForChainId(l2TxnReq2BridgeOut.chainId, false, address(testToken)); - // assertTrue(bridgeHub.baseToken(l2TxnReq2BridgeOut.chainId) == address(testToken)); - - // _setUpSharedBridge(); - // _setUpSharedBridgeL2(chainId); - // assertTrue(bridgeHub.getZKChain(l2TxnReq2BridgeOut.chainId) == address(mockChainContract)); - - // address randomCaller = makeAddr("RANDOM_CALLER"); - - // mockChainContract.setBridgeHubAddress(address(bridgeHub)); - - // { - // bytes32 canonicalHash = keccak256(abi.encode("CANONICAL_TX_HASH")); - - // vm.mockCall( - // address(mockChainContract), - // abi.encodeWithSelector(mockChainContract.bridgehubRequestL2Transaction.selector), - // abi.encode(canonicalHash) - // ); - // } - - // if (msgValue != secondBridgeValue) { - // vm.deal(randomCaller, msgValue); - // vm.expectRevert( - // abi.encodeWithSelector(MsgValueMismatch.selector, l2TxnReq2BridgeOut.secondBridgeValue, msgValue) - // ); - // vm.prank(randomCaller); - // bridgeHub.requestL2TransactionTwoBridges{value: msgValue}(l2TxnReq2BridgeOut); - // } - - // testToken.mint(randomCaller, l2TxnReq2BridgeOut.mintValue); - // assertEq(testToken.balanceOf(randomCaller), l2TxnReq2BridgeOut.mintValue); - // vm.prank(randomCaller); - // testToken.approve(sharedBridgeAddress, l2TxnReq2BridgeOut.mintValue); - - // vm.deal(randomCaller, l2TxnReq2BridgeOut.secondBridgeValue); - // vm.prank(randomCaller); - // bridgeHub.requestL2TransactionTwoBridges{value: randomCaller.balance}(l2TxnReq2BridgeOut); - // } + function _prepareETHL2TransactionDirectRequest( + uint256 mockChainId, + uint256 mockMintValue, + address mockL2Contract, + uint256 mockL2Value, + bytes memory mockL2Calldata, + uint256 mockL2GasLimit, + uint256 mockL2GasPerPubdataByteLimit, + bytes[] memory mockFactoryDeps, + address randomCaller + ) internal returns (L2TransactionRequestDirect memory l2TxnReqDirect, bytes32 canonicalHash) { + vm.assume(mockFactoryDeps.length <= MAX_NEW_FACTORY_DEPS); + + l2TxnReqDirect = _createMockL2TransactionRequestDirect({ + mockChainId: mockChainId, + mockMintValue: mockMintValue, + mockL2Contract: mockL2Contract, + mockL2Value: mockL2Value, + mockL2Calldata: mockL2Calldata, + mockL2GasLimit: mockL2GasLimit, + mockL2GasPerPubdataByteLimit: mockL2GasPerPubdataByteLimit, + mockFactoryDeps: mockFactoryDeps, + mockRefundRecipient: address(0) + }); + + l2TxnReqDirect.chainId = _setUpZKChainForChainId(l2TxnReqDirect.chainId); + + assertTrue(bridgeHub.baseTokenAssetId(l2TxnReqDirect.chainId) != ETH_TOKEN_ASSET_ID); + _setUpBaseTokenForChainId(l2TxnReqDirect.chainId, true, address(0)); + + assertTrue(bridgeHub.baseTokenAssetId(l2TxnReqDirect.chainId) == ETH_TOKEN_ASSET_ID); + console.log(IL1AssetRouter(bridgeHub.sharedBridge()).assetHandlerAddress(ETH_TOKEN_ASSET_ID)); + assertTrue(bridgeHub.baseToken(l2TxnReqDirect.chainId) == ETH_TOKEN_ADDRESS); + + assertTrue(bridgeHub.getZKChain(l2TxnReqDirect.chainId) == address(mockChainContract)); + canonicalHash = keccak256(abi.encode("CANONICAL_TX_HASH")); + + vm.mockCall( + address(mockChainContract), + abi.encodeWithSelector(mockChainContract.bridgehubRequestL2Transaction.selector), + abi.encode(canonicalHash) + ); + + mockChainContract.setFeeParams(); + mockChainContract.setBaseTokenGasMultiplierPrice(uint128(1), uint128(1)); + mockChainContract.setBridgeHubAddress(address(bridgeHub)); + assertTrue(mockChainContract.getBridgeHubAddress() == address(bridgeHub)); + } + + function test_requestL2TransactionDirect_RevertWhen_incorrectETHParams( + uint256 mockChainId, + uint256 mockMintValue, + address mockL2Contract, + uint256 mockL2Value, + uint256 msgValue, + bytes memory mockL2Calldata, + uint256 mockL2GasLimit, + uint256 mockL2GasPerPubdataByteLimit, + bytes[] memory mockFactoryDeps + ) public { + _useMockSharedBridge(); + _initializeBridgehub(); + + address randomCaller = makeAddr("RANDOM_CALLER"); + vm.assume(msgValue != mockMintValue); + + (L2TransactionRequestDirect memory l2TxnReqDirect, bytes32 hash) = _prepareETHL2TransactionDirectRequest({ + mockChainId: mockChainId, + mockMintValue: mockMintValue, + mockL2Contract: mockL2Contract, + mockL2Value: mockL2Value, + mockL2Calldata: mockL2Calldata, + mockL2GasLimit: mockL2GasLimit, + mockL2GasPerPubdataByteLimit: mockL2GasPerPubdataByteLimit, + mockFactoryDeps: mockFactoryDeps, + randomCaller: randomCaller + }); + + vm.deal(randomCaller, msgValue); + vm.expectRevert(abi.encodeWithSelector(MsgValueMismatch.selector, mockMintValue, msgValue)); + vm.prank(randomCaller); + bridgeHub.requestL2TransactionDirect{value: msgValue}(l2TxnReqDirect); + } + + function test_requestL2TransactionDirect_ETHCase( + uint256 mockChainId, + uint256 mockMintValue, + address mockL2Contract, + uint256 mockL2Value, + bytes memory mockL2Calldata, + uint256 mockL2GasLimit, + uint256 mockL2GasPerPubdataByteLimit, + bytes[] memory mockFactoryDeps, + uint256 gasPrice + ) public { + _useMockSharedBridge(); + _initializeBridgehub(); + + address randomCaller = makeAddr("RANDOM_CALLER"); + mockChainId = bound(mockChainId, 1, type(uint48).max); + + (L2TransactionRequestDirect memory l2TxnReqDirect, bytes32 hash) = _prepareETHL2TransactionDirectRequest({ + mockChainId: mockChainId, + mockMintValue: mockMintValue, + mockL2Contract: mockL2Contract, + mockL2Value: mockL2Value, + mockL2Calldata: mockL2Calldata, + mockL2GasLimit: mockL2GasLimit, + mockL2GasPerPubdataByteLimit: mockL2GasPerPubdataByteLimit, + mockFactoryDeps: mockFactoryDeps, + randomCaller: randomCaller + }); + + vm.deal(randomCaller, l2TxnReqDirect.mintValue); + gasPrice = bound(gasPrice, 1_000, 50_000_000); + vm.txGasPrice(gasPrice * 1 gwei); + vm.prank(randomCaller); + bytes32 resultantHash = bridgeHub.requestL2TransactionDirect{value: randomCaller.balance}(l2TxnReqDirect); + + assertTrue(resultantHash == hash); + } + + function test_requestL2TransactionDirect_NonETHCase( + uint256 mockChainId, + uint256 mockMintValue, + address mockL2Contract, + uint256 mockL2Value, + bytes memory mockL2Calldata, + uint256 mockL2GasLimit, + uint256 mockL2GasPerPubdataByteLimit, + bytes[] memory mockFactoryDeps, + uint256 gasPrice, + uint256 randomValue + ) public useRandomToken(randomValue) { + _useFullSharedBridge(); + _initializeBridgehub(); + + address randomCaller = makeAddr("RANDOM_CALLER"); + mockChainId = bound(mockChainId, 1, type(uint48).max); + + vm.assume(mockFactoryDeps.length <= MAX_NEW_FACTORY_DEPS); + vm.assume(mockMintValue > 0); + + L2TransactionRequestDirect memory l2TxnReqDirect = _createMockL2TransactionRequestDirect({ + mockChainId: mockChainId, + mockMintValue: mockMintValue, + mockL2Contract: mockL2Contract, + mockL2Value: mockL2Value, + mockL2Calldata: mockL2Calldata, + mockL2GasLimit: mockL2GasLimit, + mockL2GasPerPubdataByteLimit: mockL2GasPerPubdataByteLimit, + mockFactoryDeps: mockFactoryDeps, + mockRefundRecipient: address(0) + }); + + l2TxnReqDirect.chainId = _setUpZKChainForChainId(l2TxnReqDirect.chainId); + + _setUpBaseTokenForChainId(l2TxnReqDirect.chainId, false, address(testToken)); + + assertTrue(bridgeHub.getZKChain(l2TxnReqDirect.chainId) == address(mockChainContract)); + bytes32 canonicalHash = keccak256(abi.encode("CANONICAL_TX_HASH")); + + vm.mockCall( + address(mockChainContract), + abi.encodeWithSelector(mockChainContract.bridgehubRequestL2Transaction.selector), + abi.encode(canonicalHash) + ); + + mockChainContract.setFeeParams(); + mockChainContract.setBaseTokenGasMultiplierPrice(uint128(1), uint128(1)); + mockChainContract.setBridgeHubAddress(address(bridgeHub)); + assertTrue(mockChainContract.getBridgeHubAddress() == address(bridgeHub)); + + gasPrice = bound(gasPrice, 1_000, 50_000_000); + vm.txGasPrice(gasPrice * 1 gwei); + + vm.deal(randomCaller, 1 ether); + vm.prank(randomCaller); + vm.expectRevert(abi.encodeWithSelector(MsgValueMismatch.selector, 0, randomCaller.balance)); + bytes32 resultantHash = bridgeHub.requestL2TransactionDirect{value: randomCaller.balance}(l2TxnReqDirect); + + // Now, let's call the same function with zero msg.value + testToken.mint(randomCaller, l2TxnReqDirect.mintValue); + assertEq(testToken.balanceOf(randomCaller), l2TxnReqDirect.mintValue); + + vm.prank(randomCaller); + testToken.transfer(address(this), l2TxnReqDirect.mintValue); + assertEq(testToken.balanceOf(address(this)), l2TxnReqDirect.mintValue); + testToken.approve(sharedBridgeAddress, l2TxnReqDirect.mintValue); + + resultantHash = bridgeHub.requestL2TransactionDirect(l2TxnReqDirect); + + assertEq(canonicalHash, resultantHash); + } + + function test_requestTransactionTwoBridgesChecksMagicValue( + uint256 chainId, + uint256 mintValue, + uint256 l2Value, + uint256 l2GasLimit, + uint256 l2GasPerPubdataByteLimit, + address refundRecipient, + uint256 secondBridgeValue, + bytes memory secondBridgeCalldata, + bytes32 magicValue + ) public { + _useMockSharedBridge(); + _initializeBridgehub(); + + vm.assume(magicValue != TWO_BRIDGES_MAGIC_VALUE); + + chainId = bound(chainId, 1, type(uint48).max); + + L2TransactionRequestTwoBridgesOuter memory l2TxnReq2BridgeOut = _createMockL2TransactionRequestTwoBridgesOuter({ + chainId: chainId, + mintValue: mintValue, + l2Value: l2Value, + l2GasLimit: l2GasLimit, + l2GasPerPubdataByteLimit: l2GasPerPubdataByteLimit, + refundRecipient: refundRecipient, + secondBridgeValue: secondBridgeValue, + secondBridgeCalldata: secondBridgeCalldata + }); + + l2TxnReq2BridgeOut.chainId = _setUpZKChainForChainId(l2TxnReq2BridgeOut.chainId); + + _setUpBaseTokenForChainId(l2TxnReq2BridgeOut.chainId, true, address(0)); + assertTrue(bridgeHub.baseToken(l2TxnReq2BridgeOut.chainId) == ETH_TOKEN_ADDRESS); + + assertTrue(bridgeHub.getZKChain(l2TxnReq2BridgeOut.chainId) == address(mockChainContract)); + + uint256 callerMsgValue = l2TxnReq2BridgeOut.mintValue + l2TxnReq2BridgeOut.secondBridgeValue; + address randomCaller = makeAddr("RANDOM_CALLER"); + vm.deal(randomCaller, callerMsgValue); + + L2TransactionRequestTwoBridgesInner memory request = L2TransactionRequestTwoBridgesInner({ + magicValue: magicValue, + l2Contract: makeAddr("L2_CONTRACT"), + l2Calldata: new bytes(0), + factoryDeps: new bytes[](0), + txDataHash: bytes32(0) + }); + + vm.mockCall( + secondBridgeAddress, + abi.encodeWithSelector(IL1AssetRouter.bridgehubDeposit.selector), + abi.encode(request) + ); + + vm.expectRevert(abi.encodeWithSelector(WrongMagicValue.selector, TWO_BRIDGES_MAGIC_VALUE, magicValue)); + vm.prank(randomCaller); + bridgeHub.requestL2TransactionTwoBridges{value: randomCaller.balance}(l2TxnReq2BridgeOut); + } + + function test_requestL2TransactionTwoBridgesWrongBridgeAddress( + uint256 chainId, + uint256 mintValue, + uint256 msgValue, + uint256 l2Value, + uint256 l2GasLimit, + uint256 l2GasPerPubdataByteLimit, + address refundRecipient, + uint256 secondBridgeValue, + uint160 secondBridgeAddressValue, + bytes memory secondBridgeCalldata + ) public { + _useMockSharedBridge(); + _initializeBridgehub(); + + chainId = bound(chainId, 1, type(uint48).max); + + L2TransactionRequestTwoBridgesOuter memory l2TxnReq2BridgeOut = _createMockL2TransactionRequestTwoBridgesOuter({ + chainId: chainId, + mintValue: mintValue, + l2Value: l2Value, + l2GasLimit: l2GasLimit, + l2GasPerPubdataByteLimit: l2GasPerPubdataByteLimit, + refundRecipient: refundRecipient, + secondBridgeValue: secondBridgeValue, + secondBridgeCalldata: secondBridgeCalldata + }); + + l2TxnReq2BridgeOut.chainId = _setUpZKChainForChainId(l2TxnReq2BridgeOut.chainId); + + _setUpBaseTokenForChainId(l2TxnReq2BridgeOut.chainId, true, address(0)); + assertTrue(bridgeHub.baseToken(l2TxnReq2BridgeOut.chainId) == ETH_TOKEN_ADDRESS); + + assertTrue(bridgeHub.getZKChain(l2TxnReq2BridgeOut.chainId) == address(mockChainContract)); + + uint256 callerMsgValue = l2TxnReq2BridgeOut.mintValue + l2TxnReq2BridgeOut.secondBridgeValue; + address randomCaller = makeAddr("RANDOM_CALLER"); + vm.deal(randomCaller, callerMsgValue); + + mockChainContract.setBridgeHubAddress(address(bridgeHub)); + + bytes32 canonicalHash = keccak256(abi.encode("CANONICAL_TX_HASH")); + + vm.mockCall( + address(mockChainContract), + abi.encodeWithSelector(mockChainContract.bridgehubRequestL2Transaction.selector), + abi.encode(canonicalHash) + ); + + L2TransactionRequestTwoBridgesInner memory outputRequest = L2TransactionRequestTwoBridgesInner({ + magicValue: TWO_BRIDGES_MAGIC_VALUE, + l2Contract: address(0), + l2Calldata: abi.encode(""), + factoryDeps: new bytes[](0), + txDataHash: bytes32("") + }); + secondBridgeAddressValue = uint160(bound(uint256(secondBridgeAddressValue), 0, uint256(type(uint16).max))); + address secondBridgeAddress = address(secondBridgeAddressValue); + + vm.mockCall( + address(secondBridgeAddressValue), + l2TxnReq2BridgeOut.secondBridgeValue, + abi.encodeWithSelector( + IL1AssetRouter.bridgehubDeposit.selector, + l2TxnReq2BridgeOut.chainId, + randomCaller, + l2TxnReq2BridgeOut.l2Value, + l2TxnReq2BridgeOut.secondBridgeCalldata + ), + abi.encode(outputRequest) + ); + + l2TxnReq2BridgeOut.secondBridgeAddress = address(secondBridgeAddressValue); + vm.expectRevert(abi.encodeWithSelector(AddressTooLow.selector, secondBridgeAddress)); + vm.prank(randomCaller); + bridgeHub.requestL2TransactionTwoBridges{value: randomCaller.balance}(l2TxnReq2BridgeOut); + } + + function test_requestL2TransactionTwoBridges_ERC20ToNonBase( + uint256 chainId, + uint256 mintValue, + uint256 l2Value, + uint256 l2GasLimit, + uint256 l2GasPerPubdataByteLimit, + address l2Receiver, + uint256 randomValue + ) public useRandomToken(randomValue) { + _useFullSharedBridge(); + _initializeBridgehub(); + vm.assume(mintValue > 0); + + // create another token, to avoid base token + TestnetERC20Token erc20Token = new TestnetERC20Token("ZKESTT", "ZkSync ERC Test Token", 18); + address erc20TokenAddress = address(erc20Token); + l2Value = bound(l2Value, 1, type(uint256).max); + bytes memory secondBridgeCalldata = abi.encode(erc20TokenAddress, l2Value, l2Receiver); + + chainId = _setUpZKChainForChainId(chainId); + + L2TransactionRequestTwoBridgesOuter memory l2TxnReq2BridgeOut = _createMockL2TransactionRequestTwoBridgesOuter({ + chainId: chainId, + mintValue: mintValue, + l2Value: 0, // not used + l2GasLimit: l2GasLimit, + l2GasPerPubdataByteLimit: l2GasPerPubdataByteLimit, + refundRecipient: address(0), + secondBridgeValue: 0, // not used cause we are using ERC20 + secondBridgeCalldata: secondBridgeCalldata + }); + + address randomCaller = makeAddr("RANDOM_CALLER"); + bytes32 canonicalHash = keccak256(abi.encode("CANONICAL_TX_HASH")); + + _setUpBaseTokenForChainId(l2TxnReq2BridgeOut.chainId, false, address(testToken)); + assertTrue(bridgeHub.baseToken(l2TxnReq2BridgeOut.chainId) == address(testToken)); + assertTrue(bridgeHub.getZKChain(l2TxnReq2BridgeOut.chainId) == address(mockChainContract)); + mockChainContract.setBridgeHubAddress(address(bridgeHub)); + + vm.mockCall( + address(mockChainContract), + abi.encodeWithSelector(mockChainContract.bridgehubRequestL2Transaction.selector), + abi.encode(canonicalHash) + ); + + testToken.mint(randomCaller, l2TxnReq2BridgeOut.mintValue); + erc20Token.mint(randomCaller, l2Value); + + assertEq(testToken.balanceOf(randomCaller), l2TxnReq2BridgeOut.mintValue); + assertEq(erc20Token.balanceOf(randomCaller), l2Value); + + vm.startPrank(randomCaller); + testToken.approve(sharedBridgeAddress, l2TxnReq2BridgeOut.mintValue); + erc20Token.approve(secondBridgeAddress, l2Value); + vm.stopPrank(); + vm.prank(randomCaller); + bytes32 resultHash = bridgeHub.requestL2TransactionTwoBridges(l2TxnReq2BridgeOut); + assertEq(resultHash, canonicalHash); + + assertEq(erc20Token.balanceOf(randomCaller), 0); + assertEq(testToken.balanceOf(randomCaller), 0); + assertEq(erc20Token.balanceOf(address(ntv)), l2Value); + assertEq(testToken.balanceOf(address(ntv)), l2TxnReq2BridgeOut.mintValue); + + l2TxnReq2BridgeOut.secondBridgeValue = 1; + testToken.mint(randomCaller, l2TxnReq2BridgeOut.mintValue); + vm.startPrank(randomCaller); + testToken.approve(sharedBridgeAddress, l2TxnReq2BridgeOut.mintValue); + vm.expectRevert(abi.encodeWithSelector(MsgValueMismatch.selector, l2TxnReq2BridgeOut.secondBridgeValue, 0)); + bridgeHub.requestL2TransactionTwoBridges(l2TxnReq2BridgeOut); + vm.stopPrank(); + } + + function test_requestL2TransactionTwoBridges_ETHToNonBase( + uint256 chainId, + uint256 mintValue, + uint256 msgValue, + uint256 l2Value, + uint256 l2GasLimit, + uint256 l2GasPerPubdataByteLimit, + address refundRecipient, + uint256 secondBridgeValue, + address l2Receiver, + uint256 randomValue + ) public useRandomToken(randomValue) { + _useFullSharedBridge(); + _initializeBridgehub(); + vm.assume(mintValue > 0); + + secondBridgeValue = bound(secondBridgeValue, 1, type(uint256).max); + bytes memory secondBridgeCalldata = abi.encode(ETH_TOKEN_ADDRESS, 0, l2Receiver); + + chainId = _setUpZKChainForChainId(chainId); + + L2TransactionRequestTwoBridgesOuter memory l2TxnReq2BridgeOut = _createMockL2TransactionRequestTwoBridgesOuter({ + chainId: chainId, + mintValue: mintValue, + l2Value: l2Value, + l2GasLimit: l2GasLimit, + l2GasPerPubdataByteLimit: l2GasPerPubdataByteLimit, + refundRecipient: refundRecipient, + secondBridgeValue: secondBridgeValue, + secondBridgeCalldata: secondBridgeCalldata + }); + + _setUpBaseTokenForChainId(l2TxnReq2BridgeOut.chainId, false, address(testToken)); + assertTrue(bridgeHub.baseToken(l2TxnReq2BridgeOut.chainId) == address(testToken)); + assertTrue(bridgeHub.getZKChain(l2TxnReq2BridgeOut.chainId) == address(mockChainContract)); + + address randomCaller = makeAddr("RANDOM_CALLER"); + + mockChainContract.setBridgeHubAddress(address(bridgeHub)); + + { + bytes32 canonicalHash = keccak256(abi.encode("CANONICAL_TX_HASH")); + + vm.mockCall( + address(mockChainContract), + abi.encodeWithSelector(mockChainContract.bridgehubRequestL2Transaction.selector), + abi.encode(canonicalHash) + ); + } + + if (msgValue != secondBridgeValue) { + vm.deal(randomCaller, msgValue); + vm.expectRevert( + abi.encodeWithSelector(MsgValueMismatch.selector, l2TxnReq2BridgeOut.secondBridgeValue, msgValue) + ); + vm.prank(randomCaller); + bridgeHub.requestL2TransactionTwoBridges{value: msgValue}(l2TxnReq2BridgeOut); + } + + testToken.mint(randomCaller, l2TxnReq2BridgeOut.mintValue); + assertEq(testToken.balanceOf(randomCaller), l2TxnReq2BridgeOut.mintValue); + vm.prank(randomCaller); + testToken.approve(sharedBridgeAddress, l2TxnReq2BridgeOut.mintValue); + + vm.deal(randomCaller, l2TxnReq2BridgeOut.secondBridgeValue); + vm.prank(randomCaller); + bridgeHub.requestL2TransactionTwoBridges{value: randomCaller.balance}(l2TxnReq2BridgeOut); + } ///////////////////////////////////////////////////////// // INTERNAL UTILITY FUNCTIONS @@ -1514,8 +1580,11 @@ contract ExperimentalBridgeTest is Test { function _setUpZKChainForChainId(uint256 mockChainId) internal returns (uint256 mockChainIdInRange) { mockChainId = bound(mockChainId, 1, type(uint48).max); mockChainIdInRange = mockChainId; - vm.prank(bridgeOwner); - bridgeHub.addChainTypeManager(address(mockCTM)); + + if (!bridgeHub.chainTypeManagerIsRegistered(address(mockCTM))) { + vm.prank(bridgeOwner); + bridgeHub.addChainTypeManager(address(mockCTM)); + } // We need to set the chainTypeManager of the mockChainId to mockCTM // There is no function to do that in the bridgeHub @@ -1527,29 +1596,18 @@ contract ExperimentalBridgeTest is Test { } function _setUpBaseTokenForChainId(uint256 mockChainId, bool tokenIsETH, address token) internal { - address baseToken = tokenIsETH ? ETH_TOKEN_ADDRESS : token; - - stdstore.target(address(bridgeHub)).sig("baseToken(uint256)").with_key(mockChainId).checked_write(baseToken); - } - - // function _setUpSharedBridge() internal { - // vm.prank(bridgeOwner); - // bridgeHub.setSharedBridge(sharedBridgeAddress); - // } - - // function _setUpSharedBridgeL2(uint256 _chainId) internal { - // _chainId = bound(_chainId, 1, type(uint48).max); - - // vm.prank(bridgeOwner); - // sharedBridge.initializeChainGovernance(_chainId, mockL2Contract); - - // assertEq(sharedBridge.l2BridgeAddress(_chainId), mockL2Contract); + if (tokenIsETH) { + token = ETH_TOKEN_ADDRESS; + } else { + ntv.registerToken(token); + } - // vm.prank(bridgeOwner); - // secondBridge.initializeChainGovernance(_chainId, mockL2Contract); + bytes32 baseTokenAssetId = DataEncoding.encodeNTVAssetId(block.chainid, token); - // assertEq(secondBridge.l2BridgeAddress(_chainId), mockL2Contract); - // } + stdstore.target(address(bridgeHub)).sig("baseTokenAssetId(uint256)").with_key(mockChainId).checked_write( + baseTokenAssetId + ); + } function _createMockL2TransactionRequestDirect( uint256 mockChainId, diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol index 07fcf97f9..07945c886 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol @@ -174,7 +174,7 @@ contract L1AssetRouterTest is Test { sharedBridge.setNativeTokenVault(INativeTokenVault(address(nativeTokenVault))); vm.prank(address(nativeTokenVault)); nativeTokenVault.registerToken(address(token)); - // nativeTokenVault.registerToken(ETH_TOKEN_ADDRESS); + nativeTokenVault.registerEthToken(); vm.store( address(sharedBridge), diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Executor/Committing.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Executor/Committing.t.sol index 8ba961ed2..5c2d5b65a 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Executor/Committing.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Executor/Committing.t.sol @@ -211,25 +211,27 @@ contract CommittingTest is ExecutorTest { executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } - // function test_RevertWhen_CommittingWithoutProcessingSystemContextLog() public { - // bytes[] memory wrongL2Logs = Utils.createSystemLogs(l2DAValidatorOutputHash); - // delete wrongL2Logs[uint256(uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY))]; + function test_RevertWhen_CommittingWithoutProcessingSystemContextLog() public { + bytes[] memory wrongL2Logs = Utils.createSystemLogs(l2DAValidatorOutputHash); + delete wrongL2Logs[uint256(uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY))]; - // IExecutor.CommitBatchInfo memory wrongNewCommitBatchInfo = newCommitBatchInfo; - // wrongNewCommitBatchInfo.systemLogs = Utils.encodePacked(wrongL2Logs); - // wrongNewCommitBatchInfo.operatorDAInput = operatorDAInput; + IExecutor.CommitBatchInfo memory wrongNewCommitBatchInfo = newCommitBatchInfo; + wrongNewCommitBatchInfo.systemLogs = Utils.encodePacked(wrongL2Logs); + wrongNewCommitBatchInfo.operatorDAInput = operatorDAInput; - // IExecutor.CommitBatchInfo[] memory wrongNewCommitBatchInfoArray = new IExecutor.CommitBatchInfo[](1); - // wrongNewCommitBatchInfoArray[0] = wrongNewCommitBatchInfo; + IExecutor.CommitBatchInfo[] memory wrongNewCommitBatchInfoArray = new IExecutor.CommitBatchInfo[](1); + wrongNewCommitBatchInfoArray[0] = wrongNewCommitBatchInfo; - // vm.prank(validator); - // vm.blobhashes(defaultBlobVersionedHashes); + vm.prank(validator); + vm.blobhashes(defaultBlobVersionedHashes); - // vm.expectRevert(abi.encodeWithSelector(MissingSystemLogs.selector, 8191, 8183)); - // (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = - // Utils.encodeCommitBatchesData(genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); - // executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); - // } + vm.expectRevert(abi.encodeWithSelector(MissingSystemLogs.selector, 127, 125)); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + wrongNewCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); + } function test_RevertWhen_CommittingWithProcessingSystemContextLogTwice() public { bytes[] memory l2Logs = Utils.createSystemLogs(l2DAValidatorOutputHash); @@ -408,27 +410,28 @@ contract CommittingTest is ExecutorTest { } } - // FIXME: uncomment when old logs are removed - // function test_RevertWhen_SystemLogIsMissing() public { - // for (uint256 i = 0; i < 7; i++) { - // bytes[] memory l2Logs = Utils.createSystemLogs(); - // delete l2Logs[i]; + function test_RevertWhen_SystemLogIsMissing() public { + for (uint256 i = 0; i < 7; i++) { + bytes[] memory l2Logs = Utils.createSystemLogs(l2DAValidatorOutputHash); + delete l2Logs[i]; - // IExecutor.CommitBatchInfo memory wrongNewCommitBatchInfo = newCommitBatchInfo; - // wrongNewCommitBatchInfo.systemLogs = Utils.encodePacked(l2Logs); + IExecutor.CommitBatchInfo memory wrongNewCommitBatchInfo = newCommitBatchInfo; + wrongNewCommitBatchInfo.systemLogs = Utils.encodePacked(l2Logs); - // IExecutor.CommitBatchInfo[] memory wrongNewCommitBatchInfoArray = new IExecutor.CommitBatchInfo[](1); - // wrongNewCommitBatchInfoArray[0] = wrongNewCommitBatchInfo; + IExecutor.CommitBatchInfo[] memory wrongNewCommitBatchInfoArray = new IExecutor.CommitBatchInfo[](1); + wrongNewCommitBatchInfoArray[0] = wrongNewCommitBatchInfo; - // vm.prank(validator); + vm.prank(validator); - // uint256 allLogsProcessed = uint256(8191); - // vm.expectRevert(abi.encodeWithSelector(MissingSystemLogs.selector, 8191, allLogsProcessed ^ (1 << i))); - // (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = - // Utils.encodeCommitBatchesData(genesisStoredBatchInfo, wrongNewCommitBatchInfoArray); - // executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); - // } - // } + uint256 allLogsProcessed = uint256(127); + vm.expectRevert(abi.encodeWithSelector(MissingSystemLogs.selector, 127, allLogsProcessed ^ (1 << i))); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + wrongNewCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); + } + } function test_SuccessfullyCommitBatch() public { bytes32 uncompressedStateDiffHash = Utils.randomBytes32("uncompressedStateDiffHash"); @@ -635,69 +638,73 @@ contract CommittingTest is ExecutorTest { executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); } - // function test_RevertWhen_EmptyPubdataCommitments() public { - // bytes memory operatorDAInput = "\x01"; - - // bytes[] memory correctL2Logs = Utils.createSystemLogs(l2DAValidatorOutputHash); - // correctL2Logs[uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY)] = Utils.constructL2Log( - // true, - // L2_SYSTEM_CONTEXT_ADDRESS, - // uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY), - // Utils.packBatchTimestampAndBlockTimestamp(currentTimestamp, currentTimestamp) - // ); - - // IExecutor.CommitBatchInfo memory correctNewCommitBatchInfo = newCommitBatchInfo; - // correctNewCommitBatchInfo.systemLogs = Utils.encodePacked(correctL2Logs); - - // IExecutor.CommitBatchInfo[] memory correctCommitBatchInfoArray = new IExecutor.CommitBatchInfo[](1); - // correctCommitBatchInfoArray[0] = correctNewCommitBatchInfo; - // correctCommitBatchInfoArray[0].operatorDAInput = operatorDAInput; - - // vm.prank(validator); - - // vm.expectRevert(PubdataCommitmentsEmpty.selector); - // (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = - // Utils.encodeCommitBatchesData(genesisStoredBatchInfo, correctCommitBatchInfoArray); - // executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); - // } - - // function test_RevertWhen_PartialPubdataCommitment() public { - // bytes[] memory correctL2Logs = Utils.createSystemLogs(l2DAValidatorOutputHash); - // correctL2Logs[uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY)] = Utils.constructL2Log( - // true, - // L2_SYSTEM_CONTEXT_ADDRESS, - // uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY), - // Utils.packBatchTimestampAndBlockTimestamp(currentTimestamp, currentTimestamp) - // ); - - // IExecutor.CommitBatchInfo memory correctNewCommitBatchInfo = newCommitBatchInfo; - // correctNewCommitBatchInfo.systemLogs = Utils.encodePacked(correctL2Logs); - // correctNewCommitBatchInfo.operatorDAInput = operatorDAInput; - - // bytes32[] memory blobsLinearHashes = new bytes32[](1); - // blobsLinearHashes[0] = Utils.randomBytes32("blobsLinearHashes"); - - // bytes memory daInput = abi.encodePacked( - // Utils.randomBytes32("uncompressedStateDiffHash"), - // Utils.randomBytes32("totalL2PubdataHash"), - // uint8(1), - // blobsLinearHashes, - // bytes1(0x01), - // bytes("") - // ); - - // IExecutor.CommitBatchInfo[] memory correctCommitBatchInfoArray = new IExecutor.CommitBatchInfo[](1); - // correctCommitBatchInfoArray[0] = correctNewCommitBatchInfo; - // correctCommitBatchInfoArray[0].operatorDAInput = daInput; - - // vm.prank(validator); - // vm.blobhashes(defaultBlobVersionedHashes); - - // vm.expectRevert(InvalidPubdataCommitmentsSize.selector); - // (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = - // Utils.encodeCommitBatchesData(genesisStoredBatchInfo, correctCommitBatchInfoArray); - // executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); - // } + function test_RevertWhen_EmptyPubdataCommitments() public { + bytes memory operatorDAInput = "\x01"; + + bytes[] memory correctL2Logs = Utils.createSystemLogs(l2DAValidatorOutputHash); + correctL2Logs[uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY)] = Utils.constructL2Log( + true, + L2_SYSTEM_CONTEXT_ADDRESS, + uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY), + Utils.packBatchTimestampAndBlockTimestamp(currentTimestamp, currentTimestamp) + ); + + IExecutor.CommitBatchInfo memory correctNewCommitBatchInfo = newCommitBatchInfo; + correctNewCommitBatchInfo.systemLogs = Utils.encodePacked(correctL2Logs); + + IExecutor.CommitBatchInfo[] memory correctCommitBatchInfoArray = new IExecutor.CommitBatchInfo[](1); + correctCommitBatchInfoArray[0] = correctNewCommitBatchInfo; + correctCommitBatchInfoArray[0].operatorDAInput = operatorDAInput; + + vm.prank(validator); + + vm.expectRevert("too small"); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + correctCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); + } + + function test_RevertWhen_PartialPubdataCommitment() public { + bytes[] memory correctL2Logs = Utils.createSystemLogs(l2DAValidatorOutputHash); + correctL2Logs[uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY)] = Utils.constructL2Log( + true, + L2_SYSTEM_CONTEXT_ADDRESS, + uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY), + Utils.packBatchTimestampAndBlockTimestamp(currentTimestamp, currentTimestamp) + ); + + IExecutor.CommitBatchInfo memory correctNewCommitBatchInfo = newCommitBatchInfo; + correctNewCommitBatchInfo.systemLogs = Utils.encodePacked(correctL2Logs); + correctNewCommitBatchInfo.operatorDAInput = operatorDAInput; + + bytes32[] memory blobsLinearHashes = new bytes32[](1); + blobsLinearHashes[0] = Utils.randomBytes32("blobsLinearHashes"); + + bytes memory daInput = abi.encodePacked( + Utils.randomBytes32("uncompressedStateDiffHash"), + Utils.randomBytes32("totalL2PubdataHash"), + uint8(1), + blobsLinearHashes, + bytes1(0x01), + bytes("") + ); + + IExecutor.CommitBatchInfo[] memory correctCommitBatchInfoArray = new IExecutor.CommitBatchInfo[](1); + correctCommitBatchInfoArray[0] = correctNewCommitBatchInfo; + correctCommitBatchInfoArray[0].operatorDAInput = daInput; + + vm.prank(validator); + vm.blobhashes(defaultBlobVersionedHashes); + + vm.expectRevert(InvalidPubdataCommitmentsSize.selector); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + correctCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); + } function test_RevertWhen_TooManyPubdataCommitments() public { bytes32[] memory blobsLinearHashes = new bytes32[](1); @@ -836,110 +843,116 @@ contract CommittingTest is ExecutorTest { vm.clearMockedCalls(); } - // function test_RevertWhen_SecondBlobLinearHashZeroWithCommitment() public { - // bytes32 uncompressedStateDiffHash = Utils.randomBytes32("uncompressedStateDiffHash"); - // bytes32 totalL2PubdataHash = Utils.randomBytes32("totalL2PubdataHash"); - // uint8 numberOfBlobs = 2; - // bytes32[] memory blobsLinearHashes = new bytes32[](2); - // blobsLinearHashes[0] = Utils.randomBytes32("blobsLinearHashes1"); - // blobsLinearHashes[1] = bytes32(0); - - // bytes memory operatorDAInput = abi.encodePacked( - // uncompressedStateDiffHash, - // totalL2PubdataHash, - // numberOfBlobs, - // blobsLinearHashes, - // bytes1(0x01), - // defaultBlobCommitment, - // EMPTY_PREPUBLISHED_COMMITMENT, - // defaultBlobCommitment, - // EMPTY_PREPUBLISHED_COMMITMENT - // ); - - // bytes32[] memory blobVersionedHashes = new bytes32[](2); - // blobVersionedHashes[0] = defaultBlobVersionedHashes[0]; - // blobVersionedHashes[1] = defaultBlobVersionedHashes[0]; - - // bytes32 outputHash = Utils.constructRollupL2DAValidatorOutputHash( - // uncompressedStateDiffHash, - // totalL2PubdataHash, - // uint8(numberOfBlobs), - // blobsLinearHashes - // ); - - // bytes[] memory correctL2Logs = Utils.createSystemLogs(outputHash); - // correctL2Logs[uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY)] = Utils.constructL2Log( - // true, - // L2_SYSTEM_CONTEXT_ADDRESS, - // uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY), - // Utils.packBatchTimestampAndBlockTimestamp(currentTimestamp, currentTimestamp) - // ); - - // IExecutor.CommitBatchInfo memory correctNewCommitBatchInfo = newCommitBatchInfo; - // correctNewCommitBatchInfo.systemLogs = Utils.encodePacked(correctL2Logs); - - // IExecutor.CommitBatchInfo[] memory correctCommitBatchInfoArray = new IExecutor.CommitBatchInfo[](1); - // correctCommitBatchInfoArray[0] = correctNewCommitBatchInfo; - // correctCommitBatchInfoArray[0].operatorDAInput = operatorDAInput; - - // vm.prank(validator); - - // vm.expectRevert(abi.encodeWithSelector(BlobHashCommitmentError.selector, uint256(1), true, false)); - // (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = - // Utils.encodeCommitBatchesData(genesisStoredBatchInfo, correctCommitBatchInfoArray); - // executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); - // } - - // function test_RevertWhen_SecondBlobLinearHashNotZeroWithEmptyCommitment() public { - // bytes - // memory pubdataCommitment = "\x01\xf4\x3d\x53\x8d\x91\xd4\x77\xb0\xf8\xf7\x7e\x19\x52\x48\x7f\x00\xb8\xdf\x41\xda\x90\x5c\x08\x75\xc5\xc9\x9b\xa1\x92\x26\x84\x0d\x0d\x0a\x25\x26\xee\x22\xc7\x96\x60\x65\x7c\xbe\x01\x95\x33\x5b\x44\x69\xbd\x92\x94\x6f\x7f\x74\xae\xc5\xce\xef\x31\xf4\x32\x53\xd4\x08\x96\x72\x65\xfa\x85\x5a\xc8\xa0\x0a\x19\x52\x93\x6e\x0f\xe9\x97\x01\xc0\xa4\x32\xa1\x32\x2c\x45\x67\x24\xf7\xad\xd8\xa5\xb4\x7a\x51\xda\x52\x17\x06\x06\x95\x34\x61\xab\xd7\x5b\x91\x49\xc7\xc7\x91\xf4\x07\xfd\xbc\xf8\x39\x53\x2c\xb1\x08\xe8\xa5\x00\x64\x40\xcf\x21\xbf\x68\x87\x20\x5a\xcf\x44\x3b\x66\x3a\x57\xf2"; - // bytes32 versionedHash1 = 0xf39a869f62e75cf5f0bf914688a6b289caf2049435d8e68c5c5e6d05e44913f3; - - // vm.mockCall(blobVersionedHashRetriever, abi.encode(uint256(0)), abi.encode(versionedHash1)); - - // vm.mockCall(blobVersionedHashRetriever, abi.encode(uint256(1)), abi.encode(bytes32(0))); - - // vm.mockCall( - // POINT_EVALUATION_PRECOMPILE_ADDR, - // "\xf3\x9a\x86\x9f\x62\xe7\x5c\xf5\xf0\xbf\x91\x46\x88\xa6\xb2\x89\xca\xf2\x04\x94\x35\xd8\xe6\x8c\x5c\x5e\x6d\x05\xe4\x49\x13\xf3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf4\x3d\x53\x8d\x91\xd4\x77\xb0\xf8\xf7\x7e\x19\x52\x48\x7f\x00\xb8\xdf\x41\xda\x90\x5c\x08\x75\xc5\xc9\x9b\xa1\x92\x26\x84\x0d\x0d\x0a\x25\x26\xee\x22\xc7\x96\x60\x65\x7c\xbe\x01\x95\x33\x5b\x44\x69\xbd\x92\x94\x6f\x7f\x74\xae\xc5\xce\xef\x31\xf4\x32\x53\xd4\x08\x96\x72\x65\xfa\x85\x5a\xc8\xa0\x0a\x19\x52\x93\x6e\x0f\xe9\x97\x01\xc0\xa4\x32\xa1\x32\x2c\x45\x67\x24\xf7\xad\xd8\xa5\xb4\x7a\x51\xda\x52\x17\x06\x06\x95\x34\x61\xab\xd7\x5b\x91\x49\xc7\xc7\x91\xf4\x07\xfd\xbc\xf8\x39\x53\x2c\xb1\x08\xe8\xa5\x00\x64\x40\xcf\x21\xbf\x68\x87\x20\x5a\xcf\x44\x3b\x66\x3a\x57\xf2", - // "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x73\xed\xa7\x53\x29\x9d\x7d\x48\x33\x39\xd8\x08\x09\xa1\xd8\x05\x53\xbd\xa4\x02\xff\xfe\x5b\xfe\xff\xff\xff\xff\x00\x00\x00\x01" - // ); - - // bytes[] memory correctL2Logs = Utils.createSystemLogs(); - // correctL2Logs[uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY)] = Utils.constructL2Log( - // true, - // L2_SYSTEM_CONTEXT_ADDRESS, - // uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY), - // Utils.packBatchTimestampAndBlockTimestamp(currentTimestamp, currentTimestamp) - // ); - - // correctL2Logs[uint256(SystemLogKey.BLOB_ONE_HASH_KEY)] = Utils.constructL2Log( - // true, - // L2_PUBDATA_CHUNK_PUBLISHER_ADDR, - // uint256(SystemLogKey.BLOB_ONE_HASH_KEY), - // versionedHash1 - // ); - - // correctL2Logs[uint256(SystemLogKey.BLOB_TWO_HASH_KEY)] = Utils.constructL2Log( - // true, - // L2_PUBDATA_CHUNK_PUBLISHER_ADDR, - // uint256(SystemLogKey.BLOB_TWO_HASH_KEY), - // versionedHash1 - // ); - - // IExecutor.CommitBatchInfo memory correctNewCommitBatchInfo = newCommitBatchInfo; - // correctNewCommitBatchInfo.systemLogs = Utils.encodePacked(correctL2Logs); - - // IExecutor.CommitBatchInfo[] memory correctCommitBatchInfoArray = new IExecutor.CommitBatchInfo[](1); - // correctCommitBatchInfoArray[0] = correctNewCommitBatchInfo; - // correctCommitBatchInfoArray[0].pubdataCommitments = pubdataCommitment; - - // vm.prank(validator); - // vm.blobhashes(blobVersionedHashes); - - // vm.expectRevert(abi.encodeWithSelector(BlobHashCommitmentError.selector, uint256(1), false, true)); - // executor.commitBatches(genesisStoredBatchInfo, correctCommitBatchInfoArray); - - // vm.clearMockedCalls(); - // } + function test_RevertWhen_SecondBlobLinearHashZeroWithCommitment() public { + bytes32 uncompressedStateDiffHash = Utils.randomBytes32("uncompressedStateDiffHash"); + bytes32 totalL2PubdataHash = Utils.randomBytes32("totalL2PubdataHash"); + uint8 numberOfBlobs = 2; + bytes32[] memory blobsLinearHashes = new bytes32[](2); + blobsLinearHashes[0] = Utils.randomBytes32("blobsLinearHashes1"); + blobsLinearHashes[1] = bytes32(0); + + bytes memory operatorDAInput = abi.encodePacked( + uncompressedStateDiffHash, + totalL2PubdataHash, + numberOfBlobs, + blobsLinearHashes, + bytes1(0x01), + defaultBlobCommitment, + EMPTY_PREPUBLISHED_COMMITMENT, + defaultBlobCommitment, + EMPTY_PREPUBLISHED_COMMITMENT + ); + + bytes32[] memory blobVersionedHashes = new bytes32[](2); + blobVersionedHashes[0] = defaultBlobVersionedHashes[0]; + blobVersionedHashes[1] = defaultBlobVersionedHashes[0]; + + bytes32 outputHash = Utils.constructRollupL2DAValidatorOutputHash( + uncompressedStateDiffHash, + totalL2PubdataHash, + uint8(numberOfBlobs), + blobsLinearHashes + ); + + bytes[] memory correctL2Logs = Utils.createSystemLogs(outputHash); + correctL2Logs[uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY)] = Utils.constructL2Log( + true, + L2_SYSTEM_CONTEXT_ADDRESS, + uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY), + Utils.packBatchTimestampAndBlockTimestamp(currentTimestamp, currentTimestamp) + ); + + IExecutor.CommitBatchInfo memory correctNewCommitBatchInfo = newCommitBatchInfo; + correctNewCommitBatchInfo.systemLogs = Utils.encodePacked(correctL2Logs); + + IExecutor.CommitBatchInfo[] memory correctCommitBatchInfoArray = new IExecutor.CommitBatchInfo[](1); + correctCommitBatchInfoArray[0] = correctNewCommitBatchInfo; + correctCommitBatchInfoArray[0].operatorDAInput = operatorDAInput; + + vm.blobhashes(blobVersionedHashes); + vm.prank(validator); + + vm.expectRevert(abi.encodeWithSelector(BlobHashCommitmentError.selector, uint256(1), true, false)); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + correctCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); + } + + function test_RevertWhen_SecondBlobLinearHashNotZeroWithEmptyCommitment() public { + bytes32 uncompressedStateDiffHash = Utils.randomBytes32("uncompressedStateDiffHash"); + bytes32 totalL2PubdataHash = Utils.randomBytes32("totalL2PubdataHash"); + uint8 numberOfBlobs = 2; + bytes32[] memory blobsLinearHashes = new bytes32[](2); + blobsLinearHashes[0] = Utils.randomBytes32("blobsLinearHashes1"); + blobsLinearHashes[1] = Utils.randomBytes32("blobsLinearHashes2"); + + bytes memory operatorDAInput = abi.encodePacked( + uncompressedStateDiffHash, + totalL2PubdataHash, + numberOfBlobs, + blobsLinearHashes, + bytes1(0x01), + defaultBlobCommitment, + EMPTY_PREPUBLISHED_COMMITMENT + ); + + bytes32[] memory blobVersionedHashes = new bytes32[](2); + blobVersionedHashes[0] = defaultBlobVersionedHashes[0]; + blobVersionedHashes[1] = defaultBlobVersionedHashes[0]; + + bytes32 outputHash = Utils.constructRollupL2DAValidatorOutputHash( + uncompressedStateDiffHash, + totalL2PubdataHash, + uint8(numberOfBlobs), + blobsLinearHashes + ); + + bytes[] memory correctL2Logs = Utils.createSystemLogs(outputHash); + correctL2Logs[uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY)] = Utils.constructL2Log( + true, + L2_SYSTEM_CONTEXT_ADDRESS, + uint256(SystemLogKey.PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY), + Utils.packBatchTimestampAndBlockTimestamp(currentTimestamp, currentTimestamp) + ); + + IExecutor.CommitBatchInfo memory correctNewCommitBatchInfo = newCommitBatchInfo; + correctNewCommitBatchInfo.systemLogs = Utils.encodePacked(correctL2Logs); + + IExecutor.CommitBatchInfo[] memory correctCommitBatchInfoArray = new IExecutor.CommitBatchInfo[](1); + correctCommitBatchInfoArray[0] = correctNewCommitBatchInfo; + correctCommitBatchInfoArray[0].operatorDAInput = operatorDAInput; + + vm.blobhashes(blobVersionedHashes); + vm.prank(validator); + + // It will just panic with array out of bounds + vm.expectRevert(); + (uint256 commitBatchFrom, uint256 commitBatchTo, bytes memory commitData) = Utils.encodeCommitBatchesData( + genesisStoredBatchInfo, + correctCommitBatchInfoArray + ); + executor.commitBatchesSharedBridge(uint256(0), commitBatchFrom, commitBatchTo, commitData); + } } diff --git a/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/IncrementalMerkle/IncrementalMerkle.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/IncrementalMerkle/IncrementalMerkle.t.sol index 9d91647c1..bb7fe7090 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/IncrementalMerkle/IncrementalMerkle.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/common/libraries/IncrementalMerkle/IncrementalMerkle.t.sol @@ -72,46 +72,4 @@ contract IncrementalMerkleTestTest is Test { merkleTest.push(elements[i]); } } - - // function testElements(uint256 i) public { - // vm.assume(i < elements.length); - // bytes32 leaf = elements[i]; - // bytes32[] memory proof = merkleTree.getProof(elements, i); - - // bytes32 rootFromContract = merkleTest.calculateRoot(proof, i, leaf); - - // assertEq(rootFromContract, root); - // } - - // function testFirstElement() public { - // testElements(0); - // } - - // function testLastElement() public { - // testElements(elements.length - 1); - // } - - // function testEmptyProof_shouldRevert() public { - // bytes32 leaf = elements[0]; - // bytes32[] memory proof; - - // vm.expectRevert(bytes("xc")); - // merkleTest.calculateRoot(proof, 0, leaf); - // } - - // function testLeafIndexTooBig_shouldRevert() public { - // bytes32 leaf = elements[0]; - // bytes32[] memory proof = merkleTree.getProof(elements, 0); - - // vm.expectRevert(bytes("px")); - // merkleTest.calculateRoot(proof, 2 ** 255, leaf); - // } - - // function testProofLengthTooLarge_shouldRevert() public { - // bytes32 leaf = elements[0]; - // bytes32[] memory proof = new bytes32[](256); - - // vm.expectRevert(bytes("bt")); - // merkleTest.calculateRoot(proof, 0, leaf); - // } } From b3564ef5bf942eff136cb40256433ad598b96656 Mon Sep 17 00:00:00 2001 From: kelemeno <34402761+kelemeno@users.noreply.github.com> Date: Tue, 10 Sep 2024 21:37:49 +0100 Subject: [PATCH 46/53] Kl/chain balance fix (#786) Co-authored-by: Raid Ateir Co-authored-by: Stanislav Bezkorovainyi --- .../contracts/bridge/BridgeHelper.sol | 27 +++-- .../contracts/bridge/BridgedStandardERC20.sol | 34 ++++-- l1-contracts/contracts/bridge/L1Nullifier.sol | 17 ++- .../contracts/bridge/L2WrappedBaseToken.sol | 4 + .../bridge/asset-router/L1AssetRouter.sol | 5 +- .../interfaces/IBridgedStandardToken.sol | 2 + .../bridge/ntv/IL1NativeTokenVault.sol | 3 + .../bridge/ntv/INativeTokenVault.sol | 15 ++- .../bridge/ntv/L1NativeTokenVault.sol | 48 ++++++-- .../bridge/ntv/L2NativeTokenVault.sol | 25 +++- .../contracts/bridge/ntv/NativeTokenVault.sol | 114 ++++++++++++------ .../contracts/bridgehub/Bridgehub.sol | 4 +- .../contracts/bridgehub/IBridgehub.sol | 2 + .../common/libraries/DataEncoding.sol | 30 +++++ .../l1/integration/AssetRouterTest.t.sol | 6 +- .../l1/integration/DeploymentTest.t.sol | 21 ++++ .../foundry/l1/integration/GatewayTests.t.sol | 2 - .../L1SharedBridge/L1SharedBridgeBase.t.sol | 15 ++- .../L1SharedBridgeHyperEnabled.t.sol | 8 +- .../L1SharedBridge/L1SharedBridgeLegacy.t.sol | 4 +- .../_L1SharedBridge_Shared.t.sol | 6 + 21 files changed, 286 insertions(+), 106 deletions(-) diff --git a/l1-contracts/contracts/bridge/BridgeHelper.sol b/l1-contracts/contracts/bridge/BridgeHelper.sol index 8e293100f..422ad45e9 100644 --- a/l1-contracts/contracts/bridge/BridgeHelper.sol +++ b/l1-contracts/contracts/bridge/BridgeHelper.sol @@ -6,6 +6,8 @@ pragma solidity 0.8.24; import {IERC20Metadata} from "@openzeppelin/contracts-v4/token/ERC20/extensions/IERC20Metadata.sol"; import {ETH_TOKEN_ADDRESS} from "../common/Config.sol"; +import {DataEncoding} from "../common/libraries/DataEncoding.sol"; +import {NEW_ENCODING_VERSION} from "./asset-router/IAssetRouterBase.sol"; /** * @author Matter Labs @@ -14,17 +16,22 @@ import {ETH_TOKEN_ADDRESS} from "../common/Config.sol"; */ library BridgeHelper { /// @dev Receives and parses (name, symbol, decimals) from the token contract - function getERC20Getters(address _token) internal view returns (bytes memory) { + function getERC20Getters(address _token, uint256 _originChainId) internal view returns (bytes memory) { + bytes memory name; + bytes memory symbol; + bytes memory decimals; if (_token == ETH_TOKEN_ADDRESS) { - bytes memory name = abi.encode("Ether"); - bytes memory symbol = abi.encode("ETH"); - bytes memory decimals = abi.encode(uint8(18)); - return abi.encode(name, symbol, decimals); // when depositing eth to a non-eth based chain it is an ERC20 + // when depositing eth to a non-eth based chain it is an ERC20 + name = abi.encode("Ether"); + symbol = abi.encode("ETH"); + decimals = abi.encode(uint8(18)); + } else { + /// note this also works on the L2 for the base token. + (, name) = _token.staticcall(abi.encodeCall(IERC20Metadata.name, ())); + (, symbol) = _token.staticcall(abi.encodeCall(IERC20Metadata.symbol, ())); + (, decimals) = _token.staticcall(abi.encodeCall(IERC20Metadata.decimals, ())); } - /// note this also works on the L2 for the base token. - (, bytes memory data1) = _token.staticcall(abi.encodeCall(IERC20Metadata.name, ())); - (, bytes memory data2) = _token.staticcall(abi.encodeCall(IERC20Metadata.symbol, ())); - (, bytes memory data3) = _token.staticcall(abi.encodeCall(IERC20Metadata.decimals, ())); - return abi.encode(data1, data2, data3); + return + DataEncoding.encodeTokenData({_chainId: _originChainId, _name: name, _symbol: symbol, _decimals: decimals}); } } diff --git a/l1-contracts/contracts/bridge/BridgedStandardERC20.sol b/l1-contracts/contracts/bridge/BridgedStandardERC20.sol index 2a353e223..bd8d01110 100644 --- a/l1-contracts/contracts/bridge/BridgedStandardERC20.sol +++ b/l1-contracts/contracts/bridge/BridgedStandardERC20.sol @@ -9,6 +9,7 @@ import {ERC1967Upgrade} from "@openzeppelin/contracts-v4/proxy/ERC1967/ERC1967Up import {IBridgedStandardToken} from "./interfaces/IBridgedStandardToken.sol"; import {Unauthorized, NonSequentialVersion, ZeroAddress} from "../common/L1ContractErrors.sol"; import {L2_NATIVE_TOKEN_VAULT_ADDR} from "../common/L2ContractAddresses.sol"; +import {DataEncoding} from "../common/libraries/DataEncoding.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev @@ -36,8 +37,8 @@ contract BridgedStandardERC20 is ERC20PermitUpgradeable, IBridgedStandardToken, /// @dev Address of the L2 bridge that is used as trustee who can mint/burn tokens address public override l2Bridge; - /// @dev Address of the L1 token that can be deposited to mint this L2 token - address public override l1Address; + /// @dev Address of the token on its origin chain that can be deposited to mint this bridged token + address public override originToken; /// @dev Address of the native token vault that is used as trustee who can mint/burn tokens address public nativeTokenVault; @@ -73,22 +74,20 @@ contract BridgedStandardERC20 is ERC20PermitUpgradeable, IBridgedStandardToken, /// @notice Initializes a contract token for later use. Expected to be used in the proxy. /// @dev Stores the L1 address of the bridge and set `name`/`symbol`/`decimals` getters that L1 token has. - /// @param _l1Address Address of the L1 token that can be deposited to mint this L2 token + /// @param _originToken Address of the origin token that can be deposited to mint this bridged token /// @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(address _l1Address, bytes calldata _data) external initializer { - if (_l1Address == address(0)) { + function bridgeInitialize(address _originToken, bytes calldata _data) external initializer returns (uint256) { + if (_originToken == address(0)) { revert ZeroAddress(); } - l1Address = _l1Address; + originToken = _originToken; nativeTokenVault = msg.sender; // We parse the data exactly as they were created on the L1 bridge - (bytes memory nameBytes, bytes memory symbolBytes, bytes memory decimalsBytes) = abi.decode( - _data, - (bytes, bytes, bytes) - ); + (uint256 chainId, bytes memory nameBytes, bytes memory symbolBytes, bytes memory decimalsBytes) = DataEncoding + .decodeTokenData(_data); ERC20Getters memory getters; string memory decodedName; @@ -129,7 +128,8 @@ contract BridgedStandardERC20 is ERC20PermitUpgradeable, IBridgedStandardToken, } availableGetters = getters; - emit BridgeInitialize(_l1Address, decodedName, decodedSymbol, decimals_); + emit BridgeInitialize(_originToken, decodedName, decodedSymbol, decimals_); + return chainId; } /// @notice A method to be called by the governor to update the token's metadata. @@ -156,7 +156,7 @@ contract BridgedStandardERC20 is ERC20PermitUpgradeable, IBridgedStandardToken, __ERC20Permit_init(_newName); availableGetters = _availableGetters; - emit BridgeInitialize(l1Address, _newName, _newSymbol, decimals_); + emit BridgeInitialize(originToken, _newName, _newSymbol, decimals_); } /// @dev Mint tokens to a given account. @@ -207,4 +207,14 @@ contract BridgedStandardERC20 is ERC20PermitUpgradeable, IBridgedStandardToken, if (availableGetters.ignoreDecimals) revert(); return decimals_; } + + /*////////////////////////////////////////////////////////////// + LEGACY FUNCTIONS + //////////////////////////////////////////////////////////////*/ + + /// @notice Returns the address of the token on its native chain. + /// Legacy for the l2 bridge. + function l1Address() public view override returns (address) { + return originToken; + } } diff --git a/l1-contracts/contracts/bridge/L1Nullifier.sol b/l1-contracts/contracts/bridge/L1Nullifier.sol index 453e64840..f20b4ad76 100644 --- a/l1-contracts/contracts/bridge/L1Nullifier.sol +++ b/l1-contracts/contracts/bridge/L1Nullifier.sol @@ -557,7 +557,14 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, // slither-disable-next-line unused-return (amount, ) = UnsafeBytes.readUint256(_l2ToL1message, offset); assetId = BRIDGE_HUB.baseTokenAssetId(_chainId); - transferData = abi.encode(amount, l1Receiver); + address baseToken = BRIDGE_HUB.baseToken(_chainId); + transferData = DataEncoding.encodeBridgeMintData({ + _prevMsgSender: address(0), + _l2Receiver: l1Receiver, + _l1Token: baseToken, + _amount: amount, + _erc20Metadata: new bytes(0) + }); } else if (bytes4(functionSignature) == IL1ERC20Bridge.finalizeWithdrawal.selector) { // We use the IL1ERC20Bridge for backward compatibility with old withdrawals. address l1Token; @@ -575,7 +582,13 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, (amount, ) = UnsafeBytes.readUint256(_l2ToL1message, offset); assetId = DataEncoding.encodeNTVAssetId(block.chainid, l1Token); - transferData = abi.encode(amount, l1Receiver); + transferData = DataEncoding.encodeBridgeMintData({ + _prevMsgSender: address(0), + _l2Receiver: l1Receiver, + _l1Token: l1Token, + _amount: amount, + _erc20Metadata: new bytes(0) + }); } else if (bytes4(functionSignature) == IAssetRouterBase.finalizeDeposit.selector) { // The data is expected to be at least 36 bytes long to contain assetId. require(_l2ToL1message.length >= 36, "L1N: wrong msg len"); // wrong message length diff --git a/l1-contracts/contracts/bridge/L2WrappedBaseToken.sol b/l1-contracts/contracts/bridge/L2WrappedBaseToken.sol index b1d2e7396..4319a8b7c 100644 --- a/l1-contracts/contracts/bridge/L2WrappedBaseToken.sol +++ b/l1-contracts/contracts/bridge/L2WrappedBaseToken.sol @@ -127,4 +127,8 @@ contract L2WrappedBaseToken is ERC20PermitUpgradeable, IL2WrappedBaseToken, IBri revert WithdrawFailed(); } } + + function originToken() external view override returns (address) { + return l1Address; + } } diff --git a/l1-contracts/contracts/bridge/asset-router/L1AssetRouter.sol b/l1-contracts/contracts/bridge/asset-router/L1AssetRouter.sol index 0d79b7be7..74b5e52a4 100644 --- a/l1-contracts/contracts/bridge/asset-router/L1AssetRouter.sol +++ b/l1-contracts/contracts/bridge/asset-router/L1AssetRouter.sol @@ -419,7 +419,10 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { // First branch covers the case when asset is not registered with NTV (custom asset handler) // Second branch handles tokens registered with NTV and uses legacy calldata encoding // We need to use the legacy encoding to support the old SDK, which relies on a specific encoding of the data. - if ((nativeTokenVault.tokenAddress(_assetId) == address(0)) || (!nativeTokenVault.isTokenNative(_assetId))) { + if ( + (nativeTokenVault.tokenAddress(_assetId) == address(0)) || + (nativeTokenVault.originChainId(_assetId) != block.chainid) + ) { return abi.encodeCall(IAssetRouterBase.finalizeDeposit, (block.chainid, _assetId, _assetData)); } else { // slither-disable-next-line unused-return diff --git a/l1-contracts/contracts/bridge/interfaces/IBridgedStandardToken.sol b/l1-contracts/contracts/bridge/interfaces/IBridgedStandardToken.sol index af3a4212a..952bc1871 100644 --- a/l1-contracts/contracts/bridge/interfaces/IBridgedStandardToken.sol +++ b/l1-contracts/contracts/bridge/interfaces/IBridgedStandardToken.sol @@ -15,5 +15,7 @@ interface IBridgedStandardToken { function l1Address() external view returns (address); + function originToken() external view returns (address); + function l2Bridge() external view returns (address); } diff --git a/l1-contracts/contracts/bridge/ntv/IL1NativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/IL1NativeTokenVault.sol index f6f34bc10..1d16f48fb 100644 --- a/l1-contracts/contracts/bridge/ntv/IL1NativeTokenVault.sol +++ b/l1-contracts/contracts/bridge/ntv/IL1NativeTokenVault.sol @@ -14,6 +14,9 @@ interface IL1NativeTokenVault is INativeTokenVault { /// @notice The L1Nullifier contract function L1_NULLIFIER() external view returns (IL1Nullifier); + /// @notice Returns the total number of specific tokens locked for some chain + function chainBalance(uint256 _chainId, bytes32 _assetId) external view returns (uint256); + /// @notice Registers ETH token function registerEthToken() external; diff --git a/l1-contracts/contracts/bridge/ntv/INativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/INativeTokenVault.sol index 03f19bdb3..0cd78cf54 100644 --- a/l1-contracts/contracts/bridge/ntv/INativeTokenVault.sol +++ b/l1-contracts/contracts/bridge/ntv/INativeTokenVault.sol @@ -16,21 +16,20 @@ interface INativeTokenVault { /// @notice The AssetRouter contract function ASSET_ROUTER() external view returns (IAssetRouterBase); + /// @notice Returns the chain ID of the origin chain for a given asset ID + function originChainId(bytes32 assetId) external view returns (uint256); - /// @notice Returns the total number of specific tokens locked for some chain - function chainBalance(uint256 _chainId, bytes32 _assetId) external view returns (uint256); - - /// @notice Returns if the bridged version of bridged token has been deployed - function isTokenNative(bytes32 assetId) external view returns (bool); - - /// @notice Used to register a token in the vault + /// @notice Registers tokens within the NTV. + /// @dev The goal is to allow bridging native tokens automatically, by registering them on the fly. + /// @notice Allows the bridge to register a token address for the vault. + /// @notice No access control is ok, since the bridging of tokens should be permissionless. This requires permissionless registration. function registerToken(address _l1Token) external; /// @notice Used to get the assetId of a token function getAssetId(uint256 _chainId, address _tokenAddress) external view returns (bytes32); /// @notice Used to get the the ERC20 data for a token - function getERC20Getters(address _token) external view returns (bytes memory); + function getERC20Getters(address _token, uint256 _originChainId) external view returns (bytes memory); /// @notice Used to get the token address of an assetId function tokenAddress(bytes32 assetId) external view returns (address); diff --git a/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol index 2e461418a..0124858a5 100644 --- a/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol +++ b/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol @@ -37,6 +37,11 @@ contract L1NativeTokenVault is IL1NativeTokenVault, IL1AssetHandler, NativeToken /// @dev Era's chainID uint256 public immutable ERA_CHAIN_ID; + /// @dev Maps token balances for each chain to prevent unauthorized spending across ZK chains. + /// This serves as a security measure until hyperbridging is implemented. + /// NOTE: this function may be removed in the future, don't rely on it! + mapping(uint256 chainId => mapping(bytes32 assetId => uint256 balance)) public chainBalance; + /// @dev Contract is expected to be used as proxy implementation. /// @dev Initialize the implementation to prevent Parity hack. /// @param _l1WethAddress Address of WETH on deployed chain @@ -52,7 +57,8 @@ contract L1NativeTokenVault is IL1NativeTokenVault, IL1AssetHandler, NativeToken NativeTokenVault( _l1WethAddress, _l1AssetRouter, - DataEncoding.encodeNTVAssetId(block.chainid, ETH_TOKEN_ADDRESS) + DataEncoding.encodeNTVAssetId(block.chainid, ETH_TOKEN_ADDRESS), + block.chainid ) { ERA_CHAIN_ID = _eraChainId; @@ -113,11 +119,12 @@ contract L1NativeTokenVault is IL1NativeTokenVault, IL1AssetHandler, NativeToken uint256 nullifierChainBalance = L1_NULLIFIER.__DEPRECATED_chainBalance(_targetChainId, _token); bytes32 assetId = DataEncoding.encodeNTVAssetId(block.chainid, _token); chainBalance[_targetChainId][assetId] = chainBalance[_targetChainId][assetId] + nullifierChainBalance; + originChainId[assetId] = block.chainid; L1_NULLIFIER.nullifyChainBalanceByNTV(_targetChainId, _token); } /*////////////////////////////////////////////////////////////// - L1 SPECIFIC FUNCTIONS + Start transaction Functions //////////////////////////////////////////////////////////////*/ function _bridgeBurnNativeToken( @@ -144,6 +151,10 @@ contract L1NativeTokenVault is IL1NativeTokenVault, IL1AssetHandler, NativeToken }); } + /*////////////////////////////////////////////////////////////// + L1 SPECIFIC FUNCTIONS + //////////////////////////////////////////////////////////////*/ + /// @inheritdoc IL1AssetHandler function bridgeRecoverFailedTransfer( uint256 _chainId, @@ -157,11 +168,7 @@ contract L1NativeTokenVault is IL1NativeTokenVault, IL1AssetHandler, NativeToken revert NoFundsTransferred(); } - // check that the chain has sufficient balance - if (chainBalance[_chainId][_assetId] < _amount) { - revert InsufficientChainBalance(); - } - chainBalance[_chainId][_assetId] -= _amount; + _handleChainBalanceDecrease(_chainId, _assetId, _amount, false); if (l1Token == ETH_TOKEN_ADDRESS) { bool callSuccess; @@ -229,7 +236,6 @@ contract L1NativeTokenVault is IL1NativeTokenVault, IL1AssetHandler, NativeToken function _deployBeaconProxy(bytes32 _salt) internal override returns (BeaconProxy proxy) { // Use CREATE2 to deploy the BeaconProxy - address proxyAddress = Create2.deploy( 0, _salt, @@ -237,4 +243,30 @@ contract L1NativeTokenVault is IL1NativeTokenVault, IL1AssetHandler, NativeToken ); return BeaconProxy(payable(proxyAddress)); } + + function _handleChainBalanceIncrease( + uint256 _chainId, + bytes32 _assetId, + uint256 _amount, + bool _isNative + ) internal override { + if ((_isNative) || (originChainId[_assetId] != _chainId)) { + chainBalance[_chainId][_assetId] += _amount; + } + } + + function _handleChainBalanceDecrease( + uint256 _chainId, + bytes32 _assetId, + uint256 _amount, + bool _isNative + ) internal override { + if ((_isNative) || (originChainId[_assetId] != _chainId)) { + // Check that the chain has sufficient balance + if (chainBalance[_chainId][_assetId] < _amount) { + revert InsufficientChainBalance(); + } + chainBalance[_chainId][_assetId] -= _amount; + } + } } diff --git a/l1-contracts/contracts/bridge/ntv/L2NativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/L2NativeTokenVault.sol index bb4d6743d..e96a6d289 100644 --- a/l1-contracts/contracts/bridge/ntv/L2NativeTokenVault.sol +++ b/l1-contracts/contracts/bridge/ntv/L2NativeTokenVault.sol @@ -31,9 +31,6 @@ import {EmptyAddress, EmptyBytes32, AddressMismatch, DeployFailed, AssetIdNotSup contract L2NativeTokenVault is IL2NativeTokenVault, NativeTokenVault { using SafeERC20 for IERC20; - /// @dev Chain ID of L1 for bridging reasons. - uint256 public immutable L1_CHAIN_ID; - IL2SharedBridgeLegacy public immutable L2_LEGACY_SHARED_BRIDGE; /// @dev Bytecode hash of the proxy for tokens deployed by the bridge. @@ -56,8 +53,7 @@ contract L2NativeTokenVault is IL2NativeTokenVault, NativeTokenVault { bool _contractsDeployedAlready, address _wethToken, bytes32 _baseTokenAssetId - ) NativeTokenVault(_wethToken, L2_ASSET_ROUTER_ADDR, _baseTokenAssetId) { - L1_CHAIN_ID = _l1ChainId; + ) NativeTokenVault(_wethToken, L2_ASSET_ROUTER_ADDR, _baseTokenAssetId, _l1ChainId) { L2_LEGACY_SHARED_BRIDGE = IL2SharedBridgeLegacy(_legacySharedBridge); if (_l2TokenProxyBytecodeHash == bytes32(0)) { @@ -91,6 +87,7 @@ contract L2NativeTokenVault is IL2NativeTokenVault, NativeTokenVault { address l1TokenAddress = L2_LEGACY_SHARED_BRIDGE.l1TokenAddress(_l2TokenAddress); bytes32 assetId = DataEncoding.encodeNTVAssetId(L1_CHAIN_ID, l1TokenAddress); tokenAddress[assetId] = _l2TokenAddress; + originChainId[assetId] = L1_CHAIN_ID; } /// @notice Ensures that the token is deployed. @@ -201,6 +198,24 @@ contract L2NativeTokenVault is IL2NativeTokenVault, NativeTokenVault { : keccak256(abi.encode(_originChainId, _l1Token)); } + function _handleChainBalanceIncrease( + uint256 _chainId, + bytes32 _assetId, + uint256 _amount, + bool _isNative + ) internal override { + // on L2s we don't track the balance + } + + function _handleChainBalanceDecrease( + uint256 _chainId, + bytes32 _assetId, + uint256 _amount, + bool _isNative + ) internal override { + // on L2s we don't track the balance + } + /*////////////////////////////////////////////////////////////// LEGACY FUNCTIONS //////////////////////////////////////////////////////////////*/ diff --git a/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol index 087ca70bf..ff1b483c1 100644 --- a/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol +++ b/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol @@ -21,7 +21,7 @@ import {DataEncoding} from "../../common/libraries/DataEncoding.sol"; import {BridgedStandardERC20} from "../BridgedStandardERC20.sol"; import {BridgeHelper} from "../BridgeHelper.sol"; -import {EmptyDeposit, Unauthorized, TokensWithFeesNotSupported, TokenNotSupported, NonEmptyMsgValue, ValueMismatch, InsufficientChainBalance, AddressMismatch, AssetIdMismatch, AmountMustBeGreaterThanZero} from "../../common/L1ContractErrors.sol"; +import {EmptyDeposit, Unauthorized, TokensWithFeesNotSupported, TokenNotSupported, NonEmptyMsgValue, ValueMismatch, AddressMismatch, AssetIdMismatch, AmountMustBeGreaterThanZero, ZeroAddress} from "../../common/L1ContractErrors.sol"; /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev @@ -39,21 +39,19 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 /// @dev The assetId of the base token. bytes32 public immutable BASE_TOKEN_ASSET_ID; + /// @dev Chain ID of L1 for bridging reasons. + uint256 public immutable L1_CHAIN_ID; + /// @dev Contract that stores the implementation address for token. /// @dev For more details see https://docs.openzeppelin.com/contracts/3.x/api/proxy#UpgradeableBeacon. IBeacon public bridgedTokenBeacon; - /// @dev Maps token balances for each chain to prevent unauthorized spending across ZK chains. - /// This serves as a security measure until hyperbridging is implemented. - /// NOTE: this function may be removed in the future, don't rely on it! - mapping(uint256 chainId => mapping(bytes32 token => uint256 balance)) public chainBalance; + /// @dev A mapping assetId => tokenAddress + mapping(bytes32 assetId => uint256 chainId) public originChainId; /// @dev A mapping assetId => tokenAddress mapping(bytes32 assetId => address tokenAddress) public tokenAddress; - /// @dev A mapping assetId => isTokenBridged - mapping(bytes32 assetId => bool bridged) public isTokenNative; - /** * @dev This empty reserved space is put in place to allow future versions to add new * variables without shifting down storage in the inheritance chain. @@ -73,18 +71,20 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 /// @dev Disable the initialization to prevent Parity hack. /// @param _wethToken Address of WETH on deployed chain /// @param _assetRouter Address of assetRouter - constructor(address _wethToken, address _assetRouter, bytes32 _baseTokenAssetId) { + constructor(address _wethToken, address _assetRouter, bytes32 _baseTokenAssetId, uint256 _l1ChainId) { _disableInitializers(); + L1_CHAIN_ID = _l1ChainId; ASSET_ROUTER = IAssetRouterBase(_assetRouter); WETH_TOKEN = _wethToken; BASE_TOKEN_ASSET_ID = _baseTokenAssetId; } - /// @notice Registers tokens within the NTV. - /// @dev The goal was to allow bridging native tokens automatically, by registering them on the fly. - /// @notice Allows the bridge to register a token address for the vault. - /// @notice No access control is ok, since the bridging of tokens should be permissionless. This requires permissionless registration. - function registerToken(address _nativeToken) external { + /// @inheritdoc INativeTokenVault + function registerToken(address _nativeToken) external virtual { + _registerToken(_nativeToken); + } + + function _registerToken(address _nativeToken) internal { if (_nativeToken == WETH_TOKEN) { revert TokenNotSupported(WETH_TOKEN); } @@ -108,7 +108,9 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 ) external payable override onlyAssetRouter whenNotPaused { address receiver; uint256 amount; - if (isTokenNative[_assetId]) { + // we set all originChainId for all already bridged tokens with the setLegacyTokenAssetId and updateChainBalancesFromSharedBridge functions. + // for tokens that are bridged for the first time, the originChainId will be 0. + if (originChainId[_assetId] == block.chainid) { (receiver, amount) = _bridgeMintNativeToken(_chainId, _assetId, _data); } else { (receiver, amount) = _bridgeMintBridgedToken(_chainId, _assetId, _data); @@ -132,7 +134,7 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 if (token == address(0)) { token = _ensureTokenDeployed(_originChainId, _assetId, originToken, erc20Data); } - + _handleChainBalanceDecrease(_originChainId, _assetId, amount, false); IBridgedStandardToken(token).bridgeMint(receiver, amount); emit BridgeMint(_originChainId, _assetId, receiver, amount); } @@ -143,13 +145,10 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 bytes calldata _data ) internal returns (address receiver, uint256 amount) { address token = tokenAddress[_assetId]; - (amount, receiver) = abi.decode(_data, (uint256, address)); - // Check that the chain has sufficient balance - if (chainBalance[_originChainId][_assetId] < amount) { - revert InsufficientChainBalance(); - } - chainBalance[_originChainId][_assetId] -= amount; + // slither-disable-next-line unused-return + (, receiver, , amount, ) = DataEncoding.decodeBridgeMintData(_data); + _handleChainBalanceDecrease(_originChainId, _assetId, amount, true); _withdrawFunds(_assetId, receiver, token, amount); emit BridgeMint(_originChainId, _assetId, receiver, amount); } @@ -170,7 +169,7 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 address _prevMsgSender, bytes calldata _data ) external payable override onlyAssetRouter whenNotPaused returns (bytes memory _bridgeMintData) { - if (!isTokenNative[_assetId]) { + if (originChainId[_assetId] != block.chainid) { _bridgeMintData = _bridgeBurnBridgedToken(_chainId, _assetId, _prevMsgSender, _data); } else { _bridgeMintData = _bridgeBurnNativeToken({ @@ -205,7 +204,31 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 receiver: _receiver, amount: _amount }); - _bridgeMintData = _data; + bytes memory erc20Metadata; + { + // we set all originChainId for all already bridged tokens with the setLegacyTokenAssetId and updateChainBalancesFromSharedBridge functions. + // for native tokens the originChainId is set when they register. + uint256 originChainId = originChainId[_assetId]; + if (originChainId == 0) { + revert ZeroAddress(); + } + erc20Metadata = getERC20Getters(bridgedToken, originChainId); + } + address originToken; + { + originToken = IBridgedStandardToken(bridgedToken).originToken(); + if (originToken == address(0)) { + revert ZeroAddress(); + } + } + + _bridgeMintData = DataEncoding.encodeBridgeMintData({ + _prevMsgSender: _prevMsgSender, + _l2Receiver: _receiver, + _l1Token: originToken, + _amount: _amount, + _erc20Metadata: erc20Metadata + }); } function _bridgeBurnNativeToken( @@ -227,7 +250,7 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 if (_depositAmount == 0) { _depositAmount = amount; } - + _handleChainBalanceIncrease(_chainId, _assetId, amount, true); if (_depositAmount != amount) { revert ValueMismatch(amount, msg.value); } @@ -236,7 +259,7 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 if (msg.value != 0) { revert NonEmptyMsgValue(); } - + _handleChainBalanceIncrease(_chainId, _assetId, amount, true); amount = _depositAmount; if (!_depositChecked) { uint256 expectedDepositAmount = _depositFunds(_prevMsgSender, IERC20(nativeToken), _depositAmount); // note if _prevMsgSender is this contract, this will return 0. This does not happen. @@ -251,14 +274,16 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 revert EmptyDeposit(); } - chainBalance[_chainId][_assetId] += amount; - + bytes memory erc20Metadata; + { + erc20Metadata = getERC20Getters(nativeToken, originChainId[_assetId]); + } _bridgeMintData = DataEncoding.encodeBridgeMintData({ _prevMsgSender: _prevMsgSender, _l2Receiver: _receiver, _l1Token: nativeToken, _amount: amount, - _erc20Metadata: getERC20Getters(nativeToken) + _erc20Metadata: erc20Metadata }); emit BridgeBurn({ @@ -290,8 +315,8 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 /// @param _token The address of token of interest. /// @dev Receives and parses (name, symbol, decimals) from the token contract - function getERC20Getters(address _token) public view override returns (bytes memory) { - return BridgeHelper.getERC20Getters(_token); + function getERC20Getters(address _token, uint256 _originChainId) public view override returns (bytes memory) { + return BridgeHelper.getERC20Getters(_token, _originChainId); } /// @notice Returns the parsed assetId. @@ -308,9 +333,23 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 bytes32 assetId = DataEncoding.encodeNTVAssetId(block.chainid, _nativeToken); ASSET_ROUTER.setAssetHandlerAddressThisChain(bytes32(uint256(uint160(_nativeToken))), address(this)); tokenAddress[assetId] = _nativeToken; - isTokenNative[assetId] = true; + originChainId[assetId] = block.chainid; } + function _handleChainBalanceIncrease( + uint256 _chainId, + bytes32 _assetId, + uint256 _amount, + bool _isNative + ) internal virtual; + + function _handleChainBalanceDecrease( + uint256 _chainId, + bytes32 _assetId, + uint256 _amount, + bool _isNative + ) internal virtual; + /*////////////////////////////////////////////////////////////// TOKEN DEPLOYER FUNCTIONS //////////////////////////////////////////////////////////////*/ @@ -368,19 +407,20 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 ) public view virtual override returns (address); /// @notice Deploys and initializes the bridged token for the native counterpart. - /// @param _nativeToken The address of native token. + /// @param _originToken The address of origin token. /// @param _erc20Data The ERC20 metadata of the token deployed. /// @return The address of the beacon proxy (bridged token). function _deployBridgedToken( uint256 _originChainId, - address _nativeToken, + address _originToken, bytes memory _erc20Data ) internal returns (address) { - bytes32 salt = _getCreate2Salt(_originChainId, _nativeToken); + bytes32 salt = _getCreate2Salt(_originChainId, _originToken); BeaconProxy l2Token = _deployBeaconProxy(salt); - BridgedStandardERC20(address(l2Token)).bridgeInitialize(_nativeToken, _erc20Data); - + uint256 tokenOriginChainId = BridgedStandardERC20(address(l2Token)).bridgeInitialize(_originToken, _erc20Data); + tokenOriginChainId = tokenOriginChainId == 0 ? L1_CHAIN_ID : tokenOriginChainId; + originChainId[DataEncoding.encodeNTVAssetId(tokenOriginChainId, _originToken)] = tokenOriginChainId; return address(l2Token); } diff --git a/l1-contracts/contracts/bridgehub/Bridgehub.sol b/l1-contracts/contracts/bridgehub/Bridgehub.sol index bbb1bbd73..4884deb98 100644 --- a/l1-contracts/contracts/bridgehub/Bridgehub.sol +++ b/l1-contracts/contracts/bridgehub/Bridgehub.sol @@ -215,7 +215,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @notice Used for the upgrade to set the baseTokenAssetId previously stored as baseToken. /// @param _chainId the chainId of the chain. - function setLegacyBaseTokenAssetId(uint256 _chainId) external { + function setLegacyBaseTokenAssetId(uint256 _chainId) external override { if (baseTokenAssetId[_chainId] == bytes32(0)) { return; } @@ -226,7 +226,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @notice Used to set the legacy chain address for the upgrade. /// @param _chainId The chainId of the legacy chain we are migrating. - function setLegacyChainAddress(uint256 _chainId) external { + function setLegacyChainAddress(uint256 _chainId) external override { address ctm = chainTypeManager[_chainId]; if (ctm == address(0)) { revert ChainNotLegacy(); diff --git a/l1-contracts/contracts/bridgehub/IBridgehub.sol b/l1-contracts/contracts/bridgehub/IBridgehub.sol index 440d6236a..53adf37b8 100644 --- a/l1-contracts/contracts/bridgehub/IBridgehub.sol +++ b/l1-contracts/contracts/bridgehub/IBridgehub.sol @@ -228,4 +228,6 @@ interface IBridgehub is IAssetHandler, IL1AssetHandler { function setLegacyBaseTokenAssetId(uint256 _chainId) external; function registerAlreadyDeployedZKChain(uint256 _chainId, address _hyperchain) external; + + function setLegacyChainAddress(uint256 _chainId) external; } diff --git a/l1-contracts/contracts/common/libraries/DataEncoding.sol b/l1-contracts/contracts/common/libraries/DataEncoding.sol index 04e271de8..87d9143a3 100644 --- a/l1-contracts/contracts/common/libraries/DataEncoding.sol +++ b/l1-contracts/contracts/common/libraries/DataEncoding.sol @@ -117,4 +117,34 @@ library DataEncoding { revert UnsupportedEncodingVersion(); } } + + /// @notice Decodes the token data by combining chain id, asset deployment tracker and asset data. + function decodeTokenData( + bytes calldata _tokenData + ) internal pure returns (uint256 chainId, bytes memory name, bytes memory symbol, bytes memory decimals) { + bytes1 encodingVersion = _tokenData[0]; + // kl todo check correct + if (encodingVersion == LEGACY_ENCODING_VERSION) { + (name, symbol, decimals) = abi.decode(_tokenData, (bytes, bytes, bytes)); + } else if (encodingVersion == NEW_ENCODING_VERSION) { + return abi.decode(_tokenData[1:], (uint256, bytes, bytes, bytes)); + } else { + revert UnsupportedEncodingVersion(); + } + } + + /// @notice Encodes the token data by combining chain id, asset deployment tracker and asset data. + /// @param _chainId The id of the chain token is native to. + /// @param _name The name of the token. + /// @param _symbol The symbol of the token. + /// @param _decimals The decimals of the token. + /// @return The encoded token data. + function encodeTokenData( + uint256 _chainId, + bytes memory _name, + bytes memory _symbol, + bytes memory _decimals + ) internal pure returns (bytes memory) { + return bytes.concat(NEW_ENCODING_VERSION, abi.encode(_chainId, _name, _symbol, _decimals)); + } } diff --git a/l1-contracts/test/foundry/l1/integration/AssetRouterTest.t.sol b/l1-contracts/test/foundry/l1/integration/AssetRouterTest.t.sol index de9a21f0f..0fd823ebe 100644 --- a/l1-contracts/test/foundry/l1/integration/AssetRouterTest.t.sol +++ b/l1-contracts/test/foundry/l1/integration/AssetRouterTest.t.sol @@ -1,8 +1,6 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.24; -import "forge-std/console.sol"; - import {Test} from "forge-std/Test.sol"; import {Vm} from "forge-std/Vm.sol"; @@ -92,7 +90,7 @@ contract AssetRouterTest is L1ContractDeployer, ZKChainDeployer, TokenDeployer, _l2Receiver: address(this), _l1Token: ETH_TOKEN_ADDRESS, _amount: 100, - _erc20Metadata: BridgeHelper.getERC20Getters(_tokenAddress) + _erc20Metadata: BridgeHelper.getERC20Getters(_tokenAddress, chainId) }); l1Nullifier.finalizeDeposit( FinalizeL1DepositParams({ @@ -166,8 +164,6 @@ contract AssetRouterTest is L1ContractDeployer, ZKChainDeployer, TokenDeployer, abi.encode(l2TokenAssetId, abi.encode(uint256(100), address(this))) ); IERC20(tokenL1Address).approve(address(l1NativeTokenVault), 100); - console.log("kl todo 6", tokenL1Address); - console.logBytes32(l2TokenAssetId); bridgeHub.requestL2TransactionTwoBridges{value: 250000000000100}( L2TransactionRequestTwoBridgesOuter({ chainId: eraZKChainId, diff --git a/l1-contracts/test/foundry/l1/integration/DeploymentTest.t.sol b/l1-contracts/test/foundry/l1/integration/DeploymentTest.t.sol index d072aa912..9224eea05 100644 --- a/l1-contracts/test/foundry/l1/integration/DeploymentTest.t.sol +++ b/l1-contracts/test/foundry/l1/integration/DeploymentTest.t.sol @@ -89,6 +89,27 @@ contract DeploymentTests is L1ContractDeployer, ZKChainDeployer, TokenDeployer, assertEq(protocolVersion, 0); } + function test_bridgehubSetter() public { + IBridgehub bridgehub = IBridgehub(l1Script.getBridgehubProxyAddress()); + uint256 chainId = zkChainIds[0]; + IChainTypeManager chainTypeManager = IChainTypeManager(bridgehub.chainTypeManager(chainId)); + uint256 randomChainId = 123456; + + vm.mockCall( + address(chainTypeManager), + abi.encodeWithSelector(IChainTypeManager.getZKChainLegacy.selector, randomChainId), + abi.encode(address(0x01)) + ); + vm.store(address(bridgehub), keccak256(abi.encode(randomChainId, 205)), bytes32(uint256(uint160(1)))); + vm.store( + address(bridgehub), + keccak256(abi.encode(randomChainId, 204)), + bytes32(uint256(uint160(address(chainTypeManager)))) + ); + bridgehub.setLegacyBaseTokenAssetId(randomChainId); + bridgehub.setLegacyChainAddress(randomChainId); + } + // add this to be excluded from coverage report function test() internal override {} } diff --git a/l1-contracts/test/foundry/l1/integration/GatewayTests.t.sol b/l1-contracts/test/foundry/l1/integration/GatewayTests.t.sol index 331f0d2f4..e4e14e10f 100644 --- a/l1-contracts/test/foundry/l1/integration/GatewayTests.t.sol +++ b/l1-contracts/test/foundry/l1/integration/GatewayTests.t.sol @@ -80,7 +80,6 @@ contract GatewayTests is L1ContractDeployer, ZKChainDeployer, TokenDeployer, L2T _initializeGatewayScript(); - // console.log("KL todo", Ownable(l1Script.getBridgehubProxyAddress()).owner(), l1Script.getBridgehubProxyAddress()); vm.deal(Ownable(l1Script.getBridgehubProxyAddress()).owner(), 100000000000000000000000000000000000); vm.deal(l1Script.getOwnerAddress(), 100000000000000000000000000000000000); IZKChain chain = IZKChain(IBridgehub(l1Script.getBridgehubProxyAddress()).getZKChain(migratingChainId)); @@ -88,7 +87,6 @@ contract GatewayTests is L1ContractDeployer, ZKChainDeployer, TokenDeployer, L2T vm.deal(chain.getAdmin(), 100000000000000000000000000000000000); vm.deal(chain2.getAdmin(), 100000000000000000000000000000000000); - // console.log("kl todo balance", Ownable(l1Script.getBridgehubProxyAddress()).owner().balance); // vm.deal(msg.sender, 100000000000000000000000000000000000); // vm.deal(l1Script.getBridgehubProxyAddress(), 100000000000000000000000000000000000); } diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeBase.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeBase.t.sol index 6c6d2deca..dd3b8c145 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeBase.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeBase.t.sol @@ -72,10 +72,10 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { bob, address(ETH_TOKEN_ADDRESS), amount, - nativeTokenVault.getERC20Getters(address(ETH_TOKEN_ADDRESS)) + nativeTokenVault.getERC20Getters(address(ETH_TOKEN_ADDRESS), chainId) ); // solhint-disable-next-line func-named-parameters - vm.expectEmit(true, true, true, true, address(sharedBridge)); + vm.expectEmit(true, true, true, false, address(sharedBridge)); vm.prank(bridgehubAddress); emit BridgehubDepositInitiated({ chainId: chainId, @@ -287,7 +287,7 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { IAssetRouterBase.finalizeDeposit.selector, chainId, tokenAssetId, - abi.encode(amount, alice) + abi.encode(0, alice, 0, amount, new bytes(0)) ); L2Message memory l2ToL1Message = L2Message({ txNumberInBatch: l2TxNumberInBatch, @@ -333,7 +333,7 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { IAssetRouterBase.finalizeDeposit.selector, chainId, ETH_TOKEN_ASSET_ID, - abi.encode(amount, alice) + abi.encode(0, alice, 0, amount, new bytes(0)) ); L2Message memory l2ToL1Message = L2Message({ txNumberInBatch: l2TxNumberInBatch, @@ -376,7 +376,7 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { IAssetRouterBase.finalizeDeposit.selector, chainId, tokenAssetId, - abi.encode(amount, alice) + abi.encode(0, alice, 0, amount, new bytes(0)) ); L2Message memory l2ToL1Message = L2Message({ txNumberInBatch: l2TxNumberInBatch, @@ -399,9 +399,8 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { ); // solhint-disable-next-line func-named-parameters - vm.expectEmit(true, true, true, true, address(sharedBridge)); + vm.expectEmit(true, true, true, false, address(sharedBridge)); emit DepositFinalizedAssetRouter(chainId, tokenAssetId, abi.encode(amount, alice)); - sharedBridge.finalizeWithdrawal({ _chainId: chainId, _l2BatchNumber: l2BatchNumber, @@ -417,7 +416,7 @@ contract L1AssetRouterTestBase is L1AssetRouterTest { IAssetRouterBase.finalizeDeposit.selector, chainId, tokenAssetId, - abi.encode(amount, alice) + abi.encode(0, alice, 0, amount, new bytes(0)) ); vm.mockCall( bridgehubAddress, diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeHyperEnabled.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeHyperEnabled.t.sol index c0ad80ff5..cdd5908d5 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeHyperEnabled.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeHyperEnabled.t.sol @@ -221,7 +221,7 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { IAssetRouterBase.finalizeDeposit.selector, chainId, tokenAssetId, - abi.encode(amount, alice) + abi.encode(0, alice, 0, amount, new bytes(0)) ); L2Message memory l2ToL1Message = L2Message({ txNumberInBatch: l2TxNumberInBatch, @@ -263,7 +263,7 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { IAssetRouterBase.finalizeDeposit.selector, chainId, ETH_TOKEN_ASSET_ID, - abi.encode(amount, alice) + abi.encode(0, alice, 0, amount, new bytes(0)) ); L2Message memory l2ToL1Message = L2Message({ txNumberInBatch: l2TxNumberInBatch, @@ -305,7 +305,7 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { IAssetRouterBase.finalizeDeposit.selector, chainId, tokenAssetId, - abi.encode(amount, alice) + abi.encode(0, alice, 0, amount, new bytes(0)) ); L2Message memory l2ToL1Message = L2Message({ txNumberInBatch: l2TxNumberInBatch, @@ -345,7 +345,7 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { IAssetRouterBase.finalizeDeposit.selector, chainId, tokenAssetId, - abi.encode(amount, alice) + abi.encode(0, alice, 0, amount, new bytes(0)) ); _setBaseTokenAssetId(bytes32(uint256(2))); //alt base token L2Message memory l2ToL1Message = L2Message({ diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeLegacy.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeLegacy.t.sol index cd3192ea5..967930e69 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeLegacy.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeLegacy.t.sol @@ -89,7 +89,7 @@ contract L1AssetRouterLegacyTest is L1AssetRouterTest { chainId: eraChainId, l2BatchNumber: l2BatchNumber, l2MessageIndex: l2MessageIndex, - l2Sender: L2_ASSET_ROUTER_ADDR, + l2Sender: L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR, l2TxNumberInBatch: l2TxNumberInBatch, message: message, merkleProof: merkleProof @@ -135,7 +135,7 @@ contract L1AssetRouterLegacyTest is L1AssetRouterTest { ); // solhint-disable-next-line func-named-parameters vm.expectEmit(true, true, false, false, address(sharedBridge)); - emit DepositFinalizedAssetRouter(eraChainId, tokenAssetId, new bytes(0)); // kl todo + emit DepositFinalizedAssetRouter(eraChainId, tokenAssetId, new bytes(0)); vm.prank(l1ERC20BridgeAddress); FinalizeL1DepositParams memory finalizeWithdrawalParams = FinalizeL1DepositParams({ chainId: eraChainId, diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol index 07945c886..dbef5a148 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol @@ -247,6 +247,12 @@ contract L1AssetRouterTest is Test { abi.encodeWithSelector(IL1BaseTokenAssetHandler.tokenAddress.selector, ETH_TOKEN_ASSET_ID), abi.encode(address(ETH_TOKEN_ADDRESS)) ); + vm.mockCall( + bridgehubAddress, + // solhint-disable-next-line func-named-parameters + abi.encodeWithSelector(IBridgehub.baseToken.selector, chainId), + abi.encode(ETH_TOKEN_ADDRESS) + ); } function _setSharedBridgeDepositHappened(uint256 _chainId, bytes32 _txHash, bytes32 _txDataHash) internal { From cc3b2ac5dcad7ee05daf30ca7f91a74d7b8a09fd Mon Sep 17 00:00:00 2001 From: kelemeno <34402761+kelemeno@users.noreply.github.com> Date: Tue, 10 Sep 2024 22:46:56 +0100 Subject: [PATCH 47/53] chore: merge main (#790) Signed-off-by: Danil Co-authored-by: Danil Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com> --- .gitignore | 2 + .../deploy-scripts/DeployL2Contracts.sol | 54 ++++-- .../dev/SetupLegacyBridge.s.sol | 155 ++++++++++++++++++ .../test/unit_tests/custom_base_token.spec.ts | 3 +- .../unit_tests/l1_shared_bridge_test.spec.ts | 6 +- .../test/unit_tests/l2-upgrade.test.spec.ts | 2 +- .../test/unit_tests/legacy_era_test.spec.ts | 2 +- .../test/unit_tests/mailbox_test.spec.ts | 2 +- .../test/unit_tests/proxy_test.spec.ts | 6 +- 9 files changed, 210 insertions(+), 22 deletions(-) create mode 100644 l1-contracts/deploy-scripts/dev/SetupLegacyBridge.s.sol diff --git a/.gitignore b/.gitignore index 21c173828..21516dc8e 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ l1-contracts/script-config/* l1-contracts/script-out/* !l1-contracts/script-out/.gitkeep *.timestamp +l1-contracts/test/foundry/l1/integration/deploy-scripts/script-out/* +l1-contracts/zkout/* diff --git a/l1-contracts/deploy-scripts/DeployL2Contracts.sol b/l1-contracts/deploy-scripts/DeployL2Contracts.sol index 1a02fd391..fb3f35024 100644 --- a/l1-contracts/deploy-scripts/DeployL2Contracts.sol +++ b/l1-contracts/deploy-scripts/DeployL2Contracts.sol @@ -46,12 +46,20 @@ contract DeployL2Script is Script { } function run() public { + deploy(false); + } + + function runWithLegacyBridge() public { + deploy(true); + } + + function deploy(bool legacyBridge) public { initializeConfig(); - loadContracts(); + loadContracts(legacyBridge); deployFactoryDeps(); deploySharedBridge(); - deploySharedBridgeProxy(); + deploySharedBridgeProxy(legacyBridge); initializeChain(); deployForceDeployer(); deployConsensusRegistry(); @@ -60,13 +68,21 @@ contract DeployL2Script is Script { saveOutput(); } + function runDeployLegacySharedBridge() public { + deploySharedBridge(true); + } + function runDeploySharedBridge() public { + deploySharedBridge(false); + } + + function deploySharedBridge(bool legacyBridge) internal { initializeConfig(); - loadContracts(); + loadContracts(legacyBridge); deployFactoryDeps(); deploySharedBridge(); - deploySharedBridgeProxy(); + deploySharedBridgeProxy(legacyBridge); initializeChain(); saveOutput(); @@ -74,7 +90,7 @@ contract DeployL2Script is Script { function runDefaultUpgrader() public { initializeConfig(); - loadContracts(); + loadContracts(false); deployForceDeployer(); @@ -83,7 +99,7 @@ contract DeployL2Script is Script { function runDeployConsensusRegistry() public { initializeConfig(); - loadContracts(); + loadContracts(false); deployConsensusRegistry(); deployConsensusRegistryProxy(); @@ -91,7 +107,7 @@ contract DeployL2Script is Script { saveOutput(); } - function loadContracts() internal { + function loadContracts(bool legacyBridge) internal { //HACK: Meanwhile we are not integrated foundry zksync we use contracts that has been built using hardhat contracts.l2StandardErc20FactoryBytecode = Utils.readHardhatBytecode( "/../l2-contracts/artifacts-zk/@openzeppelin/contracts-v4/proxy/beacon/UpgradeableBeacon.sol/UpgradeableBeacon.json" @@ -103,9 +119,16 @@ contract DeployL2Script is Script { "/../l2-contracts/artifacts-zk/contracts/bridge/L2StandardERC20.sol/L2StandardERC20.json" ); - contracts.l2SharedBridgeBytecode = Utils.readFoundryBytecode( - "/../l2-contracts/zkout/L2SharedBridge.sol/L2SharedBridge.json" - ); + if (legacyBridge) { + contracts.l2SharedBridgeBytecode = Utils.readHardhatBytecode( + "/../l2-contracts/artifacts-zk/contracts/dev-contracts/DevL2SharedBridge.sol/DevL2SharedBridge.json" + ); + } else { + contracts.l2SharedBridgeBytecode = Utils.readHardhatBytecode( + "/../l2-contracts/zkout/L2SharedBridge.sol/L2SharedBridge.json" + ); + } + contracts.l2SharedBridgeProxyBytecode = Utils.readHardhatBytecode( "/../l2-contracts/artifacts-zk/@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json" ); @@ -186,13 +209,20 @@ contract DeployL2Script is Script { }); } - function deploySharedBridgeProxy() internal { + function deploySharedBridgeProxy(bool legacyBridge) internal { address l2GovernorAddress = AddressAliasHelper.applyL1ToL2Alias(config.governance); bytes32 l2StandardErc20BytecodeHash = L2ContractHelper.hashL2Bytecode(contracts.beaconProxy); + string memory functionSignature; + + if (legacyBridge) { + functionSignature = "initializeDevBridge(address,address,bytes32,address)"; + } else { + functionSignature = "initialize(address,address,bytes32,address)"; + } // solhint-disable-next-line func-named-parameters bytes memory proxyInitializationParams = abi.encodeWithSignature( - "initialize(address,address,bytes32,address)", + functionSignature, config.l1SharedBridgeProxy, config.erc20BridgeProxy, l2StandardErc20BytecodeHash, diff --git a/l1-contracts/deploy-scripts/dev/SetupLegacyBridge.s.sol b/l1-contracts/deploy-scripts/dev/SetupLegacyBridge.s.sol new file mode 100644 index 000000000..301bfd2c8 --- /dev/null +++ b/l1-contracts/deploy-scripts/dev/SetupLegacyBridge.s.sol @@ -0,0 +1,155 @@ +// SPDX-License-Identifier: UNLICENSED +pragma solidity ^0.8.0; + +import {Script} from "forge-std/Script.sol"; +import {stdToml} from "forge-std/StdToml.sol"; +import {Utils} from "./../Utils.sol"; +import {L1SharedBridge} from "contracts/bridge/L1SharedBridge.sol"; +import {DummyL1ERC20Bridge} from "contracts/dev-contracts/DummyL1ERC20Bridge.sol"; +import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol"; +import {ITransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol"; +import {L2ContractHelper} from "contracts/common/libraries/L2ContractHelper.sol"; + +/// This scripts is only for developer +contract SetupLegacyBridge is Script { + using stdToml for string; + + Config internal config; + Addresses internal addresses; + + struct Config { + uint256 chainId; + address l2SharedBridgeAddress; + bytes32 create2FactorySalt; + } + + struct Addresses { + address create2FactoryAddr; + address bridgehub; + address diamondProxy; + address sharedBridgeProxy; + address transparentProxyAdmin; + address erc20BridgeProxy; + address tokenWethAddress; + address erc20BridgeProxyImpl; + address sharedBridgeProxyImpl; + } + + function run() public { + initializeConfig(); + deploySharedBridgeImplementation(); + upgradeImplementation(addresses.sharedBridgeProxy, addresses.sharedBridgeProxyImpl); + deployDummyErc20Bridge(); + upgradeImplementation(addresses.erc20BridgeProxy, addresses.erc20BridgeProxyImpl); + setParamsForDummyBridge(); + } + + function initializeConfig() internal { + string memory root = vm.projectRoot(); + string memory path = string.concat(root, "/script-config/setup-legacy-bridge.toml"); + string memory toml = vm.readFile(path); + + addresses.bridgehub = toml.readAddress("$.bridgehub"); + addresses.diamondProxy = toml.readAddress("$.diamond_proxy"); + addresses.sharedBridgeProxy = toml.readAddress("$.shared_bridge_proxy"); + addresses.transparentProxyAdmin = toml.readAddress("$.transparent_proxy_admin"); + addresses.erc20BridgeProxy = toml.readAddress("$.erc20bridge_proxy"); + addresses.tokenWethAddress = toml.readAddress("$.token_weth_address"); + addresses.create2FactoryAddr = toml.readAddress("$.create2factory_addr"); + config.chainId = toml.readUint("$.chain_id"); + config.l2SharedBridgeAddress = toml.readAddress("$.l2shared_bridge_address"); + config.create2FactorySalt = toml.readBytes32("$.create2factory_salt"); + } + + // We need to deploy new shared bridge for changing chain id and diamond proxy address + function deploySharedBridgeImplementation() internal { + bytes memory bytecode = abi.encodePacked( + type(L1SharedBridge).creationCode, + // solhint-disable-next-line func-named-parameters + abi.encode(addresses.tokenWethAddress, addresses.bridgehub, config.chainId, addresses.diamondProxy) + ); + + address contractAddress = deployViaCreate2(bytecode); + addresses.sharedBridgeProxyImpl = contractAddress; + } + + function deployDummyErc20Bridge() internal { + bytes memory bytecode = abi.encodePacked( + type(DummyL1ERC20Bridge).creationCode, + // solhint-disable-next-line func-named-parameters + abi.encode(addresses.sharedBridgeProxy) + ); + address contractAddress = deployViaCreate2(bytecode); + addresses.erc20BridgeProxyImpl = contractAddress; + } + + function upgradeImplementation(address proxy, address implementation) internal { + bytes memory proxyAdminUpgradeData = abi.encodeCall( + ProxyAdmin.upgrade, + (ITransparentUpgradeableProxy(proxy), implementation) + ); + ProxyAdmin _proxyAdmin = ProxyAdmin(addresses.transparentProxyAdmin); + address governance = _proxyAdmin.owner(); + + Utils.executeUpgrade({ + _governor: address(governance), + _salt: bytes32(0), + _target: address(addresses.transparentProxyAdmin), + _data: proxyAdminUpgradeData, + _value: 0, + _delay: 0 + }); + } + + function setParamsForDummyBridge() internal { + (address l2TokenBeacon, bytes32 l2TokenBeaconHash) = calculateTokenBeaconAddress(); + DummyL1ERC20Bridge bridge = DummyL1ERC20Bridge(addresses.erc20BridgeProxy); + bridge.setValues(config.l2SharedBridgeAddress, l2TokenBeacon, l2TokenBeaconHash); + } + + function calculateTokenBeaconAddress() + internal + returns (address tokenBeaconAddress, bytes32 tokenBeaconBytecodeHash) + { + bytes memory l2StandardTokenCode = Utils.readHardhatBytecode( + "/../l2-contracts/artifacts-zk/contracts/bridge/L2StandardERC20.sol/L2StandardERC20.json" + ); + (address l2StandardToken, ) = calculateL2Create2Address( + config.l2SharedBridgeAddress, + l2StandardTokenCode, + bytes32(0), + "" + ); + + bytes memory beaconProxy = Utils.readHardhatBytecode( + "/../l2-contracts/artifacts-zk/@openzeppelin/contracts/proxy/beacon/BeaconProxy.sol/BeaconProxy.json" + ); + + (tokenBeaconAddress, tokenBeaconBytecodeHash) = calculateL2Create2Address( + config.l2SharedBridgeAddress, + beaconProxy, + bytes32(0), + abi.encode(l2StandardToken) + ); + } + + function calculateL2Create2Address( + address sender, + bytes memory bytecode, + bytes32 create2salt, + bytes memory constructorargs + ) internal returns (address create2Address, bytes32 bytecodeHash) { + bytecodeHash = L2ContractHelper.hashL2Bytecode(bytecode); + + create2Address = L2ContractHelper.computeCreate2Address( + sender, + create2salt, + bytecodeHash, + keccak256(constructorargs) + ); + } + + function deployViaCreate2(bytes memory _bytecode) internal returns (address) { + return Utils.deployViaCreate2(_bytecode, config.create2FactorySalt, addresses.create2FactoryAddr); + } +} diff --git a/l1-contracts/test/unit_tests/custom_base_token.spec.ts b/l1-contracts/test/unit_tests/custom_base_token.spec.ts index 464298482..b7dce29b1 100644 --- a/l1-contracts/test/unit_tests/custom_base_token.spec.ts +++ b/l1-contracts/test/unit_tests/custom_base_token.spec.ts @@ -147,7 +147,8 @@ describe("Custom base token chain and bridge tests", () => { const revertReason = await getCallRevertReason( l1SharedBridge.connect(randomSigner).finalizeWithdrawal(chainId, 0, 0, 0, "0x", []) ); - expect(revertReason).contains("MalformedMessage"); + console.log(revertReason); + expect(revertReason).contains("L2WithdrawalMessageWrongLength"); }); it("Should revert on finalizing a withdrawal with wrong function selector", async () => { diff --git a/l1-contracts/test/unit_tests/l1_shared_bridge_test.spec.ts b/l1-contracts/test/unit_tests/l1_shared_bridge_test.spec.ts index 31475e241..fb5cf437d 100644 --- a/l1-contracts/test/unit_tests/l1_shared_bridge_test.spec.ts +++ b/l1-contracts/test/unit_tests/l1_shared_bridge_test.spec.ts @@ -129,7 +129,7 @@ describe("Shared Bridge tests", () => { const revertReason = await getCallRevertReason( l1SharedBridge.connect(randomSigner).finalizeWithdrawal(chainId, 0, 0, 0, "0x", [ethers.constants.HashZero]) ); - expect(revertReason).contains("MalformedMessage"); + expect(revertReason).contains("L2WithdrawalMessageWrongLength"); }); it("Should revert on finalizing a withdrawal with wrong message length", async () => { @@ -145,7 +145,7 @@ describe("Shared Bridge tests", () => { [ethers.constants.HashZero] ) ); - expect(revertReason).contains("MalformedMessage"); + expect(revertReason).contains("L2WithdrawalMessageWrongLength"); }); it("Should revert on finalizing a withdrawal with wrong function selector", async () => { @@ -183,7 +183,7 @@ describe("Shared Bridge tests", () => { const revertReason = await getCallRevertReason( l1SharedBridge.connect(randomSigner).finalizeWithdrawal(chainId, 0, 0, 0, "0x", [ethers.constants.HashZero]) ); - expect(revertReason).contains("MalformedMessage"); + expect(revertReason).contains("L2WithdrawalMessageWrongLength"); }); it("Should revert on finalizing a withdrawal with wrong function signature", async () => { diff --git a/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts b/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts index b5d97bf7d..1f6af8899 100644 --- a/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts +++ b/l1-contracts/test/unit_tests/l2-upgrade.test.spec.ts @@ -42,7 +42,7 @@ import { } from "./utils"; import { packSemver, unpackStringSemVer, addToProtocolVersion } from "../../scripts/utils"; -describe.only("L2 upgrade test", function () { +describe("L2 upgrade test", function () { let proxyExecutor: ExecutorFacet; let proxyAdmin: AdminFacet; let proxyGetters: GettersFacet; diff --git a/l1-contracts/test/unit_tests/legacy_era_test.spec.ts b/l1-contracts/test/unit_tests/legacy_era_test.spec.ts index 0f4f26bd9..44469df8c 100644 --- a/l1-contracts/test/unit_tests/legacy_era_test.spec.ts +++ b/l1-contracts/test/unit_tests/legacy_era_test.spec.ts @@ -164,7 +164,7 @@ describe("Legacy Era tests", function () { const revertReason = await getCallRevertReason( l1ERC20Bridge.connect(randomSigner).finalizeWithdrawal(0, 0, 0, "0x", [ethers.constants.HashZero]) ); - expect(revertReason).contains("MalformedMessage"); + expect(revertReason).contains("L2WithdrawalMessageWrongLength"); }); it("Should revert on finalizing a withdrawal with wrong function signature", async () => { diff --git a/l1-contracts/test/unit_tests/mailbox_test.spec.ts b/l1-contracts/test/unit_tests/mailbox_test.spec.ts index 5bb874381..230f4e46e 100644 --- a/l1-contracts/test/unit_tests/mailbox_test.spec.ts +++ b/l1-contracts/test/unit_tests/mailbox_test.spec.ts @@ -105,7 +105,7 @@ describe("Mailbox tests", function () { ) ); - expect(revertReason).contains("MalformedBytecode"); + expect(revertReason).contains("LengthIsNotDivisibleBy32"); }); it("Should not accept bytecode of even length in words", async () => { diff --git a/l1-contracts/test/unit_tests/proxy_test.spec.ts b/l1-contracts/test/unit_tests/proxy_test.spec.ts index e63abe0bb..5336f3266 100644 --- a/l1-contracts/test/unit_tests/proxy_test.spec.ts +++ b/l1-contracts/test/unit_tests/proxy_test.spec.ts @@ -134,14 +134,14 @@ describe("Diamond proxy tests", function () { const proxyAsERC20 = TestnetERC20TokenFactory.connect(proxy.address, proxy.signer); const revertReason = await getCallRevertReason(proxyAsERC20.transfer(proxyAsERC20.address, 0)); - expect(revertReason).contains("InvalidSelector"); + expect(revertReason).contains("F"); }); it("check that proxy reject data with no selector", async () => { const dataWithoutSelector = "0x1122"; const revertReason = await getCallRevertReason(proxy.fallback({ data: dataWithoutSelector })); - expect(revertReason).contains("MalformedCalldata"); + expect(revertReason).contains("Ut"); }); it("should freeze the diamond storage", async () => { @@ -178,7 +178,7 @@ describe("Diamond proxy tests", function () { data: executorFacetSelector3 + "0000000000000000000000000000000000000000000000000000000000000000", }) ); - expect(revertReason).contains("FacetIsFrozen"); + expect(revertReason).contains("q1"); }); it("should be able to call an unfreezable facet when diamondStorage is frozen", async () => { From c0d45faaf4a62df72301a841ef15f98b67413734 Mon Sep 17 00:00:00 2001 From: kelemeno Date: Tue, 10 Sep 2024 23:00:33 +0100 Subject: [PATCH 48/53] test fixes --- .../contracts/bridge/BridgeHelper.sol | 1 - .../Bridgehub/experimental_bridge.t.sol | 11 +------- .../L1SharedBridge/L1SharedBridgeAdmin.t.sol | 26 ------------------- .../_L1SharedBridge_Shared.t.sol | 3 --- 4 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeAdmin.t.sol diff --git a/l1-contracts/contracts/bridge/BridgeHelper.sol b/l1-contracts/contracts/bridge/BridgeHelper.sol index 422ad45e9..bcc59327f 100644 --- a/l1-contracts/contracts/bridge/BridgeHelper.sol +++ b/l1-contracts/contracts/bridge/BridgeHelper.sol @@ -7,7 +7,6 @@ pragma solidity 0.8.24; import {IERC20Metadata} from "@openzeppelin/contracts-v4/token/ERC20/extensions/IERC20Metadata.sol"; import {ETH_TOKEN_ADDRESS} from "../common/Config.sol"; import {DataEncoding} from "../common/libraries/DataEncoding.sol"; -import {NEW_ENCODING_VERSION} from "./asset-router/IAssetRouterBase.sol"; /** * @author Matter Labs diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol index acd89b8ef..d9675912a 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol @@ -456,26 +456,17 @@ contract ExperimentalBridgeTest is Test { address randomCaller, uint256 randomValue ) public useRandomToken(randomValue) { -<<<<<<< HEAD:l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol vm.startPrank(bridgeOwner); bridgeHub.setAddresses(address(mockSharedBridge), ICTMDeploymentTracker(address(0)), IMessageRoot(address(0))); vm.stopPrank(); bytes32 assetId = DataEncoding.encodeNTVAssetId(block.chainid, testTokenAddress); - if (randomCaller != bridgeOwner) { - vm.prank(randomCaller); - vm.expectRevert(bytes("Ownable: caller is not the owner")); - bridgeHub.addTokenAssetId(assetId); - } -======= vm.assume(randomCaller != bridgeOwner); vm.assume(randomCaller != bridgeHub.admin()); - vm.prank(randomCaller); vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, randomCaller)); - bridgeHub.addToken(randomAddress); ->>>>>>> b653ac8044f78956d81625dd7ee409d7c9651685:l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol + bridgeHub.addTokenAssetId(assetId); assertTrue(!bridgeHub.assetIdIsRegistered(assetId), "This random address is not registered as a token"); diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeAdmin.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeAdmin.t.sol deleted file mode 100644 index af97e3ed2..000000000 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeAdmin.t.sol +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity 0.8.24; - -import {L1SharedBridgeTest} from "./_L1SharedBridge_Shared.t.sol"; - -/// We are testing all the specified revert and require cases. -contract L1SharedBridgeAdminTest is L1SharedBridgeTest { - uint256 internal randomChainId = 123456; - - function testAdminCanInitializeChainGovernance() public { - address randomL2Bridge = makeAddr("randomL2Bridge"); - - vm.prank(admin); - sharedBridge.initializeChainGovernance(randomChainId, randomL2Bridge); - - assertEq(sharedBridge.l2BridgeAddress(randomChainId), randomL2Bridge); - } - - function testAdminCanNotReinitializeChainGovernance() public { - address randomNewBridge = makeAddr("randomNewBridge"); - - vm.expectRevert("Ownable: caller is not the owner"); - vm.prank(admin); - sharedBridge.reinitializeChainGovernance(randomChainId, randomNewBridge); - } -} diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol index c46059052..fdc42d53e 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol @@ -178,9 +178,6 @@ contract L1AssetRouterTest is Test { nativeTokenVault.registerToken(address(token)); nativeTokenVault.registerEthToken(); vm.prank(owner); - sharedBridge.setPendingAdmin(admin); - vm.prank(admin); - sharedBridge.acceptAdmin(); vm.store( address(sharedBridge), From 07d046217db7a697d9dea9c6944113f916843894 Mon Sep 17 00:00:00 2001 From: Vlad Bochok <41153528+vladbochok@users.noreply.github.com> Date: Wed, 11 Sep 2024 03:14:58 +0200 Subject: [PATCH 49/53] Fixes (#792) --- .../contracts/bridge/L1ERC20Bridge.sol | 4 +- l1-contracts/contracts/bridge/L1Nullifier.sol | 109 +++++++++--------- .../bridge/asset-router/AssetRouterBase.sol | 11 +- .../bridge/asset-router/IL1AssetRouter.sol | 16 +-- .../bridge/asset-router/L1AssetRouter.sol | 61 +++++----- .../bridge/asset-router/L2AssetRouter.sol | 44 +++++-- .../bridge/interfaces/IAssetHandler.sol | 4 +- .../interfaces/IL1AssetDeploymentTracker.sol | 2 +- .../bridge/interfaces/IL1Nullifier.sol | 5 +- .../bridge/ntv/L1NativeTokenVault.sol | 6 +- .../contracts/bridge/ntv/NativeTokenVault.sol | 22 ++-- .../contracts/bridgehub/Bridgehub.sol | 10 +- .../bridgehub/CTMDeploymentTracker.sol | 16 +-- .../bridgehub/ICTMDeploymentTracker.sol | 2 +- .../contracts/common/L2ContractAddresses.sol | 2 +- .../common/libraries/DataEncoding.sol | 22 ++-- .../test/DummyEraBaseTokenBridge.sol | 2 +- .../dev-contracts/test/DummySharedBridge.sol | 12 +- .../chain-deps/facets/Admin.sol | 4 +- .../chain-interfaces/IAdmin.sol | 4 +- .../contracts/vendor/AddressAliasHelper.sol | 12 +- l1-contracts/deploy-scripts/DeployL1.s.sol | 2 +- .../l1/integration/AssetRouterTest.t.sol | 2 +- .../L1Erc20Bridge/FinalizeWithdrawal.sol | 2 +- .../L1SharedBridge/L1SharedBridgeFails.t.sol | 16 ++- .../L1SharedBridgeHyperEnabled.t.sol | 6 +- .../L1SharedBridge/L1SharedBridgeLegacy.t.sol | 6 +- .../_L1SharedBridge_Shared.t.sol | 5 +- .../test/unit_tests/legacy_era_test.spec.ts | 5 +- 29 files changed, 216 insertions(+), 198 deletions(-) diff --git a/l1-contracts/contracts/bridge/L1ERC20Bridge.sol b/l1-contracts/contracts/bridge/L1ERC20Bridge.sol index ced36cd36..3eb231950 100644 --- a/l1-contracts/contracts/bridge/L1ERC20Bridge.sol +++ b/l1-contracts/contracts/bridge/L1ERC20Bridge.sol @@ -145,7 +145,7 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { message: _message, merkleProof: _merkleProof }); - L1_NULLIFIER.finalizeWithdrawalLegacyContracts(finalizeWithdrawalParams); + L1_NULLIFIER.finalizeDeposit(finalizeWithdrawalParams); } /// @notice Initiates a deposit by locking funds on the contract and sending the request @@ -195,7 +195,7 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { } l2TxHash = L1_ASSET_ROUTER.depositLegacyErc20Bridge{value: msg.value}({ - _prevMsgSender: msg.sender, + _originalCaller: msg.sender, _l2Receiver: _l2Receiver, _l1Token: _l1Token, _amount: _amount, diff --git a/l1-contracts/contracts/bridge/L1Nullifier.sol b/l1-contracts/contracts/bridge/L1Nullifier.sol index f20b4ad76..789f122df 100644 --- a/l1-contracts/contracts/bridge/L1Nullifier.sol +++ b/l1-contracts/contracts/bridge/L1Nullifier.sol @@ -20,6 +20,7 @@ import {INativeTokenVault} from "./ntv/INativeTokenVault.sol"; import {IL1Nullifier, FinalizeL1DepositParams} from "./interfaces/IL1Nullifier.sol"; +import {IGetters} from "../state-transition/chain-interfaces/IGetters.sol"; import {IMailbox} from "../state-transition/chain-interfaces/IMailbox.sol"; import {L2Message, TxStatus} from "../common/Messaging.sol"; import {UnsafeBytes} from "../common/libraries/UnsafeBytes.sol"; @@ -71,7 +72,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, uint256 internal eraLegacyBridgeLastDepositTxNumber; /// @dev Legacy bridge smart contract that used to hold ERC20 tokens. - address public override legacyBridge; + IL1ERC20Bridge public override legacyBridge; /// @dev A mapping chainId => bridgeProxy. Used to store the bridge proxy's address, and to see if it has been deployed yet. // slither-disable-next-line uninitialized-state @@ -79,7 +80,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, /// @dev A mapping chainId => L2 deposit transaction hash => dataHash // keccak256(abi.encode(account, tokenAddress, amount)) for legacy transfers - // keccak256(abi.encode(_prevMsgSender, assetId, transferData)) for new transfers + // keccak256(abi.encode(_originalCaller, assetId, transferData)) for new transfers /// @dev Tracks deposit transactions to L2 to enable users to claim their funds if a deposit fails. mapping(uint256 chainId => mapping(bytes32 l2DepositTxHash => bytes32 depositDataHash)) public @@ -131,7 +132,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, /// @notice Checks that the message sender is the legacy bridge. modifier onlyLegacyBridge() { - if (msg.sender != legacyBridge) { + if (msg.sender != address(legacyBridge)) { revert Unauthorized(msg.sender); } _; @@ -139,7 +140,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, /// @notice Checks that the message sender is the legacy bridge. modifier onlyAssetRouterOrErc20Bridge() { - if (msg.sender != address(l1AssetRouter) && msg.sender != legacyBridge) { + if (msg.sender != address(l1AssetRouter) && msg.sender != address(legacyBridge)) { revert Unauthorized(msg.sender); } _; @@ -219,11 +220,11 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, /// @notice Sets the L1ERC20Bridge contract address. /// @dev Should be called only once by the owner. /// @param _legacyBridge The address of the legacy bridge. - function setL1Erc20Bridge(address _legacyBridge) external onlyOwner { + function setL1Erc20Bridge(IL1ERC20Bridge _legacyBridge) external onlyOwner { if (address(legacyBridge) != address(0)) { revert AddressAlreadySet(address(legacyBridge)); } - if (_legacyBridge == address(0)) { + if (address(_legacyBridge) == address(0)) { revert ZeroAddress(); } legacyBridge = _legacyBridge; @@ -269,19 +270,19 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, /// @dev Calls the internal `_encodeTxDataHash`. Used as a wrapped for try / catch case. /// @dev Encodes the transaction data hash using either the latest encoding standard or the legacy standard. /// @param _encodingVersion EncodingVersion. - /// @param _prevMsgSender The address of the entity that initiated the deposit. + /// @param _originalCaller The address of the entity that initiated the deposit. /// @param _assetId The unique identifier of the deposited L1 token. /// @param _transferData The encoded transfer data, which includes both the deposit amount and the address of the L2 receiver. /// @return txDataHash The resulting encoded transaction data hash. function encodeTxDataHash( bytes1 _encodingVersion, - address _prevMsgSender, + address _originalCaller, bytes32 _assetId, bytes calldata _transferData ) external view returns (bytes32 txDataHash) { txDataHash = DataEncoding.encodeTxDataHash({ _encodingVersion: _encodingVersion, - _prevMsgSender: _prevMsgSender, + _originalCaller: _originalCaller, _assetId: _assetId, _nativeTokenVault: address(l1NativeTokenVault), _transferData: _transferData @@ -301,6 +302,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, bytes32[] calldata _merkleProof ) public nonReentrant { _verifyAndClearFailedTransfer({ + _checkedInLegacyBridge: false, _chainId: _chainId, _depositSender: _depositSender, _assetId: _assetId, @@ -327,6 +329,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, /// @param _merkleProof The Merkle proof of the processing L1 -> L2 transaction with deposit finalization. /// @dev Processes claims of failed deposit, whether they originated from the legacy bridge or the current system. function _verifyAndClearFailedTransfer( + bool _checkedInLegacyBridge, uint256 _chainId, address _depositSender, bytes32 _assetId, @@ -352,8 +355,17 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, } } - require(!_isPreSharedBridgeDepositOnEra(_chainId, _l2BatchNumber, _l2TxNumberInBatch), "L1N: legacy cFD"); + bool notCheckedInLegacyBridgeOrWeCanCheckDeposit; { + // Deposits that happened before the upgrade cannot be checked here, they have to be claimed and checked in the legacyBridge + bool weCanCheckDepositHere = !_isPreSharedBridgeDepositOnEra(_chainId, _l2BatchNumber, _l2TxNumberInBatch); + // Double claims are not possible, as depositHappened is checked here for all except legacy deposits (which have to happen through the legacy bridge) + // Funds claimed before the update will still be recorded in the legacy bridge + // Note we double check NEW deposits if they are called from the legacy bridge + notCheckedInLegacyBridgeOrWeCanCheckDeposit = (!_checkedInLegacyBridge) || weCanCheckDepositHere; + } + + if (notCheckedInLegacyBridgeOrWeCanCheckDeposit) { bytes32 dataHash = depositHappened[_chainId][_l2TxHash]; // Determine if the given dataHash matches the calculated legacy transaction hash. bool isLegacyTxDataHash = _isLegacyTxDataHash(_depositSender, _assetId, _assetData, dataHash); @@ -362,7 +374,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, if (!isLegacyTxDataHash) { bytes32 txDataHash = DataEncoding.encodeTxDataHash({ _encodingVersion: NEW_ENCODING_VERSION, - _prevMsgSender: _depositSender, + _originalCaller: _depositSender, _assetId: _assetId, _nativeTokenVault: address(l1NativeTokenVault), _transferData: _assetData @@ -379,7 +391,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, /// @param _finalizeWithdrawalParams The structure that holds all necessary data to finalize withdrawal /// @dev We have both the legacy finalizeWithdrawal and the new finalizeDeposit functions, /// finalizeDeposit uses the new format. On the L2 we have finalizeDeposit with new and old formats both. - function finalizeDeposit(FinalizeL1DepositParams calldata _finalizeWithdrawalParams) public { + function finalizeDeposit(FinalizeL1DepositParams calldata _finalizeWithdrawalParams) external { _finalizeDeposit(_finalizeWithdrawalParams); } @@ -388,17 +400,6 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, function _finalizeDeposit( FinalizeL1DepositParams calldata _finalizeWithdrawalParams ) internal nonReentrant whenNotPaused { - (bytes32 assetId, bytes memory transferData) = _verifyAndGetWithdrawalData(_finalizeWithdrawalParams); - l1AssetRouter.finalizeDeposit(_finalizeWithdrawalParams.chainId, assetId, transferData); - } - - /// @notice Internal function that handles the logic for finalizing withdrawals, supporting both the current bridge system and the legacy ERC20 bridge. - /// @param _finalizeWithdrawalParams The structure that holds all necessary data to finalize withdrawal - /// @return assetId The bridged asset ID. - /// @return transferData The encoded transfer data. - function _verifyAndGetWithdrawalData( - FinalizeL1DepositParams calldata _finalizeWithdrawalParams - ) internal whenNotPaused returns (bytes32 assetId, bytes memory transferData) { uint256 chainId = _finalizeWithdrawalParams.chainId; uint256 l2BatchNumber = _finalizeWithdrawalParams.l2BatchNumber; uint256 l2MessageIndex = _finalizeWithdrawalParams.l2MessageIndex; @@ -408,10 +409,19 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, isWithdrawalFinalized[chainId][l2BatchNumber][l2MessageIndex] = true; // Handling special case for withdrawal from ZKsync Era initiated before Shared Bridge. - require(!_isPreSharedBridgeEraEthWithdrawal(chainId, l2BatchNumber), "L1N: legacy eth withdrawal"); - require(!_isPreSharedBridgeEraTokenWithdrawal(chainId, l2BatchNumber), "L1N: legacy token withdrawal"); + (bytes32 assetId, bytes memory transferData) = _verifyWithdrawal(_finalizeWithdrawalParams); - (assetId, transferData) = _verifyWithdrawal(_finalizeWithdrawalParams); + // Handling special case for withdrawal from zkSync Era initiated before Shared Bridge. + if (_isPreSharedBridgeEraEthWithdrawal(chainId, l2BatchNumber)) { + // Checks that the withdrawal wasn't finalized already. + bool alreadyFinalized = IGetters(ERA_DIAMOND_PROXY).isEthWithdrawalFinalized(l2BatchNumber, l2MessageIndex); + require(!alreadyFinalized, "L1N: Withdrawal is already finalized 2"); + } + if (_isPreSharedBridgeEraTokenWithdrawal(chainId, l2BatchNumber)) { + require(!legacyBridge.isWithdrawalFinalized(l2BatchNumber, l2MessageIndex), "L1N: legacy withdrawal"); + } + + l1AssetRouter.finalizeDeposit(chainId, assetId, transferData); } /// @dev Determines if an eth withdrawal was initiated on ZKsync Era before the upgrade to the Shared Bridge. @@ -493,21 +503,21 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, ); L2Message memory l2ToL1Message; { + address l2Sender = _finalizeWithdrawalParams.l2Sender; bool baseTokenWithdrawal = (assetId == BRIDGE_HUB.baseTokenAssetId(_finalizeWithdrawalParams.chainId)); require( /// @dev for legacy function calls we hardcode the sender as the L2AssetRouter as we don't know if it is /// a base token or erc20 token withdrawal beforehand, /// so we have to allow that option even if we override it. - _finalizeWithdrawalParams.l2Sender == L2_ASSET_ROUTER_ADDR || - _finalizeWithdrawalParams.l2Sender == L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR || - _finalizeWithdrawalParams.l2Sender == - __DEPRECATED_l2BridgeAddress[_finalizeWithdrawalParams.chainId], + l2Sender == L2_ASSET_ROUTER_ADDR || + l2Sender == L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR || + l2Sender == __DEPRECATED_l2BridgeAddress[_finalizeWithdrawalParams.chainId], "L1N: wrong l2 sender" ); l2ToL1Message = L2Message({ txNumberInBatch: _finalizeWithdrawalParams.l2TxNumberInBatch, - sender: baseTokenWithdrawal ? L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR : _finalizeWithdrawalParams.l2Sender, + sender: baseTokenWithdrawal ? L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR : l2Sender, data: _finalizeWithdrawalParams.message }); } @@ -536,22 +546,20 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, uint256 _chainId, bytes memory _l2ToL1message ) internal view returns (bytes32 assetId, bytes memory transferData) { - // We check that the message is long enough to read the data. - // Please note that there are two versions of the message: - // 1. The message that is sent by `withdraw(address _l1Receiver)` - // It should be equal to the length of the bytes4 function signature + address l1Receiver + uint256 amount = 4 + 20 + 32 = 56 (bytes). - // 2. The message that is encoded by `getL1WithdrawMessage(bytes32 _assetId, bytes memory _bridgeMintData)` - // No length is assume. The assetId is decoded and the mintData is passed to respective assetHandler - - // The data is expected to be at least 56 bytes long. - if (_l2ToL1message.length < 56) { - revert L2WithdrawalMessageWrongLength(_l2ToL1message.length); - } + // Please note that there are three versions of the message: + // 1. The message that is sent from `L2BaseToken` to withdraw base token. + // 2. The message that is sent from L2 Legacy Shared Bridge to withdraw ERC20 tokens or base token. + // 3. The message that is sent from L2 Asset Router to withdraw ERC20 tokens or base token. + uint256 amount; address l1Receiver; (uint32 functionSignature, uint256 offset) = UnsafeBytes.readUint32(_l2ToL1message, 0); if (bytes4(functionSignature) == IMailbox.finalizeEthWithdrawal.selector) { + // The data is expected to be at least 56 bytes long. + if (_l2ToL1message.length < 56) { + revert L2WithdrawalMessageWrongLength(_l2ToL1message.length); + } // this message is a base token withdrawal (l1Receiver, offset) = UnsafeBytes.readAddress(_l2ToL1message, offset); // slither-disable-next-line unused-return @@ -559,15 +567,13 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, assetId = BRIDGE_HUB.baseTokenAssetId(_chainId); address baseToken = BRIDGE_HUB.baseToken(_chainId); transferData = DataEncoding.encodeBridgeMintData({ - _prevMsgSender: address(0), + _originalCaller: address(0), _l2Receiver: l1Receiver, _l1Token: baseToken, _amount: amount, _erc20Metadata: new bytes(0) }); } else if (bytes4(functionSignature) == IL1ERC20Bridge.finalizeWithdrawal.selector) { - // We use the IL1ERC20Bridge for backward compatibility with old withdrawals. - address l1Token; // this message is a token withdrawal // Check that the message length is correct. @@ -577,13 +583,15 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, revert L2WithdrawalMessageWrongLength(_l2ToL1message.length); } (l1Receiver, offset) = UnsafeBytes.readAddress(_l2ToL1message, offset); + // We use the IL1ERC20Bridge for backward compatibility with old withdrawals. + address l1Token; (l1Token, offset) = UnsafeBytes.readAddress(_l2ToL1message, offset); // slither-disable-next-line unused-return (amount, ) = UnsafeBytes.readUint256(_l2ToL1message, offset); assetId = DataEncoding.encodeNTVAssetId(block.chainid, l1Token); transferData = DataEncoding.encodeBridgeMintData({ - _prevMsgSender: address(0), + _originalCaller: address(0), _l2Receiver: l1Receiver, _l1Token: l1Token, _amount: amount, @@ -631,6 +639,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, bytes memory assetData = abi.encode(_amount, address(0)); _verifyAndClearFailedTransfer({ + _checkedInLegacyBridge: false, _depositSender: _depositSender, _chainId: _chainId, _assetId: assetId, @@ -654,13 +663,6 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, ERA ERC20 LEGACY FUNCTIONS //////////////////////////////////////////////////////////////*/ - /// @notice Finalizes the withdrawal for transactions initiated via the legacy ERC20 bridge. - function finalizeWithdrawalLegacyContracts( - FinalizeL1DepositParams calldata _finalizeWithdrawalParams - ) external override onlyAssetRouterOrErc20Bridge { - _finalizeDeposit(_finalizeWithdrawalParams); - } - /// @notice Withdraw funds from the initiated deposit, that failed when finalizing on ZKsync Era chain. /// This function is specifically designed for maintaining backward-compatibility with legacy `claimFailedDeposit` /// method in `L1ERC20Bridge`. @@ -688,6 +690,7 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, bytes32 assetId = INativeTokenVault(address(l1NativeTokenVault)).getAssetId(block.chainid, _l1Asset); _verifyAndClearFailedTransfer({ + _checkedInLegacyBridge: true, _depositSender: _depositSender, _chainId: ERA_CHAIN_ID, _assetId: assetId, diff --git a/l1-contracts/contracts/bridge/asset-router/AssetRouterBase.sol b/l1-contracts/contracts/bridge/asset-router/AssetRouterBase.sol index a623a8187..1a27e825f 100644 --- a/l1-contracts/contracts/bridge/asset-router/AssetRouterBase.sol +++ b/l1-contracts/contracts/bridge/asset-router/AssetRouterBase.sol @@ -90,11 +90,6 @@ abstract contract AssetRouterBase is IAssetRouterBase, Ownable2StepUpgradeable, emit AssetHandlerRegisteredInitial(assetId, _assetHandlerAddress, _assetRegistrationData, sender); } - function _setAssetHandlerAddress(bytes32 _assetId, address _assetAddress) internal { - assetHandlerAddress[_assetId] = _assetAddress; - emit AssetHandlerRegistered(_assetId, _assetAddress); - } - /*////////////////////////////////////////////////////////////// Receive transaction Functions //////////////////////////////////////////////////////////////*/ @@ -127,7 +122,7 @@ abstract contract AssetRouterBase is IAssetRouterBase, Ownable2StepUpgradeable, /// @param _chainId The chain ID of the ZK chain to which to deposit. /// @param _nextMsgValue The L2 `msg.value` from the L1 -> L2 deposit transaction. /// @param _assetId The deposited asset ID. - /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. + /// @param _originalCaller The `msg.sender` address from the external call that initiated current one. /// @param _transferData The encoded data, which is used by the asset handler to determine L2 recipient and amount. Might include extra information. /// @param _passValue Boolean indicating whether to pass msg.value in the call. /// @return bridgeMintCalldata The calldata used by remote asset handler to mint tokens for recipient. @@ -135,7 +130,7 @@ abstract contract AssetRouterBase is IAssetRouterBase, Ownable2StepUpgradeable, uint256 _chainId, uint256 _nextMsgValue, bytes32 _assetId, - address _prevMsgSender, + address _originalCaller, bytes memory _transferData, bool _passValue ) internal returns (bytes memory bridgeMintCalldata) { @@ -149,7 +144,7 @@ abstract contract AssetRouterBase is IAssetRouterBase, Ownable2StepUpgradeable, _chainId: _chainId, _msgValue: _nextMsgValue, _assetId: _assetId, - _prevMsgSender: _prevMsgSender, + _originalCaller: _originalCaller, _data: _transferData }); } diff --git a/l1-contracts/contracts/bridge/asset-router/IL1AssetRouter.sol b/l1-contracts/contracts/bridge/asset-router/IL1AssetRouter.sol index dea235ff8..55b5b9560 100644 --- a/l1-contracts/contracts/bridge/asset-router/IL1AssetRouter.sol +++ b/l1-contracts/contracts/bridge/asset-router/IL1AssetRouter.sol @@ -40,7 +40,7 @@ interface IL1AssetRouter is IAssetRouterBase { /// 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. - /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. + /// @param _originalCaller The `msg.sender` address from the external call that initiated current one. /// @param _l2Receiver The account address that should receive funds on L2. /// @param _l1Token The L1 token address which is deposited. /// @param _amount The total amount of tokens to be bridged. @@ -62,7 +62,7 @@ interface IL1AssetRouter is IAssetRouterBase { /// the funds would be lost. /// @return txHash The L2 transaction hash of deposit finalization. function depositLegacyErc20Bridge( - address _prevMsgSender, + address _originalCaller, address _l2Receiver, address _l1Token, uint256 _amount, @@ -97,8 +97,8 @@ interface IL1AssetRouter is IAssetRouterBase { /// @notice Transfers funds to Native Token Vault, if the asset is registered with it. Does nothing for ETH or non-registered tokens. /// @dev assetId is not the padded address, but the correct encoded id (NTV stores respective format for IDs) /// @param _amount The asset amount to be transferred to native token vault. - /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. - function transferFundsToNTV(bytes32 _assetId, uint256 _amount, address _prevMsgSender) external returns (bool); + /// @param _originalCaller The `msg.sender` address from the external call that initiated current one. + function transferFundsToNTV(bytes32 _assetId, uint256 _amount, address _originalCaller) external returns (bool); /// @notice Finalize the withdrawal and release funds /// @param _chainId The chain ID of the transaction to check @@ -118,7 +118,7 @@ interface IL1AssetRouter is IAssetRouterBase { /// @notice Initiates a transfer transaction within Bridgehub, used by `requestL2TransactionTwoBridges`. /// @param _chainId The chain ID of the ZK chain to which deposit. - /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. + /// @param _originalCaller The `msg.sender` address from the external call that initiated current one. /// @param _value The `msg.value` on the target chain tx. /// @param _data The calldata for the second bridge deposit. /// @return request The data used by the bridgehub to create L2 transaction request to specific ZK chain. @@ -131,7 +131,7 @@ interface IL1AssetRouter is IAssetRouterBase { /// bytes _transferData function bridgehubDeposit( uint256 _chainId, - address _prevMsgSender, + address _originalCaller, uint256 _value, bytes calldata _data ) external payable returns (L2TransactionRequestTwoBridgesInner memory request); @@ -152,12 +152,12 @@ interface IL1AssetRouter is IAssetRouterBase { /// @dev If the corresponding L2 transaction fails, refunds are issued to a refund recipient on L2. /// @param _chainId The chain ID of the ZK chain to which deposit. /// @param _assetId The deposited asset ID. - /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. + /// @param _originalCaller The `msg.sender` address from the external call that initiated current one. /// @param _amount The total amount of tokens to be bridged. function bridgehubDepositBaseToken( uint256 _chainId, bytes32 _assetId, - address _prevMsgSender, + address _originalCaller, uint256 _amount ) external payable; diff --git a/l1-contracts/contracts/bridge/asset-router/L1AssetRouter.sol b/l1-contracts/contracts/bridge/asset-router/L1AssetRouter.sol index 74b5e52a4..0c3b2001f 100644 --- a/l1-contracts/contracts/bridge/asset-router/L1AssetRouter.sol +++ b/l1-contracts/contracts/bridge/asset-router/L1AssetRouter.sol @@ -13,6 +13,7 @@ import {IAssetRouterBase, LEGACY_ENCODING_VERSION, NEW_ENCODING_VERSION, SET_ASS import {AssetRouterBase} from "./AssetRouterBase.sol"; import {IL1AssetHandler} from "../interfaces/IL1AssetHandler.sol"; +import {IL1ERC20Bridge} from "../interfaces/IL1ERC20Bridge.sol"; import {IAssetHandler} from "../interfaces/IAssetHandler.sol"; import {IL1Nullifier, FinalizeL1DepositParams} from "../interfaces/IL1Nullifier.sol"; import {INativeTokenVault} from "../ntv/INativeTokenVault.sol"; @@ -49,7 +50,7 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { INativeTokenVault public nativeTokenVault; /// @dev Address of legacy bridge. - address public legacyBridge; + IL1ERC20Bridge public legacyBridge; /// @notice Checks that the message sender is the nullifier. modifier onlyNullifier() { @@ -123,11 +124,11 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { /// @notice Sets the L1ERC20Bridge contract address. /// @dev Should be called only once by the owner. /// @param _legacyBridge The address of the legacy bridge. - function setL1Erc20Bridge(address _legacyBridge) external onlyOwner { + function setL1Erc20Bridge(IL1ERC20Bridge _legacyBridge) external onlyOwner { if (address(legacyBridge) != address(0)) { revert AddressAlreadyUsed(address(legacyBridge)); } - if (_legacyBridge == address(0)) { + if (address(_legacyBridge) == address(0)) { revert ZeroAddress(); } legacyBridge = _legacyBridge; @@ -158,19 +159,20 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { /// @notice Used to set the asset handler address for a given asset ID on a remote ZK chain /// @dev No access control on the caller, as msg.sender is encoded in the assetId. /// @param _chainId The ZK chain ID. + /// @param _originalCaller The `msg.sender` address from the external call that initiated current one. /// @param _assetId The encoding of asset ID. /// @param _assetHandlerAddressOnCounterpart The address of the asset handler, which will hold the token of interest. /// @return request The tx request sent to the Bridgehub function _setAssetHandlerAddressOnCounterpart( uint256 _chainId, - address _prevMsgSender, + address _originalCaller, bytes32 _assetId, address _assetHandlerAddressOnCounterpart ) internal view returns (L2TransactionRequestTwoBridgesInner memory request) { IL1AssetDeploymentTracker(assetDeploymentTracker[_assetId]).bridgeCheckCounterpartAddress( _chainId, _assetId, - _prevMsgSender, + _originalCaller, _assetHandlerAddressOnCounterpart ); @@ -195,7 +197,7 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { function bridgehubDepositBaseToken( uint256 _chainId, bytes32 _assetId, - address _prevMsgSender, + address _originalCaller, uint256 _amount ) public payable virtual override onlyBridgehubOrEra(_chainId) whenNotPaused { address assetHandler = assetHandlerAddress[_assetId]; @@ -208,18 +210,18 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { _chainId: _chainId, _msgValue: 0, _assetId: _assetId, - _prevMsgSender: _prevMsgSender, + _originalCaller: _originalCaller, _data: abi.encode(_amount, address(0)) }); // Note that we don't save the deposited amount, as this is for the base token, which gets sent to the refundRecipient if the tx fails - emit BridgehubDepositBaseTokenInitiated(_chainId, _prevMsgSender, _assetId, _amount); + emit BridgehubDepositBaseTokenInitiated(_chainId, _originalCaller, _assetId, _amount); } /// @inheritdoc IL1AssetRouter function bridgehubDeposit( uint256 _chainId, - address _prevMsgSender, + address _originalCaller, uint256 _value, bytes calldata _data ) @@ -241,14 +243,14 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { return _setAssetHandlerAddressOnCounterpart( _chainId, - _prevMsgSender, + _originalCaller, _assetId, _assetHandlerAddressOnCounterpart ); } else if (encodingVersion == NEW_ENCODING_VERSION) { (assetId, transferData) = abi.decode(_data[1:], (bytes32, bytes)); } else if (encodingVersion == LEGACY_ENCODING_VERSION) { - (assetId, transferData) = _handleLegacyData(_data, _prevMsgSender); + (assetId, transferData) = _handleLegacyData(_data, _originalCaller); } else { revert UnsupportedEncodingVersion(); } @@ -261,7 +263,7 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { _chainId: _chainId, _nextMsgValue: _value, _assetId: assetId, - _prevMsgSender: _prevMsgSender, + _originalCaller: _originalCaller, _transferData: transferData, _passValue: true }); @@ -269,13 +271,13 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { bytes32 txDataHash = DataEncoding.encodeTxDataHash({ _nativeTokenVault: address(nativeTokenVault), _encodingVersion: encodingVersion, - _prevMsgSender: _prevMsgSender, + _originalCaller: _originalCaller, _assetId: assetId, _transferData: transferData }); request = _requestToBridge({ - _prevMsgSender: _prevMsgSender, + _originalCaller: _originalCaller, _assetId: assetId, _bridgeMintCalldata: bridgeMintCalldata, _txDataHash: txDataHash @@ -284,7 +286,7 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { emit BridgehubDepositInitiated({ chainId: _chainId, txDataHash: txDataHash, - from: _prevMsgSender, + from: _originalCaller, assetId: assetId, bridgeMintCalldata: bridgeMintCalldata }); @@ -340,7 +342,6 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { /// @notice Decodes the transfer input for legacy data and transfers allowance to NTV. /// @dev Is not applicable for custom asset handlers. /// @param _data The encoded transfer data (address _l1Token, uint256 _depositAmount, address _l2Receiver). - // / @param _prevMsgSender The address of the deposit initiator. /// @return Tuple of asset ID and encoded transfer data to conform with new encoding standard. function _handleLegacyData(bytes calldata _data, address) internal returns (bytes32, bytes memory) { (address _l1Token, uint256 _depositAmount, address _l2Receiver) = abi.decode( @@ -366,7 +367,7 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { function transferFundsToNTV( bytes32 _assetId, uint256 _amount, - address _prevMsgSender + address _originalCaller ) external onlyNativeTokenVault returns (bool) { address l1TokenAddress = INativeTokenVault(address(nativeTokenVault)).tokenAddress(_assetId); if (l1TokenAddress == address(0) || l1TokenAddress == ETH_TOKEN_ADDRESS) { @@ -377,29 +378,29 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { // Do the transfer if allowance to Shared bridge is bigger than amount // And if there is not enough allowance for the NTV if ( - l1Token.allowance(_prevMsgSender, address(this)) >= _amount && - l1Token.allowance(_prevMsgSender, address(nativeTokenVault)) < _amount + l1Token.allowance(_originalCaller, address(this)) >= _amount && + l1Token.allowance(_originalCaller, address(nativeTokenVault)) < _amount ) { // slither-disable-next-line arbitrary-send-erc20 - l1Token.safeTransferFrom(_prevMsgSender, address(nativeTokenVault), _amount); + l1Token.safeTransferFrom(_originalCaller, address(nativeTokenVault), _amount); return true; } return false; } /// @dev The request data that is passed to the bridgehub. - /// @param _prevMsgSender The `msg.sender` address from the external call that initiated current one. + /// @param _originalCaller The `msg.sender` address from the external call that initiated current one. /// @param _assetId The deposited asset ID. /// @param _bridgeMintCalldata The calldata used by remote asset handler to mint tokens for recipient. /// @param _txDataHash The keccak256 hash of 0x01 || abi.encode(bytes32, bytes) to identify deposits. /// @return request The data used by the bridgehub to create L2 transaction request to specific ZK chain. function _requestToBridge( - address _prevMsgSender, + address _originalCaller, bytes32 _assetId, bytes memory _bridgeMintCalldata, bytes32 _txDataHash ) internal view virtual returns (L2TransactionRequestTwoBridgesInner memory request) { - bytes memory l2TxCalldata = getDepositCalldata(_prevMsgSender, _assetId, _bridgeMintCalldata); + bytes memory l2TxCalldata = getDepositCalldata(_originalCaller, _assetId, _bridgeMintCalldata); request = L2TransactionRequestTwoBridgesInner({ magicValue: TWO_BRIDGES_MAGIC_VALUE, @@ -459,7 +460,7 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { /// @inheritdoc IL1AssetRouter function depositLegacyErc20Bridge( - address _prevMsgSender, + address _originalCaller, address _l2Receiver, address _l1Token, uint256 _amount, @@ -483,19 +484,19 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { _chainId: ERA_CHAIN_ID, _nextMsgValue: 0, _assetId: _assetId, - _prevMsgSender: _prevMsgSender, + _originalCaller: _originalCaller, _transferData: abi.encode(_amount, _l2Receiver), _passValue: false }); } { - bytes memory l2TxCalldata = getDepositCalldata(_prevMsgSender, _assetId, bridgeMintCalldata); + bytes memory l2TxCalldata = getDepositCalldata(_originalCaller, _assetId, bridgeMintCalldata); // If the refund recipient is not specified, the refund will be sent to the sender of the transaction. // Otherwise, the refund will be sent to the specified address. // If the recipient is a contract on L1, the address alias will be applied. - address refundRecipient = AddressAliasHelper.actualRefundRecipient(_refundRecipient, _prevMsgSender); + address refundRecipient = AddressAliasHelper.actualRefundRecipient(_refundRecipient, _originalCaller); L2TransactionRequestDirect memory request = L2TransactionRequestDirect({ chainId: ERA_CHAIN_ID, @@ -514,14 +515,14 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { // Save the deposited amount to claim funds on L1 if the deposit failed on L2 L1_NULLIFIER.bridgehubConfirmL2TransactionForwarded( ERA_CHAIN_ID, - keccak256(abi.encode(_prevMsgSender, _l1Token, _amount)), + keccak256(abi.encode(_originalCaller, _l1Token, _amount)), txHash ); emit LegacyDepositInitiated({ chainId: ERA_CHAIN_ID, l2DepositTxHash: txHash, - from: _prevMsgSender, + from: _originalCaller, to: _l2Receiver, l1Asset: _l1Token, amount: _amount @@ -549,7 +550,7 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { message: _message, merkleProof: _merkleProof }); - L1_NULLIFIER.finalizeWithdrawalLegacyContracts(finalizeWithdrawalParams); + L1_NULLIFIER.finalizeDeposit(finalizeWithdrawalParams); } /// @dev Withdraw funds from the initiated deposit, that failed when finalizing on L2. diff --git a/l1-contracts/contracts/bridge/asset-router/L2AssetRouter.sol b/l1-contracts/contracts/bridge/asset-router/L2AssetRouter.sol index 82d49688f..6c122ccc6 100644 --- a/l1-contracts/contracts/bridge/asset-router/L2AssetRouter.sol +++ b/l1-contracts/contracts/bridge/asset-router/L2AssetRouter.sol @@ -3,7 +3,6 @@ pragma solidity 0.8.24; import {IL2AssetRouter} from "./IL2AssetRouter.sol"; -import {IL1AssetRouter} from "./IL1AssetRouter.sol"; import {IAssetRouterBase} from "./IAssetRouterBase.sol"; import {AssetRouterBase} from "./AssetRouterBase.sol"; @@ -11,6 +10,7 @@ import {IL2NativeTokenVault} from "../ntv/IL2NativeTokenVault.sol"; import {IL2SharedBridgeLegacy} from "../interfaces/IL2SharedBridgeLegacy.sol"; import {IAssetHandler} from "../interfaces/IAssetHandler.sol"; import {IBridgedStandardToken} from "../interfaces/IBridgedStandardToken.sol"; +import {IL1ERC20Bridge} from "../interfaces/IL1ERC20Bridge.sol"; import {IBridgehub} from "../../bridgehub/IBridgehub.sol"; import {AddressAliasHelper} from "../../vendor/AddressAliasHelper.sol"; @@ -91,7 +91,8 @@ contract L2AssetRouter is AssetRouterBase, IL2AssetRouter { bytes32 _assetId, address _assetAddress ) external override onlyAssetRouterCounterpart(_originChainId) { - _setAssetHandlerAddress(_assetId, _assetAddress); + assetHandlerAddress[_assetId] = _assetAddress; + emit AssetHandlerRegistered(_assetId, _assetAddress); } /// @inheritdoc IAssetRouterBase @@ -133,7 +134,7 @@ contract L2AssetRouter is AssetRouterBase, IL2AssetRouter { /// @param _assetId The asset id of the withdrawn asset /// @param _assetData The data that is passed to the asset handler contract function withdraw(bytes32 _assetId, bytes memory _assetData) public override { - _withdrawSender(_assetId, _assetData, msg.sender); + _withdrawSender(_assetId, _assetData, msg.sender, true); } /// @notice Initiates a withdrawal by burning funds on the contract and sending the message to L1 @@ -141,21 +142,32 @@ contract L2AssetRouter is AssetRouterBase, IL2AssetRouter { /// @param _assetId The asset id of the withdrawn asset /// @param _assetData The data that is passed to the asset handler contract /// @param _sender The address of the sender of the message - function _withdrawSender(bytes32 _assetId, bytes memory _assetData, address _sender) internal { + /// @param _alwaysNewMessageFormat Whether to use the new message format compatible with Custom Asset Handlers + function _withdrawSender( + bytes32 _assetId, + bytes memory _assetData, + address _sender, + bool _alwaysNewMessageFormat + ) internal { address assetHandler = assetHandlerAddress[_assetId]; bytes memory _l1bridgeMintData = IAssetHandler(assetHandler).bridgeBurn({ _chainId: L1_CHAIN_ID, _msgValue: 0, _assetId: _assetId, - _prevMsgSender: _sender, + _originalCaller: _sender, _data: _assetData }); - bytes memory message = _getL1WithdrawMessage(_assetId, _l1bridgeMintData); - if (L2_LEGACY_SHARED_BRIDGE != address(0)) { + bytes memory message; + if (_alwaysNewMessageFormat || L2_LEGACY_SHARED_BRIDGE == address(0)) { + message = _getAssetRouterWithdrawMessage(_assetId, _l1bridgeMintData); // slither-disable-next-line unused-return L2ContractHelper.sendMessageToL1(message); } else { + address l1Token = IL2NativeTokenVault(L2_NATIVE_TOKEN_VAULT_ADDR).tokenAddress(_assetId); + require(l1Token != address(0), "Unsupported asset Id by NTV"); + (uint256 amount, address l1Receiver) = abi.decode(_assetData, (uint256, address)); + message = _getSharedBridgeWithdrawMessage(l1Receiver, l1Token, amount); IL2SharedBridgeLegacy(L2_LEGACY_SHARED_BRIDGE).sendMessageToL1(message); } @@ -165,14 +177,22 @@ contract L2AssetRouter is AssetRouterBase, IL2AssetRouter { /// @notice Encodes the message for l2ToL1log sent during withdraw initialization. /// @param _assetId The encoding of the asset on L2 which is withdrawn. /// @param _l1bridgeMintData The calldata used by l1 asset handler to unlock tokens for recipient. - function _getL1WithdrawMessage( + function _getAssetRouterWithdrawMessage( bytes32 _assetId, bytes memory _l1bridgeMintData ) internal pure returns (bytes memory) { - // note we use the IL1SharedBridge.finalizeWithdrawal function selector to specify the selector for L1<>L2 messages, - // and we use this interface so that when the switch happened the old messages could be processed // solhint-disable-next-line func-named-parameters - return abi.encodePacked(IL1AssetRouter.finalizeWithdrawal.selector, _assetId, _l1bridgeMintData); + return abi.encodePacked(IAssetRouterBase.finalizeDeposit.selector, _assetId, _l1bridgeMintData); + } + + /// @notice Encodes the message for l2ToL1log sent during withdraw initialization. + function _getSharedBridgeWithdrawMessage( + address _l1Receiver, + address _l1Token, + uint256 _amount + ) internal pure returns (bytes memory) { + // solhint-disable-next-line func-named-parameters + return abi.encodePacked(IL1ERC20Bridge.finalizeWithdrawal.selector, _l1Receiver, _l1Token, _amount); } /// @notice Legacy finalizeDeposit. @@ -226,7 +246,7 @@ contract L2AssetRouter is AssetRouterBase, IL2AssetRouter { function _withdrawLegacy(address _l1Receiver, address _l2Token, uint256 _amount, address _sender) internal { bytes32 assetId = DataEncoding.encodeNTVAssetId(L1_CHAIN_ID, getL1TokenAddress(_l2Token)); bytes memory data = abi.encode(_amount, _l1Receiver); - _withdrawSender(assetId, data, _sender); + _withdrawSender(assetId, data, _sender, false); } /// @notice Legacy getL1TokenAddress. diff --git a/l1-contracts/contracts/bridge/interfaces/IAssetHandler.sol b/l1-contracts/contracts/bridge/interfaces/IAssetHandler.sol index 34e1b23f2..57f58eb59 100644 --- a/l1-contracts/contracts/bridge/interfaces/IAssetHandler.sol +++ b/l1-contracts/contracts/bridge/interfaces/IAssetHandler.sol @@ -32,14 +32,14 @@ interface IAssetHandler { /// @param _chainId the chainId that the message will be sent to /// @param _msgValue the msg.value of the L2 transaction. For now it is always 0. /// @param _assetId the assetId of the asset being bridged - /// @param _prevMsgSender the original caller of the Bridgehub, + /// @param _originalCaller the original caller of the /// @param _data the actual data specified for the function /// @return _bridgeMintData The calldata used by counterpart asset handler to unlock tokens for recipient. function bridgeBurn( uint256 _chainId, uint256 _msgValue, bytes32 _assetId, - address _prevMsgSender, + address _originalCaller, bytes calldata _data ) external payable returns (bytes memory _bridgeMintData); } diff --git a/l1-contracts/contracts/bridge/interfaces/IL1AssetDeploymentTracker.sol b/l1-contracts/contracts/bridge/interfaces/IL1AssetDeploymentTracker.sol index cb464e5a1..6fb6538b6 100644 --- a/l1-contracts/contracts/bridge/interfaces/IL1AssetDeploymentTracker.sol +++ b/l1-contracts/contracts/bridge/interfaces/IL1AssetDeploymentTracker.sol @@ -8,7 +8,7 @@ interface IL1AssetDeploymentTracker { function bridgeCheckCounterpartAddress( uint256 _chainId, bytes32 _assetId, - address _prevMsgSender, + address _originalCaller, address _assetHandlerAddressOnCounterpart ) external view; } diff --git a/l1-contracts/contracts/bridge/interfaces/IL1Nullifier.sol b/l1-contracts/contracts/bridge/interfaces/IL1Nullifier.sol index 30ff91357..f5bd3539c 100644 --- a/l1-contracts/contracts/bridge/interfaces/IL1Nullifier.sol +++ b/l1-contracts/contracts/bridge/interfaces/IL1Nullifier.sol @@ -4,6 +4,7 @@ pragma solidity 0.8.24; import {IBridgehub} from "../../bridgehub/IBridgehub.sol"; import {IL1NativeTokenVault} from "../ntv/IL1NativeTokenVault.sol"; +import {IL1ERC20Bridge} from "./IL1ERC20Bridge.sol"; /// @param chainId The chain ID of the transaction to check. /// @param l2BatchNumber The L2 batch number where the withdrawal was processed. @@ -61,11 +62,11 @@ interface IL1Nullifier { bytes32[] calldata _merkleProof ) external; - function finalizeWithdrawalLegacyContracts(FinalizeL1DepositParams calldata _finalizeWithdrawalParams) external; + function finalizeDeposit(FinalizeL1DepositParams calldata _finalizeWithdrawalParams) external; function BRIDGE_HUB() external view returns (IBridgehub); - function legacyBridge() external view returns (address); + function legacyBridge() external view returns (IL1ERC20Bridge); function depositHappened(uint256 _chainId, bytes32 _l2TxHash) external view returns (bytes32); diff --git a/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol index 0124858a5..be456db43 100644 --- a/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol +++ b/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol @@ -130,7 +130,7 @@ contract L1NativeTokenVault is IL1NativeTokenVault, IL1AssetHandler, NativeToken function _bridgeBurnNativeToken( uint256 _chainId, bytes32 _assetId, - address _prevMsgSender, + address _originalCaller, // solhint-disable-next-line no-unused-vars bool _depositChecked, bytes calldata _data @@ -140,12 +140,12 @@ contract L1NativeTokenVault is IL1NativeTokenVault, IL1AssetHandler, NativeToken bool depositChecked = IL1AssetRouter(address(ASSET_ROUTER)).transferFundsToNTV( _assetId, _depositAmount, - _prevMsgSender + _originalCaller ); _bridgeMintData = super._bridgeBurnNativeToken({ _chainId: _chainId, _assetId: _assetId, - _prevMsgSender: _prevMsgSender, + _originalCaller: _originalCaller, _depositChecked: depositChecked, _data: _data }); diff --git a/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol index ff1b483c1..5e76d7630 100644 --- a/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol +++ b/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol @@ -166,16 +166,16 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 uint256 _chainId, uint256, bytes32 _assetId, - address _prevMsgSender, + address _originalCaller, bytes calldata _data ) external payable override onlyAssetRouter whenNotPaused returns (bytes memory _bridgeMintData) { if (originChainId[_assetId] != block.chainid) { - _bridgeMintData = _bridgeBurnBridgedToken(_chainId, _assetId, _prevMsgSender, _data); + _bridgeMintData = _bridgeBurnBridgedToken(_chainId, _assetId, _originalCaller, _data); } else { _bridgeMintData = _bridgeBurnNativeToken({ _chainId: _chainId, _assetId: _assetId, - _prevMsgSender: _prevMsgSender, + _originalCaller: _originalCaller, _depositChecked: false, _data: _data }); @@ -185,7 +185,7 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 function _bridgeBurnBridgedToken( uint256 _chainId, bytes32 _assetId, - address _prevMsgSender, + address _originalCaller, bytes calldata _data ) internal returns (bytes memory _bridgeMintData) { (uint256 _amount, address _receiver) = abi.decode(_data, (uint256, address)); @@ -195,12 +195,12 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 } address bridgedToken = tokenAddress[_assetId]; - IBridgedStandardToken(bridgedToken).bridgeBurn(_prevMsgSender, _amount); + IBridgedStandardToken(bridgedToken).bridgeBurn(_originalCaller, _amount); emit BridgeBurn({ chainId: _chainId, assetId: _assetId, - sender: _prevMsgSender, + sender: _originalCaller, receiver: _receiver, amount: _amount }); @@ -223,7 +223,7 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 } _bridgeMintData = DataEncoding.encodeBridgeMintData({ - _prevMsgSender: _prevMsgSender, + _originalCaller: _originalCaller, _l2Receiver: _receiver, _l1Token: originToken, _amount: _amount, @@ -234,7 +234,7 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 function _bridgeBurnNativeToken( uint256 _chainId, bytes32 _assetId, - address _prevMsgSender, + address _originalCaller, bool _depositChecked, bytes calldata _data ) internal virtual returns (bytes memory _bridgeMintData) { @@ -262,7 +262,7 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 _handleChainBalanceIncrease(_chainId, _assetId, amount, true); amount = _depositAmount; if (!_depositChecked) { - uint256 expectedDepositAmount = _depositFunds(_prevMsgSender, IERC20(nativeToken), _depositAmount); // note if _prevMsgSender is this contract, this will return 0. This does not happen. + uint256 expectedDepositAmount = _depositFunds(_originalCaller, IERC20(nativeToken), _depositAmount); // note if _originalCaller is this contract, this will return 0. This does not happen. // The token has non-standard transfer logic if (amount != expectedDepositAmount) { revert TokensWithFeesNotSupported(); @@ -279,7 +279,7 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 erc20Metadata = getERC20Getters(nativeToken, originChainId[_assetId]); } _bridgeMintData = DataEncoding.encodeBridgeMintData({ - _prevMsgSender: _prevMsgSender, + _originalCaller: _originalCaller, _l2Receiver: _receiver, _l1Token: nativeToken, _amount: amount, @@ -289,7 +289,7 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 emit BridgeBurn({ chainId: _chainId, assetId: _assetId, - sender: _prevMsgSender, + sender: _originalCaller, receiver: _receiver, amount: amount }); diff --git a/l1-contracts/contracts/bridgehub/Bridgehub.sol b/l1-contracts/contracts/bridgehub/Bridgehub.sol index e429bedfc..8e23a9f3d 100644 --- a/l1-contracts/contracts/bridgehub/Bridgehub.sol +++ b/l1-contracts/contracts/bridgehub/Bridgehub.sol @@ -675,13 +675,13 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus /// @notice IL1AssetHandler interface, used to migrate (transfer) a chain to the settlement layer. /// @param _settlementChainId the chainId of the settlement chain, i.e. where the message and the migrating chain is sent. /// @param _assetId the assetId of the migrating chain's CTM - /// @param _prevMsgSender the previous message sender + /// @param _originalCaller the message sender initiated a set of calls that leads to bridge burn /// @param _data the data for the migration function bridgeBurn( uint256 _settlementChainId, uint256, // msgValue bytes32 _assetId, - address _prevMsgSender, + address _originalCaller, bytes calldata _data ) external payable override onlyAssetRouter whenMigrationsNotPaused returns (bytes memory bridgehubMintData) { require(whitelistedSettlementLayers[_settlementChainId], "BH: SL not whitelisted"); @@ -693,7 +693,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus address zkChain = zkChainMap.get(bridgehubData.chainId); require(zkChain != address(0), "BH: zkChain not registered"); - require(_prevMsgSender == IZKChain(zkChain).getAdmin(), "BH: incorrect sender"); + require(_originalCaller == IZKChain(zkChain).getAdmin(), "BH: incorrect sender"); bytes memory ctmMintData = IChainTypeManager(chainTypeManager[bridgehubData.chainId]).forwardedBridgeBurn( bridgehubData.chainId, @@ -701,7 +701,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus ); bytes memory chainMintData = IZKChain(zkChain).forwardedBridgeBurn( zkChainMap.get(_settlementChainId), - _prevMsgSender, + _originalCaller, bridgehubData.chainData ); BridgehubMintCTMAssetData memory bridgeMintStruct = BridgehubMintCTMAssetData({ @@ -774,7 +774,7 @@ contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2StepUpgradeable, Paus IZKChain(getZKChain(bridgehubData.chainId)).forwardedBridgeRecoverFailedTransfer({ _chainId: bridgehubData.chainId, _assetInfo: _assetId, - _prevMsgSender: _depositSender, + _originalCaller: _depositSender, _chainData: bridgehubData.chainData }); } diff --git a/l1-contracts/contracts/bridgehub/CTMDeploymentTracker.sol b/l1-contracts/contracts/bridgehub/CTMDeploymentTracker.sol index 340d753a9..6ffee2482 100644 --- a/l1-contracts/contracts/bridgehub/CTMDeploymentTracker.sol +++ b/l1-contracts/contracts/bridgehub/CTMDeploymentTracker.sol @@ -36,9 +36,9 @@ contract CTMDeploymentTracker is ICTMDeploymentTracker, ReentrancyGuard, Ownable } /// @notice Checks that the message sender is the bridgehub. - modifier onlyOwnerViaRouter(address _prevMsgSender) { + modifier onlyOwnerViaRouter(address _originalCaller) { // solhint-disable-next-line gas-custom-errors - require(msg.sender == address(L1_ASSET_ROUTER) && _prevMsgSender == owner(), "CTM DT: not owner via router"); + require(msg.sender == address(L1_ASSET_ROUTER) && _originalCaller == owner(), "CTM DT: not owner via router"); _; } @@ -77,12 +77,12 @@ contract CTMDeploymentTracker is ICTMDeploymentTracker, ReentrancyGuard, Ownable /// The second approach is used due to its simplicity even though it gives the sender slightly more control over the call: /// `gasLimit`, etc. /// @param _chainId the chainId of the chain - /// @param _prevMsgSender the previous message sender + /// @param _originalCaller the previous message sender /// @param _data the data of the transaction // slither-disable-next-line locked-ether function bridgehubDeposit( uint256 _chainId, - address _prevMsgSender, + address _originalCaller, uint256, bytes calldata _data ) external payable onlyBridgehub returns (L2TransactionRequestTwoBridgesInner memory request) { @@ -91,7 +91,7 @@ contract CTMDeploymentTracker is ICTMDeploymentTracker, ReentrancyGuard, Ownable require(msg.value == 0, "CTMDT: no eth allowed"); // solhint-disable-next-line gas-custom-errors - require(_prevMsgSender == owner(), "CTMDT: not owner"); + require(_originalCaller == owner(), "CTMDT: not owner"); bytes1 encodingVersion = _data[0]; require(encodingVersion == ENCODING_VERSION, "CTMDT: wrong encoding version"); (address _ctmL1Address, address _ctmL2Address) = abi.decode(_data[1:], (address, address)); @@ -104,14 +104,14 @@ contract CTMDeploymentTracker is ICTMDeploymentTracker, ReentrancyGuard, Ownable function bridgehubConfirmL2Transaction(uint256 _chainId, bytes32 _txDataHash, bytes32 _txHash) external {} /// @notice Used to register the ctm asset in L2 AssetRouter. - /// @param _prevMsgSender the address that called the Router + /// @param _originalCaller the address that called the Router /// @param _assetHandlerAddressOnCounterpart the address of the asset handler on the counterpart chain. function bridgeCheckCounterpartAddress( uint256, bytes32, - address _prevMsgSender, + address _originalCaller, address _assetHandlerAddressOnCounterpart - ) external view override onlyOwnerViaRouter(_prevMsgSender) { + ) external view override onlyOwnerViaRouter(_originalCaller) { require(_assetHandlerAddressOnCounterpart == L2_BRIDGEHUB_ADDR, "CTMDT: wrong counter part"); } diff --git a/l1-contracts/contracts/bridgehub/ICTMDeploymentTracker.sol b/l1-contracts/contracts/bridgehub/ICTMDeploymentTracker.sol index c4de4d7f4..5f75aa990 100644 --- a/l1-contracts/contracts/bridgehub/ICTMDeploymentTracker.sol +++ b/l1-contracts/contracts/bridgehub/ICTMDeploymentTracker.sol @@ -11,7 +11,7 @@ import {IL1AssetDeploymentTracker} from "../bridge/interfaces/IL1AssetDeployment interface ICTMDeploymentTracker is IL1AssetDeploymentTracker { function bridgehubDeposit( uint256 _chainId, - address _prevMsgSender, + address _originalCaller, uint256 _l2Value, bytes calldata _data ) external payable returns (L2TransactionRequestTwoBridgesInner memory request); diff --git a/l1-contracts/contracts/common/L2ContractAddresses.sol b/l1-contracts/contracts/common/L2ContractAddresses.sol index 0a98d0395..a8fba013c 100644 --- a/l1-contracts/contracts/common/L2ContractAddresses.sol +++ b/l1-contracts/contracts/common/L2ContractAddresses.sol @@ -41,7 +41,7 @@ address constant L2_GENESIS_UPGRADE_ADDR = address(0x10001); /// @dev The address of the L2 bridge hub system contract, used to start L2<>L2 transactions address constant L2_BRIDGEHUB_ADDR = address(0x10002); -/// @dev the address of the l2 asse3t router. +/// @dev the address of the l2 asset router. address constant L2_ASSET_ROUTER_ADDR = address(0x10003); /** diff --git a/l1-contracts/contracts/common/libraries/DataEncoding.sol b/l1-contracts/contracts/common/libraries/DataEncoding.sol index 87d9143a3..9df83d67a 100644 --- a/l1-contracts/contracts/common/libraries/DataEncoding.sol +++ b/l1-contracts/contracts/common/libraries/DataEncoding.sol @@ -14,26 +14,26 @@ import {UnsupportedEncodingVersion} from "../L1ContractErrors.sol"; */ library DataEncoding { /// @notice Abi.encodes the data required for bridgeMint on remote chain. - /// @param _prevMsgSender The address which initiated the transfer. + /// @param _originalCaller The address which initiated the transfer. /// @param _l2Receiver The address which to receive tokens on remote chain. /// @param _l1Token The transferred token address. /// @param _amount The amount of token to be transferred. /// @param _erc20Metadata The transferred token metadata. /// @return The encoded bridgeMint data function encodeBridgeMintData( - address _prevMsgSender, + address _originalCaller, address _l2Receiver, address _l1Token, uint256 _amount, bytes memory _erc20Metadata ) internal pure returns (bytes memory) { // solhint-disable-next-line func-named-parameters - return abi.encode(_prevMsgSender, _l2Receiver, _l1Token, _amount, _erc20Metadata); + return abi.encode(_originalCaller, _l2Receiver, _l1Token, _amount, _erc20Metadata); } /// @notice Function decoding transfer data previously encoded with this library. /// @param _bridgeMintData The encoded bridgeMint data - /// @return _prevMsgSender The address which initiated the transfer. + /// @return _originalCaller The address which initiated the transfer. /// @return _l2Receiver The address which to receive tokens on remote chain. /// @return _parsedL1Token The transferred token address. /// @return _amount The amount of token to be transferred. @@ -44,14 +44,14 @@ library DataEncoding { internal pure returns ( - address _prevMsgSender, + address _originalCaller, address _l2Receiver, address _parsedL1Token, uint256 _amount, bytes memory _erc20Metadata ) { - (_prevMsgSender, _l2Receiver, _parsedL1Token, _amount, _erc20Metadata) = abi.decode( + (_originalCaller, _l2Receiver, _parsedL1Token, _amount, _erc20Metadata) = abi.decode( _bridgeMintData, (address, address, address, uint256, bytes) ); @@ -93,14 +93,14 @@ library DataEncoding { /// @dev Encodes the transaction data hash using either the latest encoding standard or the legacy standard. /// @param _encodingVersion EncodingVersion. - /// @param _prevMsgSender The address of the entity that initiated the deposit. + /// @param _originalCaller The address of the entity that initiated the deposit. /// @param _assetId The unique identifier of the deposited L1 token. /// @param _nativeTokenVault The address of the token, only used if the encoding version is legacy. /// @param _transferData The encoded transfer data, which includes both the deposit amount and the address of the L2 receiver. /// @return txDataHash The resulting encoded transaction data hash. function encodeTxDataHash( bytes1 _encodingVersion, - address _prevMsgSender, + address _originalCaller, bytes32 _assetId, address _nativeTokenVault, bytes memory _transferData @@ -108,11 +108,13 @@ library DataEncoding { if (_encodingVersion == LEGACY_ENCODING_VERSION) { address tokenAddress = INativeTokenVault(_nativeTokenVault).tokenAddress(_assetId); (uint256 depositAmount, ) = abi.decode(_transferData, (uint256, address)); - txDataHash = keccak256(abi.encode(_prevMsgSender, tokenAddress, depositAmount)); + txDataHash = keccak256(abi.encode(_originalCaller, tokenAddress, depositAmount)); } else if (_encodingVersion == NEW_ENCODING_VERSION) { // Similarly to calldata, the txDataHash is collision-resistant. // In the legacy data hash, the first encoded variable was the address, which is padded with zeros during `abi.encode`. - txDataHash = keccak256(bytes.concat(_encodingVersion, abi.encode(_prevMsgSender, _assetId, _transferData))); + txDataHash = keccak256( + bytes.concat(_encodingVersion, abi.encode(_originalCaller, _assetId, _transferData)) + ); } else { revert UnsupportedEncodingVersion(); } diff --git a/l1-contracts/contracts/dev-contracts/test/DummyEraBaseTokenBridge.sol b/l1-contracts/contracts/dev-contracts/test/DummyEraBaseTokenBridge.sol index 96382c44f..bb450b261 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummyEraBaseTokenBridge.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummyEraBaseTokenBridge.sol @@ -8,7 +8,7 @@ contract DummyEraBaseTokenBridge { function bridgehubDepositBaseToken( uint256 _chainId, - address _prevMsgSender, + address _originalCaller, address _l1Token, uint256 _amount ) external payable {} diff --git a/l1-contracts/contracts/dev-contracts/test/DummySharedBridge.sol b/l1-contracts/contracts/dev-contracts/test/DummySharedBridge.sol index 47a0586d8..c75ec4530 100644 --- a/l1-contracts/contracts/dev-contracts/test/DummySharedBridge.sol +++ b/l1-contracts/contracts/dev-contracts/test/DummySharedBridge.sol @@ -146,7 +146,7 @@ contract DummySharedBridge is PausableUpgradeable { function bridgehubDepositBaseToken( uint256 _chainId, bytes32 _assetId, - address _prevMsgSender, + address _originalCaller, uint256 _amount ) external payable whenNotPaused { // Dummy bridge supports only working with ETH for simplicity. @@ -155,7 +155,7 @@ contract DummySharedBridge is PausableUpgradeable { chainBalance[_chainId][address(1)] += _amount; // Note that we don't save the deposited amount, as this is for the base token, which gets sent to the refundRecipient if the tx fails - emit BridgehubDepositBaseTokenInitiated(_chainId, _prevMsgSender, _assetId, _amount); + emit BridgehubDepositBaseTokenInitiated(_chainId, _originalCaller, _assetId, _amount); } function _depositFunds(address _from, IERC20 _token, uint256 _amount) internal returns (uint256) { @@ -168,7 +168,7 @@ contract DummySharedBridge is PausableUpgradeable { function bridgehubDeposit( uint256, - address _prevMsgSender, + address _originalCaller, uint256, bytes calldata _data ) external payable returns (L2TransactionRequestTwoBridgesInner memory request) { @@ -185,15 +185,15 @@ contract DummySharedBridge is PausableUpgradeable { require(msg.value == 0, "ShB m.v > 0 for BH d.it 2"); amount = _depositAmount; - uint256 withdrawAmount = _depositFunds(_prevMsgSender, IERC20(_l1Token), _depositAmount); + uint256 withdrawAmount = _depositFunds(_originalCaller, IERC20(_l1Token), _depositAmount); require(withdrawAmount == _depositAmount, "5T"); // The token has non-standard transfer logic } bytes memory l2TxCalldata = abi.encodeCall( IL2SharedBridgeLegacyFunctions.finalizeDeposit, - (_prevMsgSender, _l2Receiver, _l1Token, amount, new bytes(0)) + (_originalCaller, _l2Receiver, _l1Token, amount, new bytes(0)) ); - bytes32 txDataHash = keccak256(abi.encode(_prevMsgSender, _l1Token, amount)); + bytes32 txDataHash = keccak256(abi.encode(_originalCaller, _l1Token, amount)); request = L2TransactionRequestTwoBridgesInner({ magicValue: TWO_BRIDGES_MAGIC_VALUE, diff --git a/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol b/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol index 54f72f918..27bbe3155 100644 --- a/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol +++ b/l1-contracts/contracts/state-transition/chain-deps/facets/Admin.sol @@ -248,11 +248,11 @@ contract AdminFacet is ZKChainBase, IAdmin { /// @inheritdoc IAdmin function forwardedBridgeBurn( address _settlementLayer, - address _prevMsgSender, + address _originalCaller, bytes calldata _data ) external payable override onlyBridgehub returns (bytes memory chainBridgeMintData) { require(s.settlementLayer == address(0), "Af: already migrated"); - require(_prevMsgSender == s.admin, "Af: not chainAdmin"); + require(_originalCaller == s.admin, "Af: not chainAdmin"); // As of now all we need in this function is the chainId so we encode it and pass it down in the _chainData field uint256 protocolVersion = abi.decode(_data, (uint256)); diff --git a/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol b/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol index 8d224f78f..4a2ad7170 100644 --- a/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol +++ b/l1-contracts/contracts/state-transition/chain-interfaces/IAdmin.sol @@ -135,7 +135,7 @@ interface IAdmin is IZKChainBase { /// @dev Similar to IL1AssetHandler interface, used to send chains. function forwardedBridgeBurn( address _settlementLayer, - address _prevMsgSender, + address _originalCaller, bytes calldata _data ) external payable returns (bytes memory _bridgeMintData); @@ -143,7 +143,7 @@ interface IAdmin is IZKChainBase { function forwardedBridgeRecoverFailedTransfer( uint256 _chainId, bytes32 _assetInfo, - address _prevMsgSender, + address _originalCaller, bytes calldata _chainData ) external payable; diff --git a/l1-contracts/contracts/vendor/AddressAliasHelper.sol b/l1-contracts/contracts/vendor/AddressAliasHelper.sol index ad80f3483..b604e9d24 100644 --- a/l1-contracts/contracts/vendor/AddressAliasHelper.sol +++ b/l1-contracts/contracts/vendor/AddressAliasHelper.sol @@ -43,19 +43,19 @@ library AddressAliasHelper { /// @notice Utility function used to calculate the correct refund recipient /// @param _refundRecipient the address that should receive the refund - /// @param _prevMsgSender the address that triggered the tx to L2 + /// @param _originalCaller the address that triggered the tx to L2 /// @return _recipient the corrected address that should receive the refund function actualRefundRecipient( address _refundRecipient, - address _prevMsgSender + address _originalCaller ) internal view returns (address _recipient) { if (_refundRecipient == address(0)) { - // If the `_refundRecipient` is not provided, we use the `_prevMsgSender` as the recipient. + // If the `_refundRecipient` is not provided, we use the `_originalCaller` as the recipient. // solhint-disable avoid-tx-origin // slither-disable-next-line tx-origin - _recipient = _prevMsgSender == tx.origin - ? _prevMsgSender - : AddressAliasHelper.applyL1ToL2Alias(_prevMsgSender); + _recipient = _originalCaller == tx.origin + ? _originalCaller + : AddressAliasHelper.applyL1ToL2Alias(_originalCaller); // solhint-enable avoid-tx-origin } else if (_refundRecipient.code.length > 0) { // If the `_refundRecipient` is a smart contract, we apply the L1 to L2 alias to prevent foot guns. diff --git a/l1-contracts/deploy-scripts/DeployL1.s.sol b/l1-contracts/deploy-scripts/DeployL1.s.sol index 05e614f13..868fdbc47 100644 --- a/l1-contracts/deploy-scripts/DeployL1.s.sol +++ b/l1-contracts/deploy-scripts/DeployL1.s.sol @@ -762,7 +762,7 @@ contract DeployL1Script is Script { function updateSharedBridge() internal { L1AssetRouter sharedBridge = L1AssetRouter(addresses.bridges.sharedBridgeProxy); vm.broadcast(msg.sender); - sharedBridge.setL1Erc20Bridge(addresses.bridges.erc20BridgeProxy); + sharedBridge.setL1Erc20Bridge(L1ERC20Bridge(addresses.bridges.erc20BridgeProxy)); console.log("SharedBridge updated with ERC20Bridge address"); } diff --git a/l1-contracts/test/foundry/l1/integration/AssetRouterTest.t.sol b/l1-contracts/test/foundry/l1/integration/AssetRouterTest.t.sol index 0fd823ebe..83913d2a4 100644 --- a/l1-contracts/test/foundry/l1/integration/AssetRouterTest.t.sol +++ b/l1-contracts/test/foundry/l1/integration/AssetRouterTest.t.sol @@ -86,7 +86,7 @@ contract AssetRouterTest is L1ContractDeployer, ZKChainDeployer, TokenDeployer, uint256 chainId = eraZKChainId; l2TokenAssetId = DataEncoding.encodeNTVAssetId(chainId, address(1)); bytes memory transferData = DataEncoding.encodeBridgeMintData({ - _prevMsgSender: ETH_TOKEN_ADDRESS, + _originalCaller: ETH_TOKEN_ADDRESS, _l2Receiver: address(this), _l1Token: ETH_TOKEN_ADDRESS, _amount: 100, diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/FinalizeWithdrawal.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/FinalizeWithdrawal.sol index 71a837564..6af9fb369 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/FinalizeWithdrawal.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/FinalizeWithdrawal.sol @@ -57,7 +57,7 @@ contract FinalizeWithdrawalTest is L1Erc20BridgeTest { }); vm.mockCall( l1NullifierAddress, - abi.encodeWithSelector(IL1Nullifier.finalizeWithdrawalLegacyContracts.selector, finalizeWithdrawalParams), + abi.encodeWithSelector(IL1Nullifier.finalizeDeposit.selector, finalizeWithdrawalParams), abi.encode(alice, address(token), amount) ); diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol index 575803a26..0131721a0 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol @@ -73,14 +73,14 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { address currentBridge = address(sharedBridge.legacyBridge()); vm.prank(owner); vm.expectRevert(abi.encodeWithSelector(AddressAlreadyUsed.selector, currentBridge)); - sharedBridge.setL1Erc20Bridge(address(0)); + sharedBridge.setL1Erc20Bridge(IL1ERC20Bridge(address(0))); } function test_setL1Erc20Bridge_emptyAddressProvided() public { stdstore.target(address(sharedBridge)).sig(sharedBridge.legacyBridge.selector).checked_write(address(0)); vm.prank(owner); vm.expectRevert(abi.encodeWithSelector(ZeroAddress.selector)); - sharedBridge.setL1Erc20Bridge(address(0)); + sharedBridge.setL1Erc20Bridge(IL1ERC20Bridge(address(0))); } function test_setNativeTokenVault_alreadySet() public { @@ -390,7 +390,7 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { abi.encode(true) ); - vm.expectRevert("L1N: legacy cFD"); + vm.expectRevert(); vm.mockCall( address(bridgehubAddress), abi.encodeWithSelector(IBridgehub.proveL1ToL2TransactionStatus.selector), @@ -589,9 +589,7 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { address(token), amount ); - vm.expectRevert( - abi.encodeWithSelector(SharedBridgeValueNotSet.selector, SharedBridgeKey.PostUpgradeFirstBatch) - ); + vm.expectRevert(); sharedBridge.finalizeWithdrawal({ _chainId: eraChainId, @@ -613,7 +611,7 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { address(token), amount ); - vm.expectRevert("L1N: legacy token withdrawal"); + vm.expectRevert(); sharedBridge.finalizeWithdrawal({ _chainId: eraChainId, @@ -774,7 +772,7 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { vm.expectRevert(abi.encodeWithSelector(TokenNotSupported.selector, l1WethAddress)); vm.prank(l1ERC20BridgeAddress); sharedBridge.depositLegacyErc20Bridge({ - _prevMsgSender: alice, + _originalCaller: alice, _l2Receiver: bob, _l1Token: l1WethAddress, _amount: amount, @@ -808,7 +806,7 @@ contract L1AssetRouterFailTest is L1AssetRouterTest { vm.prank(l1ERC20BridgeAddress); sharedBridge.depositLegacyErc20Bridge({ - _prevMsgSender: alice, + _originalCaller: alice, _l2Receiver: bob, _l1Token: address(token), _amount: amount, diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeHyperEnabled.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeHyperEnabled.t.sol index cdd5908d5..6dc2da4e4 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeHyperEnabled.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeHyperEnabled.t.sol @@ -22,7 +22,7 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { sharedBridge.bridgehubDepositBaseToken{value: amount}({ _chainId: chainId, _assetId: ETH_TOKEN_ASSET_ID, - _prevMsgSender: alice, + _originalCaller: alice, _amount: amount }); } @@ -38,7 +38,7 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { sharedBridge.bridgehubDepositBaseToken({ _chainId: chainId, _assetId: tokenAssetId, - _prevMsgSender: alice, + _originalCaller: alice, _amount: amount }); } @@ -59,7 +59,7 @@ contract L1AssetRouterHyperEnabledTest is L1AssetRouterTest { }); sharedBridge.bridgehubDeposit{value: amount}({ _chainId: chainId, - _prevMsgSender: alice, + _originalCaller: alice, _value: amount, _data: abi.encode(ETH_TOKEN_ADDRESS, amount, bob) }); diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeLegacy.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeLegacy.t.sol index 967930e69..788446502 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeLegacy.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeLegacy.t.sol @@ -39,7 +39,7 @@ contract L1AssetRouterLegacyTest is L1AssetRouterTest { vm.prank(l1ERC20BridgeAddress); sharedBridge.depositLegacyErc20Bridge({ - _prevMsgSender: alice, + _originalCaller: alice, _l2Receiver: bob, _l1Token: address(token), _amount: amount, @@ -94,7 +94,7 @@ contract L1AssetRouterLegacyTest is L1AssetRouterTest { message: message, merkleProof: merkleProof }); - l1Nullifier.finalizeWithdrawalLegacyContracts(finalizeWithdrawalParams); + l1Nullifier.finalizeDeposit(finalizeWithdrawalParams); } function test_finalizeWithdrawalLegacyErc20Bridge_ErcOnEth() public { @@ -146,6 +146,6 @@ contract L1AssetRouterLegacyTest is L1AssetRouterTest { message: message, merkleProof: merkleProof }); - l1Nullifier.finalizeWithdrawalLegacyContracts(finalizeWithdrawalParams); + l1Nullifier.finalizeDeposit(finalizeWithdrawalParams); } } diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol index fdc42d53e..52bf0fbb0 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol @@ -17,6 +17,7 @@ import {IL1NativeTokenVault} from "contracts/bridge/ntv/IL1NativeTokenVault.sol" import {INativeTokenVault} from "contracts/bridge/ntv/INativeTokenVault.sol"; import {IL1AssetHandler} from "contracts/bridge/interfaces/IL1AssetHandler.sol"; import {IL1BaseTokenAssetHandler} from "contracts/bridge/interfaces/IL1BaseTokenAssetHandler.sol"; +import {IL1ERC20Bridge} from "contracts/bridge/interfaces/IL1ERC20Bridge.sol"; import {ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; import {L2_NATIVE_TOKEN_VAULT_ADDR, L2_ASSET_ROUTER_ADDR} from "contracts/common/L2ContractAddresses.sol"; import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; @@ -168,9 +169,9 @@ contract L1AssetRouterTest is Test { vm.prank(owner); l1Nullifier.setL1NativeTokenVault(nativeTokenVault); vm.prank(owner); - l1Nullifier.setL1Erc20Bridge(l1ERC20BridgeAddress); + l1Nullifier.setL1Erc20Bridge(IL1ERC20Bridge(l1ERC20BridgeAddress)); vm.prank(owner); - sharedBridge.setL1Erc20Bridge(l1ERC20BridgeAddress); + sharedBridge.setL1Erc20Bridge(IL1ERC20Bridge(l1ERC20BridgeAddress)); tokenAssetId = DataEncoding.encodeNTVAssetId(block.chainid, address(token)); vm.prank(owner); sharedBridge.setNativeTokenVault(INativeTokenVault(address(nativeTokenVault))); diff --git a/l1-contracts/test/unit_tests/legacy_era_test.spec.ts b/l1-contracts/test/unit_tests/legacy_era_test.spec.ts index c5e97afc7..5a0d6e995 100644 --- a/l1-contracts/test/unit_tests/legacy_era_test.spec.ts +++ b/l1-contracts/test/unit_tests/legacy_era_test.spec.ts @@ -215,10 +215,7 @@ describe("Legacy Era tests", function () { erc20TestToken.address, ethers.constants.HashZero, ]); - const revertReason = await getCallRevertReason( - l1ERC20Bridge.connect(randomSigner).finalizeWithdrawal(0, 0, 0, l2ToL1message, []) - ); - expect(revertReason).contains("L1N: legacy eth withdrawal"); + await expect(l1ERC20Bridge.connect(randomSigner).finalizeWithdrawal(0, 0, 0, l2ToL1message, [])).to.be.reverted; }); it("Should revert on finalizing a withdrawal with wrong proof", async () => { From c8a720829f001aefd969203a58871cdae039e107 Mon Sep 17 00:00:00 2001 From: Stanislav Breadless Date: Wed, 11 Sep 2024 11:16:13 +0200 Subject: [PATCH 50/53] sync 2 --- .../_SharedHyperchainDeployer.t.sol | 179 ------------------ .../script-out/output-deploy-l1.toml | 56 ------ 2 files changed, 235 deletions(-) delete mode 100644 l1-contracts/test/foundry/integration/_SharedHyperchainDeployer.t.sol delete mode 100644 l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml diff --git a/l1-contracts/test/foundry/integration/_SharedHyperchainDeployer.t.sol b/l1-contracts/test/foundry/integration/_SharedHyperchainDeployer.t.sol deleted file mode 100644 index e944fca0a..000000000 --- a/l1-contracts/test/foundry/integration/_SharedHyperchainDeployer.t.sol +++ /dev/null @@ -1,179 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity 0.8.24; - -import {StdStorage, stdStorage} from "forge-std/Test.sol"; - -import {L1ContractDeployer} from "./_SharedL1ContractDeployer.t.sol"; -import {RegisterHyperchainScript} from "deploy-scripts/RegisterHyperchain.s.sol"; -import {ETH_TOKEN_ADDRESS} from "contracts/common/Config.sol"; -import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; -import "@openzeppelin/contracts-v4/utils/Strings.sol"; -import {IZkSyncHyperchain} from "contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol"; -import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; -import {DiamondProxy} from "contracts/state-transition/chain-deps/DiamondProxy.sol"; -import {IDiamondInit} from "contracts/state-transition/chain-interfaces/IDiamondInit.sol"; - -contract HyperchainDeployer is L1ContractDeployer { - using stdStorage for StdStorage; - - RegisterHyperchainScript deployScript; - - struct HyperchainDescription { - uint256 hyperchainChainId; - address baseToken; - uint256 bridgehubCreateNewChainSalt; - bool validiumMode; - address validatorSenderOperatorCommitEth; - address validatorSenderOperatorBlobsEth; - uint128 baseTokenGasPriceMultiplierNominator; - uint128 baseTokenGasPriceMultiplierDenominator; - } - - uint256 currentHyperChainId = 10; - uint256 eraHyperchainId = 9; - uint256[] public hyperchainIds; - - function _deployEra() internal { - vm.setEnv( - "HYPERCHAIN_CONFIG", - "/test/foundry/integration/deploy-scripts/script-out/output-deploy-hyperchain-era.toml" - ); - - deployScript = new RegisterHyperchainScript(); - saveHyperchainConfig(_getDefaultDescription(eraHyperchainId, ETH_TOKEN_ADDRESS, eraHyperchainId)); - vm.warp(100); - deployScript.run(); - hyperchainIds.push(eraHyperchainId); - } - - function _deployHyperchain(address _baseToken) internal { - vm.setEnv( - "HYPERCHAIN_CONFIG", - string.concat( - "/test/foundry/integration/deploy-scripts/script-out/output-deploy-hyperchain-", - Strings.toString(currentHyperChainId), - ".toml" - ) - ); - hyperchainIds.push(currentHyperChainId); - saveHyperchainConfig(_getDefaultDescription(currentHyperChainId, _baseToken, currentHyperChainId)); - currentHyperChainId++; - deployScript.run(); - } - - function _getDefaultDescription( - uint256 __chainId, - address __baseToken, - uint256 __salt - ) internal returns (HyperchainDescription memory description) { - description = HyperchainDescription({ - hyperchainChainId: __chainId, - baseToken: __baseToken, - bridgehubCreateNewChainSalt: __salt, - validiumMode: false, - validatorSenderOperatorCommitEth: address(0), - validatorSenderOperatorBlobsEth: address(1), - baseTokenGasPriceMultiplierNominator: uint128(1), - baseTokenGasPriceMultiplierDenominator: uint128(1) - }); - } - - function saveHyperchainConfig(HyperchainDescription memory description) public { - string memory serialized; - - vm.serializeAddress("toml1", "owner_address", 0x70997970C51812dc3A010C7d01b50e0d17dc79C8); - vm.serializeUint("chain", "chain_chain_id", description.hyperchainChainId); - vm.serializeAddress("chain", "base_token_addr", description.baseToken); - vm.serializeUint("chain", "bridgehub_create_new_chain_salt", description.bridgehubCreateNewChainSalt); - - uint256 validiumMode = 0; - - if (description.validiumMode) { - validiumMode = 1; - } - - vm.serializeUint("chain", "validium_mode", validiumMode); - vm.serializeAddress( - "chain", - "validator_sender_operator_commit_eth", - description.validatorSenderOperatorCommitEth - ); - vm.serializeAddress( - "chain", - "validator_sender_operator_blobs_eth", - description.validatorSenderOperatorBlobsEth - ); - vm.serializeUint( - "chain", - "base_token_gas_price_multiplier_nominator", - description.baseTokenGasPriceMultiplierNominator - ); - vm.serializeUint("chain", "governance_min_delay", 0); - vm.serializeAddress("chain", "governance_security_council_address", address(0)); - - string memory single_serialized = vm.serializeUint( - "chain", - "base_token_gas_price_multiplier_denominator", - description.baseTokenGasPriceMultiplierDenominator - ); - - string memory toml = vm.serializeString("toml1", "chain", single_serialized); - string memory path = string.concat(vm.projectRoot(), vm.envString("HYPERCHAIN_CONFIG")); - vm.writeToml(toml, path); - } - - function getHyperchainAddress(uint256 _chainId) public view returns (address) { - return bridgeHub.getHyperchain(_chainId); - } - - function getHyperchainBaseToken(uint256 _chainId) public view returns (address) { - return bridgeHub.baseToken(_chainId); - } - - function acceptPendingAdmin() public { - IZkSyncHyperchain chain = IZkSyncHyperchain(bridgeHub.getHyperchain(currentHyperChainId - 1)); - address admin = chain.getPendingAdmin(); - vm.startBroadcast(admin); - chain.acceptAdmin(); - vm.stopBroadcast(); - vm.deal(admin, 10000000000000000000000000); - } - - // add this to be excluded from coverage report - function testHyperchainDeployer() internal {} - - function _deployZkChain( - uint256 _chainId, - bytes32 _baseTokenAssetId, - address _sharedBridge, - address _admin, - uint256 _protocolVersion, - bytes32 _storedBatchZero, - address _bridgeHub - ) internal returns (address) { - Diamond.DiamondCutData memory diamondCut = abi.decode( - l1Script.getInitialDiamondCutData(), - (Diamond.DiamondCutData) - ); - bytes memory initData; - - { - initData = bytes.concat( - IDiamondInit.initialize.selector, - bytes32(_chainId), - bytes32(uint256(uint160(address(_bridgeHub)))), - bytes32(uint256(uint160(address(this)))), - bytes32(_protocolVersion), - bytes32(uint256(uint160(_admin))), - bytes32(uint256(uint160(address(0x1337)))), - _baseTokenAssetId, - bytes32(uint256(uint160(_sharedBridge))), - _storedBatchZero, - diamondCut.initCalldata - ); - } - diamondCut.initCalldata = initData; - DiamondProxy hyperchainContract = new DiamondProxy{salt: bytes32(0)}(block.chainid, diamondCut); - return address(hyperchainContract); - } -} diff --git a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml b/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml deleted file mode 100644 index 96d1f429c..000000000 --- a/l1-contracts/test/foundry/integration/deploy-scripts/script-out/output-deploy-l1.toml +++ /dev/null @@ -1,56 +0,0 @@ -create2_factory_addr = "0x4e59b44847b379578588920cA78FbF26c0B4956C" -create2_factory_salt = "0x00000000000000000000000000000000000000000000000000000000000000ff" -deployer_addr = "0x7FA9385bE102ac3EAc297483Dd6233D62b3e1496" -era_chain_id = 9 -force_deployments_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002c00000000000000000000000000000000000000000000000000000000000000440bc59a5ff202d6a9b1ce2e00f9fda0f4e963deef77e8fc6952c887b780a04fb7400000000000000000000000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9d3de98fb9db900fd0eb69c4e082f0a9b60872c04e318308d2128ee8ac82d634900000000000000000000000000000000000000000000000000000000000100030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010e000000000000000000000000000000000000000000000000000000000000000900000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000000000000000000000000000000000000000000013927048defd1ff97c7b682da4c45b7f2f838b0ad9d56f6754033951c9e6f3e1800000000000000000000000000000000000000000000000000000000000100040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000081aa7970c51812dc3a010c7d01b50e0d17dc8ad9349c400bc5cef9910dcd7cd1328960b14d2c095f0e5d26c14f4f8a467160578500000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c800000000000000000000000070997970c51812dc3a010c7d01b50e0d17dc79c80000000000000000000000000000000000000000000000000000000000000000d6476e20a4a4f5abfa4977938e30f1b8e56e036cf029bafcf05f08512453229a00000000000000000000000000000000000000000000000000000000000100050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000010002" -l1_chain_id = 31337 -multicall3_addr = "0xd0A2473b7c0ee61CdEef073A988cddcb8aFd9ECa" -owner_address = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8" - -[contracts_config] -diamond_cut_data = "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000002df49321b9ae2eb23fe13b8b9e9a47a0373c91740000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc00000000000000000000000000d81e6c72bab9d981612022adae2da2a6ad0364700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000000000000000000000000000e541deac629c33976b67da07805e9dd59e28815c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005518c73b000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000000000000000000000000000dd500590d10c3e4f77cae59a05e2b7fe574cd45d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000d077255100000000000000000000000000000000000000000000000000000000ddcc9eec00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab7000000000000000000000000000000000000000000000000000000000000000000000000000000008a295a772ac5ad976172a4ef259e576fde49d6e2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400a22e22000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000c37533bb000000000000000000000000000000000000000000000000000000006edd4f120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000a72763b774f9bd634e663eacbe19ed5c16a7d109000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c4b400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000a4cb26d6933d2c3e76718d30de8547bcdf8dd241" -diamond_init_batch_overhead_l1_gas = 1000000 -diamond_init_max_l2_gas_per_batch = 80000000 -diamond_init_max_pubdata_per_batch = 120000 -diamond_init_minimal_l2_gas_price = 250000000 -diamond_init_priority_tx_max_pubdata = 99000 -diamond_init_pubdata_pricing_mode = 0 -force_deployments_data = "0x00" -priority_tx_max_gas_limit = 80000000 -recursion_circuits_set_vks_hash = "0x0000000000000000000000000000000000000000000000000000000000000000" -recursion_leaf_level_vk_hash = "0x0000000000000000000000000000000000000000000000000000000000000000" -recursion_node_level_vk_hash = "0x0000000000000000000000000000000000000000000000000000000000000000" - -[deployed_addresses] -blob_versioned_hash_retriever_addr = "0xA4cB26d6933D2c3E76718D30de8547bCDF8dD241" -governance_addr = "0x9faE52d8426415a4eF660A2A9b582cC0422A9118" -native_token_vault_addr = "0x4520FefE8e4aE1f78Cb3CCdC190dA369d4498aE9" -transparent_proxy_admin_addr = "0xD718d5A27a29FF1cD22403426084bA0d479869a0" -validator_timelock_addr = "0x138bB623e4607cA5D9Be921eaCb2CD9fFa229C82" - -[deployed_addresses.bridgehub] -bridgehub_implementation_addr = "0x5e80e29CFf9F39b48b5B07BB67734A184Fc47F9f" -bridgehub_proxy_addr = "0xd4702DA25D468aA48848240101E6294B77d099D9" -message_root_implementation_addr = "0x4B0421fB3d928812437258e0E655d73A61647cc7" -message_root_proxy_addr = "0xB4eC2d429fa4FeB0D12bFa5BA8b0534fd591e205" -stm_deployment_tracker_implementation_addr = "0xaE70fF62B38b9Af001633598F9341637bA031B40" -stm_deployment_tracker_proxy_addr = "0xCBc9E6abfE22d7cfd854E5F1A004CBA6D4E31815" - -[deployed_addresses.bridges] -erc20_bridge_implementation_addr = "0x81F9c8c0031c943D89a6927AE6a2599609F1C9e4" -erc20_bridge_proxy_addr = "0x33291995d421E610018478a87216c28A2708a602" -shared_bridge_implementation_addr = "0xE34DCdC09Af89ed437A9a2D0ae3b7426121cA3e0" -shared_bridge_proxy_addr = "0x69fC599dCe9C6C6510329bf2D7395Be08454F3A4" - -[deployed_addresses.state_transition] -admin_facet_addr = "0x0D81E6c72bAb9d981612022ADaE2DA2a6AD03647" -default_upgrade_addr = "0x3021Bb1f5E1f54dfb75bAfFb774105A6B353838F" -diamond_init_addr = "0x2Df49321b9AE2eB23fe13B8B9e9a47a0373C9174" -diamond_proxy_addr = "0x0000000000000000000000000000000000000000" -executor_facet_addr = "0x8a295A772ac5AD976172a4Ef259e576Fde49D6e2" -genesis_upgrade_addr = "0x2e1955e337A431ba4936746C190e250Fa3f19bda" -getters_facet_addr = "0xE541DEac629c33976B67DA07805e9dd59e28815c" -mailbox_facet_addr = "0xDd500590d10c3E4f77Cae59A05E2b7fe574cd45d" -state_transition_implementation_addr = "0xbd2680234498013d34a5A90775D213Bb5D3a4Fd7" -state_transition_proxy_addr = "0x8dFB80e3F76130587297D8d4De5Cd46f4a35B304" -verifier_addr = "0xa72763b774F9bD634e663eacBE19Ed5c16A7d109" From 7206350a0ffd9f2de0ecd38e7f9e2cd711a5dd81 Mon Sep 17 00:00:00 2001 From: kelemeno <34402761+kelemeno@users.noreply.github.com> Date: Mon, 16 Sep 2024 09:39:49 +0100 Subject: [PATCH 51/53] fix: get the server to start (#803) Co-authored-by: Lyova Potyomkin Co-authored-by: Stanislav Bezkorovainyi --- .../contracts/bridge/L1ERC20Bridge.sol | 2 +- l1-contracts/contracts/bridge/L1Nullifier.sol | 9 + .../bridge/asset-router/L1AssetRouter.sol | 2 +- .../bridge/asset-router/L2AssetRouter.sol | 12 +- .../bridge/interfaces/IL1Nullifier.sol | 4 +- .../bridge/ntv/L1NativeTokenVault.sol | 2 +- .../contracts/bridge/ntv/NativeTokenVault.sol | 2 +- .../contracts/common/L1ContractErrors.sol | 10 +- .../dev-contracts/L1NullifierDev.sol | 20 ++ .../l2-deps/IL2GenesisUpgrade.sol | 9 +- .../libraries/BatchDecoder.sol | 4 - .../contracts/upgrades/GatewayUpgrade.sol | 4 +- .../contracts/upgrades/L1GenesisUpgrade.sol | 21 +- l1-contracts/deploy-scripts/DeployL1.s.sol | 3 +- .../GenerateForceDeploymentsData.s.sol | 42 --- ...ter-hyperchain.ts => register-zk-chain.ts} | 9 +- l1-contracts/scripts/sync-layer.ts | 79 ++++- l1-contracts/src.ts/deploy-process.ts | 3 +- l1-contracts/src.ts/deploy-test-process.ts | 3 +- l1-contracts/src.ts/deploy-token.ts | 8 +- l1-contracts/src.ts/deploy-utils-zk.ts | 15 +- l1-contracts/src.ts/deploy-utils.ts | 101 ++++++- l1-contracts/src.ts/deploy.ts | 280 +++++++++++++----- l1-contracts/src.ts/utils.ts | 8 + .../integration/BridgeHubInvariantTests.t.sol | 8 +- .../l1/integration/BridgehubTests.t.sol | 8 +- .../_SharedL1ContractDeployer.t.sol | 2 +- .../L1Erc20Bridge/FinalizeWithdrawal.sol | 6 + .../_L1SharedBridge_Shared.t.sol | 2 +- .../Governance/PermanentRestriction.t.sol | 14 + .../_ChainTypeManager_Shared.t.sol | 7 +- .../l2/unit/erc20/L2Erc20BridgeTest.t.sol | 2 +- .../test/foundry/l2/unit/utils/L2Utils.sol | 6 +- .../initial_deployment_test.spec.ts | 6 + system-contracts/SystemContractsHashes.json | 34 +-- system-contracts/contracts/Constants.sol | 3 +- .../contracts/L2GenesisUpgrade.sol | 89 +++++- .../interfaces/IL2GenesisUpgrade.sol | 22 +- .../test-contracts/DummyBridgehub.sol | 11 + .../test-contracts/DummyL2AssetRouter.sol | 13 + .../DummyL2NativeTokenVault.sol | 15 + .../test-contracts/DummyMessageRoot.sol | 7 + .../test/L2GenesisUpgrade.spec.ts | 57 +++- system-contracts/test/shared/constants.ts | 2 + 44 files changed, 767 insertions(+), 199 deletions(-) create mode 100644 l1-contracts/contracts/dev-contracts/L1NullifierDev.sol rename l1-contracts/scripts/{register-hyperchain.ts => register-zk-chain.ts} (93%) create mode 100644 system-contracts/contracts/test-contracts/DummyBridgehub.sol create mode 100644 system-contracts/contracts/test-contracts/DummyL2AssetRouter.sol create mode 100644 system-contracts/contracts/test-contracts/DummyL2NativeTokenVault.sol create mode 100644 system-contracts/contracts/test-contracts/DummyMessageRoot.sol diff --git a/l1-contracts/contracts/bridge/L1ERC20Bridge.sol b/l1-contracts/contracts/bridge/L1ERC20Bridge.sol index 3eb231950..0cd72ccc7 100644 --- a/l1-contracts/contracts/bridge/L1ERC20Bridge.sol +++ b/l1-contracts/contracts/bridge/L1ERC20Bridge.sol @@ -140,7 +140,7 @@ contract L1ERC20Bridge is IL1ERC20Bridge, ReentrancyGuard { chainId: ERA_CHAIN_ID, l2BatchNumber: _l2BatchNumber, l2MessageIndex: _l2MessageIndex, - l2Sender: l2Bridge, + l2Sender: L1_NULLIFIER.l2BridgeAddress(ERA_CHAIN_ID), l2TxNumberInBatch: _l2TxNumberInBatch, message: _message, merkleProof: _merkleProof diff --git a/l1-contracts/contracts/bridge/L1Nullifier.sol b/l1-contracts/contracts/bridge/L1Nullifier.sol index 789f122df..6dda093c9 100644 --- a/l1-contracts/contracts/bridge/L1Nullifier.sol +++ b/l1-contracts/contracts/bridge/L1Nullifier.sol @@ -217,6 +217,15 @@ contract L1Nullifier is IL1Nullifier, ReentrancyGuard, Ownable2StepUpgradeable, return __DEPRECATED_l2BridgeAddress[_chainId]; } + /// @notice Legacy function used for migration, do not use! + /// @param _chainId The chain id we want to get the balance for. + /// @param _token The address of the token. + // slither-disable-next-line uninitialized-state-variables + function chainBalance(uint256 _chainId, address _token) external view returns (uint256) { + // slither-disable-next-line uninitialized-state-variables + return __DEPRECATED_chainBalance[_chainId][_token]; + } + /// @notice Sets the L1ERC20Bridge contract address. /// @dev Should be called only once by the owner. /// @param _legacyBridge The address of the legacy bridge. diff --git a/l1-contracts/contracts/bridge/asset-router/L1AssetRouter.sol b/l1-contracts/contracts/bridge/asset-router/L1AssetRouter.sol index 0c3b2001f..6e44f4cae 100644 --- a/l1-contracts/contracts/bridge/asset-router/L1AssetRouter.sol +++ b/l1-contracts/contracts/bridge/asset-router/L1AssetRouter.sol @@ -540,7 +540,7 @@ contract L1AssetRouter is AssetRouterBase, IL1AssetRouter, ReentrancyGuard { ) external override { /// @dev We use a deprecated field to support L2->L1 legacy withdrawals, which were started /// by the legacy bridge. - address legacyL2Bridge = L1_NULLIFIER.__DEPRECATED_l2BridgeAddress(_chainId); + address legacyL2Bridge = L1_NULLIFIER.l2BridgeAddress(_chainId); FinalizeL1DepositParams memory finalizeWithdrawalParams = FinalizeL1DepositParams({ chainId: _chainId, l2BatchNumber: _l2BatchNumber, diff --git a/l1-contracts/contracts/bridge/asset-router/L2AssetRouter.sol b/l1-contracts/contracts/bridge/asset-router/L2AssetRouter.sol index 6c122ccc6..b75eb58e8 100644 --- a/l1-contracts/contracts/bridge/asset-router/L2AssetRouter.sol +++ b/l1-contracts/contracts/bridge/asset-router/L2AssetRouter.sol @@ -73,7 +73,8 @@ contract L2AssetRouter is AssetRouterBase, IL2AssetRouter { uint256 _eraChainId, address _l1AssetRouter, address _legacySharedBridge, - bytes32 _baseTokenAssetId + bytes32 _baseTokenAssetId, + address _aliasedOwner ) AssetRouterBase(_l1ChainId, _eraChainId, IBridgehub(L2_BRIDGEHUB_ADDR)) { L2_LEGACY_SHARED_BRIDGE = _legacySharedBridge; if (_l1AssetRouter == address(0)) { @@ -83,6 +84,7 @@ contract L2AssetRouter is AssetRouterBase, IL2AssetRouter { assetHandlerAddress[_baseTokenAssetId] = L2_NATIVE_TOKEN_VAULT_ADDR; BASE_TOKEN_ASSET_ID = _baseTokenAssetId; _disableInitializers(); + _transferOwnership(_aliasedOwner); } /// @inheritdoc IL2AssetRouter @@ -164,8 +166,12 @@ contract L2AssetRouter is AssetRouterBase, IL2AssetRouter { // slither-disable-next-line unused-return L2ContractHelper.sendMessageToL1(message); } else { - address l1Token = IL2NativeTokenVault(L2_NATIVE_TOKEN_VAULT_ADDR).tokenAddress(_assetId); - require(l1Token != address(0), "Unsupported asset Id by NTV"); + address l1Token = IBridgedStandardToken( + IL2NativeTokenVault(L2_NATIVE_TOKEN_VAULT_ADDR).tokenAddress(_assetId) + ).originToken(); + if (l1Token == address(0)) { + revert AssetIdNotSupported(_assetId); + } (uint256 amount, address l1Receiver) = abi.decode(_assetData, (uint256, address)); message = _getSharedBridgeWithdrawMessage(l1Receiver, l1Token, amount); IL2SharedBridgeLegacy(L2_LEGACY_SHARED_BRIDGE).sendMessageToL1(message); diff --git a/l1-contracts/contracts/bridge/interfaces/IL1Nullifier.sol b/l1-contracts/contracts/bridge/interfaces/IL1Nullifier.sol index f5bd3539c..61bf38516 100644 --- a/l1-contracts/contracts/bridge/interfaces/IL1Nullifier.sol +++ b/l1-contracts/contracts/bridge/interfaces/IL1Nullifier.sol @@ -78,9 +78,9 @@ interface IL1Nullifier { function setL1AssetRouter(address _l1AssetRouter) external; - function __DEPRECATED_chainBalance(uint256 _chainId, address _token) external view returns (uint256); + function chainBalance(uint256 _chainId, address _token) external view returns (uint256); - function __DEPRECATED_l2BridgeAddress(uint256 _chainId) external view returns (address); + function l2BridgeAddress(uint256 _chainId) external view returns (address); function transferTokenToNTV(address _token) external; diff --git a/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol index be456db43..f1d14834d 100644 --- a/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol +++ b/l1-contracts/contracts/bridge/ntv/L1NativeTokenVault.sol @@ -116,7 +116,7 @@ contract L1NativeTokenVault is IL1NativeTokenVault, IL1AssetHandler, NativeToken /// @param _token The address of token to be transferred (address(1) for ether and contract address for ERC20). /// @param _targetChainId The chain ID of the corresponding ZK chain. function updateChainBalancesFromSharedBridge(address _token, uint256 _targetChainId) external { - uint256 nullifierChainBalance = L1_NULLIFIER.__DEPRECATED_chainBalance(_targetChainId, _token); + uint256 nullifierChainBalance = L1_NULLIFIER.chainBalance(_targetChainId, _token); bytes32 assetId = DataEncoding.encodeNTVAssetId(block.chainid, _token); chainBalance[_targetChainId][assetId] = chainBalance[_targetChainId][assetId] + nullifierChainBalance; originChainId[assetId] = block.chainid; diff --git a/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol b/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol index 5e76d7630..02e865d5d 100644 --- a/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol +++ b/l1-contracts/contracts/bridge/ntv/NativeTokenVault.sol @@ -259,8 +259,8 @@ abstract contract NativeTokenVault is INativeTokenVault, IAssetHandler, Ownable2 if (msg.value != 0) { revert NonEmptyMsgValue(); } - _handleChainBalanceIncrease(_chainId, _assetId, amount, true); amount = _depositAmount; + _handleChainBalanceIncrease(_chainId, _assetId, amount, true); if (!_depositChecked) { uint256 expectedDepositAmount = _depositFunds(_originalCaller, IERC20(nativeToken), _depositAmount); // note if _originalCaller is this contract, this will return 0. This does not happen. // The token has non-standard transfer logic diff --git a/l1-contracts/contracts/common/L1ContractErrors.sol b/l1-contracts/contracts/common/L1ContractErrors.sol index 7f2bc781d..18766497f 100644 --- a/l1-contracts/contracts/common/L1ContractErrors.sol +++ b/l1-contracts/contracts/common/L1ContractErrors.sol @@ -25,19 +25,19 @@ error RemovingPermanentRestriction(); error UnallowedImplementation(bytes32 implementationHash); // 0x1ff9d522 error AddressAlreadyUsed(address addr); -// +// 0x0dfb42bf error AddressAlreadySet(address addr); // 0x86bb51b8 error AddressHasNoCode(address); -// +// 0x1f73225f error AddressMismatch(address expected, address supplied); // 0x1eee5481 error AddressTooLow(address); -// +// 0x5e85ae73 error AmountMustBeGreaterThanZero(); -// +// 0xfde974f4 error AssetHandlerDoesNotExist(bytes32 assetId); -// +// 0x1294e9e1 error AssetIdMismatch(bytes32 expected, bytes32 supplied); // error AssetIdAlreadyRegistered(); diff --git a/l1-contracts/contracts/dev-contracts/L1NullifierDev.sol b/l1-contracts/contracts/dev-contracts/L1NullifierDev.sol new file mode 100644 index 000000000..062d168cd --- /dev/null +++ b/l1-contracts/contracts/dev-contracts/L1NullifierDev.sol @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +import {L1Nullifier, IBridgehub} from "../bridge/L1Nullifier.sol"; + +contract L1NullifierDev is L1Nullifier { + constructor( + IBridgehub _bridgehub, + uint256 _eraChainId, + address _eraDiamondProxy + ) L1Nullifier(_bridgehub, _eraChainId, _eraDiamondProxy) {} + + function setL2LegacySharedBridge(uint256 _chainId, address _l2Bridge) external { + __DEPRECATED_l2BridgeAddress[_chainId] = _l2Bridge; + } + + // add this to be excluded from coverage report + function test() internal virtual {} +} diff --git a/l1-contracts/contracts/state-transition/l2-deps/IL2GenesisUpgrade.sol b/l1-contracts/contracts/state-transition/l2-deps/IL2GenesisUpgrade.sol index daddd142a..6221f2e18 100644 --- a/l1-contracts/contracts/state-transition/l2-deps/IL2GenesisUpgrade.sol +++ b/l1-contracts/contracts/state-transition/l2-deps/IL2GenesisUpgrade.sol @@ -15,6 +15,12 @@ struct ForceDeployment { bytes input; } +struct ZKChainSpecificForceDeploymentsData { + bytes32 baseTokenAssetId; + address l2LegacySharedBridge; + address l2Weth; +} + /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev interface IL2GenesisUpgrade { @@ -23,6 +29,7 @@ interface IL2GenesisUpgrade { function genesisUpgrade( uint256 _chainId, address _ctmDeployer, - bytes calldata _forceDeploymentsData + bytes calldata _fixedForceDeploymentsData, + bytes calldata _additionalForceDeploymentsData ) external payable; } diff --git a/l1-contracts/contracts/state-transition/libraries/BatchDecoder.sol b/l1-contracts/contracts/state-transition/libraries/BatchDecoder.sol index 05b16537b..a8af4b7ab 100644 --- a/l1-contracts/contracts/state-transition/libraries/BatchDecoder.sol +++ b/l1-contracts/contracts/state-transition/libraries/BatchDecoder.sol @@ -99,10 +99,6 @@ library BatchDecoder { uint256[] memory proof ) { - if (_proofData.length == 0) { - revert EmptyData(); - } - uint8 encodingVersion = uint8(_proofData[0]); if (encodingVersion == SUPPORTED_ENCODING_VERSION) { (prevBatch, provedBatches, proof) = abi.decode( diff --git a/l1-contracts/contracts/upgrades/GatewayUpgrade.sol b/l1-contracts/contracts/upgrades/GatewayUpgrade.sol index 9ce428f96..08d05989e 100644 --- a/l1-contracts/contracts/upgrades/GatewayUpgrade.sol +++ b/l1-contracts/contracts/upgrades/GatewayUpgrade.sol @@ -40,7 +40,9 @@ contract GatewayUpgrade is BaseZkSyncUpgrade, Initializable { s.baseTokenAssetId = DataEncoding.encodeNTVAssetId(block.chainid, s.__DEPRECATED_baseToken); s.priorityTree.setup(s.priorityQueue.getTotalPriorityTxs()); - IBridgehub(s.bridgehub).setLegacyBaseTokenAssetId(s.chainId); + IBridgehub bridgehub = IBridgehub(s.bridgehub); + s.baseTokenBridge = bridgehub.sharedBridge(); // we change the assetRouter + bridgehub.setLegacyBaseTokenAssetId(s.chainId); ProposedUpgrade memory proposedUpgrade = _proposedUpgrade; address l2LegacyBridge = IL1SharedBridgeLegacy(s.baseTokenBridge).l2BridgeAddress(s.chainId); proposedUpgrade.l2ProtocolUpgradeTx.data = bytes.concat( diff --git a/l1-contracts/contracts/upgrades/L1GenesisUpgrade.sol b/l1-contracts/contracts/upgrades/L1GenesisUpgrade.sol index 4637c535d..d6cb769c0 100644 --- a/l1-contracts/contracts/upgrades/L1GenesisUpgrade.sol +++ b/l1-contracts/contracts/upgrades/L1GenesisUpgrade.sol @@ -8,8 +8,10 @@ import {Diamond} from "../state-transition/libraries/Diamond.sol"; import {BaseZkSyncUpgradeGenesis} from "./BaseZkSyncUpgradeGenesis.sol"; import {ProposedUpgrade} from "./IDefaultUpgrade.sol"; import {L2CanonicalTransaction} from "../common/Messaging.sol"; -import {IL2GenesisUpgrade} from "../state-transition/l2-deps/IL2GenesisUpgrade.sol"; +import {IL2GenesisUpgrade, ZKChainSpecificForceDeploymentsData} from "../state-transition/l2-deps/IL2GenesisUpgrade.sol"; import {IL1GenesisUpgrade} from "./IL1GenesisUpgrade.sol"; +import {IL1Nullifier} from "../bridge/interfaces/IL1Nullifier.sol"; +import {IL1AssetRouter} from "../bridge/asset-router/IL1AssetRouter.sol"; import {IComplexUpgrader} from "../state-transition/l2-deps/IComplexUpgrader.sol"; import {L2_FORCE_DEPLOYER_ADDR, L2_COMPLEX_UPGRADER_ADDR, L2_GENESIS_UPGRADE_ADDR} from "../common/L2ContractAddresses.sol"; //, COMPLEX_UPGRADER_ADDR, GENESIS_UPGRADE_ADDR import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA, SYSTEM_UPGRADE_L2_TX_TYPE, PRIORITY_TX_MAX_GAS_LIMIT} from "../common/Config.sol"; @@ -27,7 +29,7 @@ contract L1GenesisUpgrade is IL1GenesisUpgrade, BaseZkSyncUpgradeGenesis { uint256 _chainId, uint256 _protocolVersion, address _l1CtmDeployerAddress, - bytes calldata _forceDeploymentsData, + bytes calldata _fixedForceDeploymentsData, bytes[] calldata _factoryDeps ) public override returns (bytes32) { L2CanonicalTransaction memory l2ProtocolUpgradeTx; @@ -35,9 +37,10 @@ contract L1GenesisUpgrade is IL1GenesisUpgrade, BaseZkSyncUpgradeGenesis { { bytes memory complexUpgraderCalldata; { + bytes memory additionalForceDeploymentsData = _getZKChainSpecificForceDeploymentsData(); bytes memory l2GenesisUpgradeCalldata = abi.encodeCall( IL2GenesisUpgrade.genesisUpgrade, - (_chainId, _l1CtmDeployerAddress, _forceDeploymentsData) + (_chainId, _l1CtmDeployerAddress, _fixedForceDeploymentsData, additionalForceDeploymentsData) ); complexUpgraderCalldata = abi.encodeCall( IComplexUpgrader.upgrade, @@ -101,4 +104,16 @@ contract L1GenesisUpgrade is IL1GenesisUpgrade, BaseZkSyncUpgradeGenesis { super.upgrade(_proposedUpgrade); return Diamond.DIAMOND_INIT_SUCCESS_RETURN_VALUE; } + + function _getZKChainSpecificForceDeploymentsData() internal view returns (bytes memory) { + IL1Nullifier l1Nullifier = IL1AssetRouter(s.baseTokenBridge).L1_NULLIFIER(); + address legacySharedBridge = l1Nullifier.l2BridgeAddress(s.chainId); + ZKChainSpecificForceDeploymentsData + memory additionalForceDeploymentsData = ZKChainSpecificForceDeploymentsData({ + baseTokenAssetId: s.baseTokenAssetId, + l2LegacySharedBridge: legacySharedBridge, + l2Weth: address(0) // kl todo + }); + return abi.encode(additionalForceDeploymentsData); + } } diff --git a/l1-contracts/deploy-scripts/DeployL1.s.sol b/l1-contracts/deploy-scripts/DeployL1.s.sol index 868fdbc47..20ec3cbc7 100644 --- a/l1-contracts/deploy-scripts/DeployL1.s.sol +++ b/l1-contracts/deploy-scripts/DeployL1.s.sol @@ -339,7 +339,8 @@ contract DeployL1Script is Script { } function deployGenesisUpgrade() internal { - address contractAddress = deployViaCreate2(type(L1GenesisUpgrade).creationCode); + bytes memory bytecode = abi.encodePacked(type(L1GenesisUpgrade).creationCode); + address contractAddress = deployViaCreate2(bytecode); console.log("GenesisUpgrade deployed at:", contractAddress); addresses.stateTransition.genesisUpgrade = contractAddress; } diff --git a/l1-contracts/deploy-scripts/GenerateForceDeploymentsData.s.sol b/l1-contracts/deploy-scripts/GenerateForceDeploymentsData.s.sol index 3d5a1c042..1c2db4d7d 100644 --- a/l1-contracts/deploy-scripts/GenerateForceDeploymentsData.s.sol +++ b/l1-contracts/deploy-scripts/GenerateForceDeploymentsData.s.sol @@ -95,48 +95,6 @@ contract GenerateForceDeploymentsData is Script { address aliasedGovernance = AddressAliasHelper.applyL1ToL2Alias(config.governance); ForceDeployment[] memory forceDeployments = new ForceDeployment[](4); - forceDeployments[0] = ForceDeployment({ - bytecodeHash: keccak256(contracts.bridgehubBytecode), - newAddress: L2_BRIDGEHUB_ADDR, - callConstructor: true, - value: 0, - input: abi.encode(config.chainId, aliasedGovernance) - }); - - forceDeployments[1] = ForceDeployment({ - bytecodeHash: keccak256(contracts.l2AssetRouterBytecode), - newAddress: L2_ASSET_ROUTER_ADDR, - callConstructor: true, - value: 0, - // solhint-disable-next-line func-named-parameters - input: abi.encode(config.chainId, config.eraChainId, config.l1AssetRouterProxy, address(1)) - }); - - forceDeployments[2] = ForceDeployment({ - bytecodeHash: keccak256(contracts.l2NtvBytecode), - newAddress: L2_NATIVE_TOKEN_VAULT_ADDR, - callConstructor: true, - value: 0, - // solhint-disable-next-line func-named-parameters - input: abi.encode( - config.chainId, - aliasedGovernance, - keccak256(contracts.l2TokenProxyBytecode), - config.l2LegacySharedBridge, - config.l2TokenBeacon, - config.contractsDeployedAlready - ) - }); - - forceDeployments[3] = ForceDeployment({ - bytecodeHash: keccak256(contracts.messageRootBytecode), - newAddress: L2_MESSAGE_ROOT_ADDR, - callConstructor: true, - value: 0, - // solhint-disable-next-line func-named-parameters - input: abi.encode(L2_BRIDGEHUB_ADDR) - }); - config.forceDeploymentsData = abi.encode(forceDeployments); } } diff --git a/l1-contracts/scripts/register-hyperchain.ts b/l1-contracts/scripts/register-zk-chain.ts similarity index 93% rename from l1-contracts/scripts/register-hyperchain.ts rename to l1-contracts/scripts/register-zk-chain.ts index 13013a9d2..b16f81fa8 100644 --- a/l1-contracts/scripts/register-hyperchain.ts +++ b/l1-contracts/scripts/register-zk-chain.ts @@ -8,7 +8,7 @@ import * as fs from "fs"; import * as path from "path"; import { Deployer } from "../src.ts/deploy"; import { GAS_MULTIPLIER, web3Provider } from "./utils"; -import { ADDRESS_ONE, encodeNTVAssetId } from "../src.ts/utils"; +import { ADDRESS_ONE, encodeNTVAssetId, isCurrentNetworkLocal } from "../src.ts/utils"; import { getTokens } from "../src.ts/deploy-token"; const ETH_TOKEN_ADDRESS = ADDRESS_ONE; @@ -103,7 +103,9 @@ async function main() { if (!(await deployer.bridgehubContract(deployWallet).assetIdIsRegistered(baseTokenAssetId))) { await deployer.registerTokenBridgehub(baseTokenAddress, cmd.useGovernance); } - await deployer.registerTokenInNativeTokenVault(baseTokenAddress); + if (baseTokenAddress != ETH_TOKEN_ADDRESS) { + await deployer.registerTokenInNativeTokenVault(baseTokenAddress); + } await deployer.registerZKChain( baseTokenAssetId, cmd.validiumMode, @@ -112,7 +114,8 @@ async function main() { true, null, null, - cmd.useGovernance + cmd.useGovernance, + isCurrentNetworkLocal() || cmd.localLegacyBridgeTesting ); const tokenMultiplierSetterAddress = cmd.tokenMultiplierSetterAddress || ""; diff --git a/l1-contracts/scripts/sync-layer.ts b/l1-contracts/scripts/sync-layer.ts index c463ef38d..b4e20f873 100644 --- a/l1-contracts/scripts/sync-layer.ts +++ b/l1-contracts/scripts/sync-layer.ts @@ -16,10 +16,13 @@ import { REQUIRED_L2_GAS_PRICE_PER_PUBDATA, priorityTxMaxGasLimit, L2_BRIDGEHUB_ADDRESS, + computeL2Create2Address, + DIAMOND_CUT_DATA_ABI_STRING, } from "../src.ts/utils"; import { Wallet as ZkWallet, Provider as ZkProvider, utils as zkUtils } from "zksync-ethers"; import { IChainTypeManagerFactory } from "../typechain/IChainTypeManagerFactory"; +import { IDiamondInitFactory } from "../typechain/IDiamondInitFactory"; import { TestnetERC20TokenFactory } from "../typechain/TestnetERC20TokenFactory"; import { BOOTLOADER_FORMAL_ADDRESS } from "zksync-ethers/build/utils"; @@ -30,6 +33,80 @@ async function main() { program.version("0.1.0").name("deploy").description("deploy L1 contracts"); + program + .command("compute-migrated-chain-address") + .requiredOption("--chain-id ") + .option("--private-key ") + .action(async (cmd) => { + if (process.env.CONTRACTS_BASE_NETWORK_ZKSYNC !== "true") { + throw new Error("This script is only for zkSync network"); + } + + const provider = new ZkProvider(process.env.API_WEB3_JSON_RPC_HTTP_URL); + const ethProvider = new ethers.providers.JsonRpcProvider(process.env.ETH_CLIENT_WEB3_URL); + const deployWallet = cmd.privateKey + ? new ZkWallet(cmd.privateKey, provider) + : (ZkWallet.fromMnemonic( + process.env.MNEMONIC ? process.env.MNEMONIC : ethTestConfig.mnemonic, + "m/44'/60'/0'/0/1" + ).connect(provider) as ethers.Wallet | ZkWallet); + + const deployer = new Deployer({ + deployWallet, + addresses: deployedAddressesFromEnv(), + verbose: true, + }); + + deployer.addresses.StateTransition.AdminFacet = getAddressFromEnv("GATEWAY_ADMIN_FACET_ADDR"); + deployer.addresses.StateTransition.MailboxFacet = getAddressFromEnv("GATEWAY_MAILBOX_FACET_ADDR"); + deployer.addresses.StateTransition.ExecutorFacet = getAddressFromEnv("GATEWAY_EXECUTOR_FACET_ADDR"); + deployer.addresses.StateTransition.GettersFacet = getAddressFromEnv("GATEWAY_GETTERS_FACET_ADDR"); + deployer.addresses.StateTransition.DiamondInit = getAddressFromEnv("GATEWAY_DIAMOND_INIT_ADDR"); + deployer.addresses.StateTransition.Verifier = getAddressFromEnv("GATEWAY_VERIFIER_ADDR"); + deployer.addresses.BlobVersionedHashRetriever = getAddressFromEnv("GATEWAY_BLOB_VERSIONED_HASH_RETRIEVER_ADDR"); + deployer.addresses.ValidatorTimeLock = getAddressFromEnv("GATEWAY_VALIDATOR_TIMELOCK_ADDR"); + deployer.addresses.Bridges.SharedBridgeProxy = getAddressFromEnv("CONTRACTS_L2_SHARED_BRIDGE_ADDR"); + deployer.addresses.StateTransition.StateTransitionProxy = getAddressFromEnv( + "GATEWAY_STATE_TRANSITION_PROXY_ADDR" + ); + + const stm = deployer.chainTypeManagerContract(provider); + const bridgehub = deployer.bridgehubContract(ethProvider); + const diamondInit = IDiamondInitFactory.connect(deployer.addresses.StateTransition.DiamondInit, provider); + const bytes32 = (x: ethers.BigNumberish) => ethers.utils.hexZeroPad(ethers.utils.hexlify(x), 32); + + const diamondCut = await deployer.initialZkSyncZKChainDiamondCut([], true); + const mandatoryInitData = [ + diamondInit.interface.getSighash("initialize"), + bytes32(parseInt(cmd.chainId)), + bytes32(getAddressFromEnv("GATEWAY_BRIDGEHUB_PROXY_ADDR")), + bytes32(deployer.addresses.StateTransition.StateTransitionProxy), + bytes32(await stm.protocolVersion()), + bytes32(deployer.deployWallet.address), + bytes32(deployer.addresses.ValidatorTimeLock), + await bridgehub.baseTokenAssetId(cmd.chainId), + bytes32(deployer.addresses.Bridges.SharedBridgeProxy), + await stm.storedBatchZero(), + ]; + + diamondCut.initCalldata = ethers.utils.hexConcat([...mandatoryInitData, diamondCut.initCalldata]); + const bytecode = hardhat.artifacts.readArtifactSync("DiamondProxy").bytecode; + const gatewayChainId = (await provider.getNetwork()).chainId; + const constructorData = new ethers.utils.AbiCoder().encode( + ["uint256", DIAMOND_CUT_DATA_ABI_STRING], + [gatewayChainId, diamondCut] + ); + + const address = computeL2Create2Address( + deployer.addresses.StateTransition.StateTransitionProxy, + bytecode, + constructorData, + ethers.constants.HashZero + ); + + console.log(address); + }); + program .command("deploy-sync-layer-contracts") .option("--private-key ") @@ -62,7 +139,7 @@ async function main() { : (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(); + const nonce = await deployWallet.getTransactionCount(); console.log(`Using nonce: ${nonce}`); const create2Salt = cmd.create2Salt ? cmd.create2Salt : ethers.utils.hexlify(ethers.utils.randomBytes(32)); diff --git a/l1-contracts/src.ts/deploy-process.ts b/l1-contracts/src.ts/deploy-process.ts index c0f8fd712..4415c8109 100644 --- a/l1-contracts/src.ts/deploy-process.ts +++ b/l1-contracts/src.ts/deploy-process.ts @@ -128,6 +128,7 @@ export async function registerZKChain( false, null, chainId, - useGovernance + useGovernance, + true ); } diff --git a/l1-contracts/src.ts/deploy-test-process.ts b/l1-contracts/src.ts/deploy-test-process.ts index f6b0d00fb..07b3fcfb9 100644 --- a/l1-contracts/src.ts/deploy-test-process.ts +++ b/l1-contracts/src.ts/deploy-test-process.ts @@ -104,7 +104,8 @@ export async function initialTestnetDeploymentProcess( deployer.chainId = 9; const testnetTokens = getTokens(); - const result = await deployTokens(testnetTokens, deployer.deployWallet, null, false, deployer.verbose); + const result = await deployTokens(testnetTokens, deployer.deployWallet, null, true, deployer.verbose); + fs.writeFileSync(testnetTokenPath, JSON.stringify(result, null, 2)); // deploy the verifier first diff --git a/l1-contracts/src.ts/deploy-token.ts b/l1-contracts/src.ts/deploy-token.ts index 324e754c8..ea22d7029 100644 --- a/l1-contracts/src.ts/deploy-token.ts +++ b/l1-contracts/src.ts/deploy-token.ts @@ -125,13 +125,15 @@ export async function deployTokens( } if (token.symbol !== "WETH" && mintTokens) { - await erc20.mint(wallet.address, parseEther("3000000000")); + await erc20.mint(wallet.address, parseEther("3000000000000")); } if (mintTokens) { for (let i = 0; i < 10; ++i) { - const testWalletAddress = Wallet.fromMnemonic(mnemonic as string, "m/44'/60'/0'/0/" + i).address; + const testWalletAddress = mnemonic + ? Wallet.fromMnemonic(mnemonic as string, "m/44'/60'/0'/0/" + i).address + : wallet.address; if (token.symbol !== "WETH") { - await erc20.mint(testWalletAddress, parseEther("3000000000")); + await erc20.mint(testWalletAddress, parseEther("3000000000000")); } } } diff --git a/l1-contracts/src.ts/deploy-utils-zk.ts b/l1-contracts/src.ts/deploy-utils-zk.ts index ec9b50a03..de7287f90 100644 --- a/l1-contracts/src.ts/deploy-utils-zk.ts +++ b/l1-contracts/src.ts/deploy-utils-zk.ts @@ -9,7 +9,7 @@ import type { Wallet as ZkWallet } from "zksync-ethers"; import { utils as zkUtils, ContractFactory } from "zksync-ethers"; // import { encode } from "querystring"; // import { web3Provider, web3Url } from "../scripts/utils"; -import { ethersWalletToZkWallet, readBytecode, readInterface } from "./utils"; +import { ethersWalletToZkWallet, readBytecode, readContract, readInterface } from "./utils"; export const BUILT_IN_ZKSYNC_CREATE2_FACTORY = "0x0000000000000000000000000000000000010000"; @@ -20,12 +20,15 @@ const openzeppelinBeaconProxyArtifactsPath = path.join( "@openzeppelin/contracts-v4/proxy/beacon" ); const L2_SHARED_BRIDGE_PATH = contractArtifactsPath + "contracts/bridge"; -export const L2_STANDARD_ERC20_PROXY_FACTORY_BYTECODE = readBytecode( - openzeppelinBeaconProxyArtifactsPath, - "UpgradeableBeacon" +export const L2_STANDARD_ERC20_PROXY_FACTORY = readContract(openzeppelinBeaconProxyArtifactsPath, "UpgradeableBeacon"); +export const L2_STANDARD_ERC20_IMPLEMENTATION = readContract(L2_SHARED_BRIDGE_PATH, "BridgedStandardERC20"); +export const L2_STANDARD_TOKEN_PROXY = readContract(openzeppelinBeaconProxyArtifactsPath, "BeaconProxy"); + +export const L2_SHARED_BRIDGE_IMPLEMENTATION = readContract(L2_SHARED_BRIDGE_PATH, "L2SharedBridgeLegacy"); +export const L2_SHARED_BRIDGE_PROXY = readContract( + contractArtifactsPath + "@openzeppelin/contracts-v4/proxy/transparent", + "TransparentUpgradeableProxy" ); -export const L2_STANDARD_ERC20_IMPLEMENTATION_BYTECODE = readBytecode(L2_SHARED_BRIDGE_PATH, "BridgedStandardERC20"); -export const L2_STANDARD_TOKEN_PROXY_BYTECODE = readBytecode(openzeppelinBeaconProxyArtifactsPath, "BeaconProxy"); export async function deployViaCreate2( deployWallet: ZkWallet, diff --git a/l1-contracts/src.ts/deploy-utils.ts b/l1-contracts/src.ts/deploy-utils.ts index d9e7264c1..dcec2c180 100644 --- a/l1-contracts/src.ts/deploy-utils.ts +++ b/l1-contracts/src.ts/deploy-utils.ts @@ -1,9 +1,19 @@ import * as hardhat from "hardhat"; import "@nomiclabs/hardhat-ethers"; import { ethers } from "ethers"; +import { Interface } from "ethers/lib/utils"; import { SingletonFactoryFactory } from "../typechain"; -import { encodeNTVAssetId, getAddressFromEnv, getNumberFromEnv } from "./utils"; +import { + encodeNTVAssetId, + getAddressFromEnv, + getNumberFromEnv, + REQUIRED_L2_GAS_PRICE_PER_PUBDATA, + DEPLOYER_SYSTEM_CONTRACT_ADDRESS, + ADDRESS_ONE, +} from "./utils"; +import { IBridgehubFactory } from "../typechain/IBridgehubFactory"; +import { IERC20Factory } from "../typechain/IERC20Factory"; export async function deployViaCreate2( deployWallet: ethers.Wallet, @@ -98,6 +108,91 @@ export async function deployContractWithArgs( return await factory.deploy(...args, ethTxOptions); } +export function hashL2Bytecode(bytecode: ethers.BytesLike): Uint8Array { + // For getting the consistent length we first convert the bytecode to UInt8Array + const bytecodeAsArray = ethers.utils.arrayify(bytecode); + + if (bytecodeAsArray.length % 32 != 0) { + throw new Error("The bytecode length in bytes must be divisible by 32"); + } + + const hashStr = ethers.utils.sha256(bytecodeAsArray); + const hash = ethers.utils.arrayify(hashStr); + + // Note that the length of the bytecode + // should be provided in 32-byte words. + const bytecodeLengthInWords = bytecodeAsArray.length / 32; + if (bytecodeLengthInWords % 2 == 0) { + throw new Error("Bytecode length in 32-byte words must be odd"); + } + const bytecodeLength = ethers.utils.arrayify(bytecodeAsArray.length / 32); + if (bytecodeLength.length > 2) { + throw new Error("Bytecode length must be less than 2^16 bytes"); + } + // The bytecode should always take the first 2 bytes of the bytecode hash, + // so we pad it from the left in case the length is smaller than 2 bytes. + const bytecodeLengthPadded = ethers.utils.zeroPad(bytecodeLength, 2); + + const codeHashVersion = new Uint8Array([1, 0]); + hash.set(codeHashVersion, 0); + hash.set(bytecodeLengthPadded, 2); + + return hash; +} + +export async function create2DeployFromL1( + chainId: ethers.BigNumberish, + wallet: ethers.Wallet, + bytecode: ethers.BytesLike, + constructor: ethers.BytesLike, + create2Salt: ethers.BytesLike, + l2GasLimit: ethers.BigNumberish, + gasPrice?: ethers.BigNumberish, + extraFactoryDeps?: ethers.BytesLike[], + bridgehubAddress?: string, + assetRouterAddress?: string +) { + bridgehubAddress = bridgehubAddress ?? deployedAddressesFromEnv().Bridgehub.BridgehubProxy; + const bridgehub = IBridgehubFactory.connect(bridgehubAddress, wallet); + + const deployerSystemContracts = new Interface(hardhat.artifacts.readArtifactSync("IContractDeployer").abi); + const bytecodeHash = hashL2Bytecode(bytecode); + const calldata = deployerSystemContracts.encodeFunctionData("create2", [create2Salt, bytecodeHash, constructor]); + gasPrice ??= await bridgehub.provider.getGasPrice(); + const expectedCost = await bridgehub.l2TransactionBaseCost( + chainId, + gasPrice, + l2GasLimit, + REQUIRED_L2_GAS_PRICE_PER_PUBDATA + ); + + const baseTokenAddress = await bridgehub.baseToken(chainId); + const baseTokenBridge = assetRouterAddress ?? deployedAddressesFromEnv().Bridges.SharedBridgeProxy; + const ethIsBaseToken = ADDRESS_ONE == baseTokenAddress; + + if (!ethIsBaseToken) { + const baseToken = IERC20Factory.connect(baseTokenAddress, wallet); + const tx = await baseToken.approve(baseTokenBridge, expectedCost); + await tx.wait(); + } + const factoryDeps = extraFactoryDeps ? [bytecode, ...extraFactoryDeps] : [bytecode]; + + return await bridgehub.requestL2TransactionDirect( + { + chainId, + l2Contract: DEPLOYER_SYSTEM_CONTRACT_ADDRESS, + mintValue: expectedCost, + l2Value: 0, + l2Calldata: calldata, + l2GasLimit, + l2GasPerPubdataByteLimit: REQUIRED_L2_GAS_PRICE_PER_PUBDATA, + factoryDeps: factoryDeps, + refundRecipient: wallet.address, + }, + { value: ethIsBaseToken ? expectedCost : 0, gasPrice } + ); +} + export interface DeployedAddresses { Bridgehub: { BridgehubProxy: string; @@ -130,6 +225,8 @@ export interface DeployedAddresses { SharedBridgeProxy: string; L2SharedBridgeProxy: string; L2SharedBridgeImplementation: string; + L2LegacySharedBridgeProxy: string; + L2LegacySharedBridgeImplementation: string; L2NativeTokenVaultImplementation: string; L2NativeTokenVaultProxy: string; NativeTokenVaultImplementation: string; @@ -195,6 +292,8 @@ export function deployedAddressesFromEnv(): DeployedAddresses { L2NativeTokenVaultProxy: getAddressFromEnv("CONTRACTS_L2_NATIVE_TOKEN_VAULT_PROXY_ADDR"), L2SharedBridgeImplementation: getAddressFromEnv("CONTRACTS_L2_SHARED_BRIDGE_IMPL_ADDR"), L2SharedBridgeProxy: getAddressFromEnv("CONTRACTS_L2_SHARED_BRIDGE_ADDR"), + L2LegacySharedBridgeProxy: getAddressFromEnv("CONTRACTS_L2_LEGACY_SHARED_BRIDGE_ADDR"), + L2LegacySharedBridgeImplementation: getAddressFromEnv("CONTRACTS_L2_LEGACY_SHARED_BRIDGE_IMPL_ADDR"), NativeTokenVaultImplementation: getAddressFromEnv("CONTRACTS_L1_NATIVE_TOKEN_VAULT_IMPL_ADDR"), NativeTokenVaultProxy: getAddressFromEnv("CONTRACTS_L1_NATIVE_TOKEN_VAULT_PROXY_ADDR"), BridgedStandardERC20Implementation: getAddressFromEnv("CONTRACTS_L1_BRIDGED_STANDARD_ERC20_IMPL_ADDR"), diff --git a/l1-contracts/src.ts/deploy.ts b/l1-contracts/src.ts/deploy.ts index c75a46e1f..cd3e03baf 100644 --- a/l1-contracts/src.ts/deploy.ts +++ b/l1-contracts/src.ts/deploy.ts @@ -12,13 +12,16 @@ import { deployedAddressesFromEnv, deployBytecodeViaCreate2 as deployBytecodeViaCreate2EVM, deployViaCreate2 as deployViaCreate2EVM, + create2DeployFromL1, } from "./deploy-utils"; import { deployViaCreate2 as deployViaCreate2Zk, BUILT_IN_ZKSYNC_CREATE2_FACTORY, - L2_STANDARD_ERC20_PROXY_FACTORY_BYTECODE, - L2_STANDARD_ERC20_IMPLEMENTATION_BYTECODE, - L2_STANDARD_TOKEN_PROXY_BYTECODE, + L2_STANDARD_ERC20_PROXY_FACTORY, + L2_STANDARD_ERC20_IMPLEMENTATION, + L2_STANDARD_TOKEN_PROXY, + L2_SHARED_BRIDGE_IMPLEMENTATION, + L2_SHARED_BRIDGE_PROXY, // deployBytecodeViaCreate2OnPath, // L2_SHARED_BRIDGE_PATH, } from "./deploy-utils-zk"; @@ -40,17 +43,16 @@ import { PubdataPricingMode, hashL2Bytecode, DIAMOND_CUT_DATA_ABI_STRING, - FORCE_DEPLOYMENT_ABI_STRING, - L2_BRIDGEHUB_ADDRESS, - L2_NATIVE_TOKEN_VAULT_ADDRESS, - L2_ASSET_ROUTER_ADDRESS, + FIXED_FORCE_DEPLOYMENTS_DATA_ABI_STRING, REQUIRED_L2_GAS_PRICE_PER_PUBDATA, compileInitialCutHash, readBytecode, applyL1ToL2Alias, BRIDGEHUB_CTM_ASSET_DATA_ABI_STRING, encodeNTVAssetId, - L2_MESSAGE_ROOT_ADDRESS, + computeL2Create2Address, + priorityTxMaxGasLimit, + isCurrentNetworkLocal, } from "./utils"; import type { ChainAdminCall } from "./utils"; import { IGovernanceFactory } from "../typechain/IGovernanceFactory"; @@ -59,6 +61,7 @@ import { ProxyAdminFactory } from "../typechain/ProxyAdminFactory"; import { IZKChainFactory } from "../typechain/IZKChainFactory"; import { L1AssetRouterFactory } from "../typechain/L1AssetRouterFactory"; +import { L1NullifierDevFactory } from "../typechain/L1NullifierDevFactory"; import { SingletonFactoryFactory } from "../typechain/SingletonFactoryFactory"; import { ValidatorTimelockFactory } from "../typechain/ValidatorTimelockFactory"; @@ -196,62 +199,20 @@ export class Deployer { ); l2TokenProxyBytecodeHash = ethers.utils.hexlify(hashL2Bytecode(l2TokenProxyBytecode)); } - - const bridgehubDeployment = { - bytecodeHash: ethers.utils.hexlify(hashL2Bytecode(bridgehubZKBytecode)), - newAddress: L2_BRIDGEHUB_ADDRESS, - callConstructor: true, - value: 0, - input: ethers.utils.defaultAbiCoder.encode( - ["uint256", "address", "uint256"], - [ - getNumberFromEnv("ETH_CLIENT_CHAIN_ID"), - applyL1ToL2Alias(this.addresses.Governance), - getNumberFromEnv("CONTRACTS_MAX_NUMBER_OF_ZK_CHAINS"), - ] - ), - }; - const eraChainId = getNumberFromEnv("CONTRACTS_ERA_CHAIN_ID"); - const assetRouterDeployment = { - bytecodeHash: ethers.utils.hexlify(hashL2Bytecode(assetRouterZKBytecode)), - newAddress: L2_ASSET_ROUTER_ADDRESS, - callConstructor: true, - value: 0, - input: ethers.utils.defaultAbiCoder.encode( - ["uint256", "uint256", "address", "address"], - [getNumberFromEnv("ETH_CLIENT_CHAIN_ID"), eraChainId, this.addresses.Bridges.SharedBridgeProxy, ADDRESS_ONE] - ), - }; - const tokens = getTokens(); - const l1WethToken = tokens.find((token: { symbol: string }) => token.symbol == "WETH")!.address; - const ntvDeployment = { - bytecodeHash: ethers.utils.hexlify(hashL2Bytecode(nativeTokenVaultZKBytecode)), - newAddress: L2_NATIVE_TOKEN_VAULT_ADDRESS, - callConstructor: true, - value: 0, - input: ethers.utils.defaultAbiCoder.encode( - ["uint256", "address", "bytes32", "address", "address", "bool", "address"], - [ - getNumberFromEnv("ETH_CLIENT_CHAIN_ID"), - applyL1ToL2Alias(this.addresses.Governance), - l2TokenProxyBytecodeHash, - ethers.constants.AddressZero, - ethers.constants.AddressZero, - false, - l1WethToken, - ] - ), - }; - const messageRootDeployment = { - bytecodeHash: ethers.utils.hexlify(hashL2Bytecode(messageRootZKBytecode)), - newAddress: L2_MESSAGE_ROOT_ADDRESS, - callConstructor: true, - value: 0, - input: ethers.utils.defaultAbiCoder.encode(["address"], [L2_BRIDGEHUB_ADDRESS]), + const fixedForceDeploymentsData = { + l1ChainId: getNumberFromEnv("ETH_CLIENT_CHAIN_ID"), + eraChainId: getNumberFromEnv("CONTRACTS_ERA_CHAIN_ID"), + l1AssetRouter: this.addresses.Bridges.SharedBridgeProxy, + l2TokenProxyBytecodeHash: l2TokenProxyBytecodeHash, + aliasedL1Governance: applyL1ToL2Alias(this.addresses.Governance), + maxNumberOfZKChains: getNumberFromEnv("CONTRACTS_MAX_NUMBER_OF_ZK_CHAINS"), + bridgehubBytecodeHash: ethers.utils.hexlify(hashL2Bytecode(bridgehubZKBytecode)), + l2AssetRouterBytecodeHash: ethers.utils.hexlify(hashL2Bytecode(assetRouterZKBytecode)), + l2NtvBytecodeHash: ethers.utils.hexlify(hashL2Bytecode(nativeTokenVaultZKBytecode)), + messageRootBytecodeHash: ethers.utils.hexlify(hashL2Bytecode(messageRootZKBytecode)), }; - const forceDeployments = [messageRootDeployment, bridgehubDeployment, assetRouterDeployment, ntvDeployment]; - return ethers.utils.defaultAbiCoder.encode([FORCE_DEPLOYMENT_ABI_STRING], [forceDeployments]); + return ethers.utils.defaultAbiCoder.encode([FIXED_FORCE_DEPLOYMENTS_DATA_ABI_STRING], [fixedForceDeploymentsData]); } public async updateCreate2FactoryZkMode() { @@ -848,8 +809,9 @@ export class Deployer { // const l1WethToken = tokens.find((token: { symbol: string }) => token.symbol == "WETH")!.address; const eraChainId = getNumberFromEnv("CONTRACTS_ERA_CHAIN_ID"); const eraDiamondProxy = getAddressFromEnv("CONTRACTS_ERA_DIAMOND_PROXY_ADDR"); + const contractName = isCurrentNetworkLocal() ? "L1NullifierDev" : "L1Nullifier"; const contractAddress = await this.deployViaCreate2( - "L1Nullifier", + contractName, [this.addresses.Bridgehub.BridgehubProxy, eraChainId, eraDiamondProxy], create2Salt, ethTxOptions @@ -1009,6 +971,7 @@ export class Deployer { const nullifier = this.l1NullifierContract(this.deployWallet); const assetRouter = this.defaultSharedBridge(this.deployWallet); + const ntv = this.nativeTokenVault(this.deployWallet); const data = await assetRouter.interface.encodeFunctionData("setNativeTokenVault", [ this.addresses.Bridges.NativeTokenVaultProxy, @@ -1035,6 +998,8 @@ export class Deployer { } await (await this.nativeTokenVault(this.deployWallet).registerEthToken()).wait(); + + await ntv.registerEthToken(); } public async deployCTMDeploymentTrackerImplementation( @@ -1250,6 +1215,8 @@ export class Deployer { `CONTRACTS_CTM_ASSET_INFO=${await bridgehub.ctmAssetId(this.addresses.StateTransition.StateTransitionProxy)}` ); } + } else { + console.log(`CONTRACTS_CTM_ASSET_INFO=${getHashFromEnv("CONTRACTS_CTM_ASSET_INFO")}`); } } } @@ -1292,6 +1259,7 @@ export class Deployer { const chainAssetId = await bridgehub.ctmAssetIdFromChainId(this.chainId); if (this.verbose) { console.log("Chain asset id is: ", chainAssetId); + console.log(`CONTRACTS_CTM_ASSET_INFO=${chainAssetId}`); } let sharedBridgeData = ethers.utils.defaultAbiCoder.encode( @@ -1367,7 +1335,8 @@ export class Deployer { compareDiamondCutHash: boolean = false, nonce?, predefinedChainId?: string, - useGovernance: boolean = false + useGovernance: boolean = false, + l2LegacySharedBridge: boolean = false ) { const txOptions = this.isZkMode() ? {} : { gasLimit: 10_000_000 }; @@ -1381,6 +1350,12 @@ export class Deployer { const inputChainId = predefinedChainId || getNumberFromEnv("CHAIN_ETH_ZKSYNC_NETWORK_ID"); const alreadyRegisteredInCTM = (await chainTypeManager.getZKChain(inputChainId)) != ethers.constants.AddressZero; + if (l2LegacySharedBridge) { + console.log("Setting L2 legacy shared bridge in L1Nullifier"); + await this.setL2LegacySharedBridgeInL1Nullifier(inputChainId); + nonce++; + } + const admin = process.env.CHAIN_ADMIN_ADDRESS || this.ownerAddress; const diamondCutData = await this.initialZkSyncZKChainDiamondCut(extraFacets, compareDiamondCutHash); const initialDiamondCut = new ethers.utils.AbiCoder().encode([DIAMOND_CUT_DATA_ABI_STRING], [diamondCutData]); @@ -1389,9 +1364,9 @@ export class Deployer { let factoryDeps = []; if (process.env.CHAIN_ETH_NETWORK != "hardhat") { factoryDeps = [ - L2_STANDARD_ERC20_PROXY_FACTORY_BYTECODE, - L2_STANDARD_ERC20_IMPLEMENTATION_BYTECODE, - L2_STANDARD_TOKEN_PROXY_BYTECODE, + L2_STANDARD_ERC20_PROXY_FACTORY.bytecode, + L2_STANDARD_ERC20_IMPLEMENTATION.bytecode, + L2_STANDARD_TOKEN_PROXY.bytecode, ]; } // note the factory deps are provided at genesis @@ -1431,7 +1406,9 @@ export class Deployer { console.log(`ZK chain registration tx hash: ${receipt.transactionHash}`); console.log(`CHAIN_ETH_ZKSYNC_NETWORK_ID=${parseInt(chainId, 16)}`); - + console.log( + `CONTRACTS_CTM_ASSET_INFO=${await bridgehub.ctmAssetId(this.addresses.StateTransition.StateTransitionProxy)}` + ); console.log(`CONTRACTS_BASE_TOKEN_ADDR=${baseTokenAddress}`); } @@ -1498,6 +1475,173 @@ export class Deployer { "BaseTokenMultiplier and Validium mode can't be set through the governance, please set it separately, using the admin account" ); } + + if (l2LegacySharedBridge) { + await this.deployL2LegacySharedBridge(inputChainId, gasPrice); + } + } + + public async setL2LegacySharedBridgeInL1Nullifier(inputChainId: string) { + const l1Nullifier = L1NullifierDevFactory.connect(this.addresses.Bridges.L1NullifierProxy, this.deployWallet); + const l1SharedBridge = this.defaultSharedBridge(this.deployWallet); + + if (isCurrentNetworkLocal()) { + const eraChainId = getNumberFromEnv("CONTRACTS_ERA_CHAIN_ID"); + + const l2SharedBridgeImplementationBytecode = L2_SHARED_BRIDGE_IMPLEMENTATION.bytecode; + + const l2SharedBridgeImplAddress = computeL2Create2Address( + this.deployWallet.address, + l2SharedBridgeImplementationBytecode, + ethers.utils.defaultAbiCoder.encode(["uint256"], [eraChainId]), + ethers.constants.HashZero + ); + + const l2GovernorAddress = applyL1ToL2Alias(this.addresses.Governance); + + const l2SharedBridgeInterface = new Interface(L2_SHARED_BRIDGE_IMPLEMENTATION.abi); + const proxyInitializationParams = l2SharedBridgeInterface.encodeFunctionData("initialize", [ + l1SharedBridge.address, + this.addresses.Bridges.ERC20BridgeProxy, + hashL2Bytecode(L2_STANDARD_TOKEN_PROXY.bytecode), + l2GovernorAddress, + ]); + + const l2SharedBridgeProxyConstructorData = ethers.utils.arrayify( + new ethers.utils.AbiCoder().encode( + ["address", "address", "bytes"], + [l2SharedBridgeImplAddress, l2GovernorAddress, proxyInitializationParams] + ) + ); + + /// compute L2SharedBridgeProxy address + const l2SharedBridgeProxyAddress = computeL2Create2Address( + this.deployWallet.address, + L2_SHARED_BRIDGE_PROXY.bytecode, + l2SharedBridgeProxyConstructorData, + ethers.constants.HashZero + ); + + const tx = await l1Nullifier.setL2LegacySharedBridge(inputChainId, l2SharedBridgeProxyAddress); + const receipt8 = await tx.wait(); + if (this.verbose) { + console.log(`L2 legacy shared bridge set in L1 Nullifier, gas used: ${receipt8.gasUsed.toString()}`); + } + } + } + + public async deployL2LegacySharedBridge(inputChainId: string, gasPrice: BigNumberish) { + if (this.verbose) { + console.log("Deploying L2 legacy shared bridge"); + } + await this.deploySharedBridgeImplOnL2ThroughL1(inputChainId, gasPrice); + await this.deploySharedBridgeProxyOnL2ThroughL1(inputChainId, gasPrice); + } + + public async deploySharedBridgeImplOnL2ThroughL1(chainId: string, gasPrice: BigNumberish) { + if (this.verbose) { + console.log("Deploying L2SharedBridge Implementation"); + } + const eraChainId = getNumberFromEnv("CONTRACTS_ERA_CHAIN_ID"); + + const l2SharedBridgeImplementationBytecode = L2_SHARED_BRIDGE_IMPLEMENTATION.bytecode; + // localLegacyBridgeTesting + // ? L2_DEV_SHARED_BRIDGE_IMPLEMENTATION.bytecode + // : L2_SHARED_BRIDGE_IMPLEMENTATION.bytecode; + if (!l2SharedBridgeImplementationBytecode) { + throw new Error("l2SharedBridgeImplementationBytecode not found"); + } + + if (this.verbose) { + console.log("l2SharedBridgeImplementationBytecode loaded"); + + console.log("Computing L2SharedBridge Implementation Address"); + } + + const l2SharedBridgeImplAddress = computeL2Create2Address( + this.deployWallet.address, + l2SharedBridgeImplementationBytecode, + ethers.utils.defaultAbiCoder.encode(["uint256"], [eraChainId]), + ethers.constants.HashZero + ); + this.addresses.Bridges.L2LegacySharedBridgeImplementation = l2SharedBridgeImplAddress; + + if (this.verbose) { + console.log(`L2SharedBridge Implementation Address: ${l2SharedBridgeImplAddress}`); + + console.log("Deploying L2SharedBridge Implementation"); + } + // TODO: request from API how many L2 gas needs for the transaction. + const tx2 = await create2DeployFromL1( + chainId, + this.deployWallet, + l2SharedBridgeImplementationBytecode, + ethers.utils.defaultAbiCoder.encode(["uint256"], [eraChainId]), + ethers.constants.HashZero, + priorityTxMaxGasLimit, + gasPrice, + [L2_STANDARD_TOKEN_PROXY.bytecode], + this.addresses.Bridgehub.BridgehubProxy, + this.addresses.Bridges.SharedBridgeProxy + ); + await tx2.wait(); + + if (this.verbose) { + console.log("Deployed L2SharedBridge Implementation"); + console.log(`CONTRACTS_L2_LEGACY_SHARED_BRIDGE_IMPL_ADDR=${l2SharedBridgeImplAddress}`); + } + } + + public async deploySharedBridgeProxyOnL2ThroughL1(chainId: string, gasPrice: BigNumberish) { + const l1SharedBridge = this.defaultSharedBridge(this.deployWallet); + if (this.verbose) { + console.log("Deploying L2SharedBridge Proxy"); + } + const l2GovernorAddress = applyL1ToL2Alias(this.addresses.Governance); + + const l2SharedBridgeInterface = new Interface(L2_SHARED_BRIDGE_IMPLEMENTATION.abi); + const proxyInitializationParams = l2SharedBridgeInterface.encodeFunctionData("initialize", [ + l1SharedBridge.address, + this.addresses.Bridges.ERC20BridgeProxy, + hashL2Bytecode(L2_STANDARD_TOKEN_PROXY.bytecode), + l2GovernorAddress, + ]); + + /// prepare constructor data + const l2SharedBridgeProxyConstructorData = ethers.utils.arrayify( + new ethers.utils.AbiCoder().encode( + ["address", "address", "bytes"], + [this.addresses.Bridges.L2LegacySharedBridgeImplementation, l2GovernorAddress, proxyInitializationParams] + ) + ); + + /// compute L2SharedBridgeProxy address + const l2SharedBridgeProxyAddress = computeL2Create2Address( + this.deployWallet.address, + L2_SHARED_BRIDGE_PROXY.bytecode, + l2SharedBridgeProxyConstructorData, + ethers.constants.HashZero + ); + this.addresses.Bridges.L2LegacySharedBridgeProxy = l2SharedBridgeProxyAddress; + + /// deploy L2SharedBridgeProxy + // TODO: request from API how many L2 gas needs for the transaction. + const tx3 = await create2DeployFromL1( + chainId, + this.deployWallet, + L2_SHARED_BRIDGE_PROXY.bytecode, + l2SharedBridgeProxyConstructorData, + ethers.constants.HashZero, + priorityTxMaxGasLimit, + gasPrice, + undefined, + this.addresses.Bridgehub.BridgehubProxy, + this.addresses.Bridges.SharedBridgeProxy + ); + await tx3.wait(); + if (this.verbose) { + console.log(`CONTRACTS_L2_LEGACY_SHARED_BRIDGE_ADDR=${l2SharedBridgeProxyAddress}`); + } } public async executeChainAdminMulticall(calls: ChainAdminCall[], requireSuccess: boolean = true) { diff --git a/l1-contracts/src.ts/utils.ts b/l1-contracts/src.ts/utils.ts index 92f38244f..ce57958e0 100644 --- a/l1-contracts/src.ts/utils.ts +++ b/l1-contracts/src.ts/utils.ts @@ -28,6 +28,7 @@ export const L2_BRIDGEHUB_ADDRESS = "0x0000000000000000000000000000000000010002" export const L2_ASSET_ROUTER_ADDRESS = "0x0000000000000000000000000000000000010003"; export const L2_NATIVE_TOKEN_VAULT_ADDRESS = "0x0000000000000000000000000000000000010004"; export const L2_MESSAGE_ROOT_ADDRESS = "0x0000000000000000000000000000000000010005"; +export const DEPLOYER_SYSTEM_CONTRACT_ADDRESS = "0x0000000000000000000000000000000000008006"; export const EMPTY_STRING_KECCAK = "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"; const CREATE2_PREFIX = ethers.utils.solidityKeccak256(["string"], ["zksyncCreate2"]); @@ -45,6 +46,9 @@ export const DIAMOND_CUT_DATA_ABI_STRING = export const FORCE_DEPLOYMENT_ABI_STRING = "tuple(bytes32 bytecodeHash, address newAddress, bool callConstructor, uint256 value, bytes input)[]"; export const BRIDGEHUB_CTM_ASSET_DATA_ABI_STRING = "tuple(uint256 chainId, bytes ctmData, bytes chainData)"; +export const FIXED_FORCE_DEPLOYMENTS_DATA_ABI_STRING = + "tuple(uint256 l1ChainId, uint256 eraChainId, address l1AssetRouter, bytes32 l2TokenProxyBytecodeHash, address aliasedL1Governance, uint256 maxNumberOfZKChains, bytes32 bridgehubBytecodeHash, bytes32 l2AssetRouterBytecodeHash, bytes32 l2NtvBytecodeHash, bytes32 messageRootBytecodeHash)"; +export const ADDITIONAL_FORCE_DEPLOYMENTS_DATA_ABI_STRING = "tuple(bytes32 baseTokenAssetId, address l2Weth)"; export function applyL1ToL2Alias(address: string): string { return ethers.utils.hexlify(ethers.BigNumber.from(address).add(L1_TO_L2_ALIAS_OFFSET).mod(ADDRESS_MODULO)); @@ -59,6 +63,10 @@ export function readInterface(path: string, fileName: string) { return new ethers.utils.Interface(abi); } +export function readContract(path: string, fileName: string) { + return JSON.parse(fs.readFileSync(`${path}/${fileName}.sol/${fileName}.json`, { encoding: "utf-8" })); +} + export function hashL2Bytecode(bytecode: ethers.BytesLike): Uint8Array { // For getting the consistent length we first convert the bytecode to UInt8Array const bytecodeAsArray = ethers.utils.arrayify(bytecode); diff --git a/l1-contracts/test/foundry/l1/integration/BridgeHubInvariantTests.t.sol b/l1-contracts/test/foundry/l1/integration/BridgeHubInvariantTests.t.sol index f7bd23b28..6eb78944d 100644 --- a/l1-contracts/test/foundry/l1/integration/BridgeHubInvariantTests.t.sol +++ b/l1-contracts/test/foundry/l1/integration/BridgeHubInvariantTests.t.sol @@ -486,7 +486,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe bytes32[] memory merkleProof = new bytes32[](1); _setSharedBridgeIsWithdrawalFinalized(currentChainId, l2BatchNumber, l2MessageIndex, false); - uint256 beforeChainBalance = l1Nullifier.__DEPRECATED_chainBalance(currentChainId, currentTokenAddress); + uint256 beforeChainBalance = l1Nullifier.chainBalance(currentChainId, currentTokenAddress); uint256 beforeBalance = currentToken.balanceOf(address(sharedBridge)); if (beforeChainBalance < amountToWithdraw) { @@ -534,7 +534,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe // check if the balance was updated correctly if (beforeChainBalance > amountToWithdraw) { assertEq( - beforeChainBalance - l1Nullifier.__DEPRECATED_chainBalance(currentChainId, currentTokenAddress), + beforeChainBalance - l1Nullifier.chainBalance(currentChainId, currentTokenAddress), amountToWithdraw ); assertEq(beforeBalance - currentToken.balanceOf(address(sharedBridge)), amountToWithdraw); @@ -548,7 +548,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe bytes32[] memory merkleProof = new bytes32[](1); _setSharedBridgeIsWithdrawalFinalized(currentChainId, l2BatchNumber, l2MessageIndex, false); - uint256 beforeChainBalance = l1Nullifier.__DEPRECATED_chainBalance(currentChainId, currentTokenAddress); + uint256 beforeChainBalance = l1Nullifier.chainBalance(currentChainId, currentTokenAddress); uint256 beforeBalance = address(sharedBridge).balance; if (beforeChainBalance < amountToWithdraw) { @@ -590,7 +590,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe // check if the balance was updated correctly if (beforeChainBalance > amountToWithdraw) { assertEq( - beforeChainBalance - l1Nullifier.__DEPRECATED_chainBalance(currentChainId, currentTokenAddress), + beforeChainBalance - l1Nullifier.chainBalance(currentChainId, currentTokenAddress), amountToWithdraw ); assertEq(beforeBalance - address(sharedBridge).balance, amountToWithdraw); diff --git a/l1-contracts/test/foundry/l1/integration/BridgehubTests.t.sol b/l1-contracts/test/foundry/l1/integration/BridgehubTests.t.sol index 4e262ad50..09b07cca0 100644 --- a/l1-contracts/test/foundry/l1/integration/BridgehubTests.t.sol +++ b/l1-contracts/test/foundry/l1/integration/BridgehubTests.t.sol @@ -486,7 +486,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe bytes32[] memory merkleProof = new bytes32[](1); _setSharedBridgeIsWithdrawalFinalized(currentChainId, l2BatchNumber, l2MessageIndex, false); - uint256 beforeChainBalance = l1Nullifier.__DEPRECATED_chainBalance(currentChainId, currentTokenAddress); + uint256 beforeChainBalance = l1Nullifier.chainBalance(currentChainId, currentTokenAddress); uint256 beforeBalance = currentToken.balanceOf(address(sharedBridge)); if (beforeChainBalance < amountToWithdraw) { @@ -534,7 +534,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe // check if the balance was updated correctly if (beforeChainBalance > amountToWithdraw) { assertEq( - beforeChainBalance - l1Nullifier.__DEPRECATED_chainBalance(currentChainId, currentTokenAddress), + beforeChainBalance - l1Nullifier.chainBalance(currentChainId, currentTokenAddress), amountToWithdraw ); assertEq(beforeBalance - currentToken.balanceOf(address(sharedBridge)), amountToWithdraw); @@ -548,7 +548,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe bytes32[] memory merkleProof = new bytes32[](1); _setSharedBridgeIsWithdrawalFinalized(currentChainId, l2BatchNumber, l2MessageIndex, false); - uint256 beforeChainBalance = l1Nullifier.__DEPRECATED_chainBalance(currentChainId, currentTokenAddress); + uint256 beforeChainBalance = l1Nullifier.chainBalance(currentChainId, currentTokenAddress); uint256 beforeBalance = address(sharedBridge).balance; if (beforeChainBalance < amountToWithdraw) { @@ -590,7 +590,7 @@ contract BridgeHubInvariantTests is L1ContractDeployer, ZKChainDeployer, TokenDe // check if the balance was updated correctly if (beforeChainBalance > amountToWithdraw) { assertEq( - beforeChainBalance - l1Nullifier.__DEPRECATED_chainBalance(currentChainId, currentTokenAddress), + beforeChainBalance - l1Nullifier.chainBalance(currentChainId, currentTokenAddress), amountToWithdraw ); assertEq(beforeBalance - address(sharedBridge).balance, amountToWithdraw); diff --git a/l1-contracts/test/foundry/l1/integration/_SharedL1ContractDeployer.t.sol b/l1-contracts/test/foundry/l1/integration/_SharedL1ContractDeployer.t.sol index 49c6e5c43..20d0840be 100644 --- a/l1-contracts/test/foundry/l1/integration/_SharedL1ContractDeployer.t.sol +++ b/l1-contracts/test/foundry/l1/integration/_SharedL1ContractDeployer.t.sol @@ -91,7 +91,7 @@ contract L1ContractDeployer is Test { function _setSharedBridgeChainBalance(uint256 _chainId, address _token, uint256 _value) internal { stdstore .target(address(l1Nullifier)) - .sig(l1Nullifier.__DEPRECATED_chainBalance.selector) + .sig(l1Nullifier.chainBalance.selector) .with_key(_chainId) .with_key(_token) .checked_write(_value); diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/FinalizeWithdrawal.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/FinalizeWithdrawal.sol index 6af9fb369..e5a86bc2d 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/FinalizeWithdrawal.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1Erc20Bridge/FinalizeWithdrawal.sol @@ -60,6 +60,12 @@ contract FinalizeWithdrawalTest is L1Erc20BridgeTest { abi.encodeWithSelector(IL1Nullifier.finalizeDeposit.selector, finalizeWithdrawalParams), abi.encode(alice, address(token), amount) ); + address l2BridgeAddress = address(12); + vm.mockCall( + l1NullifierAddress, + abi.encodeWithSelector(IL1Nullifier.l2BridgeAddress.selector, eraChainId), + abi.encode(l2BridgeAddress) + ); vm.prank(alice); // solhint-disable-next-line func-named-parameters diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol index 52bf0fbb0..c67fa6a36 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol @@ -281,7 +281,7 @@ contract L1AssetRouterTest is Test { function _setSharedBridgeChainBalance(uint256 _chainId, address _token, uint256 _value) internal { stdstore .target(address(l1Nullifier)) - .sig(l1Nullifier.__DEPRECATED_chainBalance.selector) + .sig(l1Nullifier.chainBalance.selector) .with_key(_chainId) .with_key(_token) .checked_write(_value); diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Governance/PermanentRestriction.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Governance/PermanentRestriction.t.sol index e6c089a56..f97ecc08a 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/Governance/PermanentRestriction.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/Governance/PermanentRestriction.t.sol @@ -20,6 +20,8 @@ import {DataEncoding} from "contracts/common/libraries/DataEncoding.sol"; import {ICTMDeploymentTracker} from "contracts/bridgehub/ICTMDeploymentTracker.sol"; import {IMessageRoot} from "contracts/bridgehub/IMessageRoot.sol"; import {MessageRoot} from "contracts/bridgehub/MessageRoot.sol"; +import {IL1AssetRouter} from "contracts/bridge/asset-router/IL1AssetRouter.sol"; +import {IL1Nullifier} from "contracts/bridge/interfaces/IL1Nullifier.sol"; contract PermanentRestrictionTest is ChainTypeManagerTest { ChainAdmin internal chainAdmin; @@ -202,6 +204,18 @@ contract PermanentRestrictionTest is ChainTypeManagerTest { bridgehub.addChainTypeManager(address(chainContractAddress)); bridgehub.addTokenAssetId(DataEncoding.encodeNTVAssetId(block.chainid, baseToken)); bridgehub.setAddresses(sharedBridge, ICTMDeploymentTracker(address(0)), new MessageRoot(bridgehub)); + address l1Nullifier = makeAddr("l1Nullifier"); + address l2LegacySharedBridge = makeAddr("l2LegacySharedBridge"); + vm.mockCall( + address(sharedBridge), + abi.encodeWithSelector(IL1AssetRouter.L1_NULLIFIER.selector), + abi.encode(l1Nullifier) + ); + vm.mockCall( + address(l1Nullifier), + abi.encodeWithSelector(IL1Nullifier.l2BridgeAddress.selector), + abi.encode(l2LegacySharedBridge) + ); bridgehub.createNewChain({ _chainId: chainId, _chainTypeManager: address(chainContractAddress), diff --git a/l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol index 6980aa52f..99d8c9859 100644 --- a/l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol +++ b/l1-contracts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/_ChainTypeManager_Shared.t.sol @@ -16,7 +16,7 @@ import {ExecutorFacet} from "contracts/state-transition/chain-deps/facets/Execut import {GettersFacet} from "contracts/state-transition/chain-deps/facets/Getters.sol"; import {Diamond} from "contracts/state-transition/libraries/Diamond.sol"; import {DiamondInit} from "contracts/state-transition/chain-deps/DiamondInit.sol"; -import {L1GenesisUpgrade as GenesisUpgrade} from "contracts/upgrades/L1GenesisUpgrade.sol"; +import {L1GenesisUpgrade} from "contracts/upgrades/L1GenesisUpgrade.sol"; import {InitializeDataNewChain} from "contracts/state-transition/chain-interfaces/IDiamondInit.sol"; import {ChainTypeManager} from "contracts/state-transition/ChainTypeManager.sol"; import {ChainTypeManagerInitializeData, ChainCreationParams} from "contracts/state-transition/IChainTypeManager.sol"; @@ -28,7 +28,7 @@ import {ZeroAddress} from "contracts/common/L1ContractErrors.sol"; contract ChainTypeManagerTest is Test { ChainTypeManager internal chainTypeManager; ChainTypeManager internal chainContractAddress; - GenesisUpgrade internal genesisUpgradeContract; + L1GenesisUpgrade internal genesisUpgradeContract; Bridgehub internal bridgehub; address internal diamondInit; address internal constant governor = address(0x1010101); @@ -40,6 +40,7 @@ contract ChainTypeManagerTest is Test { uint256 chainId = 112; address internal testnetVerifier = address(new TestnetVerifier()); bytes internal forceDeploymentsData = hex""; + uint256 eraChainId = 9; Diamond.FacetCut[] internal facetCuts; @@ -50,7 +51,7 @@ contract ChainTypeManagerTest is Test { vm.startPrank(address(bridgehub)); chainTypeManager = new ChainTypeManager(address(IBridgehub(address(bridgehub)))); diamondInit = address(new DiamondInit()); - genesisUpgradeContract = new GenesisUpgrade(); + genesisUpgradeContract = new L1GenesisUpgrade(); facetCuts.push( Diamond.FacetCut({ diff --git a/l1-contracts/test/foundry/l2/unit/erc20/L2Erc20BridgeTest.t.sol b/l1-contracts/test/foundry/l2/unit/erc20/L2Erc20BridgeTest.t.sol index 1b9535108..5e195353e 100644 --- a/l1-contracts/test/foundry/l2/unit/erc20/L2Erc20BridgeTest.t.sol +++ b/l1-contracts/test/foundry/l2/unit/erc20/L2Erc20BridgeTest.t.sol @@ -60,7 +60,7 @@ contract L2Erc20BridgeTest is Test { } L2Utils.initSystemContracts(); - L2Utils.forceDeployAssetRouter(L1_CHAIN_ID, ERA_CHAIN_ID, l1BridgeWallet, address(0)); + L2Utils.forceDeployAssetRouter(L1_CHAIN_ID, ERA_CHAIN_ID, ownerWallet, l1BridgeWallet, address(0)); L2Utils.forceDeployNativeTokenVault({ _l1ChainId: L1_CHAIN_ID, _aliasedOwner: ownerWallet, diff --git a/l1-contracts/test/foundry/l2/unit/utils/L2Utils.sol b/l1-contracts/test/foundry/l2/unit/utils/L2Utils.sol index 2c46774f4..9da81fe5d 100644 --- a/l1-contracts/test/foundry/l2/unit/utils/L2Utils.sol +++ b/l1-contracts/test/foundry/l2/unit/utils/L2Utils.sol @@ -3,6 +3,7 @@ pragma solidity ^0.8.20; import {Vm} from "forge-std/Vm.sol"; +import "forge-std/console.sol"; import {DEPLOYER_SYSTEM_CONTRACT, L2_ASSET_ROUTER_ADDR, L2_NATIVE_TOKEN_VAULT_ADDR} from "contracts/common/L2ContractAddresses.sol"; import {IContractDeployer, L2ContractHelper} from "contracts/common/libraries/L2ContractHelper.sol"; @@ -66,13 +67,14 @@ library L2Utils { function forceDeployAssetRouter( uint256 _l1ChainId, uint256 _eraChainId, + address _aliasedOwner, address _l1AssetRouter, address _legacySharedBridge ) internal { // to ensure that the bytecode is known bytes32 ethAssetId = DataEncoding.encodeNTVAssetId(_l1ChainId, ETH_TOKEN_ADDRESS); { - new L2AssetRouter(_l1ChainId, _eraChainId, _l1AssetRouter, _legacySharedBridge, ethAssetId); + new L2AssetRouter(_l1ChainId, _eraChainId, _l1AssetRouter, _legacySharedBridge, ethAssetId, _aliasedOwner); } bytes memory bytecode = readEraBytecode("L2AssetRouter"); @@ -85,7 +87,7 @@ library L2Utils { newAddress: L2_ASSET_ROUTER_ADDR, callConstructor: true, value: 0, - input: abi.encode(_l1ChainId, _eraChainId, _l1AssetRouter, _legacySharedBridge, ethAssetId) + input: abi.encode(_l1ChainId, _eraChainId, _l1AssetRouter, _legacySharedBridge, ethAssetId, _aliasedOwner) }); vm.prank(L2_FORCE_DEPLOYER_ADDR); diff --git a/l1-contracts/test/unit_tests/initial_deployment_test.spec.ts b/l1-contracts/test/unit_tests/initial_deployment_test.spec.ts index d670f9306..532fd57d1 100644 --- a/l1-contracts/test/unit_tests/initial_deployment_test.spec.ts +++ b/l1-contracts/test/unit_tests/initial_deployment_test.spec.ts @@ -16,6 +16,7 @@ import { initialTestnetDeploymentProcess } from "../../src.ts/deploy-test-proces import { ethTestConfig } from "../../src.ts/utils"; import type { Deployer } from "../../src.ts/deploy"; +import { registerZKChain } from "../../src.ts/deploy-process"; describe("Initial deployment test", function () { let bridgehub: Bridgehub; @@ -100,4 +101,9 @@ describe("Initial deployment test", function () { expect(ntvAddress1.toLowerCase()).equal(ntvAddress2.toLowerCase()); expect(ntvAddress1.toLowerCase()).equal(ntvAddress3.toLowerCase()); }); + + it("Check L2SharedBridge", async () => { + const gasPrice = await owner.provider.getGasPrice(); + await registerZKChain(deployer, false, [], gasPrice, "", "0x33", true, true); + }); }); diff --git a/system-contracts/SystemContractsHashes.json b/system-contracts/SystemContractsHashes.json index aba28da40..8b0feaf78 100644 --- a/system-contracts/SystemContractsHashes.json +++ b/system-contracts/SystemContractsHashes.json @@ -3,49 +3,49 @@ "contractName": "AccountCodeStorage", "bytecodePath": "artifacts-zk/contracts-preprocessed/AccountCodeStorage.sol/AccountCodeStorage.json", "sourceCodePath": "contracts-preprocessed/AccountCodeStorage.sol", - "bytecodeHash": "0x0100005d98c166be5bf169f5830a7fe56f591af62454527a598bf38b0a9f876c", + "bytecodeHash": "0x0100005d7a6c264bffa97a66a5ba8daff43b8a34e5ab7fab4e2ddf74f0a10e4c", "sourceCodeHash": "0x2e0e09d57a04bd1e722d8bf8c6423fdf3f8bca44e5e8c4f6684f987794be066e" }, { "contractName": "BootloaderUtilities", "bytecodePath": "artifacts-zk/contracts-preprocessed/BootloaderUtilities.sol/BootloaderUtilities.json", "sourceCodePath": "contracts-preprocessed/BootloaderUtilities.sol", - "bytecodeHash": "0x010007c79d04c5f1985588d02630c260c40edcbb2d663ed4c38c0a1242dc2bcc", + "bytecodeHash": "0x010007c7b6bd43d607e55f594e743394b7ae6288ac7f6caad8a7904b6c990e32", "sourceCodeHash": "0x0f1213c4b95acb71f4ab5d4082cc1aeb2bd5017e1cccd46afc66e53268609d85" }, { "contractName": "ComplexUpgrader", "bytecodePath": "artifacts-zk/contracts-preprocessed/ComplexUpgrader.sol/ComplexUpgrader.json", "sourceCodePath": "contracts-preprocessed/ComplexUpgrader.sol", - "bytecodeHash": "0x0100004d8b6a7af5d502b7790ebbf06a6ba21d0ca03ba3ff47d02dd33f4d619e", + "bytecodeHash": "0x0100004d8c1520bc212778de21b5df751968cbbf1690ddd362ea7ab844ec0b1d", "sourceCodeHash": "0x796046a914fb676ba2bbd337b2924311ee2177ce54571c18a2c3945755c83614" }, { "contractName": "Compressor", "bytecodePath": "artifacts-zk/contracts-preprocessed/Compressor.sol/Compressor.json", "sourceCodePath": "contracts-preprocessed/Compressor.sol", - "bytecodeHash": "0x0100014bec423120b050d8095b9623455d9b4bca881b9a5f0f434de66574a4ff", + "bytecodeHash": "0x0100014ba4bf3056bc1d10e64986c71972db9056c879eed689163f7c91bb596f", "sourceCodeHash": "0x7240b5fb2ea8e184522e731fb14f764ebae52b8a69d1870a55daedac9a3ed617" }, { "contractName": "ContractDeployer", "bytecodePath": "artifacts-zk/contracts-preprocessed/ContractDeployer.sol/ContractDeployer.json", "sourceCodePath": "contracts-preprocessed/ContractDeployer.sol", - "bytecodeHash": "0x010004e5d3f30278f686e9ad273eb77fa4d41cfd87676e88f33a63cd36329c04", + "bytecodeHash": "0x010004e5ad1de716de961c9e52e3b1d6219709891024e5b28d8cde96fe7fdc69", "sourceCodeHash": "0x92bc09da23ed9d86ba7a84f0dbf48503c99582ae58cdbebbdcc5f14ea1fcf014" }, { "contractName": "Create2Factory", "bytecodePath": "artifacts-zk/contracts-preprocessed/Create2Factory.sol/Create2Factory.json", "sourceCodePath": "contracts-preprocessed/Create2Factory.sol", - "bytecodeHash": "0x01000049ca08dfa946db4521eed61e95a989bc52f15c81f4eaf051649e7b59af", + "bytecodeHash": "0x01000049bae223f356480d01ad05099bad8cfc3e0a91e206ae5dd72abb187cb1", "sourceCodeHash": "0x114d9322a9ca654989f3e0b3b21f1311dbc4db84f443d054cd414f6414d84de3" }, { "contractName": "DefaultAccount", "bytecodePath": "artifacts-zk/contracts-preprocessed/DefaultAccount.sol/DefaultAccount.json", "sourceCodePath": "contracts-preprocessed/DefaultAccount.sol", - "bytecodeHash": "0x0100055d0b56db8580a7cb4191661efc4d56f7ab91831afed87fe98123d987b6", + "bytecodeHash": "0x0100055d760f11a3d737e7fd1816e600a4cd874a9f17f7a225d1f1c537c51a1e", "sourceCodeHash": "0xebffe840ebbd9329edb1ebff8ca50f6935e7dabcc67194a896fcc2e968d46dfb" }, { @@ -59,63 +59,63 @@ "contractName": "ImmutableSimulator", "bytecodePath": "artifacts-zk/contracts-preprocessed/ImmutableSimulator.sol/ImmutableSimulator.json", "sourceCodePath": "contracts-preprocessed/ImmutableSimulator.sol", - "bytecodeHash": "0x0100003920a44c0179abb18b63287a74e4c68d6dd4c015bed91b5aa8ec60f676", + "bytecodeHash": "0x01000039fcb0afdc4480b9a83e0a5cfc2dbc55dce4f6f1d6363778b4e9371ca9", "sourceCodeHash": "0x9659e69f7db09e8f60a8bb95314b1ed26afcc689851665cf27f5408122f60c98" }, { "contractName": "KnownCodesStorage", "bytecodePath": "artifacts-zk/contracts-preprocessed/KnownCodesStorage.sol/KnownCodesStorage.json", "sourceCodePath": "contracts-preprocessed/KnownCodesStorage.sol", - "bytecodeHash": "0x0100006f4f236efe0359b2d01a2c396fe9c2f5d74252b1acbeed29d0610e1280", + "bytecodeHash": "0x0100006f2889f3200b41f87f8e0835f970e47e513548bbf68239577f8bd97816", "sourceCodeHash": "0xb39b5b81168653e0c5062f7b8e1d6d15a4e186df3317f192f0cb2fc3a74f5448" }, { "contractName": "L1Messenger", "bytecodePath": "artifacts-zk/contracts-preprocessed/L1Messenger.sol/L1Messenger.json", "sourceCodePath": "contracts-preprocessed/L1Messenger.sol", - "bytecodeHash": "0x010001f7ce693213118f4780607b934fb0be4baece85ae52377a0279d0c027f5", + "bytecodeHash": "0x010001f735b209b666e9e3d377cf7b5c0483a57dff7b1cd035b58ac10c2e0771", "sourceCodeHash": "0x8d22a4019347a45cb0c27bed9e98f7033637a7bdcd90fafb1922caa48f2b05de" }, { "contractName": "L2BaseToken", "bytecodePath": "artifacts-zk/contracts-preprocessed/L2BaseToken.sol/L2BaseToken.json", "sourceCodePath": "contracts-preprocessed/L2BaseToken.sol", - "bytecodeHash": "0x01000103d8b1dbf62114dbf0fdb7b06e94d372346b1a99936deeb9250c7c264d", + "bytecodeHash": "0x010001036ff04ddfde50fac4cf41bf9a34df472373e8b2769938cb35d293f7a7", "sourceCodeHash": "0x8bdd2b4d0b53dba84c9f0af250bbaa2aad10b3de6747bba957f0bd3721090dfa" }, { "contractName": "L2GenesisUpgrade", "bytecodePath": "artifacts-zk/contracts-preprocessed/L2GenesisUpgrade.sol/L2GenesisUpgrade.json", "sourceCodePath": "contracts-preprocessed/L2GenesisUpgrade.sol", - "bytecodeHash": "0x010000d5c6b00a5ad08e8990515dc11146b4150a2ab27008d78f1928159404b0", - "sourceCodeHash": "0x15bb6f306f209b618ea5e52671757934d306dcb1d53be73ce49cd200ad485688" + "bytecodeHash": "0x01000109946aaf60780aa88277365bdd6bc2719f5a2592079a91aae7058cee58", + "sourceCodeHash": "0xbfe430d992d5740c4befdc7adbac2bb9a33c25a45c30ed9fe86c2b4e0263778a" }, { "contractName": "MsgValueSimulator", "bytecodePath": "artifacts-zk/contracts-preprocessed/MsgValueSimulator.sol/MsgValueSimulator.json", "sourceCodePath": "contracts-preprocessed/MsgValueSimulator.sol", - "bytecodeHash": "0x0100005d3053405421f29f79d8f9346697c19bbf4d0c1d3f357025ef4073d173", + "bytecodeHash": "0x0100005dc9890cf9aca1c56e823e2147619ea5058c70e123a6a76e51bcee8956", "sourceCodeHash": "0x082f3dcbc2fe4d93706c86aae85faa683387097d1b676e7ebd00f71ee0f13b71" }, { "contractName": "NonceHolder", "bytecodePath": "artifacts-zk/contracts-preprocessed/NonceHolder.sol/NonceHolder.json", "sourceCodePath": "contracts-preprocessed/NonceHolder.sol", - "bytecodeHash": "0x010000d98fcd3f30ceba0dffe1981b7402ac80e15d7f8d07686c94a16d1aef50", + "bytecodeHash": "0x010000d9ff72782330c259f50fc3ff63e5f8b0a2277e6d652c2a60c56e60efec", "sourceCodeHash": "0xcd0c0366effebf2c98c58cf96322cc242a2d1c675620ef5514b7ed1f0a869edc" }, { "contractName": "PubdataChunkPublisher", "bytecodePath": "artifacts-zk/contracts-preprocessed/PubdataChunkPublisher.sol/PubdataChunkPublisher.json", "sourceCodePath": "contracts-preprocessed/PubdataChunkPublisher.sol", - "bytecodeHash": "0x010000496b83c897843f12da4672f6b3e549a949f7d2078b3f56c3221ed62a68", + "bytecodeHash": "0x0100004994ca7f560b82e531240c2bac414d02180c33f75363de4edc00796c15", "sourceCodeHash": "0x04d3d2e4019081c87aae5c22a060d84ae2e9d631ebce59801ecce37b9c87e4c7" }, { "contractName": "SystemContext", "bytecodePath": "artifacts-zk/contracts-preprocessed/SystemContext.sol/SystemContext.json", "sourceCodePath": "contracts-preprocessed/SystemContext.sol", - "bytecodeHash": "0x010001a75638c20c20ae71722f6265db5258d2d70b8cdcbc3400c618b113dc5c", + "bytecodeHash": "0x010001a7e10cfa64a3b326897067f582f992db9fbb9bf50304d5db6525de961d", "sourceCodeHash": "0xb3b8c1f57928938ac590984442bc96c2c888282793014845d5ce2f90bbf2677f" }, { diff --git a/system-contracts/contracts/Constants.sol b/system-contracts/contracts/Constants.sol index a0b22c047..072c6eab9 100644 --- a/system-contracts/contracts/Constants.sol +++ b/system-contracts/contracts/Constants.sol @@ -74,7 +74,8 @@ IBaseToken constant BASE_TOKEN_SYSTEM_CONTRACT = IBaseToken(address(SYSTEM_CONTR IBaseToken constant REAL_BASE_TOKEN_SYSTEM_CONTRACT = IBaseToken(address(REAL_SYSTEM_CONTRACTS_OFFSET + 0x0a)); address constant L2_ASSET_ROUTER = address(USER_CONTRACTS_OFFSET + 0x03); -IBridgehub constant L2_BRIDDGE_HUB = IBridgehub(address(USER_CONTRACTS_OFFSET + 0x02)); +IBridgehub constant L2_BRIDGE_HUB = IBridgehub(address(USER_CONTRACTS_OFFSET + 0x02)); +address constant L2_NATIVE_TOKEN_VAULT_ADDR = address(USER_CONTRACTS_OFFSET + 0x04); IMessageRoot constant L2_MESSAGE_ROOT = IMessageRoot(address(USER_CONTRACTS_OFFSET + 0x05)); // Hardcoded because even for tests we should keep the address. (Instead `SYSTEM_CONTRACTS_OFFSET + 0x10`) diff --git a/system-contracts/contracts/L2GenesisUpgrade.sol b/system-contracts/contracts/L2GenesisUpgrade.sol index aab22ff34..35d03b648 100644 --- a/system-contracts/contracts/L2GenesisUpgrade.sol +++ b/system-contracts/contracts/L2GenesisUpgrade.sol @@ -2,11 +2,11 @@ pragma solidity 0.8.24; -import {DEPLOYER_SYSTEM_CONTRACT, SYSTEM_CONTEXT_CONTRACT, L2_BRIDDGE_HUB, L2_ASSET_ROUTER, L2_MESSAGE_ROOT} from "./Constants.sol"; +import {DEPLOYER_SYSTEM_CONTRACT, SYSTEM_CONTEXT_CONTRACT, L2_BRIDGE_HUB, L2_ASSET_ROUTER, L2_MESSAGE_ROOT, L2_NATIVE_TOKEN_VAULT_ADDR} from "./Constants.sol"; import {IContractDeployer, ForceDeployment} from "./interfaces/IContractDeployer.sol"; import {SystemContractHelper} from "./libraries/SystemContractHelper.sol"; import {ISystemContext} from "./interfaces/ISystemContext.sol"; -import {IL2GenesisUpgrade} from "./interfaces/IL2GenesisUpgrade.sol"; +import {IL2GenesisUpgrade, FixedForceDeploymentsData, ZKChainSpecificForceDeploymentsData} from "./interfaces/IL2GenesisUpgrade.sol"; /// @custom:security-contact security@matterlabs.dev /// @author Matter Labs @@ -15,12 +15,16 @@ contract L2GenesisUpgrade is IL2GenesisUpgrade { function genesisUpgrade( uint256 _chainId, address _ctmDeployer, - bytes calldata _forceDeploymentsData + bytes calldata _fixedForceDeploymentsData, + bytes calldata _additionalForceDeploymentsData ) external payable { // solhint-disable-next-line gas-custom-errors require(_chainId != 0, "Invalid chainId"); ISystemContext(SYSTEM_CONTEXT_CONTRACT).setChainId(_chainId); - ForceDeployment[] memory forceDeployments = abi.decode(_forceDeploymentsData, (ForceDeployment[])); + ForceDeployment[] memory forceDeployments = _getForceDeploymentsData( + _fixedForceDeploymentsData, + _additionalForceDeploymentsData + ); IContractDeployer(DEPLOYER_SYSTEM_CONTRACT).forceDeployOnAddresses{value: msg.value}(forceDeployments); // It is expected that either via to the force deployments above @@ -28,15 +32,15 @@ contract L2GenesisUpgrade is IL2GenesisUpgrade { // (The comment does not mention the exact order in case it changes) // However, there is still some follow up finalization that needs to be done. - address bridgehubOwner = L2_BRIDDGE_HUB.owner(); + address bridgehubOwner = L2_BRIDGE_HUB.owner(); bytes memory data = abi.encodeCall( - L2_BRIDDGE_HUB.setAddresses, + L2_BRIDGE_HUB.setAddresses, (L2_ASSET_ROUTER, _ctmDeployer, address(L2_MESSAGE_ROOT)) ); (bool success, bytes memory returnData) = SystemContractHelper.mimicCall( - address(L2_BRIDDGE_HUB), + address(L2_BRIDGE_HUB), bridgehubOwner, data ); @@ -49,4 +53,75 @@ contract L2GenesisUpgrade is IL2GenesisUpgrade { emit UpgradeComplete(_chainId); } + + function _getForceDeploymentsData( + bytes calldata _fixedForceDeploymentsData, + bytes calldata _additionalForceDeploymentsData + ) internal view returns (ForceDeployment[] memory forceDeployments) { + FixedForceDeploymentsData memory fixedForceDeploymentsData = abi.decode( + _fixedForceDeploymentsData, + (FixedForceDeploymentsData) + ); + ZKChainSpecificForceDeploymentsData memory additionalForceDeploymentsData = abi.decode( + _additionalForceDeploymentsData, + (ZKChainSpecificForceDeploymentsData) + ); + + forceDeployments = new ForceDeployment[](4); + + forceDeployments[0] = ForceDeployment({ + bytecodeHash: fixedForceDeploymentsData.messageRootBytecodeHash, + newAddress: address(L2_MESSAGE_ROOT), + callConstructor: true, + value: 0, + // solhint-disable-next-line func-named-parameters + input: abi.encode(address(L2_BRIDGE_HUB)) + }); + + forceDeployments[1] = ForceDeployment({ + bytecodeHash: fixedForceDeploymentsData.bridgehubBytecodeHash, + newAddress: address(L2_BRIDGE_HUB), + callConstructor: true, + value: 0, + input: abi.encode( + fixedForceDeploymentsData.l1ChainId, + fixedForceDeploymentsData.aliasedL1Governance, + fixedForceDeploymentsData.maxNumberOfZKChains + ) + }); + + forceDeployments[2] = ForceDeployment({ + bytecodeHash: fixedForceDeploymentsData.l2AssetRouterBytecodeHash, + newAddress: address(L2_ASSET_ROUTER), + callConstructor: true, + value: 0, + // solhint-disable-next-line func-named-parameters + input: abi.encode( + fixedForceDeploymentsData.l1ChainId, + fixedForceDeploymentsData.eraChainId, + fixedForceDeploymentsData.l1AssetRouter, + additionalForceDeploymentsData.l2LegacySharedBridge, + additionalForceDeploymentsData.baseTokenAssetId, + fixedForceDeploymentsData.aliasedL1Governance + ) + }); + + forceDeployments[3] = ForceDeployment({ + bytecodeHash: fixedForceDeploymentsData.l2NtvBytecodeHash, + newAddress: L2_NATIVE_TOKEN_VAULT_ADDR, + callConstructor: true, + value: 0, + // solhint-disable-next-line func-named-parameters + input: abi.encode( + fixedForceDeploymentsData.l1ChainId, + fixedForceDeploymentsData.aliasedL1Governance, + fixedForceDeploymentsData.l2TokenProxyBytecodeHash, + additionalForceDeploymentsData.l2LegacySharedBridge, + address(0), // this is used if the contract were already deployed, so for the migration of Era. + false, + additionalForceDeploymentsData.l2Weth, + additionalForceDeploymentsData.baseTokenAssetId + ) + }); + } } diff --git a/system-contracts/contracts/interfaces/IL2GenesisUpgrade.sol b/system-contracts/contracts/interfaces/IL2GenesisUpgrade.sol index 2b733cddb..88566d5d8 100644 --- a/system-contracts/contracts/interfaces/IL2GenesisUpgrade.sol +++ b/system-contracts/contracts/interfaces/IL2GenesisUpgrade.sol @@ -2,12 +2,32 @@ // We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; +struct ZKChainSpecificForceDeploymentsData { + bytes32 baseTokenAssetId; + address l2LegacySharedBridge; + address l2Weth; +} + +struct FixedForceDeploymentsData { + uint256 l1ChainId; + uint256 eraChainId; + address l1AssetRouter; + bytes32 l2TokenProxyBytecodeHash; + address aliasedL1Governance; + uint256 maxNumberOfZKChains; + bytes32 bridgehubBytecodeHash; + bytes32 l2AssetRouterBytecodeHash; + bytes32 l2NtvBytecodeHash; + bytes32 messageRootBytecodeHash; +} + interface IL2GenesisUpgrade { event UpgradeComplete(uint256 _chainId); function genesisUpgrade( uint256 _chainId, address _ctmDeployer, - bytes calldata _forceDeploymentsData + bytes calldata _fixedForceDeploymentsData, + bytes calldata _additionalForceDeploymentsData ) external payable; } diff --git a/system-contracts/contracts/test-contracts/DummyBridgehub.sol b/system-contracts/contracts/test-contracts/DummyBridgehub.sol new file mode 100644 index 000000000..4beadb4ce --- /dev/null +++ b/system-contracts/contracts/test-contracts/DummyBridgehub.sol @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +contract DummyBridgehub { + address public owner; + + constructor(uint256 _l1ChainId, address _aliasedL1Governance, uint256 _maxNumberOfZKChains) { + owner = _aliasedL1Governance; + } +} diff --git a/system-contracts/contracts/test-contracts/DummyL2AssetRouter.sol b/system-contracts/contracts/test-contracts/DummyL2AssetRouter.sol new file mode 100644 index 000000000..65796aa3f --- /dev/null +++ b/system-contracts/contracts/test-contracts/DummyL2AssetRouter.sol @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +contract DummyL2AssetRouter { + constructor( + uint256 _l1ChainId, + address _l1AssetRouter, + address _aliasedL1Governance, + bytes32 _baseTokenAssetId, + uint256 _maxNumberOfZKChains + ) {} +} diff --git a/system-contracts/contracts/test-contracts/DummyL2NativeTokenVault.sol b/system-contracts/contracts/test-contracts/DummyL2NativeTokenVault.sol new file mode 100644 index 000000000..1832237d2 --- /dev/null +++ b/system-contracts/contracts/test-contracts/DummyL2NativeTokenVault.sol @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +contract DummyL2NativeTokenVault { + constructor( + uint256 _l1ChainId, + address _aliasedL1Governance, + bytes32 _l2TokenProxyBytecodeHash, + address _bridgedTokenBeacon, + bool _contractsDeployedAlready, + address _wethToken, + bytes32 _baseTokenAssetId + ) {} +} diff --git a/system-contracts/contracts/test-contracts/DummyMessageRoot.sol b/system-contracts/contracts/test-contracts/DummyMessageRoot.sol new file mode 100644 index 000000000..d49cdd50f --- /dev/null +++ b/system-contracts/contracts/test-contracts/DummyMessageRoot.sol @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: MIT + +pragma solidity 0.8.24; + +contract DummyMessageRoot { + constructor(address) {} +} diff --git a/system-contracts/test/L2GenesisUpgrade.spec.ts b/system-contracts/test/L2GenesisUpgrade.spec.ts index e64fb116a..916807c99 100644 --- a/system-contracts/test/L2GenesisUpgrade.spec.ts +++ b/system-contracts/test/L2GenesisUpgrade.spec.ts @@ -1,5 +1,6 @@ import { expect } from "chai"; import { ethers, network } from "hardhat"; +import * as zksync from "zksync-ethers"; import type { ComplexUpgrader, L2GenesisUpgrade } from "../typechain"; import { ComplexUpgraderFactory, L2GenesisUpgradeFactory } from "../typechain"; import { @@ -8,8 +9,9 @@ import { REAL_L2_ASSET_ROUTER_ADDRESS, REAL_L2_MESSAGE_ROOT_ADDRESS, TEST_COMPLEX_UPGRADER_CONTRACT_ADDRESS, + ADDRESS_ONE, } from "./shared/constants"; -import { deployContractOnAddress } from "./shared/utils"; +import { deployContractOnAddress, loadArtifact } from "./shared/utils"; import { setResult } from "./shared/mocks"; describe("L2GenesisUpgrade tests", function () { @@ -30,6 +32,19 @@ describe("L2GenesisUpgrade tests", function () { }, ]; + let fixedForceDeploymentsData: string; + + const additionalForceDeploymentsData = ethers.utils.defaultAbiCoder.encode( + ["tuple(bytes32 baseTokenAssetId, address l2LegacySharedBridge, address l2Weth)"], + [ + { + baseTokenAssetId: "0x0100056f53fd9e940906d998a80ed53392e5c50a8eb198baf9f78fd84ce7ec70", + l2LegacySharedBridge: ADDRESS_ONE, + l2Weth: ADDRESS_ONE, + }, + ] + ); + before(async () => { const wallet = await ethers.getImpersonatedSigner(TEST_FORCE_DEPLOYER_ADDRESS); await deployContractOnAddress(TEST_COMPLEX_UPGRADER_CONTRACT_ADDRESS, "ComplexUpgrader"); @@ -60,19 +75,47 @@ describe("L2GenesisUpgrade tests", function () { failure: false, returnData: "0x", }); + + const msgRootBytecode = (await loadArtifact("DummyMessageRoot")).bytecode; + const messageRootBytecodeHash = zksync.utils.hashBytecode(msgRootBytecode); + + const ntvBytecode = (await loadArtifact("DummyL2NativeTokenVault")).bytecode; + const ntvBytecodeHash = zksync.utils.hashBytecode(ntvBytecode); + + const l2AssetRouterBytecode = (await loadArtifact("DummyL2AssetRouter")).bytecode; + const l2AssetRouterBytecodeHash = zksync.utils.hashBytecode(l2AssetRouterBytecode); + + const bridgehubBytecode = (await loadArtifact("DummyBridgehub")).bytecode; + const bridgehubBytecodeHash = zksync.utils.hashBytecode(bridgehubBytecode); + + fixedForceDeploymentsData = ethers.utils.defaultAbiCoder.encode( + [ + "tuple(uint256 l1ChainId, uint256 eraChainId, address l1AssetRouter, bytes32 l2TokenProxyBytecodeHash, address aliasedL1Governance, uint256 maxNumberOfZKChains, bytes32 bridgehubBytecodeHash, bytes32 l2AssetRouterBytecodeHash, bytes32 l2NtvBytecodeHash, bytes32 messageRootBytecodeHash)", + ], + [ + { + l1ChainId: 1, + eraChainId: 1, + l1AssetRouter: ADDRESS_ONE, + l2TokenProxyBytecodeHash: "0x0100056f53fd9e940906d998a80ed53392e5c50a8eb198baf9f78fd84ce7ec70", + aliasedL1Governance: ADDRESS_ONE, + maxNumberOfZKChains: 100, + bridgehubBytecodeHash: bridgehubBytecodeHash, + l2AssetRouterBytecodeHash: l2AssetRouterBytecodeHash, + l2NtvBytecodeHash: ntvBytecodeHash, + messageRootBytecodeHash: messageRootBytecodeHash, + }, + ] + ); }); describe("upgrade", function () { it("successfully upgraded", async () => { - const forceDeploymentsData = ethers.utils.defaultAbiCoder.encode( - ["tuple(bytes32 bytecodeHash, address newAddress, bool callConstructor, uint256 value, bytes input)[]"], - [forceDeployments] - ); - const data = l2GenesisUpgrade.interface.encodeFunctionData("genesisUpgrade", [ chainId, ctmDeployerAddress, - forceDeploymentsData, + fixedForceDeploymentsData, + additionalForceDeploymentsData, ]); // Note, that the event is emitted at the complex upgrader, but the event declaration is taken from the l2GenesisUpgrade contract. diff --git a/system-contracts/test/shared/constants.ts b/system-contracts/test/shared/constants.ts index cb5ae3e1c..c3f82c989 100644 --- a/system-contracts/test/shared/constants.ts +++ b/system-contracts/test/shared/constants.ts @@ -34,3 +34,5 @@ export const REAL_L2_MESSAGE_ROOT_ADDRESS = "0x000000000000000000000000000000000 export const EMPTY_STRING_KECCAK = "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"; export const TWO_IN_256 = BigNumber.from(2).pow(256); export const ONE_BYTES32_HEX = "0x0000000000000000000000000000000000000000000000000000000000000001"; + +export const ADDRESS_ONE = "0x0000000000000000000000000000000000000001"; From b9c2fef049440f4f06630c991ac7e30b8d5e4bb1 Mon Sep 17 00:00:00 2001 From: kelemeno Date: Tue, 17 Sep 2024 11:47:36 +0100 Subject: [PATCH 52/53] lint --- l2-contracts/contracts/interfaces/IConsensusRegistry.sol | 1 - 1 file changed, 1 deletion(-) diff --git a/l2-contracts/contracts/interfaces/IConsensusRegistry.sol b/l2-contracts/contracts/interfaces/IConsensusRegistry.sol index 5e6bea998..a5e017484 100644 --- a/l2-contracts/contracts/interfaces/IConsensusRegistry.sol +++ b/l2-contracts/contracts/interfaces/IConsensusRegistry.sol @@ -2,7 +2,6 @@ // We use a floating point pragma here so it can be used within other projects that interact with the ZKsync ecosystem without using our exact pragma version. pragma solidity ^0.8.20; - /// @author Matter Labs /// @custom:security-contact security@matterlabs.dev /// @title ConsensusRegistry contract interface From c566ee72adac20f6eb9298ab1ab6f3a24823b094 Mon Sep 17 00:00:00 2001 From: kelemeno <34402761+kelemeno@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:49:58 +0100 Subject: [PATCH 53/53] chore: Kl/merge-stable (#809) Co-authored-by: Lyova Potyomkin Co-authored-by: Stanislav Bezkorovainyi