fix(synapse-core): address PR review — simplify getClientDataSets args, update GIT_REF, add paginated RPC test

Author: Chaitu-Tatipamula

packages/synapse-core/src/warm-storage/get-client-data-sets.ts

@@ -19,9 +19,9 @@ export namespace getClientDataSets {
   export type OptionsType = {
     /** Client address to fetch data sets for. */
     address: Address
-    /** Starting index (0-based). Use 0 to start from beginning. Defaults to fetching all (unpaginated). */
+    /** Starting index (0-based). Use `0` to start from the beginning. Defaults to `0n`. */
     offset?: bigint
-    /** Maximum number of data sets to return. Use 0 to get all remaining. Defaults to fetching all (unpaginated). */
+    /** Maximum number of data sets to return. Use `0` to get all remaining. Defaults to `0n` (all). */
     limit?: bigint
     /** Warm storage contract address. If not provided, the default is the storage view contract address for the chain. */
     contractAddress?: Address
@@ -87,7 +87,12 @@ export async function getClientDataSets(
 export namespace getClientDataSetsCall {
   export type OptionsType = Simplify<getClientDataSets.OptionsType & ActionCallChain>
   export type ErrorType = asChain.ErrorType
-  export type OutputType = ContractFunctionParameters<typeof storageViewAbi, 'pure' | 'view', 'getClientDataSets'>
+  export type OutputType = ContractFunctionParameters<
+    typeof storageViewAbi,
+    'pure' | 'view',
+    'getClientDataSets',
+    [Address, bigint, bigint]
+  >
 }
 
 /**
@@ -123,21 +128,10 @@ export namespace getClientDataSetsCall {
  */
 export function getClientDataSetsCall(options: getClientDataSetsCall.OptionsType) {
   const chain = asChain(options.chain)
-  const base = {
+  return {
     abi: chain.contracts.fwssView.abi,
     address: options.contractAddress ?? chain.contracts.fwssView.address,
     functionName: 'getClientDataSets',
-  } as const
-
-  if (options.offset != null || options.limit != null) {
-    return {
-      ...base,
-      args: [options.address, options.offset ?? 0n, options.limit ?? 0n],
-    } as getClientDataSetsCall.OutputType
-  }
-
-  return {
-    ...base,
-    args: [options.address],
+    args: [options.address, options.offset ?? 0n, options.limit ?? 0n],
   } satisfies getClientDataSetsCall.OutputType
 }

packages/synapse-core/test/get-client-data-sets.test.ts

@@ -28,7 +28,7 @@ describe('getClientDataSets', () => {
       })
 
       assert.equal(call.functionName, 'getClientDataSets')
-      assert.deepEqual(call.args, [ADDRESSES.client1])
+      assert.deepEqual(call.args, [ADDRESSES.client1, 0n, 0n])
       assert.equal(call.address, calibration.contracts.fwssView.address)
       assert.equal(call.abi, calibration.contracts.fwssView.abi)
     })
@@ -40,7 +40,7 @@ describe('getClientDataSets', () => {
       })
 
       assert.equal(call.functionName, 'getClientDataSets')
-      assert.deepEqual(call.args, [ADDRESSES.client1])
+      assert.deepEqual(call.args, [ADDRESSES.client1, 0n, 0n])
       assert.equal(call.address, mainnet.contracts.fwssView.address)
       assert.equal(call.abi, mainnet.contracts.fwssView.abi)
     })
@@ -68,14 +68,14 @@ describe('getClientDataSets', () => {
       assert.deepEqual(call.args, [ADDRESSES.client1, 10n, 50n])
     })
 
-    it('should use unpaginated args when no offset/limit provided', () => {
+    it('should default offset/limit to 0n when not provided', () => {
       const call = getClientDataSetsCall({
         chain: calibration,
         address: ADDRESSES.client1,
       })
 
       assert.equal(call.functionName, 'getClientDataSets')
-      assert.deepEqual(call.args, [ADDRESSES.client1])
+      assert.deepEqual(call.args, [ADDRESSES.client1, 0n, 0n])
     })
   })
 
@@ -109,5 +109,30 @@ describe('getClientDataSets', () => {
       assert.equal(typeof first.providerId, 'bigint')
       assert.equal(typeof first.dataSetId, 'bigint')
     })
+
+    it('should fetch client data sets with pagination', async () => {
+      server.use(JSONRPC(presets.basic))
+
+      const client = createPublicClient({
+        chain: calibration,
+        transport: http(),
+      })
+
+      const dataSets = await getClientDataSets(client, {
+        address: ADDRESSES.client1,
+        offset: 0n,
+        limit: 10n,
+      })
+
+      assert.ok(dataSets.length > 0)
+      const [first] = dataSets
+      assert.ok(first)
+      if (!first) return
+
+      assert.equal(typeof first.pdpRailId, 'bigint')
+      assert.equal(typeof first.dataSetId, 'bigint')
+      assert.equal(typeof first.payer, 'string')
+      assert.equal(typeof first.payee, 'string')
+    })
   })
 })

packages/synapse-core/wagmi.config.ts

@@ -5,7 +5,7 @@ import { multicall } from 'viem/actions'
 import { calibration, mainnet } from './src/chains.ts'
 
 // GIT_REF can be one of: '<branch name>', '<commit>' or 'tags/<tag>'
-const GIT_REF = 'd08214e1b3d200e0bc80f0d4f2e5ea3e1e4d603e'
+const GIT_REF = 'ed85348ebad54196b5bfefc5cb0dbe7e8bfd6f7c'
 const BASE_URL = `https://raw.githubusercontent.com/FilOzone/filecoin-services/${GIT_REF.replace(/^(?![a-f0-9]{40}$)/, 'refs/')}/service_contracts/abi`
 const FWSS_ADDRESS_CALIBRATION = '0x02925630df557F957f70E112bA06e50965417CA0' as Address
 const FWSS_ADDRESS_MAINNET = '0x8408502033C418E1bbC97cE9ac48E5528F371A9f' as Address