disputes: attestation commons (#212)

* disputes: make disputes work with the common-ts attestation library
* build: bump common-ts version
* build: fix install private pkgs in CI

Author: abarmat

.eslintignore

@@ -1,4 +1,5 @@
 build/
+cache/
 coverage/
 node_modules/
 truffle.js

.github/workflows/npmtest.yml

@@ -5,25 +5,28 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
         node-version: [10.x, 12.x]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: npm ci
-    - run: npm run build --if-present
-    - run: npm test
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - shell: bash
+        env:
+          NPM_TOKEN: ${{secrets.npm_token}}
+        run: echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > ~/.npmrc
+      - run: npm ci
+      - run: npm run build --if-present
+      - run: npm test

contracts/Curation.sol

@@ -197,11 +197,15 @@ contract Curation is Governed, BancorFormula {
     function stake(bytes32 _subgraphID, uint256 _tokens) external {
         address curator = msg.sender;
 
+        // Need to stake some funds
+        require(_tokens > 0, "Cannot stake zero tokens");
+
         // Transfer tokens from the curator to this contract
         require(
             token.transferFrom(curator, address(this), _tokens),
             "Cannot transfer tokens to stake"
         );
+
         // Stake transferred tokens to subgraph
         _stake(curator, _subgraphID, _tokens);
     }

contracts/DisputeManager.sol

@@ -5,7 +5,6 @@ import "./Governed.sol";
 import "./GraphToken.sol";
 import "./Staking.sol";
 
-
 /*
  * @title DisputeManager
  * @dev Provides a way to align the incentives of participants ensuring that query results are trustful.
@@ -23,6 +22,13 @@ contract DisputeManager is Governed {
 
     // -- Attestation --
 
+    // Receipt content sent from indexer in response to request
+    struct Receipt {
+        bytes32 requestCID;
+        bytes32 responseCID;
+        bytes32 subgraphID;
+    }
+
     // Attestation sent from indexer in response to a request
     struct Attestation {
         bytes32 requestCID;
@@ -215,14 +221,19 @@ contract DisputeManager is Governed {
      * @param _receipt Receipt returned by indexer and submitted by fisherman
      * @return Message hash used to sign the receipt
      */
-    function encodeHashReceipt(bytes memory _receipt) public view returns (bytes32) {
+    function encodeHashReceipt(Receipt memory _receipt) public view returns (bytes32) {
         return
             keccak256(
                 abi.encodePacked(
                     "\x19\x01", // EIP-191 encoding pad, EIP-712 version 1
                     DOMAIN_SEPARATOR,
                     keccak256(
-                        abi.encode(RECEIPT_TYPE_HASH, _receipt) // EIP 712-encoded message hash
+                        abi.encode(
+                            RECEIPT_TYPE_HASH,
+                            _receipt.requestCID,
+                            _receipt.responseCID,
+                            _receipt.subgraphID
+                        ) // EIP 712-encoded message hash
                     )
                 )
             );
@@ -292,11 +303,15 @@ contract DisputeManager is Governed {
     {
         address fisherman = msg.sender;
 
+        // Ensure that fisherman has staked at least the minimum amount
+        require(_deposit >= minimumDeposit, "Dispute deposit is under minimum required");
+
         // Transfer tokens to deposit from fisherman to this contract
         require(
             token.transferFrom(fisherman, address(this), _deposit),
             "Cannot transfer tokens to deposit"
         );
+
         // Create a dispute using the received attestation and deposit
         _createDispute(fisherman, _deposit, _attestationData);
     }
@@ -424,9 +439,6 @@ contract DisputeManager is Governed {
         // This also validates that indexer exists
         require(staking.hasStake(indexer), "Dispute has no stake by the indexer");
 
-        // Ensure that fisherman has staked at least the minimum amount
-        require(_deposit >= minimumDeposit, "Dispute deposit is under minimum required");
-
         // A fisherman can only open one dispute for a given indexer / subgraphID at a time
         require(!isDisputeCreated(disputeID), "Dispute already created"); // Must be empty
 
@@ -450,7 +462,7 @@ contract DisputeManager is Governed {
      */
     function _recoverAttestationSigner(Attestation memory _attestation) private view returns (address) {
         // Obtain the hash of the fully-encoded message, per EIP-712 encoding
-        bytes memory receipt = abi.encode(
+        Receipt memory receipt = Receipt(
             _attestation.requestCID,
             _attestation.responseCID,
             _attestation.subgraphID