feat: v1.1

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
           cache: "npm"
       - run: npm ci
       - run: npx hardhat compile --show-stack-traces
-      - run: TS_NODE_TRANSPILE_ONLY=1 npx hardhat test --parallel
+      - run: TS_NODE_TRANSPILE_ONLY=1 npx hardhat test
   forge_tests:
     runs-on: ubuntu-latest
     steps:

README.md

@@ -173,7 +173,7 @@ Some contracts in the Edge suite need be deployed only once on root. These contr
 
 Other contracts are deployed on root once per Supernet. These contracts can deployed using the [`DeployNewRootContractSet.s.sol`](script/deployment/DeployNewRootContractSet.s.sol) script, after [`rootContractSetConfig.json`](script/deployment/rootContractSetConfig.json) has been filled with appropriate values.
 
-Note that the script does not initialize `CheckpointManager`. Instead protects it to be initializable only by the `INITIALIZER` address later.
+Note that the script does not initialize `CheckpointManager`. Instead, it protects it to be initializable only by the `INITIATOR` address later.
 
 Not all root contracts are deployed at this point, however. There are parts of the bridge that need the addresses of various child contracts in order to be initialized. These contracts can deployed using the [`DeployRootTokenContracts.s.sol`](script/deployment/DeployRootTokenContracts.s.sol) script, after [`rootTokenContractsConfig.json`](script/deployment/rootTokenContractsConfig.json) has been filled with appropriate values.
 

contracts/child/ChildERC1155.sol

@@ -3,10 +3,10 @@
 
 pragma solidity ^0.8.19;
 
 import "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/utils/StringsUpgradeable.sol";
 import "../lib/EIP712MetaTransaction.sol";
 import "../interfaces/child/IChildERC1155.sol";
 
 /**
     @title ChildERC1155
@@ -20,15 +20,19 @@
     address private _rootToken;
 
     modifier onlyPredicate() {
         require(msg.sender == _predicate, "ChildERC1155: Only predicate can call");
         _;
     }
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @inheritdoc IChildERC1155
      */
     function initialize(address rootToken_, string calldata uri_) external initializer {
         require(rootToken_ != address(0), "ChildERC1155: BAD_INITIALIZATION");
         _rootToken = rootToken_;
         _predicate = msg.sender;
         __ERC1155_init(uri_);
@@ -67,7 +71,7 @@
         uint256[] calldata amounts
     ) external onlyPredicate returns (bool) {
         uint256 length = accounts.length;
         require(length == tokenIds.length && length == amounts.length, "ChildERC1155: array len mismatch");
         for (uint256 i = 0; i < length; ) {
             _mint(accounts[i], tokenIds[i], amounts[i], "");
             unchecked {

contracts/child/ChildERC1155Predicate.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
 import "@openzeppelin/contracts/proxy/Clones.sol";
 import "../interfaces/child/IChildERC1155Predicate.sol";
 import "../interfaces/child/IChildERC1155.sol";
@@ -71,6 +71,10 @@
         _;
     }
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @notice Initialization function for ChildERC1155Predicate
      * @param newL2StateSender Address of L2StateSender to send exit information to

contracts/child/ChildERC1155PredicateAccessList.sol

@@ -11,6 +11,10 @@ import {AccessList} from "../lib/AccessList.sol";
  */
 // solhint-disable reason-string
 contract ChildERC1155PredicateAccessList is AccessList, ChildERC1155Predicate {
+    constructor() {
+        _disableInitializers();
+    }
+
     function initialize(
         address newL2StateSender,
         address newStateReceiver,

contracts/child/ChildERC20.sol

@@ -25,6 +25,10 @@ contract ChildERC20 is EIP712MetaTransaction, ERC20Upgradeable, IChildERC20 {
         _;
     }
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @inheritdoc IChildERC20
      */

contracts/child/ChildERC20Predicate.sol

@@ -49,6 +49,10 @@ contract ChildERC20Predicate is IChildERC20Predicate, Initializable, System {
     );
     event L2TokenMapped(address indexed rootToken, address indexed childToken);
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @notice Initialization function for ChildERC20Predicate
      * @param newL2StateSender Address of L2StateSender to send exit information to

contracts/child/ChildERC20PredicateAccessList.sol

@@ -11,6 +11,10 @@ import {AccessList} from "../lib/AccessList.sol";
  */
 // solhint-disable reason-string
 contract ChildERC20PredicateAccessList is AccessList, ChildERC20Predicate {
+    constructor() {
+        _disableInitializers();
+    }
+
     function initialize(
         address newL2StateSender,
         address newStateReceiver,

contracts/child/ChildERC721.sol

@@ -22,6 +22,10 @@ contract ChildERC721 is EIP712MetaTransaction, ERC721Upgradeable, IChildERC721 {
         _;
     }
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @inheritdoc IChildERC721
      */

contracts/child/ChildERC721Predicate.sol

@@ -67,6 +67,10 @@ contract ChildERC721Predicate is IChildERC721Predicate, Initializable, System {
         _;
     }
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @notice Initialization function for ChildERC721Predicate
      * @param newL2StateSender Address of L2StateSender to send exit information to

contracts/child/ChildERC721PredicateAccessList.sol

@@ -11,6 +11,10 @@ import {AccessList} from "../lib/AccessList.sol";
  */
 // solhint-disable reason-string
 contract ChildERC721PredicateAccessList is AccessList, ChildERC721Predicate {
+    constructor() {
+        _disableInitializers();
+    }
+
     function initialize(
         address newL2StateSender,
         address newStateReceiver,

contracts/child/EIP1559Burn.sol

@@ -20,6 +20,10 @@ contract EIP1559Burn is Initializable {
     // slither-disable-next-line locked-ether
     receive() external payable {} // solhint-disable-line no-empty-blocks
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @notice Initialization function for EIP1559 burn contract
      * @param newChildERC20Predicate Address of the ERC20 predicate on child chain

contracts/child/NativeERC20.sol

@@ -30,6 +30,10 @@ contract NativeERC20 is Context, Initializable, System, INativeERC20 {
         _;
     }
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @dev Sets the values for {predicate}, {name} and {symbol}.
      *

contracts/child/NativeERC20Mintable.sol

@@ -31,6 +31,10 @@ contract NativeERC20Mintable is Context, Initializable, System, Ownable2Step, IE
         _;
     }
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @dev Sets the values for {predicate}, {name} and {symbol}.
      *