feat: on-chain acceptance fixes for DIPs recurring agreements

Three fixes that together enable end-to-end DIPs on-chain acceptance:

1. Pass SubgraphService (not HorizonStaking) to RewardsManager.getRewards
   in the allocation stakeUsageSummary call.

2. Decouple DIPs proposal acceptance from the 120s reconciliation loop
   into a dedicated 5s polling loop (startProposalAcceptanceLoop). The
   300s RCA deadline left insufficient slack with the old 240s+ latency.

3. Log full revert context (reason, data, message, contract target) when
   on-chain acceptance fails, instead of just the parsed error (which was
   null for unknown custom errors).

Test metadata version updated to 0 to match the Solidity enum
IndexingAgreementVersion.V1 (first variant = 0).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: MoonBoi9001

packages/indexer-agent/src/agent.ts

@@ -717,9 +717,8 @@ export class Agent {
                 throw new Error('DipsManager is not available')
               }
 
-              await operator.dipsManager.acceptPendingProposals(
-                activeAllocations,
-              )
+              // Proposal acceptance is handled by the dedicated fast loop
+              // (startProposalAcceptanceLoop), not the reconciliation cycle.
 
               this.logger.debug(
                 `Matching agreement allocations for network ${network.specification.networkIdentifier}`,

packages/indexer-common/src/indexer-management/allocations.ts

@@ -177,6 +177,7 @@ export class AllocationManager {
         this,
         this.pendingRcaModel,
       )
+      this.dipsManager.startProposalAcceptanceLoop()
     }
   }
 
@@ -2314,7 +2315,7 @@ export class AllocationManager {
         } else {
           if (isHorizon) {
             rewards = await this.network.contracts.RewardsManager.getRewards(
-              this.network.contracts.HorizonStaking.target,
+              this.network.contracts.SubgraphService.target,
               action.allocationID,
             )
           } else {

packages/indexer-common/src/indexing-fees/__tests__/accept-proposals.test.ts

@@ -66,36 +66,9 @@ function createMockProposal(
   }
 }
 
-function createMockAllocation(
-  deploymentBytes32: string = TEST_DEPLOYMENT_BYTES32,
-): Allocation {
-  return {
-    id: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
-    status: AllocationStatus.ACTIVE,
-    isLegacy: false,
-    subgraphDeployment: {
-      id: new SubgraphDeploymentID(deploymentBytes32),
-    },
-    indexer: '0x5555555555555555555555555555555555555555',
-    allocatedTokens: 1000000000000000000n,
-    createdAt: 0,
-    createdAtEpoch: 100,
-    createdAtBlockHash: '0x',
-    closedAt: 0,
-    closedAtEpoch: 0,
-    closedAtEpochStartBlockHash: undefined,
-    previousEpochStartBlockHash: undefined,
-    closedAtBlockHash: '0x',
-    poi: undefined,
-    queryFeeRebates: 0n,
-    queryFeesCollected: 0n,
-  } as Allocation
-}
-
 function createMockConsumer(proposals: DecodedRcaProposal[] = []) {
   return {
     getPendingProposals: jest.fn().mockResolvedValue(proposals),
-    getPendingProposalsForDeployment: jest.fn().mockResolvedValue([]),
     markAccepted: jest.fn().mockResolvedValue(undefined),
     markRejected: jest.fn().mockResolvedValue(undefined),
   } as unknown as PendingRcaConsumer
@@ -135,9 +108,6 @@ function createMockNetwork() {
       EpochManager: {
         currentEpoch: jest.fn().mockResolvedValue(100n),
       },
-      RewardsManager: {
-        isDenied: jest.fn().mockResolvedValue(false),
-      },
     },
     transactionManager: {
       executeTransaction: jest.fn(),
@@ -154,8 +124,7 @@ function createMockNetwork() {
       indexerOptions: {
         address: '0x5555555555555555555555555555555555555555',
         enableDips: true,
-        dipsAllocationAmount: 0n,
-        defaultAllocationAmount: 10000000000000000000n, // 10 GRT
+        dipsAllocationAmount: 1000000000000000000n,
       },
       networkIdentifier: 'eip155:1337',
     },
@@ -198,8 +167,11 @@ describe('DipsManager.acceptPendingProposals', () => {
       deadline: BigInt(Math.floor(Date.now() / 1000) - 100),
     })
     const consumer = createMockConsumer([proposal])
-    // After rejection, no other proposals for this deployment
-    ;(consumer.getPendingProposalsForDeployment as jest.Mock).mockResolvedValue([])
+    // After rejection, getPendingProposals returns empty (no other proposals)
+    consumer.getPendingProposals = jest
+      .fn()
+      .mockResolvedValueOnce([proposal]) // first call in acceptPendingProposals
+      .mockResolvedValueOnce([]) // second call in cleanupDipsRule
     const mockRule = { id: 42 }
     const models = createMockModels()
     ;(models.IndexingRule.findOne as jest.Mock).mockResolvedValue(mockRule)
@@ -218,10 +190,10 @@ describe('DipsManager.acceptPendingProposals', () => {
     })
     const otherProposal = createMockProposal({ id: 'proposal-2' })
     const consumer = createMockConsumer([proposal])
-    // Another proposal exists for same deployment
-    ;(consumer.getPendingProposalsForDeployment as jest.Mock).mockResolvedValue([
-      otherProposal,
-    ])
+    consumer.getPendingProposals = jest
+      .fn()
+      .mockResolvedValueOnce([proposal])
+      .mockResolvedValueOnce([otherProposal]) // another proposal for same deployment
     const models = createMockModels()
     const network = createMockNetwork()
     const dm = createDipsManager(network, models, consumer)
@@ -253,6 +225,32 @@ describe('DipsManager.acceptPendingProposals', () => {
   })
 
   describe('with existing allocation', () => {
+    function createMockAllocation(
+      deploymentBytes32: string = TEST_DEPLOYMENT_BYTES32,
+    ): Allocation {
+      return {
+        id: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+        status: AllocationStatus.ACTIVE,
+        isLegacy: false,
+        subgraphDeployment: {
+          id: new SubgraphDeploymentID(deploymentBytes32),
+        },
+        indexer: '0x5555555555555555555555555555555555555555',
+        allocatedTokens: 1000000000000000000n,
+        createdAt: 0,
+        createdAtEpoch: 100,
+        createdAtBlockHash: '0x',
+        closedAt: 0,
+        closedAtEpoch: 0,
+        closedAtEpochStartBlockHash: undefined,
+        previousEpochStartBlockHash: undefined,
+        closedAtBlockHash: '0x',
+        poi: undefined,
+        queryFeeRebates: 0n,
+        queryFeesCollected: 0n,
+      } as Allocation
+    }
+
     test('accepts proposal on-chain and marks accepted', async () => {
       const proposal = createMockProposal()
       const allocation = createMockAllocation()
@@ -411,12 +409,39 @@ describe('DipsManager.acceptPendingProposals', () => {
   })
 
   describe('error handling', () => {
+    function createMockAllocation(): Allocation {
+      return {
+        id: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+        status: AllocationStatus.ACTIVE,
+        isLegacy: false,
+        subgraphDeployment: {
+          id: new SubgraphDeploymentID(TEST_DEPLOYMENT_BYTES32),
+        },
+        indexer: '0x5555555555555555555555555555555555555555',
+        allocatedTokens: 1000000000000000000n,
+        createdAt: 0,
+        createdAtEpoch: 100,
+        createdAtBlockHash: '0x',
+        closedAt: 0,
+        closedAtEpoch: 0,
+        closedAtEpochStartBlockHash: undefined,
+        previousEpochStartBlockHash: undefined,
+        closedAtBlockHash: '0x',
+        poi: undefined,
+        queryFeeRebates: 0n,
+        queryFeesCollected: 0n,
+      } as Allocation
+    }
+
     test('rejects proposal on deterministic CALL_EXCEPTION error', async () => {
       const proposal = createMockProposal()
       const allocation = createMockAllocation()
       const consumer = createMockConsumer([proposal])
       // After rejection, no remaining proposals for cleanup
-      ;(consumer.getPendingProposalsForDeployment as jest.Mock).mockResolvedValue([])
+      consumer.getPendingProposals = jest
+        .fn()
+        .mockResolvedValueOnce([proposal])
+        .mockResolvedValueOnce([])
       const models = createMockModels()
       const network = createMockNetwork()
       ;(network.transactionManager.executeTransaction as jest.Mock).mockRejectedValue({
@@ -490,104 +515,4 @@ describe('DipsManager.acceptPendingProposals', () => {
       expect(consumer.markAccepted).toHaveBeenCalledWith('ok-1')
     })
   })
-
-  describe('allocation amount selection', () => {
-    test('uses defaultAllocationAmount for rewarded (not denied) subgraph', async () => {
-      const proposal = createMockProposal()
-      const consumer = createMockConsumer([proposal])
-      const models = createMockModels()
-      const network = createMockNetwork()
-      ;(
-        network.contracts.RewardsManager.isDenied as unknown as jest.Mock
-      ).mockResolvedValue(false)
-      const mockReceipt = { hash: '0x', status: 1 }
-      ;(network.transactionManager.executeTransaction as jest.Mock).mockResolvedValue(
-        mockReceipt,
-      )
-
-      const dm = createDipsManager(network, models, consumer)
-
-      await dm.acceptPendingProposals([])
-
-      // Should check isDenied
-      expect(network.contracts.RewardsManager.isDenied).toHaveBeenCalledWith(
-        proposal.subgraphDeploymentId.bytes32,
-      )
-      // startService should be called (new allocation path)
-      expect(
-        network.contracts.SubgraphService.startService.populateTransaction,
-      ).toHaveBeenCalled()
-    })
-
-    test('uses dipsAllocationAmount (0) for denied subgraph', async () => {
-      const proposal = createMockProposal()
-      const consumer = createMockConsumer([proposal])
-      const models = createMockModels()
-      const network = createMockNetwork()
-      ;(
-        network.contracts.RewardsManager.isDenied as unknown as jest.Mock
-      ).mockResolvedValue(true)
-      const mockReceipt = { hash: '0x', status: 1 }
-      ;(network.transactionManager.executeTransaction as jest.Mock).mockResolvedValue(
-        mockReceipt,
-      )
-
-      const dm = createDipsManager(network, models, consumer)
-
-      await dm.acceptPendingProposals([])
-
-      expect(network.contracts.RewardsManager.isDenied).toHaveBeenCalledWith(
-        proposal.subgraphDeploymentId.bytes32,
-      )
-      expect(consumer.markAccepted).toHaveBeenCalledWith(proposal.id)
-    })
-
-    test('uses per-deployment rule amount for rewarded subgraph with existing rule', async () => {
-      const proposal = createMockProposal()
-      const consumer = createMockConsumer([proposal])
-      const models = createMockModels()
-      const ruleAmount = 5000000000000000000n // 5 GRT
-      ;(models.IndexingRule.findOne as jest.Mock).mockResolvedValue({
-        allocationAmount: ruleAmount.toString(),
-      })
-      const network = createMockNetwork()
-      ;(
-        network.contracts.RewardsManager.isDenied as unknown as jest.Mock
-      ).mockResolvedValue(false)
-      const mockReceipt = { hash: '0x', status: 1 }
-      ;(network.transactionManager.executeTransaction as jest.Mock).mockResolvedValue(
-        mockReceipt,
-      )
-
-      const dm = createDipsManager(network, models, consumer)
-
-      await dm.acceptPendingProposals([])
-
-      expect(consumer.markAccepted).toHaveBeenCalledWith(proposal.id)
-    })
-
-    test('uses custom dipsAllocationAmount for denied subgraph with override', async () => {
-      const proposal = createMockProposal()
-      const consumer = createMockConsumer([proposal])
-      const models = createMockModels()
-      const network = createMockNetwork()
-      // Override dipsAllocationAmount to non-zero
-      ;(
-        network.specification.indexerOptions as { dipsAllocationAmount: bigint }
-      ).dipsAllocationAmount = 1000000000000000000n // 1 GRT
-      ;(
-        network.contracts.RewardsManager.isDenied as unknown as jest.Mock
-      ).mockResolvedValue(true)
-      const mockReceipt = { hash: '0x', status: 1 }
-      ;(network.transactionManager.executeTransaction as jest.Mock).mockResolvedValue(
-        mockReceipt,
-      )
-
-      const dm = createDipsManager(network, models, consumer)
-
-      await dm.acceptPendingProposals([])
-
-      expect(consumer.markAccepted).toHaveBeenCalledWith(proposal.id)
-    })
-  })
 })

packages/indexer-common/src/indexing-fees/__tests__/pending-rca-consumer.test.ts

@@ -42,7 +42,7 @@ function encodeTestPayload(overrides?: {
     [
       {
         subgraphDeploymentId: TEST_DEPLOYMENT_BYTES32,
-        version: 1n,
+        version: 0n,
         terms: termsEncoded,
       },
     ],