fix: rav signing and recovering bug

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

Author: tmigone

packages/toolshed/src/core/graph-tally.ts

@@ -1,14 +1,10 @@
-import { BytesLike, ethers, id, Signature, Wallet } from 'ethers'
+import { BytesLike, ethers, Signature, Wallet } from 'ethers'
 
-import type { RAV, Receipt } from './types'
+import type { RAV } from './types'
 
 export const EIP712_DOMAIN_NAME = 'GraphTallyCollector'
 export const EIP712_DOMAIN_VERSION = '1'
-
-export const EIP712_RAV_PROOF_TYPEHASH = id(
-  'ReceiptAggregateVoucher(bytes32 collectionId,address payer,address serviceProvider,address dataService,uint64 timestampNs,uint128 valueAggregate,bytes metadata)',
-)
-export const EIP712_RAV_PROOF_TYPES = {
+export const EIP712_RAV_TYPES = {
   ReceiptAggregateVoucher: [
     { name: 'collectionId', type: 'bytes32' },
     { name: 'payer', type: 'address' },
@@ -20,22 +16,6 @@ export const EIP712_RAV_PROOF_TYPES = {
   ],
 }
 
-export const EIP712_RECEIPT_PROOF_TYPEHASH = id(
-  'Receipt(bytes32 collection_id,address payer,address data_service,address service_provider,uint64 timestamp_ns,uint64 nonce,uint128 value)',
-)
-
-export const EIP712_RECEIPT_PROOF_TYPES = {
-  Receipt: [
-    { name: 'collection_id', type: 'bytes32' },
-    { name: 'payer', type: 'address' },
-    { name: 'data_service', type: 'address' },
-    { name: 'service_provider', type: 'address' },
-    { name: 'timestamp_ns', type: 'uint64' },
-    { name: 'nonce', type: 'uint64' },
-    { name: 'value', type: 'uint128' },
-  ],
-}
-
 /**
  * Generates a signed RAV
  * @param allocationId The allocation ID
@@ -83,12 +63,27 @@ export async function generateSignedRAV(
 
   // Sign the RAV data
   const signer = new Wallet(signerPrivateKey)
-  const signature = await signer.signTypedData(domain, EIP712_RAV_PROOF_TYPES, ravData)
+  const signature = await signer.signTypedData(domain, EIP712_RAV_TYPES, ravData)
 
   // Return the signed RAV
   return { rav: ravData, signature: signature }
 }
 
+export function recoverRAVSigner(
+  rav: RAV,
+  signature: string,
+  graphTallyCollectorAddress: string,
+  chainId: number,
+): string {
+  const domain = {
+    name: EIP712_DOMAIN_NAME,
+    version: EIP712_DOMAIN_VERSION,
+    chainId,
+    verifyingContract: graphTallyCollectorAddress,
+  }
+  return ethers.verifyTypedData(domain, EIP712_RAV_TYPES, rav, signature)
+}
+
 /**
  * Generates a signer proof for authorizing a signer in the Graph Tally Collector
  * @param graphTallyCollector The Graph Tally Collector contract
@@ -120,26 +115,3 @@ export function generateSignerProof(
   const signer = new Wallet(signerPrivateKey)
   return Signature.from(signer.signingKey.sign(proofToDigest)).serialized
 }
-
-export function recoverReceiptSigner(
-  receipt: Receipt,
-  signature: Uint8Array | string,
-  graphTallyCollectorAddress: string,
-  chainId: number,
-): string {
-  // Create the domain for the EIP712 signature
-  const domain = {
-    name: EIP712_DOMAIN_NAME,
-    version: EIP712_DOMAIN_VERSION,
-    chainId,
-    verifyingContract: graphTallyCollectorAddress,
-  }
-
-  // Normalize signature to 0x-hex string
-  const sigHex = typeof signature === 'string' ? signature : ethers.hexlify(signature)
-
-  // Recover the signer address from the signature
-  const signerAddress = ethers.verifyTypedData(domain, EIP712_RECEIPT_PROOF_TYPES, receipt, sigHex)
-
-  return signerAddress
-}

packages/toolshed/src/core/subgraph-service.ts

@@ -25,7 +25,7 @@ export function encodeCollectIndexingRewardsData(allocationId: string, poi: Byte
 export function encodeCollectQueryFeesData(rav: RAV, signature: string, tokensToCollect: bigint) {
   return ethers.AbiCoder.defaultAbiCoder().encode(
     [
-      'tuple(tuple(bytes32 collectionId, address payer, address serviceProvider, address dataService, uint256 timestampNs, uint128 valueAggregate, bytes metadata) rav, bytes signature)',
+      'tuple(tuple(bytes32 collectionId, address payer, address serviceProvider, address dataService, uint64 timestampNs, uint128 valueAggregate, bytes metadata) rav, bytes signature)',
       'uint256',
     ],
     [{ rav, signature }, tokensToCollect],