Fix/DF-20612 por address list solv (#3582)

* DF-20612 fix solv failures on multichain address list

* add changeset

* review fixes

* fix test

Author: mmcallister-cll

.changeset/smooth-wasps-shop.md

@@ -0,0 +1,5 @@
+---
+'@chainlink/por-address-list-adapter': minor
+---
+
+Fix solv issues in multichain address list endpoint

packages/sources/por-address-list/src/config/SolvMultiAddressList.json

@@ -0,0 +1,32 @@
+[
+  {
+    "inputs": [
+      { "internalType": "uint256", "name": "startIndex_", "type": "uint256" },
+      { "internalType": "uint256", "name": "endIndex_", "type": "uint256" }
+    ],
+    "name": "getPoRAddressList",
+    "outputs": [
+      {
+        "components": [
+          { "internalType": "string", "name": "tokenSymbol", "type": "string" },
+          { "internalType": "string", "name": "chain", "type": "string" },
+          { "internalType": "uint64", "name": "chainId", "type": "uint64" },
+          { "internalType": "address", "name": "tokenAddress", "type": "address" },
+          { "internalType": "address", "name": "vaultAddress", "type": "address" }
+        ],
+        "internalType": "struct IPoRAddressListMulti.TokenVaultInfo[]",
+        "name": "tokenVaultInfos_",
+        "type": "tuple[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "getPoRAddressListLength",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  }
+]

packages/sources/por-address-list/src/endpoint/multichainAddress.ts

@@ -17,6 +17,12 @@ export const inputParameters = new InputParameters(
       type: 'string',
       required: true,
     },
+    abiName: {
+      description: 'Used to select the ABI by name',
+      type: 'string',
+      options: ['MultiEVMPoRAddressList', 'PoRAddressListMulti', 'SolvMultiAddressList'],
+      required: true,
+    },
     type: {
       description:
         'The type of addresses you are looking for. tokens is for token-balance EA. vault is for eth-balance EA.',
@@ -43,6 +49,7 @@ export const inputParameters = new InputParameters(
     {
       contractAddress: '0xb7C0817Dd23DE89E4204502dd2C2EF7F57d3A3B8',
       contractAddressNetwork: 'BINANCE',
+      abiName: 'MultiEVMPoRAddressList',
       type: 'tokens',
       vaultPlaceHolder: '0x0000000000000000000000000000000000000001',
       confirmations: 0,

packages/sources/por-address-list/src/index.ts

@@ -8,6 +8,13 @@ export const adapter = new PoRAdapter({
   name: 'POR_ADDRESS_LIST',
   config,
   endpoints: [address, solvBTC, bedrockBTC, multichainAddress],
+  rateLimiting: {
+    tiers: {
+      default: {
+        rateLimit1s: 1,
+      },
+    },
+  },
 })
 
 export const server = (): Promise<ServerInstance | undefined> => expose(adapter)

packages/sources/por-address-list/src/transport/multichainAddress.ts

@@ -2,11 +2,13 @@ import { SubscriptionTransport } from '@chainlink/external-adapter-framework/tra
 import { EndpointContext } from '@chainlink/external-adapter-framework/adapter'
 import { TransportDependencies } from '@chainlink/external-adapter-framework/transports'
 import { AdapterResponse, sleep } from '@chainlink/external-adapter-framework/util'
-import ABI from '../config/PoRAddressListMulti.json'
-import PolygonABI from '../config/MultiEVMPoRAddressList.json'
+import PoRAddressListMultiABI from '../config/PoRAddressListMulti.json'
+import SolvMultiAddressListABI from '../config/SolvMultiAddressList.json'
+import MultiEVMPoRAddressListABI from '../config/MultiEVMPoRAddressList.json'
 import { BaseEndpointTypes, inputParameters } from '../endpoint/multichainAddress'
 import { ethers } from 'ethers'
 import { fetchAddressList, addProvider, getProvider } from './utils'
+import { AdapterInputError } from '@chainlink/external-adapter-framework/validation/error'
 
 export type AddressTransportTypes = BaseEndpointTypes
 
@@ -64,16 +66,13 @@ export class AddressTransport extends SubscriptionTransport<AddressTransportType
   async _handleRequest(
     param: RequestParams,
   ): Promise<AdapterResponse<AddressTransportTypes['Response']>> {
-    const { confirmations, contractAddress, contractAddressNetwork, batchSize } = param
+    const { confirmations, contractAddress, contractAddressNetwork, abiName, batchSize } = param
 
     this.providersMap = addProvider(contractAddressNetwork, this.providersMap)
     const provider = getProvider(contractAddressNetwork, this.providersMap)
+    const abi = this.getAbi(abiName)
 
-    const addressManager = new ethers.Contract(
-      contractAddress,
-      contractAddressNetwork.toUpperCase() == 'POLYGON' ? PolygonABI : ABI,
-      provider,
-    )
+    const addressManager = new ethers.Contract(contractAddress, abi, provider)
     const latestBlockNum = await provider.getBlockNumber()
 
     const providerDataRequestedUnixMs = Date.now()
@@ -108,6 +107,22 @@ export class AddressTransport extends SubscriptionTransport<AddressTransportType
     }
   }
 
+  private getAbi(abiName: string) {
+    switch (abiName) {
+      case 'MultiEVMPoRAddressList':
+        return MultiEVMPoRAddressListABI
+      case 'PoRAddressListMulti':
+        return PoRAddressListMultiABI
+      case 'SolvMultiAddressList':
+        return SolvMultiAddressListABI
+      default:
+        throw new AdapterInputError({
+          errorResponse: 'abiName not found',
+          statusCode: 400,
+        })
+    }
+  }
+
   getSubscriptionTtlFromConfig(adapterSettings: BaseEndpointTypes['Settings']): number {
     return adapterSettings.WARMUP_SUBSCRIPTION_TTL
   }

packages/sources/por-address-list/src/transport/utils.ts

@@ -77,7 +77,7 @@ export const getProvider = (
     } else {
       throw new AdapterInputError({
         statusCode: 400,
-        message: `Missing ${networkName}_RPC_URL or ${networkName}_RPC_URL environment variables`,
+        message: `Missing ${networkName}_RPC_URL or ${networkName}_RPC_CHAIN_ID environment variables`,
       })
     }
   } else {

packages/sources/por-address-list/test-payload.json

@@ -18,6 +18,7 @@
  }, {
     "endpoint": "multichainAddress",
     "contractAddress": "0xb7C0817Dd23DE89E4204502dd2C2EF7F57d3A3B8",
-    "contractAddressNetwork": "BINANCE"
+    "contractAddressNetwork": "BINANCE",
+    "abiName": "PoRAddressListMulti"
  }]
 }

packages/sources/por-address-list/test/integration/adapter-multichain.test.ts

@@ -99,6 +99,7 @@ describe('execute', () => {
         endpoint: 'multichainAddress',
         contractAddress: 'mock-contract-address',
         contractAddressNetwork: 'BSC',
+        abiName: 'PoRAddressListMulti',
         vaultPlaceHolder: 'PLACE_HOLDER',
       }
       const response = await testAdapter.request(data)
@@ -111,6 +112,7 @@ describe('execute', () => {
         endpoint: 'multichainAddress',
         contractAddress: 'mock-contract-address',
         contractAddressNetwork: 'BSC',
+        abiName: 'PoRAddressListMulti',
         vaultPlaceHolder: 'PLACE_HOLDER',
         type: 'vault',
       }

packages/sources/por-address-list/test/integration/adapter.test.ts

@@ -59,6 +59,7 @@ describe('execute', () => {
     process.env.BEDROCK_UNIBTC_API_ENDPOINT = 'http://bedrock'
     process.env.SOLVBTC_API_ENDPOINT = 'http://solv'
     process.env.BACKGROUND_EXECUTE_MS = '0'
+    process.env.RATE_LIMIT_CAPACITY_SECOND = '500'
     const mockDate = new Date('2001-01-01T11:11:11.111Z')
     spy = jest.spyOn(Date, 'now').mockReturnValue(mockDate.getTime())