update from CR comments

Author: Thorian1te

packages/xchain-evm/__tests__/cache.test.ts

@@ -0,0 +1,46 @@
+import { JsonRpcProvider } from 'ethers'
+import { getCachedContract } from '../src/cache'
+import erc20ABI from '../src/data/erc20.json'
+
+describe('Contract Cache', () => {
+  it('should cache contracts separately for different providers', async () => {
+    // Create two different providers
+    const provider1 = new JsonRpcProvider('https://eth.llamarpc.com')
+    const provider2 = new JsonRpcProvider('https://goerli.infura.io/v3/test')
+
+    const contractAddress = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' // USDC address
+
+    // Get contracts from both providers
+    const contract1 = await getCachedContract(contractAddress, erc20ABI, provider1)
+    const contract2 = await getCachedContract(contractAddress, erc20ABI, provider2)
+
+    // Contracts should have different providers
+    expect(contract1.runner).toBe(provider1)
+    expect(contract2.runner).toBe(provider2)
+    expect(contract1).not.toBe(contract2) // Different contract instances
+
+    // Getting the same contract again should return the cached instance
+    const contract1Again = await getCachedContract(contractAddress, erc20ABI, provider1)
+    expect(contract1).toBe(contract1Again) // Same instance from cache
+  })
+
+  it('should cache contracts separately for different addresses on same provider', async () => {
+    const provider = new JsonRpcProvider('https://eth.llamarpc.com')
+
+    const address1 = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' // USDC
+    const address2 = '0xdAC17F958D2ee523a2206206994597C13D831ec7' // USDT
+
+    // Get contracts for different addresses
+    const contract1 = await getCachedContract(address1, erc20ABI, provider)
+    const contract2 = await getCachedContract(address2, erc20ABI, provider)
+
+    // Should be different contract instances
+    expect(contract1).not.toBe(contract2)
+    expect(contract1.target).toBe(address1)
+    expect(contract2.target).toBe(address2)
+
+    // Getting the same contract again should return the cached instance
+    const contract1Again = await getCachedContract(address1, erc20ABI, provider)
+    expect(contract1).toBe(contract1Again)
+  })
+})

packages/xchain-evm/src/cache.ts

@@ -1,17 +1,41 @@
 import { Contract, Provider } from 'ethers'
 import BigNumber from 'bignumber.js'
 
-// Global caches for Contract and BigNumber instances
+// Per-provider contract cache to ensure contracts are properly isolated
+// Key format: `${providerNetwork}_${chainId}_${address}`
 const contractCache = new Map<string, Contract>()
 const bigNumberCache = new Map<string, BigNumber>()
 
+/**
+ * Generate a unique cache key for a contract that includes provider context
+ */
+async function getContractCacheKey(address: string, provider: Provider): Promise<string> {
+  try {
+    // Get network information from provider to create unique key
+    const network = await provider.getNetwork()
+    const chainId = network.chainId.toString()
+    const networkName = network.name || 'unknown'
+    return `${networkName}_${chainId}_${address.toLowerCase()}`
+  } catch {
+    // Fallback to a provider-specific key if network info unavailable
+    // Use provider instance as unique identifier
+    const providerIdentity = provider as any
+    const connectionUrl = providerIdentity._request?.url || 
+                          providerIdentity.connection?.url || 
+                          providerIdentity._url || 
+                          'unknown'
+    const hashedKey = Buffer.from(connectionUrl.toString()).toString('base64').replace(/[^a-zA-Z0-9]/g, '').slice(0, 10)
+    return `provider_${hashedKey}_${address.toLowerCase()}`
+  }
+}
+
 /**
  * Get a cached Contract instance or create a new one
+ * Now includes provider/network isolation to prevent cross-network contract reuse
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function getCachedContract(address: string, abi: any, provider: Provider): Contract {
-  // Use address as key (contracts are address-specific anyway)
-  const key = address.toLowerCase()
+export async function getCachedContract(address: string, abi: any, provider: Provider): Promise<Contract> {
+  const key = await getContractCacheKey(address, provider)
   if (!contractCache.has(key)) {
     contractCache.set(key, new Contract(address, abi, provider))
   }

packages/xchain-evm/src/clients/client.ts

@@ -453,7 +453,7 @@ export class Client extends BaseXChainClient implements EVMClient {
       // ERC20 gas estimate
       const assetAddress = getTokenAddress(theAsset)
       if (!assetAddress) throw Error(`Can't get address from asset ${assetToString(theAsset)}`)
-      const contract = getCachedContract(assetAddress, erc20ABI, this.getProvider())
+      const contract = await getCachedContract(assetAddress, erc20ABI, this.getProvider())
 
       const address = from || (await this.getAddressAsync())
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -703,7 +703,7 @@ export class Client extends BaseXChainClient implements EVMClient {
       const assetAddress = getTokenAddress(asset)
       if (!assetAddress) throw Error(`Can't parse address from asset ${assetToString(asset)}`)
 
-      const contract = getCachedContract(assetAddress, erc20ABI, this.getProvider())
+      const contract = await getCachedContract(assetAddress, erc20ABI, this.getProvider())
 
       const amountToTransfer = BigInt(amount.amount().toFixed())
       const unsignedTx = await contract.getFunction('transfer').populateTransaction(recipient, amountToTransfer)
@@ -736,7 +736,7 @@ export class Client extends BaseXChainClient implements EVMClient {
     if (!this.validateAddress(spenderAddress)) throw Error('Invalid spenderAddress address')
     if (!this.validateAddress(sender)) throw Error('Invalid sender address')
 
-    const contract = getCachedContract(contractAddress, erc20ABI, this.getProvider())
+    const contract = await getCachedContract(contractAddress, erc20ABI, this.getProvider())
     const valueToApprove = getApprovalAmount(amount)
 
     const unsignedTx = await contract

packages/xchain-evm/src/utils.ts

@@ -120,7 +120,7 @@ export const estimateCall = async ({
   funcName: string
   funcParams?: unknown[]
 }): Promise<BigNumber> => {
-  const contract = getCachedContract(contractAddress, abi, provider)
+  const contract = await getCachedContract(contractAddress, abi, provider)
   const estiamtion = await contract.getFunction(funcName).estimateGas(...funcParams)
   return getCachedBigNumber(estiamtion.toString())
 }
@@ -150,7 +150,7 @@ export const call = async <T>({
   funcName: string
   funcParams?: unknown[]
 }): Promise<T> => {
-  let contract: BaseContract = getCachedContract(contractAddress, abi, provider)
+  let contract: BaseContract = await getCachedContract(contractAddress, abi, provider)
   if (signer) {
     // For sending transactions, a signer is needed
     contract = contract.connect(signer)
@@ -176,7 +176,7 @@ export const getContract = async ({
   contractAddress: Address
   abi: InterfaceAbi
 }): Promise<Contract> => {
-  return getCachedContract(contractAddress, abi, provider)
+  return await getCachedContract(contractAddress, abi, provider)
 }
 
 /**
@@ -240,7 +240,7 @@ export async function isApproved({
   amount?: BaseAmount
 }): Promise<boolean> {
   const txAmount = getCachedBigNumber(amount?.amount().toFixed() ?? '1')
-  const contract = getCachedContract(contractAddress, erc20ABI, provider)
+  const contract = await getCachedContract(contractAddress, erc20ABI, provider)
   const allowanceResponse = await contract.allowance(fromAddress, spenderAddress)
   const allowance = getCachedBigNumber(allowanceResponse.toString())