fix: address gh pr feedback

Author: juanmardefago

schema.graphql

@@ -246,6 +246,9 @@ type DataService @entity {
   "Total GRT currently in allocations for this DataService"
   totalTokensAllocated: BigInt!
 
+  "Ratio of max staked delegation tokens to indexers stake that earns rewards"
+  delegationRatio: Int
+
   provisions: [Provision!]! @derivedFrom(field: "dataService")
 }
 
@@ -867,6 +870,10 @@ type Provision @entity {
 
   tokensAllocated: BigInt!
 
+  tokensSlashedServiceProvider: BigInt!
+  
+  tokensSlashedDelegationPool: BigInt!
+
   totalAllocationCount: BigInt!
 
   allocationCount: Int!
@@ -904,7 +911,7 @@ type Provision @entity {
 
   "The percent of indexing rewards generated by the delegated stake that the Indexer keeps for itself"
   indexingRewardEffectiveCut: BigDecimal!
-  "The percent of query rebate rewards generated by the delegated stake that the Indexer keeps for itself"
+  "The percent of query fees generated by the delegated stake that the Indexer keeps for itself"
   queryFeeEffectiveCut: BigDecimal!
   "The percent of reward dilution delegators experience because of overdelegation. Overdelegated stake can't be used to generate rewards but still gets accounted while distributing the generated rewards. This causes dilution of the rewards for the rest of the pool."
   overDelegationDilution: BigDecimal!
@@ -934,11 +941,11 @@ type Provision @entity {
   delegatorShares: BigInt!
   "Exchange rate of of tokens received for each share"
   delegationExchangeRate: BigDecimal!
-  "Ratio between the amount of the indexers own stake over the total usable stake."
+  "Ratio between the amount of the indexers own stake over the total usable stake (capped by the delegationRatio)."
   ownStakeRatio: BigDecimal!
-  "Ratio between the amount of delegated stake over the total usable stake."
+  "Ratio between the amount of delegated stake over the total usable stake (capped by the delegationRatio)."
   delegatedStakeRatio: BigDecimal!
-  "Percentage of indexers' own rewards received in relation to its own stake. 1 (100%) means that the indexer is receiving the exact amount that is generated by his own stake"
+  "Percentage of indexers' own rewards received in relation to its own stake. 1 (100%) means that the indexer is receiving the exact amount that is generated by his own stake, the value can be over 100% or below depending on the amount of delegation and cuts set"
   indexerRewardsOwnGenerationRatio: BigDecimal!
 
   "Service registry URL for the indexer"

src/mappings/helpers/helpers.ts

@@ -202,6 +202,8 @@ export function createOrLoadProvision(indexerAddress: Bytes, verifierAddress: By
     provision.dataService = verifierAddress.toHexString()
     provision.tokensProvisioned = BigInt.fromI32(0)
     provision.tokensAllocated = BigInt.fromI32(0)
+    provision.tokensSlashedServiceProvider = BigInt.fromI32(0)
+    provision.tokensSlashedDelegationPool = BigInt.fromI32(0)
     provision.totalAllocationCount = BigInt.fromI32(0)
     provision.allocationCount = 0
     provision.tokensThawing = BigInt.fromI32(0)
@@ -993,18 +995,21 @@ export function calculateQueryFeeEffectiveCutForProvision(provision: Provision):
 }
 
 export function calculateIndexerRewardOwnGenerationRatioForProvision(provision: Provision): BigDecimal {
-  let rewardCut =
+  let delegatorCut =
     provision.indexingRewardsCut.toBigDecimal() / BigDecimal.fromString('1000000')
   return provision.ownStakeRatio == BigDecimal.fromString('0')
     ? BigDecimal.fromString('0')
-    : rewardCut / provision.ownStakeRatio
+    : (BigDecimal.fromString('1') - delegatorCut) / provision.ownStakeRatio
 }
 
 export function calculateOverdelegationDilutionForProvision(provision: Provision): BigDecimal {
   let provisionedTokensBD = provision.tokensProvisioned.toBigDecimal()
   let delegatedTokensBD = provision.delegatedTokens.toBigDecimal()
-  let graphNetwork = GraphNetwork.load('1')!
-  let delegationRatioBD = BigInt.fromI32(graphNetwork.delegationRatio).toBigDecimal()
+  let dataService = DataService.load(provision.dataService)!
+  if (dataService.delegationRatio == null) {
+    return BigDecimal.fromString('0')
+  }
+  let delegationRatioBD = BigInt.fromI32(dataService.delegationRatio).toBigDecimal()
   let maxDelegatedStake = provisionedTokensBD * delegationRatioBD
   return provisionedTokensBD == BigDecimal.fromString('0')
     ? BigDecimal.fromString('0')

src/mappings/horizonStaking.ts

@@ -230,15 +230,16 @@ export function handleProvisionSlashed(event: ProvisionSlashed): void {
     indexer.provisionedTokens = indexer.provisionedTokens.minus(event.params.tokens)
     indexer.stakedTokens = indexer.stakedTokens.minus(event.params.tokens)
     indexer.save()
-
+    
     dataService.totalTokensProvisioned = dataService.totalTokensProvisioned.minus(event.params.tokens)
     dataService.save()
-
+    
     graphNetwork.totalTokensProvisioned = graphNetwork.totalTokensProvisioned.minus(event.params.tokens)
     graphNetwork.totalTokensStaked = graphNetwork.totalTokensStaked.minus(event.params.tokens)
     graphNetwork.save()
-
+    
     provision.tokensProvisioned = provision.tokensProvisioned.minus(event.params.tokens)
+    provision.tokensSlashedServiceProvider = provision.tokensSlashedServiceProvider.plus(event.params.tokens)
     provision.save()
 }
 
@@ -366,6 +367,7 @@ export function handleDelegationSlashed(event: DelegationSlashed): void {
     // update provision
     let provision = createOrLoadProvision(event.params.serviceProvider, event.params.verifier, event.block.timestamp)
     provision.delegatedTokens = provision.delegatedTokens.minus(event.params.tokens)
+    provision.tokensSlashedDelegationPool = provision.tokensSlashedDelegationPool.plus(event.params.tokens)
     if (provision.delegatorShares != BigInt.fromI32(0)) {
         provision = updateDelegationExchangeRateForProvision(provision as Provision)
     }

src/mappings/subgraphService.ts

@@ -1,6 +1,6 @@
 import { BigDecimal, BigInt, ethereum, log } from "@graphprotocol/graph-ts"
-import { AllocationClosed, AllocationCreated, AllocationResized, IndexingRewardsCollected, QueryFeesCollected, RewardsDestinationSet, ServiceProviderRegistered } from "../types/SubgraphService/SubgraphService"
-import { batchUpdateSubgraphSignalledTokens, calculatePricePerShare, createOrLoadEpoch, createOrLoadGraphNetwork, createOrLoadIndexerQueryFeePaymentAggregation, createOrLoadPaymentSource, createOrLoadProvision, createOrLoadSubgraphDeployment, joinID, updateDelegationExchangeRate } from "./helpers/helpers"
+import { AllocationClosed, AllocationCreated, AllocationResized, DelegationRatioSet, IndexingRewardsCollected, QueryFeesCollected, RewardsDestinationSet, ServiceProviderRegistered } from "../types/SubgraphService/SubgraphService"
+import { batchUpdateSubgraphSignalledTokens, calculatePricePerShare, createOrLoadDataService, createOrLoadEpoch, createOrLoadGraphNetwork, createOrLoadIndexerQueryFeePaymentAggregation, createOrLoadPaymentSource, createOrLoadProvision, createOrLoadSubgraphDeployment, joinID, updateDelegationExchangeRate } from "./helpers/helpers"
 import { Allocation, GraphAccount, Indexer, PoiSubmission, SubgraphDeployment } from "../types/schema"
 import { addresses } from "../../config/addresses"
 
@@ -23,6 +23,12 @@ export function handleRewardsDestinationSet(event: RewardsDestinationSet): void
     provision.save()
 }
 
+export function handleDelegationRatioSet(event: DelegationRatioSet): void {
+    let dataService = createOrLoadDataService(event.address)
+    dataService.delegationRatio = event.params.ratio
+    dataService.save()
+}
+
 export function handleAllocationCreated(event: AllocationCreated): void {
     let graphNetwork = createOrLoadGraphNetwork(event.block.number, event.address)
     let subgraphDeploymentID = event.params.subgraphDeploymentId.toHexString()

subgraph.template.yaml

@@ -473,6 +473,8 @@ dataSources:
           handler: handleIndexingRewardsCollected
         - event: QueryFeesCollected(indexed address,indexed address,indexed address,bytes32,uint256,uint256)
           handler: handleQueryFeesCollected
+        - event: DelegationRatioSet(uint32)
+          handler: handleDelegationRatioSet
   - kind: ethereum/contract
     name: GraphPayments
     network: {{network}}