@eth-optimism/actions-sdk 0.1.0 → 0.3.0

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

@@ -15,9 +15,10 @@ 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 { 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 { 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 +60,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
@@ -71,12 +73,15 @@ export class DefaultSmartWallet extends SmartWallet {
       morpho?: LendProvider<LendProviderConfig>
       aave?: LendProvider<LendProviderConfig>
     },
+    swapProviders?: {
+      uniswap?: SwapProvider<SwapProviderConfig>
+    },
     supportedAssets?: Asset[],
     deploymentAddress?: Address,
     nonce?: bigint,
     attributionSuffix?: Hex,
   ) {
-    super(chainManager, lendProviders, supportedAssets)
+    super(chainManager, lendProviders, swapProviders, supportedAssets)
 
     const { signersWithLocalAccount, signerIndex } =
       DefaultSmartWallet.ensureLocalAccountSigner(signers, signer)
@@ -121,6 +126,9 @@ export class DefaultSmartWallet extends SmartWallet {
       morpho?: LendProvider<LendProviderConfig>
       aave?: LendProvider<LendProviderConfig>
     }
+    swapProviders?: {
+      uniswap?: SwapProvider<SwapProviderConfig>
+    }
     supportedAssets?: Asset[]
     deploymentAddress?: Address
     nonce?: bigint
@@ -132,6 +140,7 @@ export class DefaultSmartWallet extends SmartWallet {
       params.signer,
       params.chainManager,
       params.lendProviders,
+      params.swapProviders,
       params.supportedAssets,
       params.deploymentAddress,
       params.nonce,
@@ -540,7 +549,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 +559,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

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

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

@@ -4,7 +4,8 @@ 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 { SwapProvider } from '@/swap/core/SwapProvider.js'
+import type { LendProviderConfig, SwapProviderConfig } 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'
@@ -32,6 +33,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.
@@ -45,10 +47,18 @@ export class PrivyHostedWalletProvider extends HostedWalletProvider<
       morpho?: LendProvider<LendProviderConfig>
       aave?: LendProvider<LendProviderConfig>
     }
+    swapProviders?: {
+      uniswap?: SwapProvider<SwapProviderConfig>
+    }
     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 +73,7 @@ export class PrivyHostedWalletProvider extends HostedWalletProvider<
       address: getAddress(params.address),
       chainManager: this.chainManager,
       lendProviders: this.lendProviders,
+      swapProviders: this.swapProviders,
       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 { createMockLendProvider } from '@/test/MockLendProvider.js'
 import {
   createMockPrivyClient,
   createMockPrivyWallet,
   getMockAuthorizationContext,
-} from '@/test/MockPrivyClient.js'
-import { getRandomAddress } from '@/test/utils.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'

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

@@ -28,11 +28,15 @@ export class NodeHostedWalletProviderRegistry extends HostedWalletProviderRegist
       validateOptions(options): options is NodeOptionsMap['privy'] {
         return Boolean((options as NodeOptionsMap['privy'])?.privyClient)
       },
-      create({ chainManager, lendProviders, supportedAssets }, options) {
+      create(
+        { chainManager, lendProviders, swapProviders, supportedAssets },
+        options,
+      ) {
         return new PrivyHostedWalletProvider({
           privyClient: options.privyClient,
           chainManager,
           lendProviders,
+          swapProviders,
           supportedAssets,
           authorizationContext: options.authorizationContext,
         })
@@ -45,11 +49,15 @@ export class NodeHostedWalletProviderRegistry extends HostedWalletProviderRegist
         const o = options as NodeOptionsMap['turnkey']
         return Boolean(o?.client)
       },
-      create({ chainManager, lendProviders, supportedAssets }, options) {
+      create(
+        { chainManager, lendProviders, swapProviders, supportedAssets },
+        options,
+      ) {
         return new TurnkeyHostedWalletProvider(
           options.client,
           chainManager,
           lendProviders,
+          swapProviders,
           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

@@ -5,7 +5,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 { SwapProvider } from '@/swap/core/SwapProvider.js'
+import type { LendProviderConfig, SwapProviderConfig } 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'
@@ -29,6 +30,7 @@ export class TurnkeyHostedWalletProvider extends HostedWalletProvider<
    * @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 swapProviders - Optional swap providers for trading operations
    * @param supportedAssets - Optional list of supported assets
    */
   constructor(
@@ -41,9 +43,12 @@ export class TurnkeyHostedWalletProvider extends HostedWalletProvider<
       morpho?: LendProvider<LendProviderConfig>
       aave?: LendProvider<LendProviderConfig>
     },
+    swapProviders?: {
+      uniswap?: SwapProvider<SwapProviderConfig>
+    },
     supportedAssets?: Asset[],
   ) {
-    super(chainManager, lendProviders, supportedAssets)
+    super(chainManager, lendProviders, swapProviders, supportedAssets)
   }
 
   /**
@@ -65,6 +70,7 @@ export class TurnkeyHostedWalletProvider extends HostedWalletProvider<
       ethereumAddress: params.ethereumAddress,
       chainManager: this.chainManager,
       lendProviders: this.lendProviders,
+      swapProviders: this.swapProviders,
       supportedAssets: this.supportedAssets,
     })
   }

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

@@ -3,9 +3,9 @@ import type { LocalAccount } from 'viem'
 import { unichain } from 'viem/chains'
 import { describe, expect, it, vi } from 'vitest'
 
+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 { TurnkeyHostedWalletProvider } from '@/wallet/node/providers/hosted/turnkey/TurnkeyHostedWalletProvider.js'
 import { TurnkeyWallet } from '@/wallet/node/wallets/hosted/turnkey/TurnkeyWallet.js'
 import * as createSignerUtil from '@/wallet/node/wallets/hosted/turnkey/utils/createSigner.js'

package/src/wallet/node/wallets/hosted/privy/PrivyWallet.ts

@@ -3,7 +3,8 @@ import { type Address, 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 { SwapProvider } from '@/swap/core/SwapProvider.js'
+import type { LendProviderConfig, SwapProviderConfig } from '@/types/actions.js'
 import type { Asset } from '@/types/asset.js'
 import { EOAWallet } from '@/wallet/core/wallets/eoa/EOAWallet.js'
 import { createSigner } from '@/wallet/node/wallets/hosted/privy/utils/createSigner.js'
@@ -26,6 +27,7 @@ export class PrivyWallet extends EOAWallet {
    * @param address - Ethereum address of the wallet
    * @param chainManager - Chain manager for multi-chain operations
    * @param lendProviders - Optional lend providers for DeFi operations
+   * @param swapProviders - Optional swap providers for trading operations
    * @param supportedAssets - Optional list of supported assets
    */
   private constructor(
@@ -37,10 +39,13 @@ export class PrivyWallet extends EOAWallet {
       morpho?: LendProvider<LendProviderConfig>
       aave?: LendProvider<LendProviderConfig>
     },
+    swapProviders?: {
+      uniswap?: SwapProvider<SwapProviderConfig>
+    },
     supportedAssets?: Asset[],
     authorizationContext?: AuthorizationContext,
   ) {
-    super(chainManager, lendProviders, supportedAssets)
+    super(chainManager, lendProviders, swapProviders, supportedAssets)
     this.privyClient = privyClient
     this.authorizationContext = authorizationContext
     this.walletId = walletId
@@ -57,6 +62,9 @@ export class PrivyWallet extends EOAWallet {
       morpho?: LendProvider<LendProviderConfig>
       aave?: LendProvider<LendProviderConfig>
     }
+    swapProviders?: {
+      uniswap?: SwapProvider<SwapProviderConfig>
+    }
     supportedAssets?: Asset[]
   }): Promise<PrivyWallet> {
     const wallet = new PrivyWallet(
@@ -65,6 +73,7 @@ export class PrivyWallet extends EOAWallet {
       params.address,
       params.chainManager,
       params.lendProviders,
+      params.swapProviders,
       params.supportedAssets,
       params.authorizationContext,
     )

package/src/wallet/node/wallets/hosted/privy/__tests__/PrivyWallet.spec.ts

@@ -10,14 +10,14 @@ import {
 import { unichain } from 'viem/chains'
 import { beforeEach, 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'
+} from '@/__mocks__/MockPrivyClient.js'
+import { getRandomAddress } from '@/__mocks__/utils.js'
+import { MockChainManager } from '@/services/__mocks__/MockChainManager.js'
+import type { ChainManager } from '@/services/ChainManager.js'
 import { PrivyWallet } from '@/wallet/node/wallets/hosted/privy/PrivyWallet.js'
 
 vi.mock('viem', async () => ({

package/src/wallet/node/wallets/hosted/privy/utils/__tests__/createSigner.spec.ts

@@ -6,8 +6,8 @@ import {
   createMockPrivyClient,
   createMockPrivyWallet,
   getMockAuthorizationContext,
-} from '@/test/MockPrivyClient.js'
-import { getRandomAddress } from '@/test/utils.js'
+} from '@/__mocks__/MockPrivyClient.js'
+import { getRandomAddress } from '@/__mocks__/utils.js'
 import { createSigner } from '@/wallet/node/wallets/hosted/privy/utils/createSigner.js'
 
 vi.mock('@privy-io/node/viem', async () => ({

package/src/wallet/node/wallets/hosted/turnkey/TurnkeyWallet.ts

@@ -5,7 +5,8 @@ import type { Address, 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 { SwapProvider } from '@/swap/core/SwapProvider.js'
+import type { LendProviderConfig, SwapProviderConfig } from '@/types/actions.js'
 import type { Asset } from '@/types/asset.js'
 import { EOAWallet } from '@/wallet/core/wallets/eoa/EOAWallet.js'
 import { createSigner } from '@/wallet/node/wallets/hosted/turnkey/utils/createSigner.js'
@@ -50,6 +51,9 @@ export class TurnkeyWallet extends EOAWallet {
       morpho?: LendProvider<LendProviderConfig>
       aave?: LendProvider<LendProviderConfig>
     }
+    swapProviders?: {
+      uniswap?: SwapProvider<SwapProviderConfig>
+    }
     supportedAssets?: Asset[]
   }) {
     const {
@@ -59,9 +63,10 @@ export class TurnkeyWallet extends EOAWallet {
       signWith,
       ethereumAddress,
       lendProviders,
+      swapProviders,
       supportedAssets,
     } = params
-    super(chainManager, lendProviders, supportedAssets)
+    super(chainManager, lendProviders, swapProviders, supportedAssets)
     this.client = client
     this.organizationId = organizationId
     this.signWith = signWith
@@ -78,6 +83,9 @@ export class TurnkeyWallet extends EOAWallet {
       morpho?: LendProvider<LendProviderConfig>
       aave?: LendProvider<LendProviderConfig>
     }
+    swapProviders?: {
+      uniswap?: SwapProvider<SwapProviderConfig>
+    }
     supportedAssets?: Asset[]
   }): Promise<TurnkeyWallet> {
     const wallet = new TurnkeyWallet(params)

package/src/wallet/node/wallets/hosted/turnkey/__tests__/TurnkeyWallet.spec.ts

@@ -7,9 +7,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 { TurnkeyWallet } from '@/wallet/node/wallets/hosted/turnkey/TurnkeyWallet.js'
 
 vi.mock('viem', async () => ({

package/src/wallet/node/wallets/hosted/turnkey/utils/__tests__/createSigner.spec.ts

@@ -5,7 +5,7 @@ import { createAccount } from '@turnkey/viem'
 import type { LocalAccount } from 'viem'
 import { describe, expect, it, vi } from 'vitest'
 
-import { getRandomAddress } from '@/test/utils.js'
+import { getRandomAddress } from '@/__mocks__/utils.js'
 import { createSigner } from '@/wallet/node/wallets/hosted/turnkey/utils/createSigner.js'
 
 vi.mock('@turnkey/viem', async () => ({

package/src/wallet/react/providers/hosted/dynamic/DynamicHostedWalletProvider.ts

@@ -2,7 +2,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 { SwapProvider } from '@/swap/core/SwapProvider.js'
+import type { LendProviderConfig, SwapProviderConfig } from '@/types/actions.js'
 import { HostedWalletProvider } from '@/wallet/core/providers/hosted/abstract/HostedWalletProvider.js'
 import type { Wallet } from '@/wallet/core/wallets/abstract/Wallet.js'
 import type { ReactToActionsOptionsMap } from '@/wallet/react/providers/hosted/types/index.js'
@@ -19,6 +20,9 @@ export class DynamicHostedWalletProvider extends HostedWalletProvider<
 > {
   /**
    * Create a new Dynamic wallet provider
+   * @param chainManager Chain manager for RPC, chain info, and transports
+   * @param lendProviders Optional lend providers for DeFi operations
+   * @param swapProviders Optional swap providers for trading operations
    */
   constructor(
     chainManager: ChainManager,
@@ -26,8 +30,11 @@ export class DynamicHostedWalletProvider extends HostedWalletProvider<
       morpho?: LendProvider<LendProviderConfig>
       aave?: LendProvider<LendProviderConfig>
     },
+    swapProviders?: {
+      uniswap?: SwapProvider<SwapProviderConfig>
+    },
   ) {
-    super(chainManager, lendProviders)
+    super(chainManager, lendProviders, swapProviders)
   }
 
   async toActionsWallet(
@@ -37,6 +44,7 @@ export class DynamicHostedWalletProvider extends HostedWalletProvider<
       dynamicWallet: params.wallet,
       chainManager: this.chainManager,
       lendProviders: this.lendProviders,
+      swapProviders: this.swapProviders,
     })
   }
 

package/src/wallet/react/providers/hosted/dynamic/__mocks__/DynamicHostedWalletProviderMock.ts

@@ -2,8 +2,8 @@ import type { LocalAccount } from 'viem'
 import { unichain } from 'viem/op-stack'
 import { vi } from 'vitest'
 
+import { MockChainManager } from '@/services/__mocks__/MockChainManager.js'
 import type { ChainManager } from '@/services/ChainManager.js'
-import { MockChainManager } from '@/test/MockChainManager.js'
 import { HostedWalletProvider } from '@/wallet/core/providers/hosted/abstract/HostedWalletProvider.js'
 import type { Wallet } from '@/wallet/core/wallets/abstract/Wallet.js'
 import type {

package/src/wallet/react/providers/hosted/dynamic/__tests__/DynamicHostedWalletProvider.spec.ts

@@ -5,11 +5,14 @@ vi.mock('@dynamic-labs/wallet-connector-core', () => ({
   Wallet: class {},
 }))
 
+vi.mock('@dynamic-labs/ethereum', () => ({
+  isEthereumWallet: vi.fn(),
+}))
+
 // Mock DynamicWallet to avoid importing browser-related deps
 vi.mock('@/wallet/react/wallets/hosted/dynamic/DynamicWallet.js', async () => {
-  const { DynamicWalletMock } = await import(
-    '@/wallet/react/wallets/hosted/dynamic/__mocks__/DynamicWalletMock.js'
-  )
+  const { DynamicWalletMock } =
+    await import('@/wallet/react/wallets/hosted/dynamic/__mocks__/DynamicWalletMock.js')
   return { DynamicWallet: DynamicWalletMock }
 })
 
@@ -19,9 +22,9 @@ vi.mock('@/wallet/react/wallets/hosted/dynamic/utils/createSigner.js')
 /* eslint-disable import/first */
 import type { LocalAccount } from 'viem'
 
+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 { DynamicHostedWalletProvider } from '@/wallet/react/providers/hosted/dynamic/DynamicHostedWalletProvider.js'
 import type { DynamicHostedWalletToActionsWalletOptions } from '@/wallet/react/providers/hosted/types/index.js'
 import { DynamicWallet } from '@/wallet/react/wallets/hosted/dynamic/DynamicWallet.js'
@@ -53,6 +56,7 @@ describe('DynamicHostedWalletProvider', () => {
         dynamicWallet: mockDynamicWallet,
         chainManager: mockChainManager,
         lendProviders: {},
+        swapProviders: {},
       })
       expect(result).toBe(mockResult)
     })

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

@@ -2,7 +2,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 { SwapProvider } from '@/swap/core/SwapProvider.js'
+import type { LendProviderConfig, SwapProviderConfig } from '@/types/actions.js'
 import { HostedWalletProvider } from '@/wallet/core/providers/hosted/abstract/HostedWalletProvider.js'
 import type { Wallet } from '@/wallet/core/wallets/abstract/Wallet.js'
 import type { ReactToActionsOptionsMap } from '@/wallet/react/providers/hosted/types/index.js'
@@ -19,6 +20,8 @@ export class PrivyHostedWalletProvider extends HostedWalletProvider<
   /**
    * Create a new Privy wallet provider
    * @param chainManager Chain manager for RPC, chain info, and transports
+   * @param lendProviders Optional lend providers for DeFi operations
+   * @param swapProviders Optional swap providers for trading operations
    */
   constructor(
     chainManager: ChainManager,
@@ -26,8 +29,11 @@ export class PrivyHostedWalletProvider extends HostedWalletProvider<
       morpho?: LendProvider<LendProviderConfig>
       aave?: LendProvider<LendProviderConfig>
     },
+    swapProviders?: {
+      uniswap?: SwapProvider<SwapProviderConfig>
+    },
   ) {
-    super(chainManager, lendProviders)
+    super(chainManager, lendProviders, swapProviders)
   }
 
   async toActionsWallet(
@@ -38,6 +44,7 @@ export class PrivyHostedWalletProvider extends HostedWalletProvider<
       chainManager: this.chainManager,
       connectedWallet,
       lendProviders: this.lendProviders,
+      swapProviders: this.swapProviders,
     })
     return wallet
   }

package/src/wallet/react/providers/hosted/privy/__mocks__/PrivyHostedWalletProviderMock.ts

@@ -2,8 +2,8 @@ import type { LocalAccount } from 'node_modules/viem/_types/accounts/types.js'
 import { unichain } from 'viem/op-stack'
 import { vi } from 'vitest'
 
+import { MockChainManager } from '@/services/__mocks__/MockChainManager.js'
 import type { ChainManager } from '@/services/ChainManager.js'
-import { MockChainManager } from '@/test/MockChainManager.js'
 import { HostedWalletProvider } from '@/wallet/core/providers/hosted/abstract/HostedWalletProvider.js'
 import type { Wallet } from '@/wallet/core/wallets/abstract/Wallet.js'
 import type {

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

@@ -2,18 +2,17 @@ import type { ConnectedWallet } from '@privy-io/react-auth'
 import type { LocalAccount } from 'viem'
 import { describe, expect, it, vi } from 'vitest'
 
+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 { PrivyHostedWalletProvider } from '@/wallet/react/providers/hosted/privy/PrivyHostedWalletProvider.js'
 import { PrivyWallet } from '@/wallet/react/wallets/hosted/privy/PrivyWallet.js'
 import * as createSignerUtil from '@/wallet/react/wallets/hosted/privy/utils/createSigner.js'
 
 // Mock PrivyWallet to avoid importing browser-related deps
 vi.mock('@/wallet/react/wallets/hosted/privy/PrivyWallet.js', async () => {
-  const { PrivyWalletMock } = await import(
-    '@/wallet/react/wallets/hosted/privy/__mocks__/PrivyWalletMock.js'
-  )
+  const { PrivyWalletMock } =
+    await import('@/wallet/react/wallets/hosted/privy/__mocks__/PrivyWalletMock.js')
   return { PrivyWallet: PrivyWalletMock }
 })
 
@@ -41,6 +40,7 @@ describe('PrivyHostedWalletProvider (React)', () => {
         chainManager: mockChainManager,
         connectedWallet: mockConnectedWallet,
         lendProviders: {},
+        swapProviders: {},
       })
       expect(result).toBe(mockActionsWallet)
     })