fix: poi metadata handling

Signed-off-by: Tomás Migone <[email protected]>

Author: tmigone

abis/SubgraphService.json

@@ -805,9 +805,9 @@
       },
       {
         "indexed": false,
-        "internalType": "bytes32",
-        "name": "publicPoi",
-        "type": "bytes32"
+        "internalType": "bytes",
+        "name": "poiMetadata",
+        "type": "bytes"
       },
       {
         "indexed": false,

config/localNetworkAddressScript.ts

@@ -16,8 +16,8 @@ export let addresses: Addresses = {
   controller: '{{horizon.Controller.address}}',
   graphToken: '{{horizon.L2GraphToken.address}}',
   epochManager: '{{horizon.EpochManager.address}}',
-  disputeManager: '{{subgraphService.DisputeManager.address}}',
-  horizonDisputeManager: '{{subgraphService.HorizonDisputeManager.address}}',
+  disputeManager: '{{subgraphService.LegacyDisputeManager.address}}',
+  horizonDisputeManager: '{{subgraphService.DisputeManager.address}}',
   staking: '{{horizon.HorizonStaking.address}}',
   stakingExtension: '{{horizon.HorizonStaking.address}}',
   curation: '{{horizon.L2Curation.address}}',
@@ -52,15 +52,8 @@ const main = (): void => {
     if(output.ethereumDIDRegistry == '') {
       output.ethereumDIDRegistry = '0x0000000000000000000000000000000000000000' // to avoid crashes due to bad config
     }
-    // TODO: Remove this once subgraph service scripts deploy GNS and SubgraphNFT
-    if(output.gns == '') {
-      output.gns = '0x0000000000000000000000000000000000000000' // to avoid crashes due to bad config
-    }
-    if(output.subgraphNFT == '') {
-      output.subgraphNFT = '0x0000000000000000000000000000000000000000' // to avoid crashes due to bad config
-    }
-    if(output.horizonDisputeManager == '') {
-      output.horizonDisputeManager = '0x0000000000000000000000000000000000000000' // to avoid crashes due to bad config
+    if(output.disputeManager == '') {
+      output.disputeManager = '0x0000000000000000000000000000000000000000' // to avoid crashes due to bad config
     }
     fs.writeFileSync(__dirname + '/generatedAddresses.json', JSON.stringify(output, null, 2))
   } catch (e) {

schema.graphql

@@ -1108,8 +1108,6 @@ type Allocation @entity(immutable: false) {
   poi: Bytes
   "POIs submitted when collecting payments in Horizon"
   pois: [PoiSubmission!]! @derivedFrom(field: "allocation")
-  "Public POIs submitted when collecting payments in Horizon"
-  publicPois: [PublicPoiSubmission!]! @derivedFrom(field: "allocation")
   "Number of POIs submitted for this allocation. Only available for Horizon allocations"
   poiCount: BigInt
   "Timestamp for the latest POI presentation"
@@ -1139,26 +1137,14 @@ type Allocation @entity(immutable: false) {
 
 type PoiSubmission @entity(immutable: true) {
   id: ID!
-
   allocation: Allocation!
-
   poi: Bytes!
-
-  submittedAtEpoch: Int!
-
-  presentedAtTimestamp: Int!
-}
-
-type PublicPoiSubmission @entity(immutable: true) {
-  id: ID!
-
-  allocation: Allocation!
-
   publicPoi: Bytes!
-
   submittedAtEpoch: Int!
-
   presentedAtTimestamp: Int!
+  indexingStatus: Int!
+  blockNumber: Int!
+  metadataDecoded: Boolean!
 }
 
 enum AllocationStatus {

src/mappings/gns.ts

@@ -625,14 +625,14 @@ export function handleGRTWithdrawn(event: GRTWithdrawn): void {
  *   call the contract directly to get the updated value
  */
 export function handleParameterUpdated(event: ParameterUpdated): void {
-  let parameter = event.params.param
-  let graphNetwork = createOrLoadGraphNetwork(event.block.number, event.address)
-  let gns = GNS.bind(event.address)
-
-  if (parameter == 'ownerTaxPercentage') {
-    graphNetwork.ownerTaxPercentage = gns.ownerTaxPercentage().toI32()
-  }
-  graphNetwork.save()
+  // let parameter = event.params.param
+  // let graphNetwork = createOrLoadGraphNetwork(event.block.number, event.address)
+  // let gns = GNS.bind(event.address)
+
+  // if (parameter == 'ownerTaxPercentage') {
+  //   graphNetwork.ownerTaxPercentage = gns.ownerTaxPercentage().toI32()
+  // }
+  // graphNetwork.save()
 }
 
 // - event: SubgraphPublished(indexed uint256,indexed bytes32,uint32)

src/mappings/subgraphService.ts

@@ -1,7 +1,7 @@
-import { BigDecimal, BigInt, ethereum, log } from "@graphprotocol/graph-ts"
+import { BigDecimal, BigInt, Bytes, ethereum, log } from "@graphprotocol/graph-ts"
 import { AllocationClosed, AllocationCreated, AllocationResized, CurationCutSet, DelegationRatioSet, IndexingRewardsCollected, MaxPOIStalenessSet, ProvisionTokensRangeSet, QueryFeesCollected, RewardsDestinationSet, ServiceProviderRegistered, StakeToFeesRatioSet, ThawingPeriodRangeSet, VerifierCutRangeSet } from "../types/SubgraphService/SubgraphService"
 import { batchUpdateSubgraphSignalledTokens, calculatePricePerShare, createOrLoadDataService, createOrLoadEpoch, createOrLoadGraphNetwork, createOrLoadIndexerQueryFeePaymentAggregation, createOrLoadPaymentSource, createOrLoadProvision, createOrLoadSubgraphDeployment, joinID, updateDelegationExchangeRate } from "./helpers/helpers"
-import { Allocation, PublicPoiSubmission, Indexer, PoiSubmission, SubgraphDeployment } from "../types/schema"
+import { Allocation, Indexer, PoiSubmission, SubgraphDeployment } from "../types/schema"
 import { addresses } from "../../config/addresses"
 import { tuplePrefixBytes } from "./helpers/decoder"
 import { createOrLoadIndexer } from "./helpers/helpers"
@@ -255,22 +255,40 @@ export function handleIndexingRewardsCollected(event: IndexingRewardsCollected):
     allocation.poiCount = allocation.poiCount!.plus(BigInt.fromI32(1))
     allocation.save()
 
+    // Decode poi metadata
+    let poiBlockNumber = 0
+    let poiIndexingStatus = 0 // 0 is unknown, 1 is healthy, 2 is unhealthy, 3 is failed
+    let publicPoi = Bytes.fromHexString('0x')
+    let poiMetadataDecoded = false
+    
+    let poiMetadata = ethereum.decode('(uint256,bytes32,uint8,uint8,uint256)', event.params.poiMetadata)
+    if (poiMetadata != null && poiMetadata.kind == ethereum.ValueKind.TUPLE) {
+        poiMetadataDecoded = true
+
+        let tupleData = poiMetadata.toTuple()
+        poiBlockNumber = tupleData[0].toI32()
+        publicPoi = tupleData[1].toBytes()
+        poiIndexingStatus = tupleData[2].toI32()
+        
+        // TODO: implement error code handling
+        // let errorCode = tupleData[3].toBigInt()
+        // let errorBlockNumber = tupleData[4].toBigInt()
+    } else {
+        log.error("IndexingRewardsCollected failed to decode poi metadata: {}", [event.params.poiMetadata.toHexString()])
+    }
+
     // Create PoI submission
     let poiSubmission = new PoiSubmission(joinID([event.transaction.hash.toHexString(), event.logIndex.toString()]))
     poiSubmission.allocation = allocation.id
     poiSubmission.poi = event.params.poi
+    poiSubmission.publicPoi = publicPoi
     poiSubmission.submittedAtEpoch = event.params.currentEpoch.toI32()
     poiSubmission.presentedAtTimestamp = event.block.timestamp.toI32()
+    poiSubmission.indexingStatus = poiIndexingStatus
+    poiSubmission.blockNumber = poiBlockNumber
+    poiSubmission.metadataDecoded = poiMetadataDecoded
     poiSubmission.save()
 
-    // Create public PoI submission
-    let publicPoiSubmission = new PublicPoiSubmission(joinID([event.transaction.hash.toHexString(), event.logIndex.toString()]))
-    publicPoiSubmission.allocation = allocation.id
-    publicPoiSubmission.publicPoi = event.params.publicPoi
-    publicPoiSubmission.submittedAtEpoch = event.params.currentEpoch.toI32()
-    publicPoiSubmission.presentedAtTimestamp = event.block.timestamp.toI32()
-    publicPoiSubmission.save()
-
     // Update latest POI in allocation
     allocation.poi = event.params.poi
     allocation.latestPoiPresentedAt = event.block.timestamp.toI32()

subgraph.template.yaml

@@ -477,7 +477,7 @@ dataSources:
           handler: handleAllocationResized
         - event: AllocationClosed(indexed address,indexed address,indexed bytes32,uint256,bool)
           handler: handleAllocationClosed
-        - event: IndexingRewardsCollected(indexed address,indexed address,indexed bytes32,uint256,uint256,uint256,bytes32,bytes32,uint256)
+        - event: IndexingRewardsCollected(indexed address,indexed address,indexed bytes32,uint256,uint256,uint256,bytes32,bytes,uint256)
           handler: handleIndexingRewardsCollected
         - event: QueryFeesCollected(indexed address,indexed address,indexed address,bytes32,uint256,uint256)
           handler: handleQueryFeesCollected