statechannels: change nitro/statechannel version and revert change in GRTAssetHolder

Author: abarmat

contracts/statechannels/GRTAssetHolder.sol

@@ -3,7 +3,6 @@
 pragma solidity ^0.7.3;
 pragma experimental ABIEncoderV2;
 
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@statechannels/nitro-protocol/contracts/ERC20AssetHolder.sol";
 
 import "../governance/IController.sol";
@@ -17,7 +16,7 @@ contract GRTAssetHolder is ERC20AssetHolder {
 
     constructor(
         address _AdjudicatorAddress,
-        IERC20 _TokenAddress,
+        address _TokenAddress,
         IController _Controller
     ) ERC20AssetHolder(_AdjudicatorAddress, _TokenAddress) {
         AdjudicatorAddress = _AdjudicatorAddress;

package-lock.json

@@ -18,12 +18,12 @@
   "devDependencies": {
     "@ethersproject/experimental": "^5.0.5",
     "@graphprotocol/common-ts": "^0.2.0",
-    "@graphprotocol/statechannels": "^0.1.3",
+    "@graphprotocol/statechannels": "^0.1.18-next.91581ca.3",
     "@nomiclabs/hardhat-ethers": "^2.0.0",
     "@nomiclabs/hardhat-etherscan": "^2.0.0",
     "@nomiclabs/hardhat-waffle": "^2.0.0",
     "@openzeppelin/contracts": "^3.3.0-solc-0.7",
-    "@statechannels/nitro-protocol": "^0.11.2",
+    "@statechannels/nitro-protocol": "^0.9.1",
     "@tenderly/hardhat-tenderly": "^1.0.3",
     "@typechain/ethers-v5": "^1.0.0",
     "@types/bs58": "^4.0.1",

package.json

@@ -2,5 +2,8 @@
 
 set -eo pipefail
 
+# Compile AttestationApp along with the rest of the contracts	
+cp node_modules/@graphprotocol/statechannels/contracts/AttestationApp.sol contracts/statechannels
+
 # Build
 npm run compile