@eth-optimism/actions-sdk 0.0.4 → 0.2.0

package/src/wallet/core/providers/smart/default/__tests__/DefaultSmartWalletProvider.spec.ts

@@ -14,11 +14,11 @@ import type {
 } from 'viem/account-abstraction'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+import { getRandomAddress } from '@/__mocks__/utils.js'
 import type { SupportedChainId } from '@/constants/supportedChains.js'
+import { createMockLendProvider } from '@/lend/__mocks__/MockLendProvider.js'
+import { MockChainManager } from '@/services/__mocks__/MockChainManager.js'
 import type { ChainManager } from '@/services/ChainManager.js'
-import { MockChainManager } from '@/test/MockChainManager.js'
-import { createMockLendProvider } from '@/test/MockLendProvider.js'
-import { getRandomAddress } from '@/test/utils.js'
 import { DefaultSmartWalletProvider } from '@/wallet/core/providers/smart/default/DefaultSmartWalletProvider.js'
 import { createMock as createDefaultSmartWalletMock } from '@/wallet/core/wallets/smart/default/__mocks__/DefaultSmartWallet.js'
 import {
@@ -35,6 +35,7 @@ const mockSigner: LocalAccount = {
   address: getRandomAddress(),
   type: 'local',
 } as unknown as LocalAccount
+const supportedAssets = undefined
 
 describe('DefaultSmartWalletProvider', () => {
   const mockWallet: ReturnType<typeof createDefaultSmartWalletMock> =
@@ -75,10 +76,9 @@ describe('DefaultSmartWalletProvider', () => {
   })
 
   it('should create a wallet and return deployment results', async () => {
-    const provider = new DefaultSmartWalletProvider(
-      mockChainManager,
-      mockLendProvider,
-    )
+    const provider = new DefaultSmartWalletProvider(mockChainManager, {
+      morpho: mockLendProvider,
+    })
     const signers = [mockSigner.address, getRandomAddress()]
     const nonce = BigInt(123)
 
@@ -117,10 +117,9 @@ describe('DefaultSmartWalletProvider', () => {
   })
 
   it('should report deployment successes across multiple chains', async () => {
-    const provider = new DefaultSmartWalletProvider(
-      mockChainManager,
-      mockLendProvider,
-    )
+    const provider = new DefaultSmartWalletProvider(mockChainManager, {
+      morpho: mockLendProvider,
+    })
     const signers = [mockSigner.address, getRandomAddress()]
     const nonce = BigInt(123)
 
@@ -159,17 +158,15 @@ describe('DefaultSmartWalletProvider', () => {
   })
 
   it('should report deployment failures', async () => {
-    const provider = new DefaultSmartWalletProvider(
-      mockChainManager,
-      mockLendProvider,
-    )
+    const provider = new DefaultSmartWalletProvider(mockChainManager, {
+      morpho: mockLendProvider,
+    })
     const signers = [mockSigner.address, getRandomAddress()]
     const nonce = BigInt(123)
 
     // Mock deploy to fail for all chains
-    const { SmartWalletDeploymentError } = await import(
-      '@/wallet/core/wallets/smart/error/errors.js'
-    )
+    const { SmartWalletDeploymentError } =
+      await import('@/wallet/core/wallets/smart/error/errors.js')
     vi.mocked(mockWallet.deploy)
       .mockRejectedValueOnce(
         new SmartWalletDeploymentError('Deployment failed', 1),
@@ -205,16 +202,14 @@ describe('DefaultSmartWalletProvider', () => {
   })
 
   it('should handle mixed deployment successes and failures', async () => {
-    const provider = new DefaultSmartWalletProvider(
-      mockChainManager,
-      mockLendProvider,
-    )
+    const provider = new DefaultSmartWalletProvider(mockChainManager, {
+      morpho: mockLendProvider,
+    })
     const signers = [mockSigner.address, getRandomAddress()]
     const nonce = BigInt(123)
 
-    const { SmartWalletDeploymentError } = await import(
-      '@/wallet/core/wallets/smart/error/errors.js'
-    )
+    const { SmartWalletDeploymentError } =
+      await import('@/wallet/core/wallets/smart/error/errors.js')
 
     // Mock deploy to succeed for chain 1, fail for chain 130
     vi.mocked(mockWallet.deploy)
@@ -255,10 +250,9 @@ describe('DefaultSmartWalletProvider', () => {
   })
 
   it('should respect deploymentChainIds parameter', async () => {
-    const provider = new DefaultSmartWalletProvider(
-      mockChainManager,
-      mockLendProvider,
-    )
+    const provider = new DefaultSmartWalletProvider(mockChainManager, {
+      morpho: mockLendProvider,
+    })
     const signers = [mockSigner.address, getRandomAddress()]
     const nonce = BigInt(123)
     const deploymentChainIds: SupportedChainId[] = [1]
@@ -286,10 +280,9 @@ describe('DefaultSmartWalletProvider', () => {
   })
 
   it('should throw error for non-SmartWalletDeploymentError failures', async () => {
-    const provider = new DefaultSmartWalletProvider(
-      mockChainManager,
-      mockLendProvider,
-    )
+    const provider = new DefaultSmartWalletProvider(mockChainManager, {
+      morpho: mockLendProvider,
+    })
     const signers = [mockSigner.address, getRandomAddress()]
     const nonce = BigInt(123)
 
@@ -306,10 +299,9 @@ describe('DefaultSmartWalletProvider', () => {
   })
 
   it('should get wallet address with correct contract call', async () => {
-    const provider = new DefaultSmartWalletProvider(
-      mockChainManager,
-      mockLendProvider,
-    )
+    const provider = new DefaultSmartWalletProvider(mockChainManager, {
+      morpho: mockLendProvider,
+    })
     const signers = [mockSigner.address, getRandomAddress()]
     const nonce = BigInt(456)
     const mockAddress = getRandomAddress()
@@ -329,10 +321,9 @@ describe('DefaultSmartWalletProvider', () => {
   })
 
   it('should get wallet address with default nonce', async () => {
-    const provider = new DefaultSmartWalletProvider(
-      mockChainManager,
-      mockLendProvider,
-    )
+    const provider = new DefaultSmartWalletProvider(mockChainManager, {
+      morpho: mockLendProvider,
+    })
     const signers = [getRandomAddress()]
     const mockAddress = getRandomAddress()
 
@@ -351,10 +342,9 @@ describe('DefaultSmartWalletProvider', () => {
   })
 
   it('should handle WebAuthn accounts in wallet address calculation', async () => {
-    const provider = new DefaultSmartWalletProvider(
-      mockChainManager,
-      mockLendProvider,
-    )
+    const provider = new DefaultSmartWalletProvider(mockChainManager, {
+      morpho: mockLendProvider,
+    })
     const webAuthnAccount: WebAuthnAccount = {
       type: 'webAuthn',
       publicKey: '0x123456789abcdef',
@@ -380,10 +370,9 @@ describe('DefaultSmartWalletProvider', () => {
   })
 
   it('should throw error for invalid signer type', async () => {
-    const provider = new DefaultSmartWalletProvider(
-      mockChainManager,
-      mockLendProvider,
-    )
+    const provider = new DefaultSmartWalletProvider(mockChainManager, {
+      morpho: mockLendProvider,
+    })
     const invalidSigner = { type: 'invalid' } as unknown as Address
     const signers = [invalidSigner]
 
@@ -393,10 +382,9 @@ describe('DefaultSmartWalletProvider', () => {
   })
 
   it('should get existing wallet', async () => {
-    const provider = new DefaultSmartWalletProvider(
-      mockChainManager,
-      mockLendProvider,
-    )
+    const provider = new DefaultSmartWalletProvider(mockChainManager, {
+      morpho: mockLendProvider,
+    })
     const walletAddress = getRandomAddress()
 
     const wallet = await provider.getWallet({
@@ -424,7 +412,8 @@ describe('DefaultSmartWalletProvider', () => {
       DefaultSmartWalletProvider.computeAttributionSuffix(attributionSeed)
     const provider = new DefaultSmartWalletProvider(
       mockChainManager,
-      mockLendProvider,
+      { morpho: mockLendProvider },
+      supportedAssets,
       attributionSeed,
     )
 
@@ -450,7 +439,8 @@ describe('DefaultSmartWalletProvider', () => {
       DefaultSmartWalletProvider.computeAttributionSuffix(attributionSeed)
     const provider = new DefaultSmartWalletProvider(
       mockChainManager,
-      mockLendProvider,
+      { morpho: mockLendProvider },
+      supportedAssets,
       attributionSeed,
     )
 

package/src/wallet/core/wallets/abstract/Wallet.ts

@@ -1,17 +1,14 @@
 import type { Address, LocalAccount } from 'viem'
 
 import type { SupportedChainId } from '@/constants/supportedChains.js'
+import type { LendProvider } from '@/lend/core/LendProvider.js'
 import { WalletLendNamespace } from '@/lend/namespaces/WalletLendNamespace.js'
 import type { ChainManager } from '@/services/ChainManager.js'
 import { fetchERC20Balance, fetchETHBalance } from '@/services/tokenBalance.js'
 import { SUPPORTED_TOKENS } from '@/supported/tokens.js'
-import type { TokenBalance } from '@/types/asset.js'
-import type {
-  BaseLendConfig,
-  LendConfig,
-  LendProvider,
-  TransactionData,
-} from '@/types/lend/index.js'
+import type { LendProviderConfig } from '@/types/actions.js'
+import type { Asset, TokenBalance } from '@/types/asset.js'
+import type { TransactionData } from '@/types/lend/index.js'
 import type {
   BatchTransactionReturnType,
   TransactionReturnType,
@@ -24,11 +21,16 @@ import type {
  */
 export abstract class Wallet {
   /** Lend namespace with all lending operations */
-  lend?: WalletLendNamespace<BaseLendConfig>
-  /** Provider for lending market operations */
-  protected lendProvider?: LendProvider<LendConfig>
+  lend?: WalletLendNamespace
+  /** Providers for lending market operations */
+  protected lendProviders: {
+    morpho?: LendProvider<LendProviderConfig>
+    aave?: LendProvider<LendProviderConfig>
+  }
   /** Manages supported blockchain networks and RPC clients */
   protected chainManager: ChainManager
+  /** List of supported assets for this wallet */
+  protected supportedAssets: Asset[]
   /** Promise to initialize the wallet */
   private initPromise?: Promise<void>
 
@@ -50,27 +52,33 @@ export abstract class Wallet {
   /**
    * Create a new wallet
    * @param chainManager - Chain manager for the wallet
-   * @param lendProvider - Lend provider for the wallet
+   * @param lendProviders - Lend providers for the wallet
+   * @param supportedAssets - List of supported assets (defaults to all SUPPORTED_TOKENS)
    */
   protected constructor(
     chainManager: ChainManager,
-    lendProvider?: LendProvider<LendConfig>,
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    },
+    supportedAssets?: Asset[],
   ) {
     this.chainManager = chainManager
-    this.lendProvider = lendProvider
-    if (this.lendProvider) {
-      this.lend = new WalletLendNamespace(this.lendProvider, this)
+    this.lendProviders = lendProviders || {}
+    this.supportedAssets = supportedAssets || SUPPORTED_TOKENS
+    if (this.lendProviders.morpho || this.lendProviders.aave) {
+      this.lend = new WalletLendNamespace(this.lendProviders, this)
     }
   }
 
   /**
    * Get asset balances across all supported chains
    * @description Fetches ETH and ERC20 token balances for this wallet across all supported networks.
+   * Uses the configured supported assets from ActionsConfig.assets if provided.
    * @returns Promise resolving to array of token balances with chain breakdown
    */
   async getBalance(): Promise<TokenBalance[]> {
-    // TEMPORARY - will use optimism token list eventually
-    const tokenBalancePromises = SUPPORTED_TOKENS.map(async (asset) => {
+    const tokenBalancePromises = this.supportedAssets.map(async (asset) => {
       return fetchERC20Balance(this.chainManager, this.address, asset)
     })
     const ethBalancePromise = fetchETHBalance(this.chainManager, this.address)

package/src/wallet/core/wallets/abstract/__tests__/Wallet.spec.ts

@@ -2,12 +2,12 @@ import type { LocalAccount } from 'viem'
 import { unichain } from 'viem/chains'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+import { getRandomAddress } from '@/__mocks__/utils.js'
 import type { WalletLendNamespace } from '@/lend/namespaces/WalletLendNamespace.js'
+import { MockChainManager } from '@/services/__mocks__/MockChainManager.js'
 import type { ChainManager } from '@/services/ChainManager.js'
 import { fetchERC20Balance, fetchETHBalance } from '@/services/tokenBalance.js'
 import { SUPPORTED_TOKENS } from '@/supported/tokens.js'
-import { MockChainManager } from '@/test/MockChainManager.js'
-import { getRandomAddress } from '@/test/utils.js'
 import { TestWallet } from '@/wallet/core/wallets/abstract/__mocks__/TestWallet.js'
 
 vi.mock('@/services/tokenBalance.js', async () => {

package/src/wallet/core/wallets/eoa/__tests__/EOAWallet.spec.ts

@@ -10,9 +10,9 @@ import { createWalletClient } from 'viem'
 import { unichain } from 'viem/chains'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+import { getRandomAddress } from '@/__mocks__/utils.js'
+import { MockChainManager } from '@/services/__mocks__/MockChainManager.js'
 import type { ChainManager } from '@/services/ChainManager.js'
-import { MockChainManager } from '@/test/MockChainManager.js'
-import { getRandomAddress } from '@/test/utils.js'
 import type { TransactionData } from '@/types/lend/index.js'
 import type { EOATransactionReceipt } from '@/wallet/core/wallets/abstract/types/index.js'
 import { EOAWallet } from '@/wallet/core/wallets/eoa/EOAWallet.js'

package/src/wallet/core/wallets/smart/default/DefaultSmartWallet.ts

@@ -13,13 +13,11 @@ import { toCoinbaseSmartAccount } from 'viem/account-abstraction'
 import type { SupportedChainId } from '@/constants/supportedChains.js'
 import { TransactionConfirmedButRevertedError } from '@/core/error/errors.js'
 import { retryOnStaleRead } from '@/core/utils/retryOnStaleRead.js'
+import type { LendProvider } from '@/lend/core/LendProvider.js'
 import type { ChainManager } from '@/services/ChainManager.js'
+import type { LendProviderConfig } from '@/types/actions.js'
 import type { Asset } from '@/types/asset.js'
-import type {
-  LendConfig,
-  LendProvider,
-  TransactionData,
-} from '@/types/lend/index.js'
+import type { TransactionData } from '@/types/lend/index.js'
 import { parseAssetAmount } from '@/utils/assets.js'
 import { SmartWallet } from '@/wallet/core/wallets/smart/abstract/SmartWallet.js'
 import type { Signer } from '@/wallet/core/wallets/smart/abstract/types/index.js'
@@ -60,7 +58,7 @@ export class DefaultSmartWallet extends SmartWallet {
    * @param owners - Array of wallet owners (addresses or WebAuthn accounts)
    * @param signer - Local account for signing transactions
    * @param chainManager - Network management service
-   * @param lendProvider - Lending operations provider
+   * @param lendProviders - Lending operations providers
    * @param deploymentAddress - Known wallet address (if already deployed)
    * @param ownerIndex - Index of signer in owners array
    * @param nonce - Nonce for address generation
@@ -69,12 +67,16 @@ export class DefaultSmartWallet extends SmartWallet {
     signers: Signer[],
     signer: LocalAccount,
     chainManager: ChainManager,
-    lendProvider?: LendProvider<LendConfig>,
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    },
+    supportedAssets?: Asset[],
     deploymentAddress?: Address,
     nonce?: bigint,
     attributionSuffix?: Hex,
   ) {
-    super(chainManager, lendProvider)
+    super(chainManager, lendProviders, supportedAssets)
 
     const { signersWithLocalAccount, signerIndex } =
       DefaultSmartWallet.ensureLocalAccountSigner(signers, signer)
@@ -115,7 +117,11 @@ export class DefaultSmartWallet extends SmartWallet {
     signer: LocalAccount
     chainManager: ChainManager
     signers?: Signer[]
-    lendProvider?: LendProvider<LendConfig>
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    }
+    supportedAssets?: Asset[]
     deploymentAddress?: Address
     nonce?: bigint
     attributionSuffix?: Hex
@@ -125,7 +131,8 @@ export class DefaultSmartWallet extends SmartWallet {
       signers,
       params.signer,
       params.chainManager,
-      params.lendProvider,
+      params.lendProviders,
+      params.supportedAssets,
       params.deploymentAddress,
       params.nonce,
       params.attributionSuffix,

package/src/wallet/core/wallets/smart/default/__tests__/DefaultSmartWallet.spec.ts

@@ -8,16 +8,13 @@ import { toCoinbaseSmartAccount } from 'viem/account-abstraction'
 import { baseSepolia, unichain } from 'viem/chains'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+import { getRandomAddress } from '@/__mocks__/utils.js'
+import { createMockLendProvider } from '@/lend/__mocks__/MockLendProvider.js'
+import { MockChainManager } from '@/services/__mocks__/MockChainManager.js'
 import type { ChainManager } from '@/services/ChainManager.js'
 import { SUPPORTED_TOKENS } from '@/supported/tokens.js'
-import { MockChainManager } from '@/test/MockChainManager.js'
-import { createMockLendProvider } from '@/test/MockLendProvider.js'
-import { getRandomAddress } from '@/test/utils.js'
-import type {
-  LendConfig,
-  LendProvider,
-  TransactionData,
-} from '@/types/lend/index.js'
+import type { LendProviderConfig } from '@/types/actions.js'
+import type { LendProvider, TransactionData } from '@/types/lend/index.js'
 import {
   smartWalletAbi,
   smartWalletFactoryAbi,
@@ -754,7 +751,7 @@ async function createAndInitDefaultSmartWallet(
     signers?: Address[]
     signer?: LocalAccount
     chainManager?: ChainManager
-    lendProvider?: LendProvider<LendConfig>
+    lendProvider?: LendProvider<LendProviderConfig>
     deploymentAddress?: Address
     nonce?: bigint
     attributionSuffix?: Hex
@@ -773,7 +770,7 @@ async function createAndInitDefaultSmartWallet(
     signers,
     signer,
     chainManager,
-    lendProvider,
+    lendProviders: lendProvider ? { morpho: lendProvider } : undefined,
     deploymentAddress,
     nonce,
     attributionSuffix,

package/src/wallet/core/wallets/smart/default/utils/__tests__/findSignerInArray.spec.ts

@@ -3,7 +3,7 @@ import { pad } from 'viem'
 import type { WebAuthnAccount } from 'viem/account-abstraction'
 import { describe, expect, it } from 'vitest'
 
-import { getRandomAddress } from '@/test/utils.js'
+import { getRandomAddress } from '@/__mocks__/utils.js'
 import { findSignerInArray } from '@/wallet/core/wallets/smart/default/utils/findSignerInArray.js'
 
 describe('findSignerInArray', () => {

package/src/wallet/core/wallets/smart/default/utils/__tests__/getSignerPublicKey.spec.ts

@@ -2,7 +2,7 @@ import type { Address, Hex, LocalAccount } from 'viem'
 import type { WebAuthnAccount } from 'viem/account-abstraction'
 import { describe, expect, it } from 'vitest'
 
-import { getRandomAddress } from '@/test/utils.js'
+import { getRandomAddress } from '@/__mocks__/utils.js'
 import { getSignerPublicKey } from '@/wallet/core/wallets/smart/default/utils/getSignerPublicKey.js'
 
 describe('getSignerPublicKey', () => {

package/src/wallet/node/providers/hosted/privy/PrivyHostedWalletProvider.ts

@@ -2,8 +2,10 @@ import type { AuthorizationContext, PrivyClient } from '@privy-io/node'
 import type { LocalAccount } from 'viem'
 import { getAddress } from 'viem'
 
+import type { LendProvider } from '@/lend/core/LendProvider.js'
 import type { ChainManager } from '@/services/ChainManager.js'
-import type { LendConfig, LendProvider } from '@/types/lend/index.js'
+import type { LendProviderConfig } from '@/types/actions.js'
+import type { Asset } from '@/types/asset.js'
 import { HostedWalletProvider } from '@/wallet/core/providers/hosted/abstract/HostedWalletProvider.js'
 import type { Wallet } from '@/wallet/core/wallets/abstract/Wallet.js'
 import type {
@@ -29,7 +31,8 @@ export class PrivyHostedWalletProvider extends HostedWalletProvider<
    * @param params - Configuration parameters
    * @param params.privyClient - Privy client instance
    * @param params.chainManager - Chain manager for multi-chain operations
-   * @param params.lendProvider - Optional lend provider for DeFi operations
+   * @param params.lendProviders - Optional lend providers for DeFi operations
+   * @param params.supportedAssets - Optional list of supported assets
    * @param params.authorizationContext - Optional authorization context for the Privy client.
    * Used when Privy needs to sign requests.
    * See https://docs.privy.io/controls/authorization-keys/using-owners/sign/automatic#using-the-authorization-context
@@ -38,10 +41,14 @@ export class PrivyHostedWalletProvider extends HostedWalletProvider<
   constructor(params: {
     privyClient: PrivyClient
     chainManager: ChainManager
-    lendProvider?: LendProvider<LendConfig>
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    }
+    supportedAssets?: Asset[]
     authorizationContext?: AuthorizationContext
   }) {
-    super(params.chainManager, params.lendProvider)
+    super(params.chainManager, params.lendProviders, params.supportedAssets)
     this.privyClient = params.privyClient
     this.authorizationContext = params.authorizationContext
   }
@@ -55,7 +62,8 @@ export class PrivyHostedWalletProvider extends HostedWalletProvider<
       walletId: params.walletId,
       address: getAddress(params.address),
       chainManager: this.chainManager,
-      lendProvider: this.lendProvider,
+      lendProviders: this.lendProviders,
+      supportedAssets: this.supportedAssets,
     })
   }
 

package/src/wallet/node/providers/hosted/privy/__tests__/PrivyHostedWalletProvider.spec.ts

@@ -3,15 +3,15 @@ import { getAddress } from 'viem'
 import { unichain } from 'viem/chains'
 import { describe, expect, it, vi } from 'vitest'
 
-import type { ChainManager } from '@/services/ChainManager.js'
-import { MockChainManager } from '@/test/MockChainManager.js'
 import {
   createMockPrivyClient,
   createMockPrivyWallet,
   getMockAuthorizationContext,
-} from '@/test/MockPrivyClient.js'
-import { getRandomAddress } from '@/test/utils.js'
-import type { LendConfig, LendProvider } from '@/types/lend/index.js'
+} from '@/__mocks__/MockPrivyClient.js'
+import { getRandomAddress } from '@/__mocks__/utils.js'
+import { createMockLendProvider } from '@/lend/__mocks__/MockLendProvider.js'
+import { MockChainManager } from '@/services/__mocks__/MockChainManager.js'
+import type { ChainManager } from '@/services/ChainManager.js'
 import { Wallet } from '@/wallet/core/wallets/abstract/Wallet.js'
 import { PrivyHostedWalletProvider } from '@/wallet/node/providers/hosted/privy/PrivyHostedWalletProvider.js'
 import { PrivyWallet } from '@/wallet/node/wallets/hosted/privy/PrivyWallet.js'
@@ -83,12 +83,12 @@ describe('PrivyHostedWalletProvider', () => {
 
     it('forwards lendProvider when provided to constructor', async () => {
       const privy = createMockPrivyClient('app', 'secret')
-      const mockLendProvider = {} as LendProvider<LendConfig>
+      const mockLendProvider = createMockLendProvider()
       const provider = new PrivyHostedWalletProvider({
         privyClient: privy,
         authorizationContext: getMockAuthorizationContext(),
         chainManager: mockChainManager,
-        lendProvider: mockLendProvider,
+        lendProviders: { morpho: mockLendProvider },
       })
       const spy = vi.spyOn(PrivyWallet, 'create')
 
@@ -102,7 +102,7 @@ describe('PrivyHostedWalletProvider', () => {
 
       expect(spy).toHaveBeenCalledWith(
         expect.objectContaining({
-          lendProvider: mockLendProvider,
+          lendProviders: { morpho: mockLendProvider },
         }),
       )
     })

package/src/wallet/node/providers/hosted/registry/NodeHostedWalletProviderRegistry.ts

@@ -28,11 +28,12 @@ export class NodeHostedWalletProviderRegistry extends HostedWalletProviderRegist
       validateOptions(options): options is NodeOptionsMap['privy'] {
         return Boolean((options as NodeOptionsMap['privy'])?.privyClient)
       },
-      create({ chainManager, lendProvider }, options) {
+      create({ chainManager, lendProviders, supportedAssets }, options) {
         return new PrivyHostedWalletProvider({
           privyClient: options.privyClient,
           chainManager,
-          lendProvider,
+          lendProviders,
+          supportedAssets,
           authorizationContext: options.authorizationContext,
         })
       },
@@ -44,11 +45,12 @@ export class NodeHostedWalletProviderRegistry extends HostedWalletProviderRegist
         const o = options as NodeOptionsMap['turnkey']
         return Boolean(o?.client)
       },
-      create({ chainManager, lendProvider }, options) {
+      create({ chainManager, lendProviders, supportedAssets }, options) {
         return new TurnkeyHostedWalletProvider(
           options.client,
           chainManager,
-          lendProvider,
+          lendProviders,
+          supportedAssets,
         )
       },
     })

package/src/wallet/node/providers/hosted/registry/__tests__/NodeHostedWalletProviderRegistry.spec.ts

@@ -3,12 +3,12 @@ import type { TurnkeyClient } from '@turnkey/http'
 import { unichain } from 'viem/chains'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
-import type { ChainManager } from '@/services/ChainManager.js'
-import { MockChainManager } from '@/test/MockChainManager.js'
 import {
   createMockPrivyClient,
   getMockAuthorizationContext,
-} from '@/test/MockPrivyClient.js'
+} from '@/__mocks__/MockPrivyClient.js'
+import { MockChainManager } from '@/services/__mocks__/MockChainManager.js'
+import type { ChainManager } from '@/services/ChainManager.js'
 import { PrivyHostedWalletProvider } from '@/wallet/node/providers/hosted/privy/PrivyHostedWalletProvider.js'
 import { NodeHostedWalletProviderRegistry } from '@/wallet/node/providers/hosted/registry/NodeHostedWalletProviderRegistry.js'
 import { TurnkeyHostedWalletProvider } from '@/wallet/node/providers/hosted/turnkey/TurnkeyHostedWalletProvider.js'

package/src/wallet/node/providers/hosted/turnkey/TurnkeyHostedWalletProvider.ts

@@ -3,8 +3,10 @@ import type { TurnkeyClient as TurnkeyHttpClient } from '@turnkey/http'
 import type { TurnkeyServerClient } from '@turnkey/sdk-server'
 import type { LocalAccount } from 'viem'
 
+import type { LendProvider } from '@/lend/core/LendProvider.js'
 import type { ChainManager } from '@/services/ChainManager.js'
-import type { LendConfig, LendProvider } from '@/types/lend/index.js'
+import type { LendProviderConfig } from '@/types/actions.js'
+import type { Asset } from '@/types/asset.js'
 import { HostedWalletProvider } from '@/wallet/core/providers/hosted/abstract/HostedWalletProvider.js'
 import type { Wallet } from '@/wallet/core/wallets/abstract/Wallet.js'
 import type { NodeToActionsOptionsMap } from '@/wallet/node/providers/hosted/types/index.js'
@@ -26,6 +28,8 @@ export class TurnkeyHostedWalletProvider extends HostedWalletProvider<
    * Create a new Turnkey wallet provider
    * @param client - Turnkey client instance (HTTP, server, or core SDK base)
    * @param chainManager - Chain manager used to resolve chains and RPC transports
+   * @param lendProviders - Optional lend providers for DeFi operations
+   * @param supportedAssets - Optional list of supported assets
    */
   constructor(
     private readonly client:
@@ -33,9 +37,13 @@ export class TurnkeyHostedWalletProvider extends HostedWalletProvider<
       | TurnkeyServerClient
       | TurnkeySDKClientBase,
     chainManager: ChainManager,
-    lendProvider?: LendProvider<LendConfig>,
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    },
+    supportedAssets?: Asset[],
   ) {
-    super(chainManager, lendProvider)
+    super(chainManager, lendProviders, supportedAssets)
   }
 
   /**
@@ -56,7 +64,8 @@ export class TurnkeyHostedWalletProvider extends HostedWalletProvider<
       signWith: params.signWith,
       ethereumAddress: params.ethereumAddress,
       chainManager: this.chainManager,
-      lendProvider: this.lendProvider,
+      lendProviders: this.lendProviders,
+      supportedAssets: this.supportedAssets,
     })
   }