0xPolygon · ZeroEkkusu · Dec 1, 2023 · Oct 3, 2023 · Oct 19, 2023 · Oct 19, 2023
diff --git a/contracts/child/ChildERC1155.sol b/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 {

diff --git a/contracts/child/ChildERC1155Predicate.sol b/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

diff --git a/contracts/child/ChildERC1155PredicateAccessList.sol b/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,

diff --git a/contracts/child/ChildERC20.sol b/contracts/child/ChildERC20.sol
@@ -25,6 +25,10 @@ contract ChildERC20 is EIP712MetaTransaction, ERC20Upgradeable, IChildERC20 {
         _;
     }
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @inheritdoc IChildERC20
      */

diff --git a/contracts/child/ChildERC20Predicate.sol b/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

diff --git a/contracts/child/ChildERC20PredicateAccessList.sol b/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,

diff --git a/contracts/child/ChildERC721.sol b/contracts/child/ChildERC721.sol
@@ -22,6 +22,10 @@ contract ChildERC721 is EIP712MetaTransaction, ERC721Upgradeable, IChildERC721 {
         _;
     }
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @inheritdoc IChildERC721
      */

diff --git a/contracts/child/ChildERC721Predicate.sol b/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

diff --git a/contracts/child/ChildERC721PredicateAccessList.sol b/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,

diff --git a/contracts/child/EIP1559Burn.sol b/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

diff --git a/contracts/child/NativeERC20.sol b/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}.
      *

diff --git a/contracts/child/NativeERC20Mintable.sol b/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}.
      *

diff --git a/contracts/child/RootMintableERC1155Predicate.sol b/contracts/child/RootMintableERC1155Predicate.sol
@@ -20,6 +20,10 @@ contract RootMintableERC1155Predicate is Initializable, ERC1155Holder, IRootMint
     bytes32 public constant MAP_TOKEN_SIG = keccak256("MAP_TOKEN");
     mapping(address => address) public rootTokenToChildToken;
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @notice Initialization function for RootMintableERC1155Predicate
      * @param newL2StateSender Address of L2StateSender to send deposit information to

diff --git a/contracts/child/RootMintableERC1155PredicateAccessList.sol b/contracts/child/RootMintableERC1155PredicateAccessList.sol
@@ -11,6 +11,10 @@ import {AccessList} from "../lib/AccessList.sol";
  */
 // solhint-disable reason-string
 contract RootMintableERC1155PredicateAccessList is AccessList, RootMintableERC1155Predicate {
+    constructor() {
+        _disableInitializers();
+    }
+
     function initialize(
         address newL2StateSender,
         address newStateReceiver,

diff --git a/contracts/child/RootMintableERC20Predicate.sol b/contracts/child/RootMintableERC20Predicate.sol
@@ -26,6 +26,10 @@ contract RootMintableERC20Predicate is IRootMintableERC20Predicate, Initializabl
     bytes32 public constant MAP_TOKEN_SIG = keccak256("MAP_TOKEN");
     mapping(address => address) public rootTokenToChildToken;
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @notice Initialization function for RootMintableERC20Predicate
      * @param newL2StateSender Address of L2StateSender to send exit information to

diff --git a/contracts/child/RootMintableERC20PredicateAccessList.sol b/contracts/child/RootMintableERC20PredicateAccessList.sol
@@ -11,6 +11,10 @@ import {AccessList} from "../lib/AccessList.sol";
  */
 // solhint-disable reason-string
 contract RootMintableERC20PredicateAccessList is AccessList, RootMintableERC20Predicate {
+    constructor() {
+        _disableInitializers();
+    }
+
     function initialize(
         address newL2StateSender,
         address newStateReceiver,

diff --git a/contracts/child/RootMintableERC721Predicate.sol b/contracts/child/RootMintableERC721Predicate.sol
@@ -21,6 +21,10 @@ contract RootMintableERC721Predicate is Initializable, ERC721Holder, System, IRo
     bytes32 public constant MAP_TOKEN_SIG = keccak256("MAP_TOKEN");
     mapping(address => address) public rootTokenToChildToken;
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @notice Initialization function for RootMintableERC721Predicate
      * @param newL2StateSender Address of L2StateSender to send deposit information to

diff --git a/contracts/child/RootMintableERC721PredicateAccessList.sol b/contracts/child/RootMintableERC721PredicateAccessList.sol
@@ -11,6 +11,10 @@ import {AccessList} from "../lib/AccessList.sol";
  */
 // solhint-disable reason-string
 contract RootMintableERC721PredicateAccessList is AccessList, RootMintableERC721Predicate {
+    constructor() {
+        _disableInitializers();
+    }
+
     function initialize(
         address newL2StateSender,
         address newStateReceiver,

diff --git a/contracts/child/validator/RewardPool.sol b/contracts/child/validator/RewardPool.sol
@@ -18,6 +18,10 @@ contract RewardPool is IRewardPool, System, Initializable {
     mapping(uint256 => uint256) public paidRewardPerEpoch;
     mapping(address => uint256) public pendingRewards;
 
+    constructor() {
+        _disableInitializers();
+    }
+
     function initialize(
         address newRewardToken,
         address newRewardWallet,

diff --git a/contracts/child/validator/ValidatorSet.sol b/contracts/child/validator/ValidatorSet.sol
@@ -26,6 +26,10 @@ contract ValidatorSet is IValidatorSet, ERC20SnapshotUpgradeable, System {
     uint256[] public epochEndBlocks;
     mapping(address => WithdrawalQueue) private _withdrawals;
 
+    constructor() {
+        _disableInitializers();
+    }
+
     function initialize(
         address newStateSender,
         address newStateReceiver,

diff --git a/contracts/root/CheckpointManager.sol b/contracts/root/CheckpointManager.sol
@@ -35,6 +35,8 @@ contract CheckpointManager is ICheckpointManager, Initializable {
     constructor(address initiator) {
         // slither-disable-next-line missing-zero-check
         _INITIATOR = initiator;
+
+        _disableInitializers();
     }
 
     /**

diff --git a/contracts/root/ChildMintableERC1155Predicate.sol b/contracts/root/ChildMintableERC1155Predicate.sol
@@ -2,7 +2,6 @@
 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/root/IChildMintableERC1155Predicate.sol";
 import "../interfaces/child/IChildERC1155.sol";
@@ -32,6 +31,10 @@ contract ChildMintableERC1155Predicate is Initializable, IChildMintableERC1155Pr
         _;
     }
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @notice Initialization function for ChildMintableERC1155Predicate
      * @param newStateSender Address of StateSender to send exit information to

diff --git a/contracts/root/ChildMintableERC20Predicate.sol b/contracts/root/ChildMintableERC20Predicate.sol
@@ -28,6 +28,10 @@ contract ChildMintableERC20Predicate is Initializable, IChildMintableERC20Predic
 
     mapping(address => address) public rootTokenToChildToken;
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @notice Initialization function for ChildMintableERC20Predicate
      * @param newStateSender Address of StateSender to send deposit information to

diff --git a/contracts/root/ChildMintableERC721Predicate.sol b/contracts/root/ChildMintableERC721Predicate.sol
@@ -2,7 +2,6 @@
 pragma solidity 0.8.19;
 
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import "@openzeppelin/contracts/proxy/Clones.sol";
 import "../interfaces/root/IChildMintableERC721Predicate.sol";
 import "../interfaces/child/IChildERC721.sol";
@@ -32,6 +31,10 @@ contract ChildMintableERC721Predicate is Initializable, IChildMintableERC721Pred
         _;
     }
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @notice Initialization function for ChildMintableERC721Predicate
      * @param newStateSender Address of StateSender to send exit information to

diff --git a/contracts/root/ExitHelper.sol b/contracts/root/ExitHelper.sol
@@ -17,6 +17,10 @@ contract ExitHelper is IExitHelper, Initializable {
         _;
     }
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @notice Initialize the contract with the checkpoint manager address
      * @dev The checkpoint manager contract must be deployed first

diff --git a/contracts/root/RootERC1155Predicate.sol b/contracts/root/RootERC1155Predicate.sol
@@ -20,6 +20,10 @@ contract RootERC1155Predicate is Initializable, ERC1155Holder, IRootERC1155Predi
     bytes32 public constant MAP_TOKEN_SIG = keccak256("MAP_TOKEN");
     mapping(address => address) public rootTokenToChildToken;
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @notice Initialization function for RootERC1155Predicate
      * @param newStateSender Address of StateSender to send deposit information to

diff --git a/contracts/root/RootERC20Predicate.sol b/contracts/root/RootERC20Predicate.sol
@@ -21,6 +21,10 @@ contract RootERC20Predicate is Initializable, IRootERC20Predicate {
     mapping(address => address) public rootTokenToChildToken;
     address public nativeTokenRoot;
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @notice Initialization function for RootERC20Predicate
      * @param newStateSender Address of StateSender to send deposit information to

diff --git a/contracts/root/RootERC721Predicate.sol b/contracts/root/RootERC721Predicate.sol
@@ -20,6 +20,10 @@ contract RootERC721Predicate is Initializable, ERC721Holder, IRootERC721Predicat
     bytes32 public constant MAP_TOKEN_SIG = keccak256("MAP_TOKEN");
     mapping(address => address) public rootTokenToChildToken;
 
+    constructor() {
+        _disableInitializers();
+    }
+
     /**
      * @notice Initialization function for RootERC721Predicate
      * @param newStateSender Address of StateSender to send deposit information to

diff --git a/contracts/root/staking/CustomSupernetManager.sol b/contracts/root/staking/CustomSupernetManager.sol
@@ -8,7 +8,6 @@ import "./SupernetManager.sol";
 import "../../interfaces/common/IBLS.sol";
 import "../../interfaces/IStateSender.sol";
 import "../../interfaces/root/staking/ICustomSupernetManager.sol";
-import "../../interfaces/root/IExitHelper.sol";
 import "../../interfaces/root/IRootERC20Predicate.sol";
 
 contract CustomSupernetManager is ICustomSupernetManager, Ownable2StepUpgradeable, SupernetManager {
@@ -36,6 +35,10 @@ contract CustomSupernetManager is ICustomSupernetManager, Ownable2StepUpgradeabl
         _;
     }
 
+    constructor() {
+        _disableInitializers();
+    }
+
     function initialize(
         address newStakeManager,
         address newBls,

diff --git a/contracts/root/staking/StakeManager.sol b/contracts/root/staking/StakeManager.sol
@@ -13,6 +13,10 @@ contract StakeManager is IStakeManager, Initializable, StakeManagerChildData, St
 
     IERC20 private _stakingToken;
 
+    constructor() {
+        _disableInitializers();
+    }
+
     function initialize(address newStakingToken) public initializer {
         _stakingToken = IERC20(newStakingToken);
     }

diff --git a/foundry.toml b/foundry.toml
@@ -15,7 +15,7 @@ fs_permissions = [
   { access = "read", path = "script/deployment/sharedRootContractsConfig.json" },
   { access = "read", path = "script/deployment/rootContractSetConfig.json" },
   { access = "read", path = "script/deployment/rootTokenContractsConfig.json" },
-  { access = "read", path = "out/GenesisProxy.sol/GenesisProxy.json" }
+  { access = "read", path = "out/" }
 ]
 
 # do not use for computationally expensive tests

diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "coverage": "npx hardhat coverage",
     "coverage:foundry": "forge coverage --report lcov && genhtml -o forge-coverage lcov.info",
     "prepare": "husky install",
-    "husky:pre-commit": "npm run prettier && git add ."
+    "husky:pre-commit": ""
   },
   "dependencies": {
     "@openzeppelin/contracts": "^4.9.3",