Merge pull request #391 from 0xPolygon/dev

feat: v1.1

Author: ZeroEkkusu

.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

@@ -24,6 +24,10 @@ contract ChildERC1155 is EIP712MetaTransaction, ERC1155Upgradeable, IChildERC115
         _;
     }
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @inheritdoc IChildERC1155
      */

contracts/child/ChildERC1155Predicate.sol

@@ -71,6 +71,10 @@ contract ChildERC1155Predicate is IChildERC1155Predicate, Initializable, System
         _;
     }
 
+    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