1116 init validation solidity v0.6

modules/cf-core/package.json

@@ -22,7 +22,7 @@
     "@connext/utils": "6.3.13",
     "@connext/types": "6.3.13",
     "ethers": "4.0.47",
-    "@openzeppelin/contracts": "2.5.0",
+    "@openzeppelin/contracts": "3.0.1",
     "eventemitter3": "4.0.0",
     "memoizee": "0.4.14",
     "p-queue": "6.4.0",

modules/contracts/buidler.config.ts

@@ -18,8 +18,7 @@ const config: BuidlerConfig = {
     artifacts: "./build",
   },
   solc: {
-    version: "0.5.11", // Note that this only has the version number
-    evmVersion: "constantinople",
+    version: "0.6.7", // Note that this only has the version number
   },
   defaultNetwork: "buidlerevm",
   networks: {

modules/contracts/contracts/adjudicator/ChallengeRegistry.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.11;
+pragma solidity 0.6.7;
 pragma experimental "ABIEncoderV2";
 
 import "./mixins/MixinChallengeRegistryCore.sol";

modules/contracts/contracts/adjudicator/interfaces/CounterfactualApp.sol

@@ -1,10 +1,14 @@
-pragma solidity 0.5.11;
+pragma solidity 0.6.7;
 pragma experimental "ABIEncoderV2";
 
+import "./CounterfactualAppInterface.sol";
 
-contract CounterfactualApp {
+
+contract CounterfactualApp is CounterfactualAppInterface {
 
     function isStateTerminal(bytes calldata)
+        override
+        virtual
         external
         view
         returns (bool)
@@ -13,6 +17,8 @@ contract CounterfactualApp {
     }
 
     function getTurnTaker(bytes calldata, address[] calldata)
+        override
+        virtual
         external
         view
         returns (address)
@@ -21,6 +27,8 @@ contract CounterfactualApp {
     }
 
     function init(bytes calldata)
+        override
+        virtual
         external
         view
         returns (bool)
@@ -29,6 +37,8 @@ contract CounterfactualApp {
     }
 
     function applyAction(bytes calldata, bytes calldata)
+        override
+        virtual
         external
         view
         returns (bytes memory)
@@ -37,6 +47,8 @@ contract CounterfactualApp {
     }
 
     function computeOutcome(bytes calldata)
+        override
+        virtual
         external
         view
         returns (bytes memory)

modules/contracts/contracts/adjudicator/interfaces/CounterfactualAppInterface.sol

@@ -0,0 +1,32 @@
+pragma solidity 0.6.7;
+pragma experimental "ABIEncoderV2";
+
+
+interface CounterfactualAppInterface {
+
+    function isStateTerminal(bytes calldata)
+        external
+        view
+        returns (bool);
+
+    function getTurnTaker(bytes calldata, address[] calldata)
+        external
+        view
+        returns (address);
+
+    function init(bytes calldata)
+        external
+        view
+        returns (bool);
+
+    function applyAction(bytes calldata, bytes calldata)
+        external
+        view
+        returns (bytes memory);
+
+    function computeOutcome(bytes calldata)
+        external
+        view
+        returns (bytes memory);
+
+}

modules/contracts/contracts/adjudicator/libs/LibAppCaller.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.11;
+pragma solidity 0.6.7;
 pragma experimental "ABIEncoderV2";
 
 import "../interfaces/CounterfactualApp.sol";

modules/contracts/contracts/adjudicator/libs/LibDispute.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.11;
+pragma solidity 0.6.7;
 pragma experimental ABIEncoderV2;
 
 

modules/contracts/contracts/adjudicator/libs/LibStateChannelApp.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.11;
+pragma solidity 0.6.7;
 pragma experimental ABIEncoderV2;
 
 import "@openzeppelin/contracts/math/SafeMath.sol";
@@ -66,7 +66,7 @@ contract LibStateChannelApp is LibDispute {
         AppChallenge memory appChallenge
     )
         public
-        view
+        pure
         returns (bool)
     {
         return appChallenge.status == ChallengeStatus.OUTCOME_SET;

modules/contracts/contracts/adjudicator/mixins/MChallengeRegistryCore.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.11;
+pragma solidity 0.6.7;
 pragma experimental "ABIEncoderV2";
 
 import "../../shared/libs/LibCommitment.sol";

modules/contracts/contracts/adjudicator/mixins/MixinCancelDispute.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.11;
+pragma solidity 0.6.7;
 pragma experimental "ABIEncoderV2";
 
 import "../libs/LibStateChannelApp.sol";

modules/contracts/contracts/adjudicator/mixins/MixinChallengeRegistryCore.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.11;
+pragma solidity 0.6.7;
 pragma experimental "ABIEncoderV2";
 
 import "../libs/LibStateChannelApp.sol";

modules/contracts/contracts/adjudicator/mixins/MixinProgressState.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.11;
+pragma solidity 0.6.7;
 pragma experimental "ABIEncoderV2";
 
 import "../libs/LibStateChannelApp.sol";

modules/contracts/contracts/adjudicator/mixins/MixinSetAndProgressState.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.11;
+pragma solidity 0.6.7;
 pragma experimental "ABIEncoderV2";
 
 import "../libs/LibDispute.sol";

modules/contracts/contracts/adjudicator/mixins/MixinSetOutcome.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.11;
+pragma solidity 0.6.7;
 pragma experimental "ABIEncoderV2";
 
 import "../libs/LibStateChannelApp.sol";

modules/contracts/contracts/adjudicator/mixins/MixinSetState.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.11;
+pragma solidity 0.6.7;
 pragma experimental "ABIEncoderV2";
 
 import "../libs/LibStateChannelApp.sol";

modules/contracts/contracts/adjudicator/test-fixtures/AppApplyActionFails.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.11;
+pragma solidity 0.6.7;
 pragma experimental "ABIEncoderV2";
 
 import "./AppWithAction.sol";
@@ -11,8 +11,9 @@ import "./AppWithAction.sol";
 contract AppApplyActionFails is AppWithAction {
 
     function init(
-        bytes calldata encodedState
+        bytes calldata /* encodedState */
     )
+        override
         external
         view
         returns (bool)
@@ -21,12 +22,13 @@ contract AppApplyActionFails is AppWithAction {
     }
 
     function applyAction(
-        bytes calldata encodedState,
-        bytes calldata encodedAction
+        bytes calldata /* encodedState */,
+        bytes calldata /* encodedAction */
     )
+        override
         external
         view
-        returns (bytes memory ret)
+        returns (bytes memory)
     {
         revert("applyAction fails for this app");
     }

modules/contracts/contracts/adjudicator/test-fixtures/AppComputeOutcomeFails.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.11;
+pragma solidity 0.6.7;
 pragma experimental "ABIEncoderV2";
 
 import "./AppWithAction.sol";
@@ -11,6 +11,7 @@ import "./AppWithAction.sol";
 contract AppComputeOutcomeFails is AppWithAction {
 
     function init(bytes calldata)
+        override
         external
         view
         returns (bool)
@@ -19,6 +20,7 @@ contract AppComputeOutcomeFails is AppWithAction {
     }
 
     function computeOutcome(bytes calldata)
+        override
         external
         view
         returns (bytes memory)

modules/contracts/contracts/adjudicator/test-fixtures/AppWithAction.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.11;
+pragma solidity 0.6.7;
 pragma experimental "ABIEncoderV2";
 
 import "../interfaces/CounterfactualApp.sol";
@@ -35,6 +35,7 @@ contract AppWithAction is CounterfactualApp {
         bytes calldata encodedState,
         address[] calldata participants
     )
+        override
         external
         view
         returns (address)
@@ -44,6 +45,8 @@ contract AppWithAction is CounterfactualApp {
     }
 
     function computeOutcome(bytes calldata)
+        override
+        virtual
         external
         view
         returns (bytes memory)
@@ -55,6 +58,8 @@ contract AppWithAction is CounterfactualApp {
         bytes calldata encodedState,
         bytes calldata encodedAction
     )
+        override
+        virtual
         external
         view
         returns (bytes memory ret)
@@ -72,7 +77,9 @@ contract AppWithAction is CounterfactualApp {
         return abi.encode(state);
     }
 
-    function init(bytes calldata encodedState)
+    function init(bytes calldata)
+        override
+        virtual
         external
         view
         returns (bool)
@@ -81,6 +88,7 @@ contract AppWithAction is CounterfactualApp {
     }
 
     function isStateTerminal(bytes calldata encodedState)
+        override
         external
         view
         returns (bool)

modules/contracts/contracts/apps/HashLockTransferApp.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.5.11;
+pragma solidity 0.6.7;
 pragma experimental "ABIEncoderV2";
 
 import "../adjudicator/interfaces/CounterfactualApp.sol";
@@ -28,6 +28,7 @@ contract HashLockTransferApp is CounterfactualApp {
     }
 
     function init(bytes calldata encodedState)
+        override
         external
         view
         returns(bool)
@@ -48,6 +49,7 @@ contract HashLockTransferApp is CounterfactualApp {
         bytes calldata encodedState,
         bytes calldata encodedAction
     )
+        override
         external
         view
         returns (bytes memory)
@@ -69,6 +71,7 @@ contract HashLockTransferApp is CounterfactualApp {
     }
 
     function computeOutcome(bytes calldata encodedState)
+        override
         external
         view
         returns (bytes memory)
@@ -84,9 +87,10 @@ contract HashLockTransferApp is CounterfactualApp {
     }
 
     function getTurnTaker(
-        bytes calldata encodedState,
+        bytes calldata /* encodedState */,
         address[] calldata participants
     )
+        override
         external
         view
         returns (address)
@@ -95,6 +99,7 @@ contract HashLockTransferApp is CounterfactualApp {
     }
 
     function isStateTerminal(bytes calldata encodedState)
+        override
         external
         view
         returns (bool)