fix(SubgraphService): use correct payment type for collect indexing r…

…ewards (#1032)
graphprotocol · Sep 19, 2024 · fe380e4 · fe380e4
1 parent 4354737
commit fe380e4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/packages/subgraph-service/contracts/utilities/AllocationManager.sol b/packages/subgraph-service/contracts/utilities/AllocationManager.sol
@@ -288,7 +288,7 @@ abstract contract AllocationManager is EIP712Upgradeable, GraphDirectory, Alloca
             uint256 delegatorCut = _graphStaking().getDelegationFeeCut(
                 allocation.indexer,
                 address(this),
-                IGraphPayments.PaymentTypes.IndexingFee
+                IGraphPayments.PaymentTypes.IndexingRewards
             );
             IHorizonStakingTypes.DelegationPool memory delegationPool = _graphStaking().getDelegationPool(
                 allocation.indexer,

diff --git a/packages/subgraph-service/test/subgraphService/SubgraphService.t.sol b/packages/subgraph-service/test/subgraphService/SubgraphService.t.sol
@@ -253,8 +253,7 @@ contract SubgraphServiceTest is SubgraphServiceSharedTest {
             uint256 delegatorCut = staking.getDelegationFeeCut(
                 allocation.indexer,
                 address(subgraphService),
-                // TODO: this should be fixed in AllocationManager, it should be IndexingRewards instead
-                IGraphPayments.PaymentTypes.IndexingFee
+                IGraphPayments.PaymentTypes.IndexingRewards
             );
             IHorizonStakingTypes.DelegationPool memory delegationPool = staking.getDelegationPool(allocation.indexer, address(subgraphService));
             indexingRewardsData.tokensDelegationRewards = delegationPool.shares > 0 ? paymentCollected.mulPPM(delegatorCut) : 0;

diff --git a/packages/subgraph-service/test/subgraphService/collect/indexing/indexing.t.sol b/packages/subgraph-service/test/subgraphService/collect/indexing/indexing.t.sol
@@ -32,8 +32,7 @@ contract SubgraphServiceCollectIndexingTest is SubgraphServiceTest {
         _setDelegationFeeCut(
             users.indexer,
             address(subgraphService),
-            // TODO: this should be fixed in AllocationManager, it should be IndexingRewards instead
-            IGraphPayments.PaymentTypes.IndexingFee,
+            IGraphPayments.PaymentTypes.IndexingRewards,
             delegationFeeCut
         );
         IGraphPayments.PaymentTypes paymentType = IGraphPayments.PaymentTypes.IndexingRewards;
@@ -51,8 +50,7 @@ contract SubgraphServiceCollectIndexingTest is SubgraphServiceTest {
         _setDelegationFeeCut(
             users.indexer,
             address(subgraphService),
-            // TODO: this should be fixed in AllocationManager, it should be IndexingRewards instead
-            IGraphPayments.PaymentTypes.IndexingFee,
+            IGraphPayments.PaymentTypes.IndexingRewards,
             delegationFeeCut
         );
         // Undelegate
@@ -97,8 +95,7 @@ contract SubgraphServiceCollectIndexingTest is SubgraphServiceTest {
         _setDelegationFeeCut(
             users.indexer,
             address(subgraphService),
-            // TODO: this should be fixed in AllocationManager, it should be IndexingRewards instead
-            IGraphPayments.PaymentTypes.IndexingFee,
+            IGraphPayments.PaymentTypes.IndexingRewards,
             delegationFeeCut
         );