Skip to content

fix(SubgraphService): use correct payment type for collect indexing rewards #1032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2024
Merged

fix(SubgraphService): use correct payment type for collect indexing rewards #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/subgraph-service/contracts/utilities/AllocationManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions packages/subgraph-service/test/subgraphService/SubgraphService.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 3 additions & 6 deletions packages/subgraph-service/test/subgraphService/collect/indexing/indexing.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down Expand Up @@ -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
);

Expand Down