fix: use new generate allocation helper

Author: Maikol

packages/subgraph-service/tasks/test/seed.ts

@@ -3,18 +3,23 @@ import { task } from 'hardhat/config'
 import { HorizonStakingExtension } from '@graphprotocol/horizon'
 
 import { indexers } from './fixtures/indexers'
-import { encodeRegistrationData, encodeStartServiceData, generatePOI } from '@graphprotocol/toolshed'
+import { encodeRegistrationData, encodeStartServiceData, generateAllocationProof, generatePOI } from '@graphprotocol/toolshed'
 
 task('test:seed', 'Seed the test environment, must be run after deployment')
   .setAction(async (_, hre) => {
     // Get contracts
     const graph = hre.graph()
-    const { generateAllocationProof } = graph.subgraphService.actions
     const horizonStaking = graph.horizon.contracts.HorizonStaking
     const horizonStakingExtension = graph.horizon.contracts.HorizonStaking as HorizonStakingExtension
     const subgraphService = graph.subgraphService.contracts.SubgraphService
     const disputeManager = graph.subgraphService.contracts.DisputeManager
 
+    // Get contract addresses
+    const subgraphServiceAddress = await subgraphService.getAddress()
+
+    // Get chain id
+    const chainId = (await hre.ethers.provider.getNetwork()).chainId
+
     // Get configs
     const disputePeriod = await disputeManager.getDisputePeriod()
     const maxSlashingCut = await disputeManager.maxSlashingCut()
@@ -83,7 +88,7 @@ task('test:seed', 'Seed the test environment, must be run after deployment')
         console.log(`Starting allocation: ${allocation.allocationID}`)
 
         // Build allocation proof
-        const signature = await generateAllocationProof(allocation.allocationPrivateKey, [indexer.address, allocation.allocationID])
+        const signature = await generateAllocationProof(indexer.address, allocation.allocationPrivateKey, subgraphServiceAddress, Number(chainId))
         const subgraphDeploymentId = allocation.subgraphDeploymentID
         const allocationTokens = allocation.tokens
         const allocationId = allocation.allocationID

packages/subgraph-service/test/integration/after-transition-period/subgraph-service/indexer.test.ts

@@ -3,7 +3,7 @@ import { expect } from 'chai'
 import { HDNodeWallet } from 'ethers'
 import hre from 'hardhat'
 
-import { encodeCollectData, encodeStartServiceData, generatePOI, getSignedRAVCalldata, getSignerProof, PaymentTypes } from '@graphprotocol/toolshed'
+import { encodeCollectData, encodeStartServiceData, generateAllocationProof, generatePOI, getSignedRAVCalldata, getSignerProof, PaymentTypes } from '@graphprotocol/toolshed'
 import { GraphPayments, GraphTallyCollector, HorizonStaking } from '@graphprotocol/horizon'
 import { IGraphToken, IPaymentsEscrow, SubgraphService } from '../../../../typechain-types'
 import { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers'
@@ -29,7 +29,7 @@ describe('Indexer', () => {
   let subgraphServiceAddress: string
 
   const graph = hre.graph()
-  const { collect, generateAllocationProof } = graph.subgraphService.actions
+  const { collect } = graph.subgraphService.actions
 
   before(async () => {
     // Get contracts
@@ -110,7 +110,7 @@ describe('Indexer', () => {
         const beforeLockedTokens = await subgraphService.allocationProvisionTracker(indexer.address)
 
         // Build allocation proof
-        const signature = await generateAllocationProof(allocationPrivateKey, [indexer.address, allocationId])
+        const signature = await generateAllocationProof(indexer.address, allocationPrivateKey, subgraphServiceAddress, chainId)
 
         // Attempt to create an allocation with the same ID
         const data = encodeStartServiceData(subgraphDeploymentId, allocationTokens, allocationId, signature)
@@ -134,7 +134,7 @@ describe('Indexer', () => {
 
       it('should be able to start an allocation with zero tokens', async () => {
         // Build allocation proof
-        const signature = await generateAllocationProof(allocationPrivateKey, [indexer.address, allocationId])
+        const signature = await generateAllocationProof(indexer.address, allocationPrivateKey, subgraphServiceAddress, chainId)
 
         // Attempt to create an allocation with the same ID
         const data = encodeStartServiceData(subgraphDeploymentId, 0n, allocationId, signature)
@@ -154,7 +154,7 @@ describe('Indexer', () => {
 
       it('should not start an allocation without enough tokens', async () => {
         // Build allocation proof
-        const signature = await generateAllocationProof(allocationPrivateKey, [indexer.address, allocationId])
+        const signature = await generateAllocationProof(indexer.address, allocationPrivateKey, subgraphServiceAddress, chainId)
 
         // Build allocation data
         const allocationTokens = provisionTokens + ethers.parseEther('10000000')
@@ -384,7 +384,7 @@ describe('Indexer', () => {
           allocationPrivateKey = wallet.privateKey
           subgraphDeploymentId = indexers[0].allocations[0].subgraphDeploymentID
           const allocationTokens = availableTokens - lockedTokens
-          const signature = await generateAllocationProof(allocationPrivateKey, [indexer.address, allocationId])
+          const signature = await generateAllocationProof(indexer.address, allocationPrivateKey, subgraphServiceAddress, chainId)
           const data = encodeStartServiceData(subgraphDeploymentId, allocationTokens, allocationId, signature)
           await subgraphService.connect(indexer).startService(
             indexer.address,

packages/subgraph-service/test/integration/after-transition-period/subgraph-service/operator.test.ts

@@ -3,7 +3,7 @@ import { expect } from 'chai'
 import hre from 'hardhat'
 
 import { DisputeManager, IGraphToken, IPaymentsEscrow, SubgraphService } from '../../../../typechain-types'
-import { encodeCollectData, encodeRegistrationData, encodeStartServiceData, generatePOI, getSignedRAVCalldata, getSignerProof } from '@graphprotocol/toolshed'
+import { encodeCollectData, encodeRegistrationData, encodeStartServiceData, generateAllocationProof, generatePOI, getSignedRAVCalldata, getSignerProof } from '@graphprotocol/toolshed'
 import { GraphTallyCollector, HorizonStaking } from '@graphprotocol/horizon'
 import { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers'
 
@@ -33,7 +33,7 @@ describe('Operator', () => {
   let subgraphServiceAddress: string
   const graph = hre.graph()
   const { provision } = graph.horizon.actions
-  const { collect, generateAllocationProof } = graph.subgraphService.actions
+  const { collect } = graph.subgraphService.actions
 
   before(async () => {
     // Get contracts
@@ -143,7 +143,7 @@ describe('Operator', () => {
 
         it('should be able to create an allocation', async () => {
           // Build allocation proof
-          const signature = await generateAllocationProof(allocationPrivateKey, [indexer.address, allocationId])
+          const signature = await generateAllocationProof(indexer.address, allocationPrivateKey, subgraphServiceAddress, chainId)
 
           // Build allocation data
           const data = encodeStartServiceData(subgraphDeploymentId, allocationTokens, allocationId, signature)
@@ -164,7 +164,7 @@ describe('Operator', () => {
       describe('Unauthorized Operator', () => {
         it('should not be able to create an allocation', async () => {
           // Build allocation proof
-          const signature = await generateAllocationProof(allocationPrivateKey, [indexer.address, allocationId])
+          const signature = await generateAllocationProof(indexer.address, allocationPrivateKey, subgraphServiceAddress, chainId)
 
           // Build allocation data
           const data = encodeStartServiceData(subgraphDeploymentId, allocationTokens, allocationId, signature)

packages/subgraph-service/test/integration/after-transition-period/subgraph-service/paused.test.ts

@@ -6,7 +6,7 @@ import { DisputeManager, IGraphToken, SubgraphService } from '../../../../typech
 import { setGRTBalance } from '@graphprotocol/toolshed/hardhat'
 import { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers'
 
-import { encodeCollectData, encodeRegistrationData, encodeStartServiceData, generatePOI, PaymentTypes } from '@graphprotocol/toolshed'
+import { encodeCollectData, encodeRegistrationData, encodeStartServiceData, generateAllocationProof, generatePOI, PaymentTypes } from '@graphprotocol/toolshed'
 import { indexers } from '../../../../tasks/test/fixtures/indexers'
 
 describe('Paused Protocol', () => {
@@ -15,17 +15,19 @@ describe('Paused Protocol', () => {
   let subgraphService: SubgraphService
 
   let snapshotId: string
+  let chainId: number
 
   // Test addresses
   let pauseGuardian: HardhatEthersSigner
   let indexer: HardhatEthersSigner
   let allocationId: string
   let subgraphDeploymentId: string
   let allocationTokens: bigint
+  let subgraphServiceAddress: string
 
   const graph = hre.graph()
   const { provision } = graph.horizon.actions
-  const { collect, generateAllocationProof } = graph.subgraphService.actions
+  const { collect } = graph.subgraphService.actions
 
   before(async () => {
     // Get contracts
@@ -35,6 +37,12 @@ describe('Paused Protocol', () => {
 
     // Get signers
     pauseGuardian = await graph.accounts.getPauseGuardian()
+
+    // Get chain id
+    chainId = Number((await hre.ethers.provider.getNetwork()).chainId)
+
+    // Get subgraph service address
+    subgraphServiceAddress = await subgraphService.getAddress()
   })
 
   beforeEach(async () => {
@@ -155,7 +163,7 @@ describe('Paused Protocol', () => {
 
         it('should not allow indexer to start an allocation while paused', async () => {
           // Build allocation proof
-          const signature = await generateAllocationProof(allocationPrivateKey, [indexer.address, allocationId])
+          const signature = await generateAllocationProof(indexer.address, allocationPrivateKey, subgraphServiceAddress, chainId)
 
           // Build allocation data
           const data = encodeStartServiceData(subgraphDeploymentId, allocationTokens, allocationId, signature)

packages/subgraph-service/test/integration/after-transition-period/subgraph-service/permisionless.test.ts

@@ -6,7 +6,7 @@ import { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers'
 import { SubgraphService } from '../../../../typechain-types'
 
 import { indexers } from '../../../../tasks/test/fixtures/indexers'
-import { encodeStartServiceData } from '@graphprotocol/toolshed'
+import { encodeStartServiceData, generateAllocationProof } from '@graphprotocol/toolshed'
 
 describe('Permissionless', () => {
   let subgraphService: SubgraphService
@@ -20,7 +20,6 @@ describe('Permissionless', () => {
   let allocationTokens: bigint
 
   const graph = hre.graph()
-  const { generateAllocationProof } = graph.subgraphService.actions
 
   before(async () => {
     // Get contracts
@@ -91,7 +90,9 @@ describe('Permissionless', () => {
       allocationTokens = 0n
 
       // Start allocation
-      const signature = await generateAllocationProof(allocationPrivateKey, [indexer.address, allocationId])
+      const subgraphServiceAddress = await subgraphService.getAddress()
+      const chainId = Number((await hre.ethers.provider.getNetwork()).chainId)
+      const signature = await generateAllocationProof(indexer.address, allocationPrivateKey, subgraphServiceAddress, chainId)
       const data = encodeStartServiceData(subgraphDeploymentId, allocationTokens, allocationId, signature)
       await subgraphService.connect(indexer).startService(indexer.address, data)
     })

packages/toolshed/src/deployments/subgraph-service/actions.ts

@@ -14,15 +14,6 @@ export function loadActions(contracts: { SubgraphService: ISubgraphService }) {
      * @returns The payment collected
      */
     collect: (signer: HardhatEthersSigner, args: Parameters<ISubgraphService['collect']>): Promise<bigint> => collect(contracts, signer, args),
-
-    /**
-     * Generates an allocation proof for the subgraph services
-     * @param signer - The signer that will sign the allocation proof
-     * @param args Parameters:
-     *   - `[indexer, allocationId]` - The encodeAllocationProof parameters
-     * @returns The allocation proof
-     */
-    generateAllocationProof: (allocationPrivateKey: string, args: Parameters<ISubgraphService['encodeAllocationProof']>): Promise<string> => generateAllocationProof(contracts, allocationPrivateKey, args),
   }
 }
 
@@ -45,18 +36,3 @@ async function collect(
 
   return BigInt(event.data)
 }
-
-// Generate allocation proof for the subgraph services
-async function generateAllocationProof(
-  contracts: { SubgraphService: ISubgraphService },
-  allocationPrivateKey: string,
-  args: Parameters<ISubgraphService['encodeAllocationProof']>,
-): Promise<string> {
-  const { SubgraphService } = contracts
-  const [indexer, allocationId] = args
-
-  const wallet = new ethers.Wallet(allocationPrivateKey)
-  const messageHash = await SubgraphService.encodeAllocationProof(indexer, allocationId)
-  const signature = wallet.signingKey.sign(messageHash)
-  return ethers.Signature.from(signature).serialized
-}