Merge pull request #10 from reddyismav/halborn-audit

jdkanani · web-flow · commit 1abe18cb4d6c · 2021-08-05T14:52:24.000+04:00
halborn audit fixes
diff --git a/contracts/FxChild.sol b/contracts/FxChild.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 // IStateReceiver represents interface to receive state
 interface IStateReceiver {
@@ -19,7 +19,7 @@ contract FxChild is IStateReceiver {
 
     event NewFxMessage(address rootMessageSender, address receiver, bytes data);
 
-    function setFxRoot(address _fxRoot) public {
+    function setFxRoot(address _fxRoot) external {
         require(fxRoot == address(0x0));
         fxRoot = _fxRoot;
     }
diff --git a/contracts/FxRoot.sol b/contracts/FxRoot.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 
 interface IStateSender {
diff --git a/contracts/examples/erc1155-transfer/FxERC1155ChildTunnel.sol b/contracts/examples/erc1155-transfer/FxERC1155ChildTunnel.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import {IFxERC1155} from "../../tokens/IFxERC1155.sol";
 import {ERC1155Holder} from "../../lib/ERC1155Holder.sol" ;
diff --git a/contracts/examples/erc1155-transfer/FxERC1155RootTunnel.sol b/contracts/examples/erc1155-transfer/FxERC1155RootTunnel.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import {ERC1155} from "../../lib/ERC1155.sol";
 import {ERC1155Holder} from "../../lib/ERC1155Holder.sol" ;
diff --git a/contracts/examples/erc20-transfer/FxERC20ChildTunnel.sol b/contracts/examples/erc20-transfer/FxERC20ChildTunnel.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import { FxBaseChildTunnel } from '../../tunnel/FxBaseChildTunnel.sol';
 import { Create2 } from '../../lib/Create2.sol';
diff --git a/contracts/examples/erc20-transfer/FxERC20RootTunnel.sol b/contracts/examples/erc20-transfer/FxERC20RootTunnel.sol
@@ -1,14 +1,16 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import { ERC20 } from "../../lib/ERC20.sol";
 import { Create2 } from "../../lib/Create2.sol";
 import { FxBaseRootTunnel } from "../../tunnel/FxBaseRootTunnel.sol";
+import {SafeERC20,IERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 /**
  * @title FxERC20RootTunnel
  */
 contract FxERC20RootTunnel is FxBaseRootTunnel, Create2 {
+    using SafeERC20 for IERC20;
     // maybe DEPOSIT and MAP_TOKEN can be reduced to bytes4
     bytes32 public constant DEPOSIT = keccak256("DEPOSIT");
     bytes32 public constant MAP_TOKEN = keccak256("MAP_TOKEN");
@@ -57,7 +59,7 @@ contract FxERC20RootTunnel is FxBaseRootTunnel, Create2 {
         }
 
         // transfer from depositor to this contract
-        ERC20(rootToken).transferFrom(
+        IERC20(rootToken).safeTransferFrom(
             msg.sender,    // depositor
             address(this), // manager contract
             amount
@@ -75,7 +77,7 @@ contract FxERC20RootTunnel is FxBaseRootTunnel, Create2 {
         require(rootToChildTokens[rootToken] == childToken, "FxERC20RootTunnel: INVALID_MAPPING_ON_EXIT");
 
         // transfer from tokens to
-        ERC20(rootToken).transfer(
+        IERC20(rootToken).safeTransfer(
             to,
             amount
         );
diff --git a/contracts/examples/erc721-transfer/FxERC721ChildTunnel.sol b/contracts/examples/erc721-transfer/FxERC721ChildTunnel.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import { FxBaseChildTunnel } from '../../tunnel/FxBaseChildTunnel.sol';
 import { Create2 } from '../../lib/Create2.sol';
@@ -33,7 +33,7 @@ contract FxERC721ChildTunnel is FxBaseChildTunnel, Create2, IERC721Receiver {
         return this.onERC721Received.selector;
     }
 
-    function withdraw(address childToken, uint256 tokenId, bytes memory data) public {
+    function withdraw(address childToken, uint256 tokenId, bytes memory data) external {
         IFxERC721 childTokenContract = IFxERC721(childToken);
         // child token contract will have root token
         address rootToken = childTokenContract.connectedToken();
diff --git a/contracts/examples/erc721-transfer/FxERC721RootTunnel.sol b/contracts/examples/erc721-transfer/FxERC721RootTunnel.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import { ERC721 } from "../../lib/ERC721.sol";
 import { Create2 } from "../../lib/Create2.sol";
diff --git a/contracts/examples/mintable-erc20-transfer/FxMintableERC20ChildTunnel.sol b/contracts/examples/mintable-erc20-transfer/FxMintableERC20ChildTunnel.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import { FxBaseChildTunnel } from '../../tunnel/FxBaseChildTunnel.sol';
 import { Create2 } from '../../lib/Create2.sol';
diff --git a/contracts/examples/mintable-erc20-transfer/FxMintableERC20RootTunnel.sol b/contracts/examples/mintable-erc20-transfer/FxMintableERC20RootTunnel.sol
@@ -1,16 +1,19 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import { Create2 } from "../../lib/Create2.sol";
 import { SafeMath } from "../../lib/SafeMath.sol";
 import { FxERC20 } from "../../tokens/FxERC20.sol";
 import { FxBaseRootTunnel } from "../../tunnel/FxBaseRootTunnel.sol";
+import {SafeERC20,IERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+
 
 /** 
  * @title FxMintableERC20RootTunnel
  */
 contract FxMintableERC20RootTunnel is FxBaseRootTunnel, Create2 {
     using SafeMath for uint256;
+    using SafeERC20 for IERC20;
 
     // maybe DEPOSIT and MAP_TOKEN can be reduced to bytes4
     bytes32 public constant DEPOSIT = keccak256("DEPOSIT");
@@ -30,7 +33,7 @@ contract FxMintableERC20RootTunnel is FxBaseRootTunnel, Create2 {
         require(rootToChildTokens[rootToken] != address(0x0), "FxMintableERC20RootTunnel: NO_MAPPING_FOUND");
 
         // transfer from depositor to this contract
-        FxERC20(rootToken).transferFrom(
+        IERC20(rootToken).safeTransferFrom(
             msg.sender,    // depositor
             address(this), // manager contract
             amount
@@ -68,7 +71,7 @@ contract FxMintableERC20RootTunnel is FxBaseRootTunnel, Create2 {
         tokenObj.approve(address(this), amount);
         
         // transfer from tokens
-        tokenObj.transferFrom(
+        IERC20(rootToken).safeTransferFrom(
             address(this),
             to,
             amount
@@ -96,4 +99,3 @@ contract FxMintableERC20RootTunnel is FxBaseRootTunnel, Create2 {
         return (size > 0);
     }
 }
-
diff --git a/contracts/examples/state-transfer/FxStateChildTunnel.sol b/contracts/examples/state-transfer/FxStateChildTunnel.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import { FxBaseChildTunnel } from '../../tunnel/FxBaseChildTunnel.sol';
 
diff --git a/contracts/examples/state-transfer/FxStateRootTunnel.sol b/contracts/examples/state-transfer/FxStateRootTunnel.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import { FxBaseRootTunnel } from '../../tunnel/FxBaseRootTunnel.sol';
 
diff --git a/contracts/lib/Address.sol b/contracts/lib/Address.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 /**
  * @dev Collection of functions related to the address type
diff --git a/contracts/lib/Context.sol b/contracts/lib/Context.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 /*
  * @dev Provides information about the current execution context, including the
diff --git a/contracts/lib/Create2.sol b/contracts/lib/Create2.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 
 // Create2 adds common methods for minimal proxy with create2
diff --git a/contracts/lib/ERC1155.sol b/contracts/lib/ERC1155.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import "./IERC1155.sol";
 import "./IERC1155Receiver.sol";
diff --git a/contracts/lib/ERC1155Holder.sol b/contracts/lib/ERC1155Holder.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import "./ERC1155Receiver.sol";
 
diff --git a/contracts/lib/ERC1155Receiver.sol b/contracts/lib/ERC1155Receiver.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import "./IERC1155Receiver.sol";
 import "./ERC165.sol";
diff --git a/contracts/lib/ERC165.sol b/contracts/lib/ERC165.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import "./IERC165.sol";
 
diff --git a/contracts/lib/ERC20.sol b/contracts/lib/ERC20.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import { IERC20 } from './IERC20.sol';
 import { SafeMath } from './SafeMath.sol';
diff --git a/contracts/lib/ERC721.sol b/contracts/lib/ERC721.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import "./IERC721.sol";
 import "./IERC721Receiver.sol";
diff --git a/contracts/lib/IERC1155.sol b/contracts/lib/IERC1155.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import "./IERC165.sol";
 
diff --git a/contracts/lib/IERC1155MetadataURI.sol b/contracts/lib/IERC1155MetadataURI.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import "./IERC1155.sol";
 
diff --git a/contracts/lib/IERC1155Receiver.sol b/contracts/lib/IERC1155Receiver.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import "./IERC165.sol";
 
diff --git a/contracts/lib/IERC165.sol b/contracts/lib/IERC165.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 /**
  * @dev Interface of the ERC165 standard, as defined in the
diff --git a/contracts/lib/IERC20.sol b/contracts/lib/IERC20.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 /**
  * @dev Interface of the ERC20 standard as defined in the EIP.
diff --git a/contracts/lib/IERC721.sol b/contracts/lib/IERC721.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import "./IERC165.sol";
 
diff --git a/contracts/lib/IERC721Metadata.sol b/contracts/lib/IERC721Metadata.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import "./IERC721.sol";
 
diff --git a/contracts/lib/IERC721Receiver.sol b/contracts/lib/IERC721Receiver.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 /**
  * @title ERC721 token receiver interface
diff --git a/contracts/lib/Merkle.sol b/contracts/lib/Merkle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 library Merkle {
     function checkMembership(
diff --git a/contracts/lib/MerklePatriciaProof.sol b/contracts/lib/MerklePatriciaProof.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 import {RLPReader} from "./RLPReader.sol";
 
diff --git a/contracts/lib/Ownable.sol b/contracts/lib/Ownable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.7.3;
+pragma solidity ^0.8.0;
 
 /**
  * @dev Contract module which provides a basic access control mechanism, where
diff --git a/contracts/lib/RLPReader.sol b/contracts/lib/RLPReader.sol
diff --git a/contracts/lib/SafeMath.sol b/contracts/lib/SafeMath.sol
diff --git a/contracts/lib/Strings.sol b/contracts/lib/Strings.sol
diff --git a/contracts/tokens/FxERC1155.sol b/contracts/tokens/FxERC1155.sol
diff --git a/contracts/tokens/FxERC20.sol b/contracts/tokens/FxERC20.sol
diff --git a/contracts/tokens/FxERC721.sol b/contracts/tokens/FxERC721.sol
diff --git a/contracts/tokens/IFxERC1155.sol b/contracts/tokens/IFxERC1155.sol
diff --git a/contracts/tokens/IFxERC20.sol b/contracts/tokens/IFxERC20.sol
diff --git a/contracts/tokens/IFxERC721.sol b/contracts/tokens/IFxERC721.sol
diff --git a/contracts/tunnel/FxBaseChildTunnel.sol b/contracts/tunnel/FxBaseChildTunnel.sol
diff --git a/contracts/tunnel/FxBaseRootTunnel.sol b/contracts/tunnel/FxBaseRootTunnel.sol
diff --git a/hardhat.config.js b/hardhat.config.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/yarn.lock b/yarn.lock
