fix: operator check in closeAllocation (TRST-M12)

graphprotocol · Dec 4, 2024 · 07ef418 · 07ef418
1 parent 91cda56
commit 07ef418
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/packages/horizon/contracts/staking/HorizonStakingExtension.sol b/packages/horizon/contracts/staking/HorizonStakingExtension.sol
@@ -443,8 +443,7 @@ contract HorizonStakingExtension is HorizonStakingBase, IHorizonStakingExtension
         // Anyone is allowed to close ONLY under two concurrent conditions
         // - After maxAllocationEpochs passed
         // - When the allocation is for non-zero amount of tokens
-        bool isIndexerOrOperator = msg.sender == alloc.indexer ||
-            isOperator(alloc.indexer, SUBGRAPH_DATA_SERVICE_ADDRESS);
+        bool isIndexerOrOperator = msg.sender == alloc.indexer || isOperator(msg.sender, alloc.indexer);
         if (epochs <= __DEPRECATED_maxAllocationEpochs || alloc.tokens == 0) {
             require(isIndexerOrOperator, "!auth");
         }

diff --git a/packages/horizon/test/staking/allocation/close.t.sol b/packages/horizon/test/staking/allocation/close.t.sol
@@ -12,6 +12,18 @@ contract HorizonStakingCloseAllocationTest is HorizonStakingTest {
 
     bytes32 internal constant _poi = keccak256("poi");
 
+    /*
+     * MODIFIERS
+     */
+
+    modifier useLegacyOperator() {
+        resetPrank(users.indexer);
+        _setOperator(subgraphDataServiceLegacyAddress, users.operator, true);
+        vm.startPrank(users.operator);
+        _;
+        vm.stopPrank();
+    }
+
     /*
      * TESTS
      */
@@ -26,6 +38,16 @@ contract HorizonStakingCloseAllocationTest is HorizonStakingTest {
         _closeAllocation(_allocationId, _poi);
     }
 
+    function testCloseAllocation_Operator(uint256 tokens) public useLegacyOperator() useAllocation(1 ether) {
+        tokens = bound(tokens, 1, MAX_STAKING_TOKENS);
+        _createProvision(users.indexer, subgraphDataServiceLegacyAddress, tokens, 0, 0);
+
+        // Skip 15 epochs
+        vm.roll(15);
+
+        _closeAllocation(_allocationId, _poi);
+    }
+
     function testCloseAllocation_WithBeneficiaryAddress(uint256 tokens) public useIndexer useAllocation(1 ether) {
         tokens = bound(tokens, 1, MAX_STAKING_TOKENS);
         _createProvision(users.indexer, subgraphDataServiceLegacyAddress, tokens, 0, 0);