@eth-optimism/actions-sdk 0.2.0 → 0.4.0

package/src/wallet/core/namespace/WalletNamespace.ts

@@ -11,9 +11,21 @@ import type { WalletProvider } from '@/wallet/core/providers/WalletProvider.js'
 import type { Wallet } from '@/wallet/core/wallets/abstract/Wallet.js'
 import type { SmartWallet } from '@/wallet/core/wallets/smart/abstract/SmartWallet.js'
 
+/**
+ * Provider factory function for lazy initialization
+ */
+type WalletProviderFactory<
+  THostedProviderType extends string,
+  TToActionsMap extends Record<THostedProviderType, unknown>,
+  H extends HostedWalletProvider<THostedProviderType, TToActionsMap>,
+  S extends SmartWalletProvider,
+> = () => Promise<WalletProvider<THostedProviderType, TToActionsMap, H, S>>
+
 /**
  * Wallet namespace that provides unified wallet operations
- * @description Provides access to wallet functionality through a single provider interface
+ * @description Provides access to wallet functionality through a single provider interface.
+ * Supports lazy initialization — the wallet provider is created on first method call,
+ * enabling tree-shaking of unused wallet provider dependencies.
  */
 export class WalletNamespace<
   THostedProviderType extends string,
@@ -22,32 +34,70 @@ export class WalletNamespace<
     HostedWalletProvider<THostedProviderType, TToActionsMap>,
   S extends SmartWalletProvider = SmartWalletProvider,
 > {
-  private provider: WalletProvider<THostedProviderType, TToActionsMap, H, S>
+  private _provider: WalletProvider<
+    THostedProviderType,
+    TToActionsMap,
+    H,
+    S
+  > | null = null
+  private _providerFactory: WalletProviderFactory<
+    THostedProviderType,
+    TToActionsMap,
+    H,
+    S
+  >
+  private _initPromise: Promise<
+    WalletProvider<THostedProviderType, TToActionsMap, H, S>
+  > | null = null
 
   constructor(
-    provider: WalletProvider<THostedProviderType, TToActionsMap, H, S>,
+    providerOrFactory:
+      | WalletProvider<THostedProviderType, TToActionsMap, H, S>
+      | WalletProviderFactory<THostedProviderType, TToActionsMap, H, S>,
   ) {
-    this.provider = provider
+    if (typeof providerOrFactory === 'function') {
+      this._providerFactory = providerOrFactory
+    } else {
+      this._provider = providerOrFactory
+      this._providerFactory = () => Promise.resolve(providerOrFactory)
+    }
+  }
+
+  private resolveProvider(): Promise<
+    WalletProvider<THostedProviderType, TToActionsMap, H, S>
+  > {
+    if (this._provider) return Promise.resolve(this._provider)
+    if (!this._initPromise) {
+      this._initPromise = this._providerFactory().then((provider) => {
+        this._provider = provider
+        return provider
+      })
+    }
+    return this._initPromise
   }
 
   /**
    * Get direct access to the hosted wallet provider
    * @description Provides direct access to the underlying hosted wallet provider when
-   * advanced functionality beyond the unified interface is needed
-   * @returns The configured hosted wallet provider instance
+   * advanced functionality beyond the unified interface is needed.
+   * Lazily initializes the provider if not yet created.
+   * @returns Promise resolving to the configured hosted wallet provider instance
    */
-  get hostedWalletProvider(): H {
-    return this.provider.hostedWalletProvider
+  async hostedWalletProvider(): Promise<H> {
+    const provider = await this.resolveProvider()
+    return provider.hostedWalletProvider
   }
 
   /**
    * Get direct access to the smart wallet provider
    * @description Provides direct access to the underlying smart wallet provider when
-   * advanced functionality beyond the unified interface is needed
-   * @returns The configured smart wallet provider instance
+   * advanced functionality beyond the unified interface is needed.
+   * Lazily initializes the provider if not yet created.
+   * @returns Promise resolving to the configured smart wallet provider instance
    */
-  get smartWalletProvider(): S {
-    return this.provider.smartWalletProvider
+  async smartWalletProvider(): Promise<S> {
+    const provider = await this.resolveProvider()
+    return provider.smartWalletProvider
   }
 
   /**
@@ -70,7 +120,8 @@ export class WalletNamespace<
   async createSmartWallet(
     params: CreateSmartWalletOptions,
   ): Promise<SmartWalletCreationResult<SmartWallet>> {
-    return this.provider.createSmartWallet(params)
+    const provider = await this.resolveProvider()
+    return provider.createSmartWallet(params)
   }
 
   /**
@@ -85,7 +136,8 @@ export class WalletNamespace<
   async createSigner(
     params: TToActionsMap[THostedProviderType],
   ): Promise<LocalAccount> {
-    return this.provider.createSigner(params)
+    const provider = await this.resolveProvider()
+    return provider.createSigner(params)
   }
 
   /**
@@ -99,7 +151,8 @@ export class WalletNamespace<
   async toActionsWallet(
     params: TToActionsMap[THostedProviderType],
   ): Promise<Wallet> {
-    return this.provider.hostedWalletToActionsWallet(params)
+    const provider = await this.resolveProvider()
+    return provider.hostedWalletToActionsWallet(params)
   }
 
   /**
@@ -118,6 +171,7 @@ export class WalletNamespace<
    * @throws Error if neither walletAddress nor deploymentSigners provided
    */
   async getSmartWallet(params: GetSmartWalletOptions) {
-    return this.provider.getSmartWallet(params)
+    const provider = await this.resolveProvider()
+    return provider.getSmartWallet(params)
   }
 }

package/src/wallet/core/namespace/__tests__/WalletNamespace.spec.ts

@@ -38,7 +38,7 @@ describe('WalletNamespace', () => {
   })
 
   describe('hostedWalletProvider', () => {
-    it('should provide access to hosted wallet provider', () => {
+    it('should provide access to hosted wallet provider', async () => {
       const hostedWalletProvider = new PrivyHostedWalletProvider({
         privyClient: mockPrivyClient,
         chainManager: mockChainManager,
@@ -54,12 +54,14 @@ describe('WalletNamespace', () => {
       )
       const walletNamespace = new WalletNamespace(walletProvider)
 
-      expect(walletNamespace.hostedWalletProvider).toBe(hostedWalletProvider)
+      expect(await walletNamespace.hostedWalletProvider()).toBe(
+        hostedWalletProvider,
+      )
     })
   })
 
   describe('smartWalletProvider', () => {
-    it('should provide access to smart wallet provider', () => {
+    it('should provide access to smart wallet provider', async () => {
       const mockPrivyClient = createMockPrivyClient(
         'test-app-id',
         'test-app-secret',
@@ -79,7 +81,9 @@ describe('WalletNamespace', () => {
       )
       const walletNamespace = new WalletNamespace(walletProvider)
 
-      expect(walletNamespace.smartWalletProvider).toBe(smartWalletProvider)
+      expect(await walletNamespace.smartWalletProvider()).toBe(
+        smartWalletProvider,
+      )
     })
   })
 

package/src/wallet/core/providers/hosted/abstract/HostedWalletProvider.ts

@@ -1,9 +1,8 @@
 import type { LocalAccount } from 'viem'
 
-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 { LendProviders, SwapProviders } from '@/types/providers.js'
 import type { Wallet } from '@/wallet/core/wallets/abstract/Wallet.js'
 
 /**
@@ -17,22 +16,19 @@ export abstract class HostedWalletProvider<
   TOptionsMap extends Record<TType, unknown>,
 > {
   protected chainManager: ChainManager
-  protected lendProviders: {
-    morpho?: LendProvider<LendProviderConfig>
-    aave?: LendProvider<LendProviderConfig>
-  }
+  protected lendProviders: LendProviders
+  protected swapProviders: SwapProviders
   protected supportedAssets?: Asset[]
 
   protected constructor(
     chainManager: ChainManager,
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    },
+    lendProviders?: LendProviders,
+    swapProviders?: SwapProviders,
     supportedAssets?: Asset[],
   ) {
     this.chainManager = chainManager
     this.lendProviders = lendProviders || {}
+    this.swapProviders = swapProviders || {}
     this.supportedAssets = supportedAssets
   }
   /**

package/src/wallet/core/providers/hosted/types/index.ts

@@ -1,7 +1,7 @@
-import type { LendProvider } from '@/lend/core/LendProvider.js'
 import type { ChainManager } from '@/services/ChainManager.js'
-import type { LendProviderConfig } from '@/types/actions.js'
+import type { SwapSettings } from '@/types/actions.js'
 import type { Asset } from '@/types/asset.js'
+import type { LendProviders, SwapProviders } from '@/types/providers.js'
 import type { HostedWalletProvider } from '@/wallet/core/providers/hosted/abstract/HostedWalletProvider.js'
 
 /**
@@ -12,11 +12,10 @@ import type { HostedWalletProvider } from '@/wallet/core/providers/hosted/abstra
  */
 export interface HostedProviderDeps {
   chainManager: ChainManager
-  lendProviders?: {
-    morpho?: LendProvider<LendProviderConfig>
-    aave?: LendProvider<LendProviderConfig>
-  }
+  lendProviders?: LendProviders
+  swapProviders?: SwapProviders
   supportedAssets?: Asset[]
+  swapSettings?: SwapSettings
 }
 
 /**
@@ -52,7 +51,10 @@ export interface HostedProviderFactory<
 > {
   type: TType
   validateOptions(options: unknown): options is TOptions
-  create(deps: HostedProviderDeps, options: TOptions): TInstance
+  create(
+    deps: HostedProviderDeps,
+    options: TOptions,
+  ): TInstance | Promise<TInstance>
 }
 
 /**

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

@@ -2,10 +2,9 @@ import type { Address, Hex, LocalAccount } from 'viem'
 import { keccak256, slice, toHex } from 'viem'
 
 import type { SupportedChainId } from '@/constants/supportedChains.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 { LendProviders, SwapProviders } from '@/types/providers.js'
 import { SmartWalletProvider } from '@/wallet/core/providers/smart/abstract/SmartWalletProvider.js'
 import type { SmartWalletCreationResult } from '@/wallet/core/providers/smart/abstract/types/index.js'
 import type { Signer } from '@/wallet/core/wallets/smart/abstract/types/index.js'
@@ -27,10 +26,9 @@ export class DefaultSmartWalletProvider extends SmartWalletProvider {
   /** Manages supported blockchain networks */
   private chainManager: ChainManager
   /** Providers for lending market operations */
-  private lendProviders: {
-    morpho?: LendProvider<LendProviderConfig>
-    aave?: LendProvider<LendProviderConfig>
-  }
+  private lendProviders: LendProviders
+  /** Providers for swap operations */
+  private swapProviders: SwapProviders
   /** Supported assets for this wallet provider */
   private supportedAssets?: Asset[]
   /** Optional 16-byte attribution suffix appended to callData */
@@ -40,21 +38,21 @@ export class DefaultSmartWalletProvider extends SmartWalletProvider {
    * Initialize the Smart Wallet Provider
    * @param chainManager - Manages supported blockchain networks
    * @param lendProviders - Providers for lending market operations
+   * @param swapProviders - Providers for swap operations
    * @param supportedAssets - Optional list of supported assets
    * @param attributionSuffix - Optional attribution suffix
    */
   constructor(
     chainManager: ChainManager,
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    },
+    lendProviders?: LendProviders,
+    swapProviders?: SwapProviders,
     supportedAssets?: Asset[],
     attributionSuffix?: string,
   ) {
     super()
     this.chainManager = chainManager
     this.lendProviders = lendProviders || {}
+    this.swapProviders = swapProviders || {}
     this.supportedAssets = supportedAssets
     if (attributionSuffix) {
       this.attributionSuffix =
@@ -93,6 +91,7 @@ export class DefaultSmartWalletProvider extends SmartWalletProvider {
       signer,
       chainManager: this.chainManager,
       lendProviders: this.lendProviders,
+      swapProviders: this.swapProviders,
       supportedAssets: this.supportedAssets,
       nonce,
       attributionSuffix: this.attributionSuffix,
@@ -182,6 +181,7 @@ export class DefaultSmartWalletProvider extends SmartWalletProvider {
       signer,
       chainManager: this.chainManager,
       lendProviders: this.lendProviders,
+      swapProviders: this.swapProviders,
       supportedAssets: this.supportedAssets,
       deploymentAddress: walletAddress,
       attributionSuffix: this.attributionSuffix,

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

@@ -413,6 +413,7 @@ describe('DefaultSmartWalletProvider', () => {
     const provider = new DefaultSmartWalletProvider(
       mockChainManager,
       { morpho: mockLendProvider },
+      undefined,
       supportedAssets,
       attributionSeed,
     )
@@ -440,6 +441,7 @@ describe('DefaultSmartWalletProvider', () => {
     const provider = new DefaultSmartWalletProvider(
       mockChainManager,
       { morpho: mockLendProvider },
+      undefined,
       supportedAssets,
       attributionSeed,
     )

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

@@ -1,14 +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 { LendProviderConfig } from '@/types/actions.js'
+import { WalletSwapNamespace } from '@/swap/namespaces/WalletSwapNamespace.js'
+import type { SwapSettings } from '@/types/actions.js'
 import type { Asset, TokenBalance } from '@/types/asset.js'
-import type { TransactionData } from '@/types/lend/index.js'
+import type { LendProviders, SwapProviders } from '@/types/providers.js'
+import type { TransactionData } from '@/types/transaction.js'
 import type {
   BatchTransactionReturnType,
   TransactionReturnType,
@@ -23,10 +23,11 @@ export abstract class Wallet {
   /** Lend namespace with all lending operations */
   lend?: WalletLendNamespace
   /** Providers for lending market operations */
-  protected lendProviders: {
-    morpho?: LendProvider<LendProviderConfig>
-    aave?: LendProvider<LendProviderConfig>
-  }
+  protected lendProviders: LendProviders
+  /** Swap namespace with all swap operations */
+  swap?: WalletSwapNamespace
+  /** Providers for swap operations */
+  protected swapProviders: SwapProviders
   /** Manages supported blockchain networks and RPC clients */
   protected chainManager: ChainManager
   /** List of supported assets for this wallet */
@@ -53,22 +54,30 @@ export abstract class Wallet {
    * Create a new wallet
    * @param chainManager - Chain manager for the wallet
    * @param lendProviders - Lend providers for the wallet
-   * @param supportedAssets - List of supported assets (defaults to all SUPPORTED_TOKENS)
+   * @param swapProviders - Swap providers for the wallet
+   * @param supportedAssets - List of supported assets (defaults to empty)
    */
   protected constructor(
     chainManager: ChainManager,
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    },
+    lendProviders?: LendProviders,
+    swapProviders?: SwapProviders,
     supportedAssets?: Asset[],
+    swapSettings?: SwapSettings,
   ) {
     this.chainManager = chainManager
     this.lendProviders = lendProviders || {}
-    this.supportedAssets = supportedAssets || SUPPORTED_TOKENS
+    this.swapProviders = swapProviders || {}
+    this.supportedAssets = supportedAssets || []
     if (this.lendProviders.morpho || this.lendProviders.aave) {
       this.lend = new WalletLendNamespace(this.lendProviders, this)
     }
+    if (Object.values(this.swapProviders).some(Boolean)) {
+      this.swap = new WalletSwapNamespace(
+        this.swapProviders,
+        this,
+        swapSettings,
+      )
+    }
   }
 
   /**

package/src/wallet/core/wallets/abstract/__mocks__/TestWallet.ts

@@ -1,7 +1,11 @@
 import type { Address, LocalAccount, WalletClient } from 'viem'
 
 import type { SupportedChainId } from '@/constants/supportedChains.js'
+import type { LendProvider } from '@/lend/core/LendProvider.js'
 import type { ChainManager } from '@/services/ChainManager.js'
+import type { SwapProvider } from '@/swap/core/SwapProvider.js'
+import type { LendProviderConfig, SwapProviderConfig } from '@/types/actions.js'
+import type { Asset } from '@/types/asset.js'
 import type { TransactionData } from '@/types/lend/index.js'
 import type { EOATransactionReceipt } from '@/wallet/core/wallets/abstract/types/index.js'
 import { Wallet } from '@/wallet/core/wallets/abstract/Wallet.js'
@@ -14,8 +18,16 @@ export class TestWallet extends Wallet {
     chainManager: ChainManager,
     address: Address,
     signer: LocalAccount,
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    },
+    swapProviders?: {
+      uniswap?: SwapProvider<SwapProviderConfig>
+    },
+    supportedAssets?: Asset[],
   ) {
-    super(chainManager)
+    super(chainManager, lendProviders, swapProviders, supportedAssets)
     this.address = address
     this.signer = signer
   }

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

@@ -3,11 +3,11 @@ import { unichain } from 'viem/chains'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { getRandomAddress } from '@/__mocks__/utils.js'
+import { ETH, USDC } from '@/constants/assets.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 { TestWallet } from '@/wallet/core/wallets/abstract/__mocks__/TestWallet.js'
 
 vi.mock('@/services/tokenBalance.js', async () => {
@@ -29,7 +29,7 @@ describe('Wallet (base)', () => {
     vi.clearAllMocks()
   })
 
-  it('getBalance fetches ETH and ERC20 balances for all supported tokens', async () => {
+  it('getBalance returns only ETH when no supportedAssets configured', async () => {
     const wallet = new TestWallet(chainManager, address, signer)
 
     const result = await wallet.getBalance()
@@ -37,10 +37,26 @@ describe('Wallet (base)', () => {
     expect(result).toBeTruthy()
     expect(fetchETHBalance).toHaveBeenCalledTimes(1)
     expect(fetchETHBalance).toHaveBeenCalledWith(chainManager, address)
-    // Should call fetchERC20Balance for each token in SUPPORTED_TOKENS
-    expect(fetchERC20Balance).toHaveBeenCalledTimes(
-      Object.keys(SUPPORTED_TOKENS).length,
+    // No supportedAssets configured, so no ERC20 balance fetches
+    expect(fetchERC20Balance).toHaveBeenCalledTimes(0)
+  })
+
+  it('getBalance fetches ERC20 balances for explicitly configured assets', async () => {
+    const wallet = new TestWallet(
+      chainManager,
+      address,
+      signer,
+      undefined,
+      undefined,
+      [ETH, USDC],
     )
+
+    const result = await wallet.getBalance()
+
+    expect(result).toBeTruthy()
+    expect(fetchETHBalance).toHaveBeenCalledTimes(1)
+    // Should call fetchERC20Balance for each configured asset
+    expect(fetchERC20Balance).toHaveBeenCalledTimes(2)
   })
 
   it('getBalance propagates errors from underlying fetchers', async () => {

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

@@ -13,11 +13,10 @@ 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 { TransactionData } from '@/types/lend/index.js'
+import type { LendProviders, SwapProviders } from '@/types/providers.js'
+import type { TransactionData } from '@/types/transaction.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'
@@ -59,6 +58,7 @@ export class DefaultSmartWallet extends SmartWallet {
    * @param signer - Local account for signing transactions
    * @param chainManager - Network management service
    * @param lendProviders - Lending operations providers
+   * @param swapProviders - Swap operations providers
    * @param deploymentAddress - Known wallet address (if already deployed)
    * @param ownerIndex - Index of signer in owners array
    * @param nonce - Nonce for address generation
@@ -67,16 +67,14 @@ export class DefaultSmartWallet extends SmartWallet {
     signers: Signer[],
     signer: LocalAccount,
     chainManager: ChainManager,
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    },
+    lendProviders?: LendProviders,
+    swapProviders?: SwapProviders,
     supportedAssets?: Asset[],
     deploymentAddress?: Address,
     nonce?: bigint,
     attributionSuffix?: Hex,
   ) {
-    super(chainManager, lendProviders, supportedAssets)
+    super(chainManager, lendProviders, swapProviders, supportedAssets)
 
     const { signersWithLocalAccount, signerIndex } =
       DefaultSmartWallet.ensureLocalAccountSigner(signers, signer)
@@ -117,10 +115,8 @@ export class DefaultSmartWallet extends SmartWallet {
     signer: LocalAccount
     chainManager: ChainManager
     signers?: Signer[]
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    }
+    lendProviders?: LendProviders
+    swapProviders?: SwapProviders
     supportedAssets?: Asset[]
     deploymentAddress?: Address
     nonce?: bigint
@@ -132,6 +128,7 @@ export class DefaultSmartWallet extends SmartWallet {
       params.signer,
       params.chainManager,
       params.lendProviders,
+      params.swapProviders,
       params.supportedAssets,
       params.deploymentAddress,
       params.nonce,
@@ -540,7 +537,7 @@ export class DefaultSmartWallet extends SmartWallet {
 
     // Handle ETH transfers
     if (asset.type === 'native') {
-      const parsedAmount = parseAssetAmount(amount, asset.metadata.decimals)
+      const parsedAmount = parseAssetAmount(asset, amount)
 
       return {
         to: recipientAddress,
@@ -550,7 +547,7 @@ export class DefaultSmartWallet extends SmartWallet {
     }
 
     // Handle ERC20 token transfers
-    const parsedAmount = parseAssetAmount(amount, asset.metadata.decimals)
+    const parsedAmount = parseAssetAmount(asset, amount)
 
     // Encode ERC20 transfer function call
     const transferData = encodeFunctionData({

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

@@ -12,7 +12,6 @@ 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 type { LendProviderConfig } from '@/types/actions.js'
 import type { LendProvider, TransactionData } from '@/types/lend/index.js'
 import {

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

@@ -2,10 +2,9 @@ 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 { LendProviderConfig } from '@/types/actions.js'
 import type { Asset } from '@/types/asset.js'
+import type { LendProviders, SwapProviders } from '@/types/providers.js'
 import { HostedWalletProvider } from '@/wallet/core/providers/hosted/abstract/HostedWalletProvider.js'
 import type { Wallet } from '@/wallet/core/wallets/abstract/Wallet.js'
 import type {
@@ -32,6 +31,7 @@ export class PrivyHostedWalletProvider extends HostedWalletProvider<
    * @param params.privyClient - Privy client instance
    * @param params.chainManager - Chain manager for multi-chain operations
    * @param params.lendProviders - Optional lend providers for DeFi operations
+   * @param params.swapProviders - Optional swap providers for trading 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.
@@ -41,14 +41,17 @@ export class PrivyHostedWalletProvider extends HostedWalletProvider<
   constructor(params: {
     privyClient: PrivyClient
     chainManager: ChainManager
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    }
+    lendProviders?: LendProviders
+    swapProviders?: SwapProviders
     supportedAssets?: Asset[]
     authorizationContext?: AuthorizationContext
   }) {
-    super(params.chainManager, params.lendProviders, params.supportedAssets)
+    super(
+      params.chainManager,
+      params.lendProviders,
+      params.swapProviders,
+      params.supportedAssets,
+    )
     this.privyClient = params.privyClient
     this.authorizationContext = params.authorizationContext
   }
@@ -63,6 +66,7 @@ export class PrivyHostedWalletProvider extends HostedWalletProvider<
       address: getAddress(params.address),
       chainManager: this.chainManager,
       lendProviders: this.lendProviders,
+      swapProviders: this.swapProviders,
       supportedAssets: this.supportedAssets,
     })
   }