@eth-optimism/actions-sdk 0.2.0 → 0.4.0

package/src/lend/providers/aave/sdk.ts

@@ -2,12 +2,14 @@ import { UiPoolDataProvider } from '@aave/contract-helpers'
 import { formatReserves } from '@aave/math-utils'
 import { providers } from 'ethers'
 import type { Address } from 'viem'
-import { base, baseSepolia, optimism, optimismSepolia } from 'viem/chains'
 
 import { WETH } from '@/constants/assets.js'
-import type { SUPPORTED_CHAIN_IDS } from '@/constants/supportedChains.js'
+import type { SupportedChainId } from '@/constants/supportedChains.js'
 import { POOL_GET_RESERVE_DATA_ABI } from '@/lend/providers/aave/abis/pool.js'
-import { getPoolAddress } from '@/lend/providers/aave/addresses.js'
+import {
+  getAaveAddresses,
+  getPoolAddress,
+} from '@/lend/providers/aave/addresses.js'
 import type { ChainManager } from '@/services/ChainManager.js'
 import type { LendProviderConfig } from '@/types/actions.js'
 import type {
@@ -18,27 +20,6 @@ import type {
 } from '@/types/lend/index.js'
 import { getAssetAddress } from '@/utils/assets.js'
 
-/**
- * UI Pool Data Provider addresses for each chain
- * @description Contract addresses for UiPoolDataProvider on each supported chain
- */
-const UI_POOL_DATA_PROVIDER_ADDRESSES: Record<number, Address> = {
-  [optimism.id]: '0x69FA688f1Dc47d4B5d8029D5a35FB7a548310654',
-  [base.id]: '0xd82a47fdebB5bf5329b09441C3DaB4b5df2153Ad',
-  [optimismSepolia.id]: '0x86E2938daE289763D4e09a7e42c5cCcA62Cf9809',
-  [baseSepolia.id]: '0xBc9f5b7E248451CdD7cA54e717a2BFe1F32b566b',
-} as const
-
-/**
- * Pool Addresses Provider addresses for each chain
- */
-const POOL_ADDRESSES_PROVIDER: Record<number, Address> = {
-  [optimism.id]: '0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb',
-  [base.id]: '0xe20fCBdBfFC4Dd138cE8b2E6FBb6CB49777ad64D',
-  [optimismSepolia.id]: '0x36616cf17557639614c1cdDb356b1B83fc0B2132',
-  [baseSepolia.id]: '0xE4C23309117Aa30342BFaae6c95c6478e0A4Ad00',
-} as const
-
 /**
  * Parameters for getReserve function
  */
@@ -119,20 +100,14 @@ export async function getReserve(
     )
   }
 
-  const poolAddress = getPoolAddress(params.marketId.chainId)
-  if (!poolAddress) {
+  const addresses = getAaveAddresses(params.marketId.chainId)
+  if (!addresses) {
     throw new Error(`Aave V3 not deployed on chain ${params.marketId.chainId}`)
   }
 
-  const uiPoolDataProviderAddress =
-    UI_POOL_DATA_PROVIDER_ADDRESSES[params.marketId.chainId]
-  const poolAddressesProvider = POOL_ADDRESSES_PROVIDER[params.marketId.chainId]
-
-  if (!uiPoolDataProviderAddress || !poolAddressesProvider) {
-    throw new Error(
-      `UiPoolDataProvider not configured for chain ${params.marketId.chainId}`,
-    )
-  }
+  const poolAddress = addresses.pool
+  const uiPoolDataProviderAddress = addresses.uiPoolDataProvider
+  const poolAddressesProvider = addresses.poolAddressesProvider
 
   try {
     // Get viem public client for this chain
@@ -264,7 +239,7 @@ export async function getReserves(
  */
 export async function getATokenAddress(params: {
   underlyingAsset: Address
-  chainId: (typeof SUPPORTED_CHAIN_IDS)[number]
+  chainId: SupportedChainId
   chainManager: ChainManager
 }): Promise<Address> {
   const poolAddress = getPoolAddress(params.chainId)

package/src/lend/providers/morpho/MorphoLendProvider.ts

@@ -1,9 +1,8 @@
-import { ChainId } from '@morpho-org/blue-sdk'
 import { MetaMorphoAction } from '@morpho-org/blue-sdk-viem'
 import { erc20Abi, formatUnits } from 'viem'
 
-import { SUPPORTED_CHAIN_IDS as ACTIONS_SUPPORTED_CHAIN_IDS } from '@/constants/supportedChains.js'
 import { LendProvider } from '@/lend/core/LendProvider.js'
+import { getSupportedChainIds as getMorphoSupportedChainIds } from '@/lend/providers/morpho/contracts.js'
 import { getVault, getVaults } from '@/lend/providers/morpho/sdk.js'
 import type { ChainManager } from '@/services/ChainManager.js'
 import type { LendProviderConfig } from '@/types/actions.js'
@@ -19,25 +18,14 @@ import type {
 } from '@/types/lend/index.js'
 import { getAssetAddress } from '@/utils/assets.js'
 
-/**
- * Supported chain IDs for Morpho lending
- * @description Array of chain IDs where Morpho is available
- */
-export const SUPPORTED_CHAIN_IDS = [
-  ...new Set([
-    ...Object.values(ChainId).filter(
-      (value): value is number => typeof value === 'number',
-    ),
-    ...ACTIONS_SUPPORTED_CHAIN_IDS,
-  ]),
-] as readonly number[]
-
 /**
  * Morpho lending provider implementation
  * @description Lending provider implementation using Morpho protocol
  */
 export class MorphoLendProvider extends LendProvider<LendProviderConfig> {
-  protected readonly SUPPORTED_CHAIN_IDS = SUPPORTED_CHAIN_IDS
+  protocolSupportedChainIds(): number[] {
+    return getMorphoSupportedChainIds()
+  }
 
   /**
    * Create a new Morpho lending provider

package/src/lend/providers/morpho/__tests__/api.test.ts

@@ -1,6 +1,8 @@
 import type { Address } from 'viem'
+import { mainnet } from 'viem/chains'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 
+import { MORPHO, USDC } from '@/constants/assets.js'
 import { fetchRewards } from '@/lend/providers/morpho/api.js'
 import {
   calculateRewardsBreakdown,
@@ -8,6 +10,10 @@ import {
 } from '@/lend/providers/morpho/sdk.js'
 import { externalTest } from '@/utils/test.js'
 
+const CHAIN_ID = mainnet.id
+const USDC_ADDRESS = USDC.address[CHAIN_ID]!.toLowerCase()
+const MORPHO_ADDRESS = MORPHO.address[CHAIN_ID]!.toLowerCase()
+
 /**
  * Mock API response for a vault with rewards
  */
@@ -18,20 +24,20 @@ const mockVaultWithRewards = {
     rewards: [
       {
         asset: {
-          address: '0x078d782b760474a361dda0af3839290b0ef57ad6',
+          address: USDC_ADDRESS,
           name: 'USD Coin',
           symbol: 'USDC',
-          chain: { id: 130 },
+          chain: { id: CHAIN_ID },
         },
         amountPerSuppliedToken: '1000000',
         supplyApr: 0.025, // 2.5% APR
       },
       {
         asset: {
-          address: '0x9994e35db50125e0df82e4c2dde62496ce330999',
+          address: MORPHO_ADDRESS,
           name: 'Morpho Token',
           symbol: 'MORPHO',
-          chain: { id: 130 },
+          chain: { id: CHAIN_ID },
         },
         amountPerSuppliedToken: '500000',
         supplyApr: 0.01, // 1% APR
@@ -50,7 +56,7 @@ const mockVaultWithRewards = {
                 asset: {
                   address: '0xunknown',
                   symbol: 'UNKNOWN',
-                  chain: { id: 130 },
+                  chain: { id: CHAIN_ID },
                 },
               },
             ],
@@ -70,7 +76,7 @@ const mockVaultWithRewards = {
       },
     ],
   },
-  chain: { id: 130 },
+  chain: { id: CHAIN_ID },
 }
 
 /**
@@ -83,7 +89,7 @@ const mockVaultNoRewards = {
     rewards: [],
     allocation: [],
   },
-  chain: { id: 130 },
+  chain: { id: CHAIN_ID },
 }
 
 describe('Morpho API Integration', () => {
@@ -107,7 +113,7 @@ describe('Morpho API Integration', () => {
         }),
       )
 
-      const vaultData = await fetchRewards(GAUNTLET_USDC_VAULT)
+      const vaultData = await fetchRewards(GAUNTLET_USDC_VAULT, CHAIN_ID)
 
       expect(vaultData).toBeDefined()
       expect(vaultData).not.toBeNull()
@@ -129,7 +135,7 @@ describe('Morpho API Integration', () => {
         }),
       )
 
-      const vaultData = await fetchRewards(GAUNTLET_USDC_VAULT)
+      const vaultData = await fetchRewards(GAUNTLET_USDC_VAULT, CHAIN_ID)
       expect(vaultData).toBeNull()
     })
 
@@ -139,7 +145,7 @@ describe('Morpho API Integration', () => {
         vi.fn().mockRejectedValue(new Error('Network error')),
       )
 
-      const vaultData = await fetchRewards(GAUNTLET_USDC_VAULT)
+      const vaultData = await fetchRewards(GAUNTLET_USDC_VAULT, CHAIN_ID)
       expect(vaultData).toBeNull()
     })
 
@@ -153,17 +159,17 @@ describe('Morpho API Integration', () => {
         }),
       )
 
-      const vaultData = await fetchRewards(GAUNTLET_USDC_VAULT)
+      const vaultData = await fetchRewards(GAUNTLET_USDC_VAULT, CHAIN_ID)
       expect(vaultData).toBeNull()
     })
   })
 
   describe('calculateRewardsBreakdown', () => {
-    it('should calculate rewards from vault-level rewards', () => {
-      const rewards = calculateRewardsBreakdown(mockVaultWithRewards)
+    it('should calculate rewards from vault-level rewards keyed by address', () => {
+      const rewards = calculateRewardsBreakdown(mockVaultWithRewards, CHAIN_ID)
 
-      expect(rewards.usdc).toBe(0.025)
-      expect(rewards.morpho).toBe(0.01)
+      expect(rewards[USDC_ADDRESS]).toBe(0.025)
+      expect(rewards[MORPHO_ADDRESS]).toBe(0.01)
       expect(rewards.totalRewards).toBeCloseTo(
         0.025 + 0.01 + 0.005 * (1000000 / 1500000),
         6,
@@ -171,21 +177,21 @@ describe('Morpho API Integration', () => {
     })
 
     it('should return zeros for vault with no rewards', () => {
-      const rewards = calculateRewardsBreakdown(mockVaultNoRewards)
+      const rewards = calculateRewardsBreakdown(mockVaultNoRewards, CHAIN_ID)
 
-      expect(rewards.usdc).toBe(0)
-      expect(rewards.morpho).toBe(0)
+      expect(rewards[USDC_ADDRESS]).toBe(0)
+      expect(rewards[MORPHO_ADDRESS]).toBe(0)
       expect(rewards.other).toBe(0)
       expect(rewards.totalRewards).toBe(0)
     })
 
-    it('should categorize unknown tokens as other', () => {
+    it('should categorize unknown token addresses as other', () => {
       const vaultWithUnknown = {
         ...mockVaultNoRewards,
         state: {
           rewards: [
             {
-              asset: { symbol: 'RARE_TOKEN' },
+              asset: { address: '0xunknowntoken', symbol: 'RARE_TOKEN' },
               supplyApr: 0.05,
             },
           ],
@@ -193,7 +199,7 @@ describe('Morpho API Integration', () => {
         },
       }
 
-      const rewards = calculateRewardsBreakdown(vaultWithUnknown)
+      const rewards = calculateRewardsBreakdown(vaultWithUnknown, CHAIN_ID)
 
       expect(rewards.other).toBe(0.05)
     })
@@ -207,7 +213,12 @@ describe('Morpho API Integration', () => {
             {
               market: {
                 state: {
-                  rewards: [{ asset: { symbol: 'USDC' }, supplyApr: 0.1 }],
+                  rewards: [
+                    {
+                      asset: { address: USDC_ADDRESS, symbol: 'USDC' },
+                      supplyApr: 0.1,
+                    },
+                  ],
                 },
               },
               supplyAssetsUsd: 750000, // 75% of total
@@ -215,7 +226,12 @@ describe('Morpho API Integration', () => {
             {
               market: {
                 state: {
-                  rewards: [{ asset: { symbol: 'USDC' }, supplyApr: 0.02 }],
+                  rewards: [
+                    {
+                      asset: { address: USDC_ADDRESS, symbol: 'USDC' },
+                      supplyApr: 0.02,
+                    },
+                  ],
                 },
               },
               supplyAssetsUsd: 250000, // 25% of total
@@ -224,10 +240,13 @@ describe('Morpho API Integration', () => {
         },
       }
 
-      const rewards = calculateRewardsBreakdown(vaultWithMarketRewards)
+      const rewards = calculateRewardsBreakdown(
+        vaultWithMarketRewards,
+        CHAIN_ID,
+      )
 
       // Expected: 0.1 * 0.75 + 0.02 * 0.25 = 0.075 + 0.005 = 0.08
-      expect(rewards.usdc).toBeCloseTo(0.08, 6)
+      expect(rewards[USDC_ADDRESS]).toBeCloseTo(0.08, 6)
     })
   })
 
@@ -244,15 +263,18 @@ describe('Morpho API Integration', () => {
         }),
       )
 
-      const rewards = await fetchAndCalculateRewards(GAUNTLET_USDC_VAULT)
+      const rewards = await fetchAndCalculateRewards(
+        GAUNTLET_USDC_VAULT,
+        CHAIN_ID,
+      )
 
       expect(rewards).toBeDefined()
-      expect(typeof rewards.usdc).toBe('number')
-      expect(typeof rewards.morpho).toBe('number')
+      expect(typeof rewards[USDC_ADDRESS]).toBe('number')
+      expect(typeof rewards[MORPHO_ADDRESS]).toBe('number')
       expect(typeof rewards.other).toBe('number')
       expect(typeof rewards.totalRewards).toBe('number')
-      expect(rewards.usdc).toBeGreaterThan(0)
-      expect(rewards.morpho).toBeGreaterThan(0)
+      expect(rewards[USDC_ADDRESS]).toBeGreaterThan(0)
+      expect(rewards[MORPHO_ADDRESS]).toBeGreaterThan(0)
     })
 
     it('should return empty rewards when vault not found', async () => {
@@ -267,10 +289,13 @@ describe('Morpho API Integration', () => {
         }),
       )
 
-      const rewards = await fetchAndCalculateRewards(GAUNTLET_USDC_VAULT)
+      const rewards = await fetchAndCalculateRewards(
+        GAUNTLET_USDC_VAULT,
+        CHAIN_ID,
+      )
 
-      expect(rewards.usdc).toBe(0)
-      expect(rewards.morpho).toBe(0)
+      expect(rewards[USDC_ADDRESS]).toBe(0)
+      expect(rewards[MORPHO_ADDRESS]).toBe(0)
       expect(rewards.other).toBe(0)
       expect(rewards.totalRewards).toBe(0)
     })
@@ -279,7 +304,7 @@ describe('Morpho API Integration', () => {
   // External tests that make real network requests (only run with EXTERNAL_TEST=true)
   describe.runIf(externalTest())('External API Tests', () => {
     it('should fetch raw vault data from Morpho GraphQL API', async () => {
-      const vaultData = await fetchRewards(GAUNTLET_USDC_VAULT)
+      const vaultData = await fetchRewards(GAUNTLET_USDC_VAULT, CHAIN_ID)
 
       expect(vaultData).toBeDefined()
       expect(vaultData).not.toBeNull()
@@ -290,33 +315,29 @@ describe('Morpho API Integration', () => {
     }, 30000)
 
     it('should fetch and calculate rewards breakdown', async () => {
-      const rewards = await fetchAndCalculateRewards(GAUNTLET_USDC_VAULT)
+      const rewards = await fetchAndCalculateRewards(
+        GAUNTLET_USDC_VAULT,
+        CHAIN_ID,
+      )
 
       expect(rewards).toBeDefined()
-      expect(typeof rewards.usdc).toBe('number')
-      expect(typeof rewards.morpho).toBe('number')
       expect(typeof rewards.other).toBe('number')
       expect(typeof rewards.totalRewards).toBe('number')
 
-      expect(rewards.usdc).toBeGreaterThanOrEqual(0)
-      expect(rewards.morpho).toBeGreaterThanOrEqual(0)
       expect(rewards.other).toBeGreaterThanOrEqual(0)
       expect(rewards.totalRewards).toBeGreaterThanOrEqual(0)
-
-      const expectedTotal = rewards.usdc + rewards.morpho + rewards.other
-      expect(rewards.totalRewards).toBeCloseTo(expectedTotal, 6)
     }, 30000)
 
     it('should handle non-existent vault gracefully', async () => {
       const nonExistentVault =
         '0x0000000000000000000000000000000000000000' as Address
 
-      const vaultData = await fetchRewards(nonExistentVault)
+      const vaultData = await fetchRewards(nonExistentVault, CHAIN_ID)
       expect(vaultData).toBeNull()
     }, 30000)
 
     it('should validate GraphQL response structure', async () => {
-      const vaultData = await fetchRewards(GAUNTLET_USDC_VAULT)
+      const vaultData = await fetchRewards(GAUNTLET_USDC_VAULT, CHAIN_ID)
 
       expect(vaultData).toMatchObject({
         address: expect.any(String),

package/src/lend/providers/morpho/__tests__/sdk.test.ts

@@ -1,10 +1,16 @@
+import { mainnet } from 'viem/chains'
 import { describe, expect, it } from 'vitest'
 
+import { MORPHO, USDC } from '@/constants/assets.js'
 import {
   calculateBaseApy,
   calculateRewardsBreakdown,
 } from '@/lend/providers/morpho/sdk.js'
 
+const CHAIN_ID = mainnet.id
+const USDC_ADDRESS = USDC.address[CHAIN_ID]!.toLowerCase()
+const MORPHO_ADDRESS = MORPHO.address[CHAIN_ID]!.toLowerCase()
+
 describe('Vault Utilities', () => {
   describe('calculateBaseApy', () => {
     it('should return 0 for vault with no assets', () => {
@@ -157,39 +163,34 @@ describe('Vault Utilities', () => {
         },
       }
 
-      const result = calculateRewardsBreakdown(apiVault)
-
-      expect(result).toEqual({
-        usdc: 0,
-        usdc_demo: 0,
-        morpho: 0,
-        eth: 0,
-        weth: 0,
-        other: 0,
-        totalRewards: 0,
-      })
+      const result = calculateRewardsBreakdown(apiVault, CHAIN_ID)
+
+      expect(result[USDC_ADDRESS]).toBe(0)
+      expect(result[MORPHO_ADDRESS]).toBe(0)
+      expect(result.other).toBe(0)
+      expect(result.totalRewards).toBe(0)
     })
 
-    it('should categorize vault-level rewards by chain ID', () => {
+    it('should categorize vault-level rewards by address', () => {
       const apiVault = {
         state: {
           rewards: [
             {
               supplyApr: 0.03, // 3% USDC rewards
               asset: {
-                address: '0x078d782b760474a361dda0af3839290b0ef57ad6',
+                address: USDC_ADDRESS,
                 name: 'USDC',
                 symbol: 'USDC',
-                chain: { id: 130 }, // Unichain = USDC rewards
+                chain: { id: CHAIN_ID },
               },
             },
             {
               supplyApr: 0.015, // 1.5% MORPHO rewards
               asset: {
-                address: '0x58D97B57BB95320F9a05dC918Aef65434969c2B2',
+                address: MORPHO_ADDRESS,
                 name: 'MORPHO',
                 symbol: 'MORPHO',
-                chain: { id: 1 }, // Ethereum = MORPHO rewards
+                chain: { id: CHAIN_ID },
               },
             },
           ],
@@ -197,10 +198,10 @@ describe('Vault Utilities', () => {
         },
       }
 
-      const result = calculateRewardsBreakdown(apiVault)
+      const result = calculateRewardsBreakdown(apiVault, CHAIN_ID)
 
-      expect(result.usdc).toBeCloseTo(0.03, 4)
-      expect(result.morpho).toBeCloseTo(0.015, 4)
+      expect(result[USDC_ADDRESS]).toBeCloseTo(0.03, 4)
+      expect(result[MORPHO_ADDRESS]).toBeCloseTo(0.015, 4)
       expect(result.other).toBe(0)
       expect(result.totalRewards).toBeCloseTo(0.045, 4)
     })
@@ -219,9 +220,9 @@ describe('Vault Utilities', () => {
                     {
                       supplyApr: 0.02, // 2% reward
                       asset: {
-                        address: '0x078d782b760474a361dda0af3839290b0ef57ad6',
+                        address: USDC_ADDRESS,
                         symbol: 'USDC',
-                        chain: { id: 130 }, // USDC reward
+                        chain: { id: CHAIN_ID },
                       },
                     },
                   ],
@@ -237,9 +238,9 @@ describe('Vault Utilities', () => {
                     {
                       supplyApr: 0.05, // 5% reward
                       asset: {
-                        address: '0x58D97B57BB95320F9a05dC918Aef65434969c2B2',
+                        address: MORPHO_ADDRESS,
                         symbol: 'MORPHO',
-                        chain: { id: 1 }, // MORPHO reward
+                        chain: { id: CHAIN_ID },
                       },
                     },
                   ],
@@ -250,13 +251,13 @@ describe('Vault Utilities', () => {
         },
       }
 
-      const result = calculateRewardsBreakdown(apiVault)
+      const result = calculateRewardsBreakdown(apiVault, CHAIN_ID)
 
       // Expected calculation:
       // USDC: 2% * (600k / 1M) = 1.2%
       // MORPHO: 5% * (400k / 1M) = 2%
-      expect(result.usdc).toBeCloseTo(0.012, 4)
-      expect(result.morpho).toBeCloseTo(0.02, 4)
+      expect(result[USDC_ADDRESS]).toBeCloseTo(0.012, 4)
+      expect(result[MORPHO_ADDRESS]).toBeCloseTo(0.02, 4)
       expect(result.other).toBe(0)
       expect(result.totalRewards).toBeCloseTo(0.032, 4)
     })
@@ -268,9 +269,9 @@ describe('Vault Utilities', () => {
             {
               supplyApr: 0.01, // 1% vault-level USDC reward
               asset: {
-                address: '0xBAa5CC21fd487B8Fcc2F632f3F4E8D37262a0842',
+                address: USDC_ADDRESS,
                 symbol: 'USDC',
-                chain: { id: 130 },
+                chain: { id: CHAIN_ID },
               },
             },
           ],
@@ -284,9 +285,9 @@ describe('Vault Utilities', () => {
                     {
                       supplyApr: 0.015, // 1.5% market-level MORPHO reward
                       asset: {
-                        address: '0x58D97B57BB95320F9a05dC918Aef65434969c2B2',
+                        address: MORPHO_ADDRESS,
                         symbol: 'MORPHO',
-                        chain: { id: 1 },
+                        chain: { id: CHAIN_ID },
                       },
                     },
                   ],
@@ -297,14 +298,14 @@ describe('Vault Utilities', () => {
         },
       }
 
-      const result = calculateRewardsBreakdown(apiVault)
+      const result = calculateRewardsBreakdown(apiVault, CHAIN_ID)
 
-      expect(result.usdc).toBeCloseTo(0.01, 4) // Vault-level
-      expect(result.morpho).toBeCloseTo(0.015, 4) // Market-level (100% weight)
+      expect(result[USDC_ADDRESS]).toBeCloseTo(0.01, 4) // Vault-level
+      expect(result[MORPHO_ADDRESS]).toBeCloseTo(0.015, 4) // Market-level (100% weight)
       expect(result.totalRewards).toBeCloseTo(0.025, 4)
     })
 
-    it('should categorize unknown tokens as other rewards', () => {
+    it('should categorize unknown token addresses as other', () => {
       const apiVault = {
         state: {
           rewards: [
@@ -314,7 +315,7 @@ describe('Vault Utilities', () => {
                 address: '0x1234567890123456789012345678901234567890',
                 name: 'UNKNOWN',
                 symbol: 'UNKNOWN',
-                chain: { id: 42 }, // Unknown chain
+                chain: { id: CHAIN_ID },
               },
             },
           ],
@@ -322,10 +323,10 @@ describe('Vault Utilities', () => {
         },
       }
 
-      const result = calculateRewardsBreakdown(apiVault)
+      const result = calculateRewardsBreakdown(apiVault, CHAIN_ID)
 
-      expect(result.usdc).toBe(0)
-      expect(result.morpho).toBe(0)
+      expect(result[USDC_ADDRESS]).toBe(0)
+      expect(result[MORPHO_ADDRESS]).toBe(0)
       expect(result.other).toBeCloseTo(0.005, 4)
       expect(result.totalRewards).toBeCloseTo(0.005, 4)
     })
@@ -344,9 +345,9 @@ describe('Vault Utilities', () => {
                     {
                       supplyApr: 0.1, // High reward but no weight
                       asset: {
-                        address: '0xBAa5CC21fd487B8Fcc2F632f3F4E8D37262a0842',
+                        address: USDC_ADDRESS,
                         symbol: 'USDC',
-                        chain: { id: 130 },
+                        chain: { id: CHAIN_ID },
                       },
                     },
                   ],
@@ -357,10 +358,10 @@ describe('Vault Utilities', () => {
         },
       }
 
-      const result = calculateRewardsBreakdown(apiVault)
+      const result = calculateRewardsBreakdown(apiVault, CHAIN_ID)
 
       // Should be zero because total supply is zero (weight = 0)
-      expect(result.usdc).toBe(0)
+      expect(result[USDC_ADDRESS]).toBe(0)
       expect(result.totalRewards).toBe(0)
     })
   })

package/src/lend/providers/morpho/api.ts

@@ -3,8 +3,8 @@ import type { Address } from 'viem'
 const MORPHO_API_ENDPOINT = 'https://api.morpho.org/graphql'
 
 export interface RewardsBreakdown {
-  usdc: number
-  morpho: number
+  /** Reward APR per token, keyed by lowercase token address. 'other' for unrecognized tokens. */
+  [tokenAddress: string]: number
   other: number
   totalRewards: number
 }
@@ -14,7 +14,10 @@ export interface RewardsBreakdown {
  * @param vaultAddress - Vault address
  * @returns Promise resolving to raw vault data or null if not found
  */
-export async function fetchRewards(vaultAddress: Address): Promise<any | null> {
+export async function fetchRewards(
+  vaultAddress: Address,
+  chainId: number,
+): Promise<any | null> {
   const vaultQuery = {
     query: `
       query VaultByAddress($address: String!, $chainId: Int) {
@@ -63,7 +66,7 @@ export async function fetchRewards(vaultAddress: Address): Promise<any | null> {
     `,
     variables: {
       address: vaultAddress.toLowerCase(),
-      chainId: 130,
+      chainId,
     },
   }