feat: added QueryFeesCollected handler with latest contract changes

Author: juanmardefago

schema.graphql

@@ -575,11 +575,12 @@ type SubgraphDeployment @entity {
   indexingDelegatorRewardAmount: BigInt!
   "Total query fees earned by this Subgraph Deployment, without curator query fees"
   queryFeesAmount: BigInt!
-  "Total query fee rebates earned from the protocol, through the rebates formula. Does not include delegation fees"
+  "Total query fee rebates earned from the protocol, through the rebates formula. Does not include delegation query fees"
   queryFeeRebates: BigInt!
   "Total curator rewards from fees"
   curatorFeeRewards: BigInt!
-  # TODO - We can add a field here for delegation fees earned when calling claim()
+  "Total query fee rebates earned from the protocol, through the rebates formula. Does not include indexer query fees"
+  delegatorsQueryFeeRebates: BigInt!
 
   # Subgraph deployment curation bonding curve
   "CURRENT signalled tokens in the bonding curve"
@@ -911,6 +912,10 @@ type Provision @entity {
   # Query fees
   "Total query fees collected. Includes the portion given to delegators"
   queryFeesCollected: BigInt!
+  "Query fee amount collected from the protocol. Does not include portion given to delegators"
+  providerQueryFees: BigInt!
+  "Query fee amount collected from the protocol for Delegators. Does not include portion taken by the provider"
+  delegatorQueryFees: BigInt!
 
   # Delegation
   "Tokens delegated to the provision"

src/mappings/helpers/helpers.ts

@@ -102,6 +102,7 @@ export function createOrLoadSubgraphDeployment(
     deployment.indexingDelegatorRewardAmount = BigInt.fromI32(0)
     deployment.queryFeesAmount = BigInt.fromI32(0)
     deployment.queryFeeRebates = BigInt.fromI32(0)
+    deployment.delegatorsQueryFeeRebates = BigInt.fromI32(0)
     deployment.curatorFeeRewards = BigInt.fromI32(0)
     deployment.signalledTokensReceivedOnL2 = BigInt.fromI32(0)
     deployment.signalledTokensSentToL2 = BigInt.fromI32(0)

src/mappings/staking.ts

@@ -673,6 +673,7 @@ export function handleRebateClaimed(event: RebateClaimed): void {
   // update subgraph deployment
   let subgraphDeployment = SubgraphDeployment.load(subgraphDeploymentID)!
   subgraphDeployment.queryFeeRebates = subgraphDeployment.queryFeeRebates.plus(event.params.tokens)
+  subgraphDeployment.delegatorsQueryFeeRebates = subgraphDeployment.delegatorsQueryFeeRebates.plus(event.params.delegationFees)
   subgraphDeployment.save()
 
   // update graph network
@@ -751,6 +752,7 @@ export function handleRebateCollected(event: RebateCollected): void {
   deployment.curatorFeeRewards = deployment.curatorFeeRewards.plus(event.params.curationFees)
   deployment.pricePerShare = calculatePricePerShare(deployment as SubgraphDeployment)
   deployment.queryFeeRebates = deployment.queryFeeRebates.plus(event.params.queryRebates)
+  deployment.delegatorsQueryFeeRebates = deployment.delegatorsQueryFeeRebates.plus(event.params.delegationRewards)
   deployment.save()
 
   batchUpdateSubgraphSignalledTokens(deployment as SubgraphDeployment)

src/mappings/subgraphService.ts

@@ -241,33 +241,49 @@ export function handleIndexingRewardsCollected(event: IndexingRewardsCollected):
 }
 
 export function handleQueryFeesCollected(event: QueryFeesCollected): void {
-    // To Do
-
     let graphNetwork = createOrLoadGraphNetwork(event.block.number, event.address)
     let subgraphDeploymentID = event.params.subgraphDeploymentId.toHexString()
     let indexerID = event.params.serviceProvider.toHexString()
     let allocationID = event.params.allocationId.toHexString()
     let paymentAddress = event.params.payer
 
-    // update indexer
-    let indexer = Indexer.load(indexerID)!
-    indexer.queryFeesCollected = indexer.queryFeesCollected.plus(event.params.tokensCollected)
-    indexer.save()
-
     // update provision
     let provision = createOrLoadProvision(event.params.serviceProvider, event.address, event.block.timestamp)
+
+    let delegationPoolQueryFees =
+        provision.delegatedTokens == BigInt.fromI32(0)
+            ? event.params.tokensCollected
+            : event.params.tokensCollected
+                .times(provision.queryFeeCut)
+                .div(BigInt.fromI32(1000000))
+    let indexerQueryFees = event.params.tokensCollected.minus(delegationPoolQueryFees)
+
     provision.queryFeesCollected = provision.queryFeesCollected.plus(event.params.tokensCollected)
+    provision.providerQueryFees = provision.providerQueryFees.plus(indexerQueryFees)
+    provision.delegatorQueryFees = provision.delegatorQueryFees.plus(delegationPoolQueryFees)
     provision.save()
 
+    // update indexer
+    let indexer = Indexer.load(indexerID)!
+    indexer.queryFeesCollected = indexer.queryFeesCollected.plus(event.params.tokensCollected)
+    indexer.queryFeeRebates = indexer.queryFeeRebates.plus(indexerQueryFees)
+    indexer.delegatorQueryFees = indexer.delegatorQueryFees.plus(delegationPoolQueryFees)
+    indexer.save()
+
     // Replicate for payment source specific aggregation
     let paymentAggregation = createOrLoadIndexerQueryFeePaymentAggregation(paymentAddress, event.params.serviceProvider)
     paymentAggregation.queryFeesCollected = paymentAggregation.queryFeesCollected.plus(event.params.tokensCollected)
+    paymentAggregation.queryFeeRebates = paymentAggregation.queryFeeRebates.plus(indexerQueryFees)
+    paymentAggregation.delegatorQueryFees = paymentAggregation.delegatorQueryFees.plus(delegationPoolQueryFees)
     paymentAggregation.save()
 
     // update allocation
     let allocation = Allocation.load(allocationID)!
     allocation.queryFeesCollected = allocation.queryFeesCollected.plus(event.params.tokensCollected)
     allocation.curatorRewards = allocation.curatorRewards.plus(event.params.tokensCurators)
+    allocation.queryFeeRebates = allocation.queryFeeRebates.plus(indexerQueryFees)
+    allocation.distributedRebates = allocation.distributedRebates.plus(event.params.tokensCollected)
+    allocation.delegationFees = allocation.delegationFees.plus(delegationPoolQueryFees)
     allocation.save()
 
     // Update epoch
@@ -277,6 +293,7 @@ export function handleQueryFeesCollected(event: QueryFeesCollected): void {
     epoch.totalQueryFees = epoch.totalQueryFees.plus(event.params.tokensCollected).plus(event.params.tokensCurators)
     epoch.queryFeesCollected = epoch.queryFeesCollected.plus(event.params.tokensCollected)
     epoch.curatorQueryFees = epoch.curatorQueryFees.plus(event.params.tokensCurators)
+    epoch.queryFeeRebates = epoch.queryFeeRebates.plus(event.params.tokensCollected)
     epoch.save()
 
     // update subgraph deployment
@@ -285,6 +302,8 @@ export function handleQueryFeesCollected(event: QueryFeesCollected): void {
     deployment.signalledTokens = deployment.signalledTokens.plus(event.params.tokensCurators)
     deployment.curatorFeeRewards = deployment.curatorFeeRewards.plus(event.params.tokensCurators)
     deployment.pricePerShare = calculatePricePerShare(deployment as SubgraphDeployment)
+    deployment.queryFeeRebates = deployment.queryFeeRebates.plus(indexerQueryFees)
+    deployment.delegatorsQueryFeeRebates = deployment.delegatorsQueryFeeRebates.plus(delegationPoolQueryFees)
     deployment.save()
 
     batchUpdateSubgraphSignalledTokens(deployment as SubgraphDeployment)
@@ -297,6 +316,12 @@ export function handleQueryFeesCollected(event: QueryFeesCollected): void {
     graphNetwork.totalCuratorQueryFees = graphNetwork.totalCuratorQueryFees.plus(
         event.params.tokensCurators,
     )
+    graphNetwork.totalIndexerQueryFeeRebates = graphNetwork.totalIndexerQueryFeeRebates.plus(
+        indexerQueryFees,
+    )
+    graphNetwork.totalDelegatorQueryFeeRebates = graphNetwork.totalDelegatorQueryFeeRebates.plus(
+        delegationPoolQueryFees,
+    )
     graphNetwork.save()
 
     // Replicate for payment source specific data
@@ -308,5 +333,11 @@ export function handleQueryFeesCollected(event: QueryFeesCollected): void {
     paymentSource.totalCuratorQueryFees = paymentSource.totalCuratorQueryFees.plus(
         event.params.tokensCurators,
     )
+    paymentSource.totalIndexerQueryFeeRebates = paymentSource.totalIndexerQueryFeeRebates.plus(
+        indexerQueryFees,
+    )
+    paymentSource.totalDelegatorQueryFeeRebates = paymentSource.totalDelegatorQueryFeeRebates.plus(
+        delegationPoolQueryFees,
+    )
     paymentSource.save()
 }