fix: addressed provision config PR feedback

Author: juanmardefago

schema.graphql

@@ -274,10 +274,10 @@ type GraphAccount @entity {
   # Operator info
   "Operator of other Graph Accounts"
   operatorOf: [GraphAccount!]! @derivedFrom(field: "operators")
-  "Operators of this Graph Accounts"
+  "Operators of this Graph Account"
   operators: [GraphAccount!]!
-  "Operators of this Graph Accounts"
-  provisionedOperators: [Operator!]!
+  "Horizon Operators of this Graph Account"
+  horizonOperators: [HorizonOperator!]!
 
   # GRT info
   "Graph token balance"
@@ -843,11 +843,11 @@ type IndexerQueryFeePaymentAggregation @entity {
   paymentSource: PaymentSource!
 }
 
-type Operator @entity {
+type HorizonOperator @entity {
   "Joint address of all 3 parties involved (Operator, Indexer, DataService)"
   id: ID!
 
-  operatorOf: [GraphAccount!]! @derivedFrom(field: "provisionedOperators")
+  operatorOf: [GraphAccount!]! @derivedFrom(field: "horizonOperators")
 
   operator: GraphAccount!
 
@@ -908,7 +908,7 @@ type Provision @entity {
   "Pending value for thawingPeriod. Verifier needs to accept it before it becomes active"
   thawingPeriodPending: BigInt!
 
-  # Cuts for subgraph service. Percentage of rewards that the delegation pool receives
+  # Percentage of rewards/fees that the delegation pool receives
   "Raw query fee cut. In Horizon this is amount of query fees that the delegation pool receives in PPM"
   queryFeeCut: BigInt!
 
@@ -965,12 +965,6 @@ type Provision @entity {
   rewardsDestination: Bytes
 }
 
-enum PaymentTypes {
-    QueryFee,
-    IndexingFee,
-    IndexingRewards
-}
-
 type ThawRequest @entity {
   id: ID!
 

src/mappings/helpers/helpers.ts

@@ -28,7 +28,7 @@ import {
   IndexerQueryFeePaymentAggregation,
   Provision,
   DataService,
-  Operator,
+  HorizonOperator,
 } from '../../types/schema'
 import {
   SubgraphDeploymentManifest as SubgraphDeploymentManifestTemplate
@@ -243,19 +243,19 @@ export function createOrLoadDataService(verifierAddress: Bytes): DataService {
   return service as DataService
 }
 
-export function createOrLoadOperator(address: Bytes, verifierAddress: Bytes, indexerAddress: Bytes): Operator {
+export function createOrLoadHorizonOperator(address: Bytes, verifierAddress: Bytes, indexerAddress: Bytes): HorizonOperator {
   let id = joinID([address.toHexString(), indexerAddress.toHexString(), verifierAddress.toHexString()])
-  let operator = Operator.load(id)
+  let operator = HorizonOperator.load(id)
   if (operator == null) {
-    operator = new Operator(id)
+    operator = new HorizonOperator(id)
     operator.allowed = false
     operator.operator = address.toHexString()
     operator.indexer = indexerAddress.toHexString()
     operator.dataService = verifierAddress.toHexString()
     operator.save()
   }
 
-  return operator as Operator
+  return operator as HorizonOperator
 }
 
 export function createOrLoadPaymentSource(paymentAddress: Bytes): PaymentSource {
@@ -529,7 +529,7 @@ export function createOrLoadGraphAccount(owner: Bytes, timeStamp: BigInt): Graph
     graphAccount = new GraphAccount(id)
     graphAccount.createdAt = timeStamp.toI32()
     graphAccount.operators = []
-    graphAccount.provisionedOperators = []
+    graphAccount.horizonOperators = []
     graphAccount.balance = BigInt.fromI32(0)
     graphAccount.balanceReceivedFromL1Signalling = BigInt.fromI32(0)
     graphAccount.balanceReceivedFromL1Delegation = BigInt.fromI32(0)

src/mappings/horizonStaking.ts

@@ -2,7 +2,7 @@ import { BigInt } from '@graphprotocol/graph-ts'
 import { addresses } from '../../config/addresses'
 import { DelegatedTokensWithdrawn, DelegationFeeCutSet, DelegationSlashed, HorizonStakeDeposited, HorizonStakeLocked, HorizonStakeWithdrawn, OperatorSet, StakeDelegatedWithdrawn, TokensDelegated, TokensDeprovisioned, TokensToDelegationPoolAdded, TokensUndelegated } from '../types/HorizonStaking/HorizonStaking'
 import { DelegatedStake, Delegator, Indexer, Provision, ThawRequest } from '../types/schema'
-import { calculateCapacities, createOrLoadDataService, createOrLoadDelegatedStake, createOrLoadDelegatedStakeForProvision, createOrLoadDelegator, createOrLoadEpoch, createOrLoadGraphAccount, createOrLoadGraphNetwork, createOrLoadIndexer, createOrLoadOperator, createOrLoadProvision, joinID, updateAdvancedIndexerMetrics, updateAdvancedProvisionMetrics, updateDelegationExchangeRate, updateDelegationExchangeRateForProvision } from './helpers/helpers'
+import { calculateCapacities, createOrLoadDataService, createOrLoadDelegatedStake, createOrLoadDelegatedStakeForProvision, createOrLoadDelegator, createOrLoadEpoch, createOrLoadGraphAccount, createOrLoadGraphNetwork, createOrLoadHorizonOperator, createOrLoadIndexer, createOrLoadProvision, joinID, updateAdvancedIndexerMetrics, updateAdvancedProvisionMetrics, updateDelegationExchangeRate, updateDelegationExchangeRateForProvision } from './helpers/helpers'
 import {
     ProvisionCreated,
     ProvisionIncreased,
@@ -172,9 +172,9 @@ export function handleProvisionParametersStaged(event: ProvisionParametersStaged
 
 export function handleOperatorSet(event: OperatorSet): void {
     let indexerGraphAccount = createOrLoadGraphAccount(event.params.serviceProvider, event.block.timestamp)
-    let operator = createOrLoadOperator(event.params.operator, event.params.verifier, event.params.serviceProvider)
+    let operator = createOrLoadHorizonOperator(event.params.operator, event.params.verifier, event.params.serviceProvider)
     let operators = indexerGraphAccount.operators
-    // Will have to handle legacy operators list, and horizon provisionedOperators list for extra context
+    // Will have to handle legacy operators list, and horizon horizonOperators list for extra context
     let operatorsIndex = operators.indexOf(event.params.operator.toHexString())
     if (operatorsIndex != -1) {
         // false - it existed, and we set it to false, so remove from operators
@@ -190,12 +190,12 @@ export function handleOperatorSet(event: OperatorSet): void {
         }
     }
 
-    let provisionedOperators = indexerGraphAccount.provisionedOperators
-    let provisionedOperatorsIndex = provisionedOperators.indexOf(event.params.operator.toHexString())
-    if (provisionedOperatorsIndex != -1) {
+    let horizonOperators = indexerGraphAccount.horizonOperators
+    let horizonOperatorsIndex = horizonOperators.indexOf(event.params.operator.toHexString())
+    if (horizonOperatorsIndex != -1) {
         // false - it existed, and we set it to false, so remove from operators and update operator
         if (!event.params.allowed) {
-            operators.splice(provisionedOperatorsIndex, 1)
+            operators.splice(horizonOperatorsIndex, 1)
         }
     } else {
         // true - it did not exist before, and we say add, so add
@@ -208,7 +208,7 @@ export function handleOperatorSet(event: OperatorSet): void {
     operator.allowed = event.params.allowed
     operator.save()
     indexerGraphAccount.operators = operators
-    indexerGraphAccount.provisionedOperators = provisionedOperators
+    indexerGraphAccount.horizonOperators = horizonOperators
     indexerGraphAccount.save()
 }
 
@@ -230,14 +230,14 @@ 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()