disputes: update events and setters (#183)

* disputes: improve events
* disputes: add a salt to the domain separator
* disputes: add setter for staking contract

Author: abarmat

contracts/DisputeManager.sol

@@ -1,18 +1,17 @@
 pragma solidity ^0.6.4;
 pragma experimental ABIEncoderV2;
 
-/*
- * @title Dispute management
- * @notice Provides a way to align the incentives of participants ensuring that Query Results are trustful.
- */
-
 import "./Governed.sol";
 import "./GraphToken.sol";
 import "./Staking.sol";
 import "./bytes/BytesLib.sol";
 import "@openzeppelin/contracts/cryptography/ECDSA.sol";
 
 
+/*
+ * @title DisputeManager
+ * @dev Provides a way to align the incentives of participants ensuring that query results are trustful.
+ */
 contract DisputeManager is Governed {
     using BytesLib for bytes;
     using ECDSA for bytes32;
@@ -63,6 +62,7 @@ contract DisputeManager is Governed {
     );
     bytes32 private constant DOMAIN_NAME_HASH = keccak256("Graph Protocol");
     bytes32 private constant DOMAIN_VERSION_HASH = keccak256("0.1");
+    bytes32 private constant DOMAIN_SALT = 0xa070ffb1cd7409649bf77822cce74495468e06dbfaef09556838bf188679b9c2;
     bytes32 private constant ATTESTATION_TYPE_HASH = keccak256(
         "Attestation(IpfsHash requestCID,IpfsHash responseCID,uint256 gasUsed,uint256 responseNumBytes)IpfsHash(bytes32 hash,uint16 hashFunction)"
     );
@@ -108,6 +108,7 @@ contract DisputeManager is Governed {
         bytes32 indexed subgraphID,
         address indexed indexNode,
         address indexed fisherman,
+        uint256 tokens,
         bytes attestation
     );
 
@@ -116,23 +117,23 @@ contract DisputeManager is Governed {
         bytes32 indexed subgraphID,
         address indexed indexNode,
         address indexed fisherman,
-        uint256 deposit
+        uint256 tokens
     );
 
     event DisputeRejected(
         bytes32 disputeID,
         bytes32 indexed subgraphID,
         address indexed indexNode,
         address indexed fisherman,
-        uint256 deposit
+        uint256 tokens
     );
 
     event DisputeIgnored(
         bytes32 disputeID,
         bytes32 indexed subgraphID,
         address indexed indexNode,
         address indexed fisherman,
-        uint256 deposit
+        uint256 tokens
     );
 
     modifier onlyArbitrator {
@@ -173,7 +174,8 @@ contract DisputeManager is Governed {
                 DOMAIN_NAME_HASH,
                 DOMAIN_VERSION_HASH,
                 _getChainID(),
-                address(this)
+                address(this),
+                DOMAIN_SALT
             )
         );
     }
@@ -267,6 +269,15 @@ contract DisputeManager is Governed {
         slashingPercentage = _percentage;
     }
 
+    /**
+     * @dev Set the staking contract used for slashing
+     * @notice Update the staking contract to `_staking`
+     * @param _staking Address of the staking contract
+     */
+    function setStaking(Staking _staking) external onlyGovernor {
+        staking = _staking;
+    }
+
     /**
      * @dev Accept tokens
      * @notice Receive Graph tokens
@@ -418,7 +429,7 @@ contract DisputeManager is Governed {
         // Store dispute
         disputes[disputeID] = Dispute(_subgraphID, indexNode, _fisherman, _deposit);
 
-        emit DisputeCreated(disputeID, _subgraphID, indexNode, _fisherman, _attestation);
+        emit DisputeCreated(disputeID, _subgraphID, indexNode, _fisherman, _deposit, _attestation);
     }
 
     /**

test/disputes.test.js

@@ -72,6 +72,31 @@ contract('Disputes', ([me, other, governor, arbitrator, indexNode, fisherman]) =
       })
     })
 
+    describe('minimumDeposit', function() {
+      it('should set `minimumDeposit`', async function() {
+        const minimumDeposit = defaults.dispute.minimumDeposit
+        const newMinimumDeposit = web3.utils.toBN(1)
+
+        // Set right in the constructor
+        expect(await this.disputeManager.minimumDeposit()).to.be.bignumber.eq(minimumDeposit)
+
+        // Set new value
+        await this.disputeManager.setMinimumDeposit(newMinimumDeposit, {
+          from: governor,
+        })
+        expect(await this.disputeManager.minimumDeposit()).to.be.bignumber.eq(newMinimumDeposit)
+      })
+
+      it('reject set `minimumDeposit` if not allowed', async function() {
+        await expectRevert(
+          this.disputeManager.setMinimumDeposit(defaults.dispute.minimumDeposit, {
+            from: other,
+          }),
+          'Only Governor can call',
+        )
+      })
+    })
+
     describe('rewardPercentage', function() {
       it('should set `rewardPercentage`', async function() {
         const rewardPercentage = defaults.dispute.rewardPercentage
@@ -140,24 +165,19 @@ contract('Disputes', ([me, other, governor, arbitrator, indexNode, fisherman]) =
       })
     })
 
-    describe('minimumDeposit', function() {
-      it('should set `minimumDeposit`', async function() {
-        const minimumDeposit = defaults.dispute.minimumDeposit
-        const newMinimumDeposit = web3.utils.toBN(1)
-
+    describe('staking', function() {
+      it('should set `staking`', async function() {
         // Set right in the constructor
-        expect(await this.disputeManager.minimumDeposit()).to.be.bignumber.eq(minimumDeposit)
+        expect(await this.disputeManager.staking()).to.eq(this.staking.address)
 
-        // Set new value
-        await this.disputeManager.setMinimumDeposit(newMinimumDeposit, {
-          from: governor,
-        })
-        expect(await this.disputeManager.minimumDeposit()).to.be.bignumber.eq(newMinimumDeposit)
+        // Can set if allowed
+        await this.disputeManager.setStaking(this.graphToken.address, { from: governor })
+        expect(await this.disputeManager.staking()).to.eq(this.graphToken.address)
       })
 
-      it('reject set `minimumDeposit` if not allowed', async function() {
+      it('reject set `staking` if not allowed', async function() {
         await expectRevert(
-          this.disputeManager.setMinimumDeposit(defaults.dispute.minimumDeposit, {
+          this.disputeManager.setStaking(this.graphToken.address, {
             from: other,
           }),
           'Only Governor can call',
@@ -302,6 +322,7 @@ contract('Disputes', ([me, other, governor, arbitrator, indexNode, fisherman]) =
             subgraphID: this.subgraphId,
             indexNode: indexNode,
             fisherman: fisherman,
+            tokens: this.tokensForFisherman,
             attestation: this.dispute.attestation,
           })
         })
@@ -429,7 +450,7 @@ contract('Disputes', ([me, other, governor, arbitrator, indexNode, fisherman]) =
               subgraphID: this.subgraphId,
               indexNode: indexNode,
               fisherman: fisherman,
-              deposit: deposit.add(reward),
+              tokens: deposit.add(reward),
             })
           })
         })
@@ -477,7 +498,7 @@ contract('Disputes', ([me, other, governor, arbitrator, indexNode, fisherman]) =
               subgraphID: this.subgraphId,
               indexNode: indexNode,
               fisherman: fisherman,
-              deposit: this.tokensForFisherman,
+              tokens: this.tokensForFisherman,
             })
           })
         })
@@ -520,7 +541,7 @@ contract('Disputes', ([me, other, governor, arbitrator, indexNode, fisherman]) =
               subgraphID: this.subgraphId,
               indexNode: indexNode,
               fisherman: fisherman,
-              deposit: this.tokensForFisherman,
+              tokens: this.tokensForFisherman,
             })
           })
         })

test/lib/attestation.js

@@ -46,12 +46,13 @@ function createDomainSeparatorHash(contractAddress) {
   )
   const domainNameHash = web3.utils.sha3('Graph Protocol')
   const domainVersionHash = web3.utils.sha3('0.1')
+  const domainSalt = '0xa070ffb1cd7409649bf77822cce74495468e06dbfaef09556838bf188679b9c2'
 
   // ABI encoded
   return web3.utils.sha3(
     web3.eth.abi.encodeParameters(
-      ['bytes32', 'bytes32', 'bytes32', 'uint256', 'address'],
-      [domainTypeHash, domainNameHash, domainVersionHash, chainId, contractAddress],
+      ['bytes32', 'bytes32', 'bytes32', 'uint256', 'address', 'bytes32'],
+      [domainTypeHash, domainNameHash, domainVersionHash, chainId, contractAddress, domainSalt],
     ),
   )
 }