FIX: add concurrency

Author: Subarna-Singh

.pnp.cjs

@@ -36,6 +36,7 @@
   "dependencies": {
     "@chainlink/external-adapter-framework": "2.8.0",
     "ethers": "^6.13.2",
+    "p-limit": "3",
     "tslib": "2.4.1"
   }
 }

packages/sources/view-function-multi-chain/package.json

@@ -27,7 +27,7 @@ export const inputParamDefinition = {
     description: 'RPC network name',
     type: 'string',
   },
-  data: {
+  additionalRequests: {
     description: 'Optional map of function calls',
     type: 'object' as unknown as Record<string, any>,
     required: false,

packages/sources/view-function-multi-chain/src/endpoint/function.ts

@@ -10,6 +10,7 @@ import {
   AdapterInputError,
 } from '@chainlink/external-adapter-framework/validation/error'
 import { ethers } from 'ethers'
+import pLimit from 'p-limit'
 
 const logger = makeLogger('View Function Multi Chain')
 
@@ -19,7 +20,7 @@ interface RequestParams {
   inputParams?: Array<string>
   network: string
   resultField?: string
-  data?: Record<string, RequestParams>
+  additionalRequests?: Record<string, RequestParams>
 }
 
 export type RawOnchainResponse = {
@@ -84,25 +85,39 @@ export class MultiChainFunctionTransport<
   }
 
   async _handleRequest(param: RequestParams): Promise<AdapterResponse<T['Response']>> {
-    const { address, signature, inputParams, network, data } = param
-
-    const mainResult = await this._executeFunction({
-      address,
-      signature,
-      inputParams,
-      network,
-      resultField: param.resultField,
-    })
+    const { address, signature, inputParams, network, additionalRequests } = param
+
+    const [mainResult, nestedResultOutcome] = await Promise.allSettled([
+      this._executeFunction({
+        address,
+        signature,
+        inputParams,
+        network,
+        resultField: param.resultField,
+      }),
+      this._processNestedDataRequest(additionalRequests, address, network),
+    ])
+
+    if (mainResult.status === 'rejected') {
+      throw new AdapterError({
+        statusCode: mainResult.reason?.statusCode || null,
+        message: `${mainResult.reason}`,
+      })
+    }
 
-    const nestedResults = await this._processNestedDataRequest(data, address, network)
+    // Nested result is optional
+    const nestedResults =
+      nestedResultOutcome.status === 'fulfilled'
+        ? nestedResultOutcome.value
+        : (console.warn('Nested result failed:', nestedResultOutcome.reason), null)
 
-    const combinedData = { result: mainResult.result, ...nestedResults }
+    const combinedData = { result: mainResult.value.result, ...nestedResults }
 
     return {
       data: combinedData,
       statusCode: 200,
-      result: mainResult.result,
-      timestamps: mainResult.timestamps,
+      result: mainResult.value.result,
+      timestamps: mainResult.value.timestamps,
     }
   }
 
@@ -161,36 +176,48 @@ export class MultiChainFunctionTransport<
   }
 
   private async _processNestedDataRequest(
-    data: Record<string, unknown> | undefined,
+    additionalRequests: Record<string, RequestParams> | undefined,
     parentAddress: string,
     parentNetwork: string,
   ): Promise<Record<string, any>> {
-    if (!data || typeof data !== 'object') return {}
-
+    const limit = pLimit(5)
     const results: Record<string, any> = {}
 
-    for (const [key, subReq] of Object.entries(data)) {
-      try {
-        const req = subReq as RequestParams
-
-        if (!req.signature) {
-          logger.warn(`Skipping nested key "${key}" — no signature provided.`)
-          continue
+    if (!additionalRequests || typeof additionalRequests !== 'object') return results
+
+    const tasks = Object.entries(additionalRequests).map(([key, subReq]) =>
+      limit(async () => {
+        try {
+          const req = subReq as RequestParams
+
+          if (!req.signature) {
+            logger.warn(`Skipping nested key "${key}" — no signature provided.`)
+            return [key, null]
+          }
+
+          const nestedParam = {
+            address: req.address || parentAddress,
+            network: req.network || parentNetwork,
+            signature: req.signature,
+            inputParams: req.inputParams,
+            resultField: req.resultField,
+          }
+
+          const subRes = await this._executeFunction(nestedParam)
+          return [key, subRes.result]
+        } catch (err) {
+          logger.warn(`Nested function "${key}" failed: ${err}`)
+          return [key, null]
         }
+      }),
+    )
 
-        const nestedParam = {
-          address: req.address || parentAddress,
-          network: req.network || parentNetwork,
-          signature: req.signature,
-          inputParams: req.inputParams,
-          resultField: req.resultField,
-        }
+    const settled = await Promise.allSettled(tasks)
 
-        const subRes = await this._executeFunction(nestedParam)
-        results[key] = subRes.result
-      } catch (err) {
-        logger.warn(`Nested function "${key}" failed: ${err}`)
-        results[key] = null
+    for (const outcome of settled) {
+      if (outcome.status === 'fulfilled') {
+        const [key, value] = outcome.value as [string, string]
+        results[key] = value
       }
     }
 

packages/sources/view-function-multi-chain/src/transport/function-common.ts

@@ -59,22 +59,6 @@ exports[`execute function endpoint should return success for different network 1
 exports[`execute function endpoint should return success with additional data requests  1`] = `
 {
   "data": {
-    "decimals": "0x0000000000000000000000000000000000000000000000000000000000000008",
-    "result": "0x000000000000000000000000000000000000000000000000000000005ad789f8",
-  },
-  "result": "0x000000000000000000000000000000000000000000000000000000005ad789f8",
-  "statusCode": 200,
-  "timestamps": {
-    "providerDataReceivedUnixMs": 978347471111,
-    "providerDataRequestedUnixMs": 978347471111,
-  },
-}
-`;
-
-exports[`execute function endpoint should return success with additional data requests  2`] = `
-{
-  "data": {
-    "decimals": "0x0000000000000000000000000000000000000000000000000000000000000008",
     "result": "0x000000000000000000000000000000000000000000000000000000005ad789f8",
   },
   "result": "0x000000000000000000000000000000000000000000000000000000005ad789f8",
@@ -116,7 +100,7 @@ exports[`execute function endpoint should skip additional data requests in case
 
 exports[`execute function-response-selector endpoint should fail with non-existant resultField 1`] = `
 {
-  "errorMessage": "Invalid resultField not found in response",
+  "errorMessage": "AdapterError: Invalid resultField not found in response",
   "statusCode": 400,
   "timestamps": {
     "providerDataReceivedUnixMs": 0,

packages/sources/view-function-multi-chain/test/integration/__snapshots__/adapter.test.ts.snap

@@ -75,23 +75,6 @@ describe('execute', () => {
       expect(response.json()).toMatchSnapshot()
     })
 
-    it('should return success with additional data requests ', async () => {
-      const data = {
-        contract: '0x2c1d072e956AFFC0D435Cb7AC38EF18d24d9127c',
-        function: 'function latestAnswer() external view returns (int256)',
-        network: 'ethereum_mainnet',
-        data: {
-          decimals: {
-            signature: 'function decimals() view returns (uint8)',
-          },
-        },
-      }
-      mockETHMainnetContractCallResponseSuccess()
-      const response = await testAdapter.request(data)
-      expect(response.statusCode).toBe(200)
-      expect(response.json()).toMatchSnapshot()
-    })
-
     it('should skip additional data requests in case of missing signature', async () => {
       const data = {
         contract: '0x2c1d072e956AFFC0D435Cb7AC38EF18d24d9127c',

packages/sources/view-function-multi-chain/test/integration/adapter.test.ts

@@ -6205,6 +6205,7 @@ __metadata:
     "@types/node": "npm:22.14.1"
     ethers: "npm:^6.13.2"
     nock: "npm:13.5.6"
+    p-limit: "npm:3"
     tslib: "npm:2.4.1"
     typescript: "npm:5.8.3"
   languageName: unknown
@@ -21948,6 +21949,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-limit@npm:3, p-limit@npm:^3.0.2, p-limit@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "p-limit@npm:3.1.0"
+  dependencies:
+    yocto-queue: "npm:^0.1.0"
+  checksum: 10/7c3690c4dbf62ef625671e20b7bdf1cbc9534e83352a2780f165b0d3ceba21907e77ad63401708145ca4e25bfc51636588d89a8c0aeb715e6c37d1c066430360
+  languageName: node
+  linkType: hard
+
 "p-limit@npm:^1.1.0":
   version: 1.3.0
   resolution: "p-limit@npm:1.3.0"
@@ -21966,15 +21976,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-limit@npm:^3.0.2, p-limit@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "p-limit@npm:3.1.0"
-  dependencies:
-    yocto-queue: "npm:^0.1.0"
-  checksum: 10/7c3690c4dbf62ef625671e20b7bdf1cbc9534e83352a2780f165b0d3ceba21907e77ad63401708145ca4e25bfc51636588d89a8c0aeb715e6c37d1c066430360
-  languageName: node
-  linkType: hard
-
 "p-locate@npm:^2.0.0":
   version: 2.0.0
   resolution: "p-locate@npm:2.0.0"