feat: add legacy allo proof encoding

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

Author: tmigone

packages/horizon/tasks/test/seed.ts

@@ -1,4 +1,4 @@
-import { generateAllocationProof, randomAllocationMetadata } from '@graphprotocol/toolshed'
+import { encodeLegacyAllocationProof, randomAllocationMetadata } from '@graphprotocol/toolshed'
 import { requireLocalNetwork, setGRTBalance } from '@graphprotocol/toolshed/hardhat'
 import { delegators } from './fixtures/delegators'
 import { indexers } from './fixtures/indexers'
@@ -73,7 +73,7 @@ task('test:seed', 'Sets up some protocol state for testing')
           allocation.tokens,
           allocation.allocationID,
           randomAllocationMetadata(),
-          await generateAllocationProof(indexer.address, allocation.allocationPrivateKey),
+          await encodeLegacyAllocationProof(indexer.address, allocation.allocationPrivateKey),
         )
       }
     }

packages/toolshed/README.md

@@ -21,7 +21,7 @@ The package is organized into several modules that can be imported separately:
 
 ```typescript
 // Import core functionality
-import { generateAllocationProof } from '@graphprotocol/toolshed';
+import { encodeAllocationProof } from '@graphprotocol/toolshed';
 
 // Import deployment
 import { loadGraphHorizon } from '@graphprotocol/toolshed/deployments/horizon';

packages/toolshed/src/core/accounts.ts

@@ -86,11 +86,13 @@ export async function getTestAccounts(provider: HardhatEthersProvider, grtTokenA
 async function _getAccount(provider: HardhatEthersProvider, accountIndex: number | string, grtTokenAddress?: string | Addressable) {
   const account = await provider.getSigner(accountIndex)
 
-  // If the chain is local, send 10M GRT to the account
-  const chainId = await provider.send('eth_chainId', []) as string
-  const isLocal = [toBeHex(1337), toBeHex(31337)].includes(toBeHex(BigInt(chainId)))
-  if (grtTokenAddress && isLocal) {
-    await setGRTBalance(provider, grtTokenAddress, account.address, TEN_MILLION)
+  // If the chain is local, set balance to 10M GRT
+  if (grtTokenAddress) {
+    const chainId = await provider.send('eth_chainId', []) as string
+    const isLocal = [toBeHex(1337), toBeHex(31337)].includes(toBeHex(BigInt(chainId)))
+    if (isLocal) {
+      await setGRTBalance(provider, grtTokenAddress, account.address, TEN_MILLION)
+    }
   }
 
   return account

packages/toolshed/src/core/allocation.ts

@@ -1,8 +1,8 @@
-import { ethers } from 'ethers'
+import { ethers, id } from 'ethers'
 import { randomHexBytes } from '../lib/bytes'
 
-// Generate allocation proof with the indexer's address and the allocation id, signed by the allocation private key
-export async function generateAllocationProof(indexerAddress: string, allocationPrivateKey: string) {
+// For legacy allocations in the staking contract
+export async function encodeLegacyAllocationProof(indexerAddress: string, allocationPrivateKey: string) {
   const wallet = new ethers.Wallet(allocationPrivateKey)
   const messageHash = ethers.solidityPackedKeccak256(
     ['address', 'address'],
@@ -12,6 +12,37 @@ export async function generateAllocationProof(indexerAddress: string, allocation
   return wallet.signMessage(messageHashBytes)
 }
 
+export const EIP712_ALLOCATION_PROOF_TYPEHASH = id('AllocationIdProof(address indexer,address allocationId)')
+
+export const EIP712_ALLOCATION_ID_PROOF_TYPES = {
+  AllocationIdProof: [
+    { name: 'indexer', type: 'address' },
+    { name: 'allocationId', type: 'address' },
+  ],
+}
+
+// For new allocations in the subgraph service
+export async function encodeAllocationProof(
+  indexerAddress: string,
+  allocationPrivateKey: string,
+  subgraphServiceAddress: string,
+  chainId: number,
+) {
+  const wallet = new ethers.Wallet(allocationPrivateKey)
+
+  const domain = {
+    name: 'SubgraphService',
+    version: '1.0',
+    chainId: chainId,
+    verifyingContract: subgraphServiceAddress,
+  }
+
+  return wallet.signTypedData(domain, EIP712_ALLOCATION_ID_PROOF_TYPES, {
+    indexer: indexerAddress,
+    allocationId: wallet.address,
+  })
+}
+
 export function randomAllocationMetadata() {
   return randomHexBytes(32)
 }

packages/toolshed/src/hardhat/local.ts

@@ -1,4 +1,5 @@
-import { HardhatRuntimeEnvironment } from 'hardhat/types'
+import type { HardhatEthersProvider } from '@nomicfoundation/hardhat-ethers/internal/hardhat-ethers-provider'
+import type { HardhatRuntimeEnvironment } from 'hardhat/types'
 
 const localNetworks = ['localhost', 'hardhat', 'localNetwork']
 
@@ -7,3 +8,12 @@ export function requireLocalNetwork(hre: HardhatRuntimeEnvironment) {
     throw new Error(`Network ${hre.network.name} is not a local network.`)
   }
 }
+
+export async function warp(provider: HardhatEthersProvider, seconds: number) {
+  await provider.send('evm_increaseTime', [seconds])
+  await provider.send('evm_mine', [])
+}
+
+export async function mine(provider: HardhatEthersProvider, blocks: number) {
+  await provider.send('evm_mine', [blocks])
+}