Merge pull request #87 from maticnetwork/halborn-audit-fix

Halborn Audit Fix
maticnetwork · Aug 5, 2021 · dabb08e · dabb08e
2 parents d062711 + 959e46b
commit dabb08e
Show file tree

Hide file tree

Showing 22 changed files with 59 additions and 13 deletions.
diff --git a/contracts/child/ChildToken/UpgradeableChildERC20/ERC20.sol b/contracts/child/ChildToken/UpgradeableChildERC20/ERC20.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity 0.6.6;
 
 
 import "@openzeppelin/contracts/GSN/Context.sol";

diff --git a/contracts/root/RootChainManager/RootChainManager.sol b/contracts/root/RootChainManager/RootChainManager.sol
@@ -95,6 +95,7 @@ contract RootChainManager is
         external
         only(DEFAULT_ADMIN_ROLE)
     {
+        require(newStateSender != address(0), "RootChainManager: BAD_NEW_STATE_SENDER");
         _stateSender = IStateSender(newStateSender);
     }
 
@@ -115,6 +116,7 @@ contract RootChainManager is
         external
         only(DEFAULT_ADMIN_ROLE)
     {
+        require(newCheckpointManager != address(0), "RootChainManager: BAD_NEW_CHECKPOINT_MANAGER");
         _checkpointManager = ICheckpointManager(newCheckpointManager);
     }
 
@@ -140,7 +142,7 @@ contract RootChainManager is
     }
 
     /**
-     * @notice Register a token predicate address against its type, callable only by mappers
+     * @notice Register a token predicate address against its type, callable only by ADMIN
      * @dev A predicate is a contract responsible to process the token specific logic while locking or exiting tokens
      * @param tokenType bytes32 unique identifier for the token type
      * @param predicateAddress address of token predicate address
@@ -192,7 +194,7 @@ contract RootChainManager is
 
     /**
      * @notice Remap a token that has already been mapped, properly cleans up old mapping
-     * Callable only by mappers
+     * Callable only by ADMIN
      * @param rootToken address of token on root chain
      * @param childToken address of token on child chain
      * @param tokenType bytes32 unique identifier for the token type

diff --git a/contracts/root/RootToken/DummyERC1155.sol b/contracts/root/RootToken/DummyERC1155.sol
@@ -1,3 +1,6 @@
+// This contract is not supposed to be used in production
+// It's strictly for testing purpose
+
 pragma solidity 0.6.6;
 
 import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";

diff --git a/contracts/root/RootToken/DummyERC20.sol b/contracts/root/RootToken/DummyERC20.sol
@@ -1,3 +1,6 @@
+// This contract is not supposed to be used in production
+// It's strictly for testing purpose
+
 pragma solidity 0.6.6;
 
 import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";

diff --git a/contracts/root/RootToken/DummyERC721.sol b/contracts/root/RootToken/DummyERC721.sol
@@ -1,3 +1,6 @@
+// This contract is not supposed to be used in production
+// It's strictly for testing purpose
+
 pragma solidity 0.6.6;
 
 import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";

diff --git a/contracts/root/RootToken/DummyMintableERC1155.sol b/contracts/root/RootToken/DummyMintableERC1155.sol
@@ -1,3 +1,6 @@
+// This contract is not supposed to be used in production
+// It's strictly for testing purpose
+
 pragma solidity 0.6.6;
 
 import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";

diff --git a/contracts/root/RootToken/DummyMintableERC20.sol b/contracts/root/RootToken/DummyMintableERC20.sol
@@ -1,3 +1,6 @@
+// This contract is not supposed to be used in production
+// It's strictly for testing purpose
+
 pragma solidity 0.6.6;
 
 import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";

diff --git a/contracts/root/RootToken/DummyMintableERC721.sol b/contracts/root/RootToken/DummyMintableERC721.sol
@@ -1,3 +1,6 @@
+// This contract is not supposed to be used in production
+// It's strictly for testing purpose
+
 pragma solidity 0.6.6;
 
 import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";

diff --git a/contracts/tunnel/BaseRootTunnel.sol b/contracts/tunnel/BaseRootTunnel.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.6.6;
+pragma solidity 0.6.6;
 
 
 import {SafeMath} from "@openzeppelin/contracts/math/SafeMath.sol";
@@ -44,6 +44,7 @@ abstract contract BaseRootTunnel is AccessControlMixin {
         external
         only(DEFAULT_ADMIN_ROLE)
     {
+        require(newStateSender != address(0), "RootTunnel: BAD_NEW_STATE_SENDER");
         stateSender = IStateSender(newStateSender);
     }
 
@@ -56,6 +57,7 @@ abstract contract BaseRootTunnel is AccessControlMixin {
         external
         only(DEFAULT_ADMIN_ROLE)
     {
+        require(newCheckpointManager != address(0), "RootTunnel: BAD_NEW_CHECKPOINT_MANAGER");
         checkpointManager = ICheckpointManager(newCheckpointManager);
     }
 

diff --git a/contracts/tunnel/ChildTunnel.sol b/contracts/tunnel/ChildTunnel.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.6.6;
+pragma solidity 0.6.6;
 
 import {BaseChildTunnel} from "./BaseChildTunnel.sol";
 

diff --git a/contracts/tunnel/RootTunnel.sol b/contracts/tunnel/RootTunnel.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.6.6;
+pragma solidity 0.6.6;
 
 import {BaseRootTunnel} from "./BaseRootTunnel.sol";
 

diff --git a/flat/BaseRootTunnel.sol b/flat/BaseRootTunnel.sol
@@ -1319,7 +1319,7 @@ library Merkle {
 
 // File: contracts/tunnel/BaseRootTunnel.sol
 
-pragma solidity ^0.6.6;
+pragma solidity 0.6.6;
 
 
 
@@ -1362,6 +1362,7 @@ abstract contract BaseRootTunnel is AccessControlMixin {
         external
         only(DEFAULT_ADMIN_ROLE)
     {
+        require(newStateSender != address(0), "RootTunnel: BAD_NEW_STATE_SENDER");
         stateSender = IStateSender(newStateSender);
     }
 
@@ -1374,6 +1375,7 @@ abstract contract BaseRootTunnel is AccessControlMixin {
         external
         only(DEFAULT_ADMIN_ROLE)
     {
+        require(newCheckpointManager != address(0), "RootTunnel: BAD_NEW_CHECKPOINT_MANAGER");
         checkpointManager = ICheckpointManager(newCheckpointManager);
     }
 

diff --git a/flat/ChildTunnel.sol b/flat/ChildTunnel.sol
@@ -709,7 +709,7 @@ abstract contract BaseChildTunnel is AccessControlMixin {
 
 // File: contracts/tunnel/ChildTunnel.sol
 
-pragma solidity ^0.6.6;
+pragma solidity 0.6.6;
 
 
 

diff --git a/flat/DummyERC1155.sol b/flat/DummyERC1155.sol
@@ -1243,6 +1243,9 @@ abstract contract ContextMixin {
 
 // File: contracts/root/RootToken/DummyERC1155.sol
 
+// This contract is not supposed to be used in production
+// It's strictly for testing purpose
+
 pragma solidity 0.6.6;
 
 

diff --git a/flat/DummyERC20.sol b/flat/DummyERC20.sol
@@ -947,6 +947,9 @@ abstract contract ContextMixin {
 
 // File: contracts/root/RootToken/DummyERC20.sol
 
+// This contract is not supposed to be used in production
+// It's strictly for testing purpose
+
 pragma solidity 0.6.6;
 
 

diff --git a/flat/DummyERC721.sol b/flat/DummyERC721.sol
@@ -2107,6 +2107,9 @@ abstract contract ContextMixin {
 
 // File: contracts/root/RootToken/DummyERC721.sol
 
+// This contract is not supposed to be used in production
+// It's strictly for testing purpose
+
 pragma solidity 0.6.6;
 
 

diff --git a/flat/DummyMintableERC1155.sol b/flat/DummyMintableERC1155.sol
@@ -1758,6 +1758,9 @@ contract AccessControlMixin is AccessControl {
 
 // File: contracts/root/RootToken/DummyMintableERC1155.sol
 
+// This contract is not supposed to be used in production
+// It's strictly for testing purpose
+
 pragma solidity 0.6.6;
 
 

diff --git a/flat/DummyMintableERC20.sol b/flat/DummyMintableERC20.sol
@@ -1447,6 +1447,9 @@ contract AccessControlMixin is AccessControl {
 
 // File: contracts/root/RootToken/DummyMintableERC20.sol
 
+// This contract is not supposed to be used in production
+// It's strictly for testing purpose
+
 pragma solidity 0.6.6;
 
 

diff --git a/flat/DummyMintableERC721.sol b/flat/DummyMintableERC721.sol
@@ -2129,6 +2129,9 @@ abstract contract ContextMixin {
 
 // File: contracts/root/RootToken/DummyMintableERC721.sol
 
+// This contract is not supposed to be used in production
+// It's strictly for testing purpose
+
 pragma solidity 0.6.6;
 
 

diff --git a/flat/RootChainManager.sol b/flat/RootChainManager.sol
@@ -1742,6 +1742,7 @@ contract RootChainManager is
         external
         only(DEFAULT_ADMIN_ROLE)
     {
+        require(newStateSender != address(0), "RootChainManager: BAD_NEW_STATE_SENDER");
         _stateSender = IStateSender(newStateSender);
     }
 
@@ -1762,6 +1763,7 @@ contract RootChainManager is
         external
         only(DEFAULT_ADMIN_ROLE)
     {
+        require(newCheckpointManager != address(0), "RootChainManager: BAD_NEW_CHECKPOINT_MANAGER");
         _checkpointManager = ICheckpointManager(newCheckpointManager);
     }
 
@@ -1787,7 +1789,7 @@ contract RootChainManager is
     }
 
     /**
-     * @notice Register a token predicate address against its type, callable only by mappers
+     * @notice Register a token predicate address against its type, callable only by ADMIN
      * @dev A predicate is a contract responsible to process the token specific logic while locking or exiting tokens
      * @param tokenType bytes32 unique identifier for the token type
      * @param predicateAddress address of token predicate address
@@ -1839,7 +1841,7 @@ contract RootChainManager is
 
     /**
      * @notice Remap a token that has already been mapped, properly cleans up old mapping
-     * Callable only by mappers
+     * Callable only by ADMIN
      * @param rootToken address of token on root chain
      * @param childToken address of token on child chain
      * @param tokenType bytes32 unique identifier for the token type

diff --git a/flat/RootTunnel.sol b/flat/RootTunnel.sol
@@ -1319,7 +1319,7 @@ library Merkle {
 
 // File: contracts/tunnel/BaseRootTunnel.sol
 
-pragma solidity ^0.6.6;
+pragma solidity 0.6.6;
 
 
 
@@ -1362,6 +1362,7 @@ abstract contract BaseRootTunnel is AccessControlMixin {
         external
         only(DEFAULT_ADMIN_ROLE)
     {
+        require(newStateSender != address(0), "RootTunnel: BAD_NEW_STATE_SENDER");
         stateSender = IStateSender(newStateSender);
     }
 
@@ -1374,6 +1375,7 @@ abstract contract BaseRootTunnel is AccessControlMixin {
         external
         only(DEFAULT_ADMIN_ROLE)
     {
+        require(newCheckpointManager != address(0), "RootTunnel: BAD_NEW_CHECKPOINT_MANAGER");
         checkpointManager = ICheckpointManager(newCheckpointManager);
     }
 
@@ -1536,7 +1538,7 @@ abstract contract BaseRootTunnel is AccessControlMixin {
 
 // File: contracts/tunnel/RootTunnel.sol
 
-pragma solidity ^0.6.6;
+pragma solidity 0.6.6;
 
 
 

diff --git a/flat/UChildERC20.sol b/flat/UChildERC20.sol
@@ -416,7 +416,7 @@ library Address {
 
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity 0.6.6;