fix: few things about indexing rewards and pois

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

Author: tmigone

abis/SubgraphService.json

@@ -803,6 +803,12 @@
         "name": "poi",
         "type": "bytes32"
       },
+      {
+        "indexed": false,
+        "internalType": "bytes32",
+        "name": "publicPoi",
+        "type": "bytes32"
+      },
       {
         "indexed": false,
         "internalType": "uint256",

schema.graphql

@@ -1092,8 +1092,12 @@ type Allocation @entity {
   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"
+  latestPoiPresentedAt: Int
   "Whether this allocation was created in the legacy protocol. If true, the allocation will not have a provision since it's not a Horizon allocation"
   isLegacy: Boolean!
   "Whether this allocation was forced closed. Force closures in Horizon can happen when the latest PoI is stale, compared to the legacy protocol, where force closures can happen when the allocation hasn't been closed within the max amount of epochs"
@@ -1125,6 +1129,20 @@ type PoiSubmission @entity {
   poi: Bytes!
 
   submittedAtEpoch: Int!
+
+  presentedAtTimestamp: Int!
+}
+
+type PublicPoiSubmission @entity {
+  id: ID!
+
+  allocation: Allocation!
+
+  publicPoi: Bytes!
+
+  submittedAtEpoch: Int!
+
+  presentedAtTimestamp: Int!
 }
 
 enum AllocationStatus {

src/mappings/subgraphService.ts

@@ -1,7 +1,7 @@
 import { BigDecimal, BigInt, 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, GraphAccount, Indexer, PoiSubmission, SubgraphDeployment } from "../types/schema"
+import { Allocation, PublicPoiSubmission, Indexer, PoiSubmission, SubgraphDeployment } from "../types/schema"
 import { addresses } from "../../config/addresses"
 import { tuplePrefixBytes } from "./helpers/decoder"
 import { createOrLoadIndexer } from "./helpers/helpers"
@@ -260,8 +260,22 @@ export function handleIndexingRewardsCollected(event: IndexingRewardsCollected):
     poiSubmission.allocation = allocation.id
     poiSubmission.poi = event.params.poi
     poiSubmission.submittedAtEpoch = event.params.currentEpoch.toI32()
+    poiSubmission.presentedAtTimestamp = event.block.timestamp.toI32()
     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()
+    allocation.save()
+
     // Update epoch
     let epoch = createOrLoadEpoch((addresses.isL1 ? event.block.number : graphNetwork.currentL1BlockNumber!))
     epoch.totalRewards = epoch.totalRewards.plus(event.params.tokensRewards)

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,uint256)
+        - event: IndexingRewardsCollected(indexed address,indexed address,indexed bytes32,uint256,uint256,uint256,bytes32,bytes32,uint256)
           handler: handleIndexingRewardsCollected
         - event: QueryFeesCollected(indexed address,indexed address,indexed address,bytes32,uint256,uint256)
           handler: handleQueryFeesCollected