Merge pull request #1075 from graphprotocol/tmigone/trust-fixes-dispu…

…te-manager
graphprotocol · Dec 17, 2024 · a228e0e · a228e0e
2 parents 2fbe0e1 + 8aa05c4
commit a228e0e
Show file tree

Hide file tree

Showing 13 changed files with 750 additions and 210 deletions.
diff --git a/packages/subgraph-service/contracts/DisputeManager.sol b/packages/subgraph-service/contracts/DisputeManager.sol
diff --git a/packages/subgraph-service/contracts/interfaces/IDisputeManager.sol b/packages/subgraph-service/contracts/interfaces/IDisputeManager.sol
@@ -169,6 +169,8 @@ interface IDisputeManager {
     error DisputeManagerDisputeNotPending(IDisputeManager.DisputeStatus status);
     error DisputeManagerDisputeAlreadyCreated(bytes32 disputeId);
     error DisputeManagerDisputePeriodNotFinished();
+    error DisputeManagerDisputeInConflict(bytes32 disputeId);
+    error DisputeManagerDisputeNotInConflict(bytes32 disputeId);
     error DisputeManagerMustAcceptRelatedDispute(bytes32 disputeId, bytes32 relatedDisputeId);
     error DisputeManagerIndexerNotFound(address allocationId);
     error DisputeManagerNonMatchingSubgraphDeployment(bytes32 subgraphDeploymentId1, bytes32 subgraphDeploymentId2);
@@ -180,6 +182,7 @@ interface IDisputeManager {
         bytes32 responseCID2,
         bytes32 subgraphDeploymentId2
     );
+    error DisputeManagerSubgraphServiceNotSet();
 
     function setDisputePeriod(uint64 disputePeriod) external;
 
@@ -204,6 +207,13 @@ interface IDisputeManager {
 
     function acceptDispute(bytes32 disputeId, uint256 tokensSlash) external;
 
+    function acceptDisputeConflict(
+        bytes32 disputeId,
+        uint256 tokensSlash,
+        bool acceptDisputeInConflict,
+        uint256 tokensSlashRelated
+    ) external;
+
     function rejectDispute(bytes32 disputeId) external;
 
     function drawDispute(bytes32 disputeId) external;

diff --git a/packages/subgraph-service/test/disputeManager/DisputeManager.t.sol b/packages/subgraph-service/test/disputeManager/DisputeManager.t.sol
diff --git a/packages/subgraph-service/test/disputeManager/disputes/indexing/accept.t.sol b/packages/subgraph-service/test/disputeManager/disputes/indexing/accept.t.sol
@@ -27,6 +27,36 @@ contract DisputeManagerIndexingAcceptDisputeTest is DisputeManagerTest {
         _acceptDispute(disputeID, tokensSlash);
     }
 
+    function test_Indexing_Accept_Dispute_RevertWhen_SubgraphServiceNotSet(
+        uint256 tokens,
+        uint256 tokensSlash
+    ) public useIndexer useAllocation(tokens) {
+        tokensSlash = bound(tokensSlash, 1, uint256(maxSlashingPercentage).mulPPM(tokens));
+
+        resetPrank(users.fisherman);
+        bytes32 disputeID = _createIndexingDispute(allocationID, bytes32("POI1"));
+
+        resetPrank(users.arbitrator);
+        // clear subgraph service address from storage
+        _setStorage_SubgraphService(address(0));
+
+        vm.expectRevert(abi.encodeWithSelector(IDisputeManager.DisputeManagerSubgraphServiceNotSet.selector));
+        disputeManager.acceptDispute(disputeID, tokensSlash);
+    }
+
+    function test_Indexing_Accept_Dispute_OptParam(
+        uint256 tokens,
+        uint256 tokensSlash
+    ) public useIndexer useAllocation(tokens) {
+        tokensSlash = bound(tokensSlash, 1, uint256(maxSlashingPercentage).mulPPM(tokens));
+
+        resetPrank(users.fisherman);
+        bytes32 disputeID = _createIndexingDispute(allocationID, bytes32("POI1"));
+
+        resetPrank(users.arbitrator);
+        _acceptDispute(disputeID, tokensSlash);
+    }
+
     function test_Indexing_Accept_RevertIf_CallerIsNotArbitrator(
         uint256 tokens,
         uint256 tokensSlash

diff --git a/packages/subgraph-service/test/disputeManager/disputes/indexing/create.t.sol b/packages/subgraph-service/test/disputeManager/disputes/indexing/create.t.sol
@@ -7,16 +7,28 @@ import { IDisputeManager } from "../../../../contracts/interfaces/IDisputeManage
 import { DisputeManagerTest } from "../../DisputeManager.t.sol";
 
 contract DisputeManagerIndexingCreateDisputeTest is DisputeManagerTest {
-
     /*
      * TESTS
      */
 
-    function test_Indexing_Create_Dispute(
+    function test_Indexing_Create_Dispute(uint256 tokens) public useIndexer useAllocation(tokens) {
+        resetPrank(users.fisherman);
+        _createIndexingDispute(allocationID, bytes32("POI1"));
+    }
+
+    function test_Indexing_Create_Dispute_RevertWhen_SubgraphServiceNotSet(
         uint256 tokens
     ) public useIndexer useAllocation(tokens) {
         resetPrank(users.fisherman);
-        _createIndexingDispute(allocationID, bytes32("POI1"));
+
+        // clear subgraph service address from storage
+        _setStorage_SubgraphService(address(0));
+
+        // // Approve the dispute deposit
+        token.approve(address(disputeManager), disputeDeposit);
+
+        vm.expectRevert(abi.encodeWithSelector(IDisputeManager.DisputeManagerSubgraphServiceNotSet.selector));
+        disputeManager.createIndexingDispute(allocationID, bytes32("POI2"));
     }
 
     function test_Indexing_Create_MultipleDisputes() public {
@@ -33,7 +45,12 @@ contract DisputeManagerIndexingCreateDisputeTest is DisputeManagerTest {
             _createProvision(indexer, tokens, maxSlashingPercentage, disputePeriod);
             _register(indexer, abi.encode("url", "geoHash", address(0)));
             uint256 allocationIDPrivateKey = uint256(keccak256(abi.encodePacked(i)));
-            bytes memory data = _createSubgraphAllocationData(indexer, subgraphDeployment, allocationIDPrivateKey, tokens);
+            bytes memory data = _createSubgraphAllocationData(
+                indexer,
+                subgraphDeployment,
+                allocationIDPrivateKey,
+                tokens
+            );
             _startService(indexer, data);
             allocationIDPrivateKeys[i] = allocationIDPrivateKey;
         }
@@ -48,7 +65,7 @@ contract DisputeManagerIndexingCreateDisputeTest is DisputeManagerTest {
         uint256 tokens
     ) public useIndexer useAllocation(tokens) {
         resetPrank(users.fisherman);
-        bytes32 disputeID =_createIndexingDispute(allocationID, bytes32("POI1"));
+        bytes32 disputeID = _createIndexingDispute(allocationID, bytes32("POI1"));
 
         // Create another dispute with different fisherman
         address otherFisherman = makeAddr("otherFisherman");
@@ -78,9 +95,7 @@ contract DisputeManagerIndexingCreateDisputeTest is DisputeManagerTest {
         vm.stopPrank();
     }
 
-    function test_Indexing_Create_RevertIf_AllocationDoesNotExist(
-        uint256 tokens
-    ) public useFisherman {
+    function test_Indexing_Create_RevertIf_AllocationDoesNotExist(uint256 tokens) public useFisherman {
         tokens = bound(tokens, disputeDeposit, 10_000_000_000 ether);
         token.approve(address(disputeManager), tokens);
         bytes memory expectedError = abi.encodeWithSelector(
@@ -92,9 +107,7 @@ contract DisputeManagerIndexingCreateDisputeTest is DisputeManagerTest {
         vm.stopPrank();
     }
 
-    function test_Indexing_Create_RevertIf_IndexerIsBelowStake(
-        uint256 tokens
-    ) public useIndexer useAllocation(tokens) {
+    function test_Indexing_Create_RevertIf_IndexerIsBelowStake(uint256 tokens) public useIndexer useAllocation(tokens) {
         // Close allocation
         bytes memory data = abi.encode(allocationID);
         _stopService(users.indexer, data);

diff --git a/packages/subgraph-service/test/disputeManager/disputes/query/accept.t.sol b/packages/subgraph-service/test/disputeManager/disputes/query/accept.t.sol
@@ -34,6 +34,39 @@ contract DisputeManagerQueryAcceptDisputeTest is DisputeManagerTest {
         _acceptDispute(disputeID, tokensSlash);
     }
 
+    function test_Query_Accept_Dispute_RevertWhen_SubgraphServiceNotSet(
+        uint256 tokens,
+        uint256 tokensSlash
+    ) public useIndexer useAllocation(tokens) {
+        tokensSlash = bound(tokensSlash, 1, uint256(maxSlashingPercentage).mulPPM(tokens));
+
+        resetPrank(users.fisherman);
+        Attestation.Receipt memory receipt = _createAttestationReceipt(requestCID, responseCID, subgraphDeploymentId);
+        bytes memory attestationData = _createAtestationData(receipt, allocationIDPrivateKey);
+        bytes32 disputeID = _createQueryDispute(attestationData);
+
+        resetPrank(users.arbitrator);
+        // clear subgraph service address from storage
+        _setStorage_SubgraphService(address(0));
+        vm.expectRevert(abi.encodeWithSelector(IDisputeManager.DisputeManagerSubgraphServiceNotSet.selector));
+        disputeManager.acceptDispute(disputeID, tokensSlash);
+    }
+
+    function test_Query_Accept_Dispute_OptParam(
+        uint256 tokens,
+        uint256 tokensSlash
+    ) public useIndexer useAllocation(tokens) {
+        tokensSlash = bound(tokensSlash, 1, uint256(maxSlashingPercentage).mulPPM(tokens));
+
+        resetPrank(users.fisherman);
+        Attestation.Receipt memory receipt = _createAttestationReceipt(requestCID, responseCID, subgraphDeploymentId);
+        bytes memory attestationData = _createAtestationData(receipt, allocationIDPrivateKey);
+        bytes32 disputeID = _createQueryDispute(attestationData);
+
+        resetPrank(users.arbitrator);
+        _acceptDispute(disputeID, tokensSlash);
+    }
+
     function test_Query_Accept_RevertIf_CallerIsNotArbitrator(
         uint256 tokens,
         uint256 tokensSlash
@@ -72,4 +105,23 @@ contract DisputeManagerQueryAcceptDisputeTest is DisputeManagerTest {
         vm.expectRevert(expectedError);
         disputeManager.acceptDispute(disputeID, tokensSlash);
     }
+
+    function test_Query_Accept_RevertWhen_UsingConflictAccept(
+        uint256 tokens,
+        uint256 tokensSlash
+    ) public useIndexer useAllocation(tokens) {
+        tokensSlash = bound(tokensSlash, 1, uint256(maxSlashingPercentage).mulPPM(tokens));
+
+        resetPrank(users.fisherman);
+        Attestation.Receipt memory receipt = _createAttestationReceipt(requestCID, responseCID, subgraphDeploymentId);
+        bytes memory attestationData = _createAtestationData(receipt, allocationIDPrivateKey);
+        bytes32 disputeID = _createQueryDispute(attestationData);
+
+        resetPrank(users.arbitrator);
+        vm.expectRevert(abi.encodeWithSelector(
+            IDisputeManager.DisputeManagerDisputeNotInConflict.selector,
+            disputeID
+        ));
+        disputeManager.acceptDisputeConflict(disputeID, tokensSlash, true, 0);
+    }
 }
diff --git a/packages/subgraph-service/test/disputeManager/disputes/query/create.t.sol b/packages/subgraph-service/test/disputeManager/disputes/query/create.t.sol
@@ -17,13 +17,28 @@ contract DisputeManagerQueryCreateDisputeTest is DisputeManagerTest {
      * TESTS
      */
 
-    function test_Query_Create_Dispute(uint256 tokens) public useIndexer useAllocation(tokens) {
+    function test_Query_Create_Dispute_Only(uint256 tokens) public useIndexer useAllocation(tokens) {
         resetPrank(users.fisherman);
         Attestation.Receipt memory receipt = _createAttestationReceipt(requestCID, responseCID, subgraphDeploymentId);
         bytes memory attestationData = _createAtestationData(receipt, allocationIDPrivateKey);
         _createQueryDispute(attestationData);
     }
 
+    function test_Query_Create_Dispute_RevertWhen_SubgraphServiceNotSet(uint256 tokens) public useIndexer useAllocation(tokens) {
+        resetPrank(users.fisherman);
+        Attestation.Receipt memory receipt = _createAttestationReceipt(requestCID, responseCID, subgraphDeploymentId);
+        bytes memory attestationData = _createAtestationData(receipt, allocationIDPrivateKey);
+
+        // clear subgraph service address from storage
+        _setStorage_SubgraphService(address(0));
+
+        // // Approve the dispute deposit
+        token.approve(address(disputeManager), disputeDeposit);
+
+        vm.expectRevert(abi.encodeWithSelector(IDisputeManager.DisputeManagerSubgraphServiceNotSet.selector));
+        disputeManager.createQueryDispute(attestationData);
+    }
+
     function test_Query_Create_MultipleDisputes_DifferentFisherman(
         uint256 tokens
     ) public useIndexer useAllocation(tokens) {