fix: operator and delegator fees can be set without pre existing other

entities

Signed-off-by: Tomás Migone <tomas@edgeandnode.com>

Author: tmigone

packages/subgraph/schema.graphql

@@ -228,12 +228,16 @@ type Provision @entity(immutable: false) {
 }
 
 type ProvisionFeeCut @entity(immutable: false) {
-  "Composite ID: provision-paymentType"
+  "Composite ID: serviceProvider-dataService-paymentType"
   id: Bytes!
 
   # Relationships
   "Provision this fee cut belongs to"
-  provision: Provision!
+  provision: Provision
+  "Service provider"
+  serviceProvider: ServiceProvider
+  "Data service"
+  dataService: DataService
 
   # State
   "Payment type (maps to PaymentTypes enum: 0 = QueryFee, 1 = IndexingFee, 2 = IndexingReward, ...)"
@@ -318,9 +322,9 @@ type OperatorAuthorization @entity(immutable: false) {
   "Operator that is authorized"
   operator: Operator!
   "Service provider that granted the authorization"
-  serviceProvider: ServiceProvider!
+  serviceProvider: ServiceProvider
   "Data service this authorization applies to"
-  dataService: DataService!
+  dataService: DataService
 
   # State
   "Whether the operator is currently authorized"

packages/subgraph/src/entities/provisionFeeCut.ts

@@ -31,6 +31,8 @@ export function getOrCreateProvisionFeeCut(
 
   if (entity == null) {
     entity = new ProvisionFeeCut(id)
+    entity.serviceProvider = serviceProvider
+    entity.dataService = dataService
     entity.provision = getProvisionId(serviceProvider, dataService)
     entity.paymentType = paymentType
     entity.feeCut = BIGINT_ZERO

packages/subgraph/tests/feeCut.test.ts

@@ -123,12 +123,35 @@ describe("DelegationFeeCutSet", () => {
 
     assert.entityCount("ProvisionFeeCut", 1)
     assert.fieldEquals("ProvisionFeeCut", entityId, "provision", provisionId)
+    assert.fieldEquals("ProvisionFeeCut", entityId, "serviceProvider", SP_ADDRESS.toHexString())
+    assert.fieldEquals("ProvisionFeeCut", entityId, "dataService", VERIFIER_ADDRESS.toHexString())
     assert.fieldEquals("ProvisionFeeCut", entityId, "paymentType", PAYMENT_TYPE_QUERY_FEE.toString())
     assert.fieldEquals("ProvisionFeeCut", entityId, "feeCut", feeCut.toString())
     assert.fieldEquals("ProvisionFeeCut", entityId, "updatedAtBlock", "300")
     assert.fieldEquals("ProvisionFeeCut", entityId, "updatedAt", "3000")
   })
 
+  test("creates ProvisionFeeCut without existing provision", () => {
+    // Set fee cut WITHOUT creating provision first
+    let feeCut = BigInt.fromI32(100000) // 10% in PPM
+    let event = createDelegationFeeCutSetEvent(
+      SP_ADDRESS,
+      VERIFIER_ADDRESS,
+      PAYMENT_TYPE_QUERY_FEE,
+      feeCut
+    )
+    handleDelegationFeeCutSet(event)
+
+    let entityId = getFeeCutIdString(SP_ADDRESS, VERIFIER_ADDRESS, PAYMENT_TYPE_QUERY_FEE)
+
+    // Entity should exist with serviceProvider and dataService set
+    assert.entityCount("ProvisionFeeCut", 1)
+    assert.fieldEquals("ProvisionFeeCut", entityId, "serviceProvider", SP_ADDRESS.toHexString())
+    assert.fieldEquals("ProvisionFeeCut", entityId, "dataService", VERIFIER_ADDRESS.toHexString())
+    assert.fieldEquals("ProvisionFeeCut", entityId, "paymentType", PAYMENT_TYPE_QUERY_FEE.toString())
+    assert.fieldEquals("ProvisionFeeCut", entityId, "feeCut", feeCut.toString())
+  })
+
   test("creates separate entities for different payment types", () => {
     setupServiceProviderAndProvision()
 

packages/tools/src/validation/onchain/fee-cuts.ts

@@ -18,11 +18,8 @@ import {
 
 interface ProvisionFeeCut {
   id: string
-  provision: {
-    id: string
-    serviceProvider: { id: string }
-    dataService: { id: string }
-  }
+  serviceProvider: { id: string } | null
+  dataService: { id: string } | null
   paymentType: number
   feeCut: string
 }
@@ -37,11 +34,8 @@ async function main(): Promise<number> {
     subgraphUrl,
     `{ provisionFeeCuts(first: 1000) {
       id
-      provision {
-        id
-        serviceProvider { id }
-        dataService { id }
-      }
+      serviceProvider { id }
+      dataService { id }
       paymentType
       feeCut
     } }`
@@ -55,11 +49,18 @@ async function main(): Promise<number> {
   console.log("=== Comparing ProvisionFeeCuts against on-chain state ===")
   let mismatches = 0
   let matches = 0
+  let skipped = 0
 
   for (const feeCut of feeCuts) {
+    // Skip if serviceProvider or dataService entity doesn't exist yet
+    if (!feeCut.serviceProvider || !feeCut.dataService) {
+      skipped++
+      continue
+    }
+
     const onChainFeeCut = await getDelegationFeeCut(
-      feeCut.provision.serviceProvider.id,
-      feeCut.provision.dataService.id,
+      feeCut.serviceProvider.id,
+      feeCut.dataService.id,
       feeCut.paymentType
     )
 
@@ -69,7 +70,7 @@ async function main(): Promise<number> {
     if (fieldMismatches.length > 0) {
       mismatches++
       console.log(
-        `MISMATCH: ${feeCut.provision.serviceProvider.id} -> ${feeCut.provision.dataService.id} (paymentType=${feeCut.paymentType})`
+        `MISMATCH: ${feeCut.serviceProvider.id} -> ${feeCut.dataService.id} (paymentType=${feeCut.paymentType})`
       )
       for (const m of fieldMismatches) {
         console.log(m.message)
@@ -82,6 +83,11 @@ async function main(): Promise<number> {
     await delay()
   }
 
+  if (skipped > 0) {
+    console.log(`  Skipped ${skipped} fee cuts (serviceProvider or dataService entity doesn't exist)`)
+    console.log("")
+  }
+
   // Summary
   const results: ValidationResult[] = [{ label: "ProvisionFeeCuts", total: feeCuts.length, matches, mismatches }]
   printValidationSummary(results)

packages/tools/src/validation/onchain/operators.ts

@@ -18,8 +18,8 @@ import {
 interface OperatorAuthorization {
   id: string
   operator: { id: string }
-  serviceProvider: { id: string }
-  dataService: { id: string }
+  serviceProvider: { id: string } | null
+  dataService: { id: string } | null
   allowed: boolean
 }
 
@@ -53,7 +53,14 @@ async function main(): Promise<number> {
   let mismatches = 0
   let matches = 0
 
+  let skipped = 0
   for (const auth of authorizations) {
+    // Skip if serviceProvider or dataService entity doesn't exist yet
+    if (!auth.serviceProvider || !auth.dataService) {
+      skipped++
+      continue
+    }
+
     const onChainAllowed = await isAuthorized(
       auth.serviceProvider.id,
       auth.dataService.id,
@@ -75,6 +82,11 @@ async function main(): Promise<number> {
     await delay()
   }
 
+  if (skipped > 0) {
+    console.log(`  Skipped ${skipped} authorizations (serviceProvider or dataService entity doesn't exist)`)
+    console.log("")
+  }
+
   // Summary
   const results: ValidationResult[] = [{ label: "OperatorAuthorizations", total: authorizations.length, matches, mismatches }]
   printValidationSummary(results)