@eth-optimism/actions-sdk 0.3.0 → 0.4.0

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

@@ -2,11 +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 { SwapProvider } from '@/swap/core/SwapProvider.js'
-import type { LendProviderConfig, SwapProviderConfig } 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 {
@@ -43,13 +41,8 @@ export class PrivyHostedWalletProvider extends HostedWalletProvider<
   constructor(params: {
     privyClient: PrivyClient
     chainManager: ChainManager
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    }
-    swapProviders?: {
-      uniswap?: SwapProvider<SwapProviderConfig>
-    }
+    lendProviders?: LendProviders
+    swapProviders?: SwapProviders
     supportedAssets?: Asset[]
     authorizationContext?: AuthorizationContext
   }) {

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

@@ -1,6 +1,4 @@
 import { HostedWalletProviderRegistry } from '@/wallet/core/providers/hosted/registry/HostedWalletProviderRegistry.js'
-import { PrivyHostedWalletProvider } from '@/wallet/node/providers/hosted/privy/PrivyHostedWalletProvider.js'
-import { TurnkeyHostedWalletProvider } from '@/wallet/node/providers/hosted/turnkey/TurnkeyHostedWalletProvider.js'
 import type {
   NodeHostedProviderInstanceMap,
   NodeOptionsMap,
@@ -11,10 +9,8 @@ import type {
  * Node hosted wallet provider registry
  * @description
  * Environment-scoped registry that binds Node/server provider keys to their
- * factory implementations. This ensures browser-only hosted providers are
- * discoverable at runtime without importing Node-only code. The registry
- * pre-registers 'privy' and 'turnkey' providers and can be extended with
- * additional providers via `register`.
+ * factory implementations. Provider code is loaded lazily via dynamic import()
+ * so that unused wallet SDKs are not included in the bundle.
  */
 export class NodeHostedWalletProviderRegistry extends HostedWalletProviderRegistry<
   NodeHostedProviderInstanceMap,
@@ -28,10 +24,12 @@ export class NodeHostedWalletProviderRegistry extends HostedWalletProviderRegist
       validateOptions(options): options is NodeOptionsMap['privy'] {
         return Boolean((options as NodeOptionsMap['privy'])?.privyClient)
       },
-      create(
+      async create(
         { chainManager, lendProviders, swapProviders, supportedAssets },
         options,
       ) {
+        const { PrivyHostedWalletProvider } =
+          await import('@/wallet/node/providers/hosted/privy/PrivyHostedWalletProvider.js')
         return new PrivyHostedWalletProvider({
           privyClient: options.privyClient,
           chainManager,
@@ -49,10 +47,12 @@ export class NodeHostedWalletProviderRegistry extends HostedWalletProviderRegist
         const o = options as NodeOptionsMap['turnkey']
         return Boolean(o?.client)
       },
-      create(
+      async create(
         { chainManager, lendProviders, swapProviders, supportedAssets },
         options,
       ) {
+        const { TurnkeyHostedWalletProvider } =
+          await import('@/wallet/node/providers/hosted/turnkey/TurnkeyHostedWalletProvider.js')
         return new TurnkeyHostedWalletProvider(
           options.client,
           chainManager,

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

@@ -54,11 +54,11 @@ describe('NodeHostedWalletProviderRegistry', () => {
     ).toBe(false)
   })
 
-  it('creates a PrivyHostedWalletProvider instance', () => {
+  it('creates a PrivyHostedWalletProvider instance', async () => {
     const registry = new NodeHostedWalletProviderRegistry()
     const factory = registry.getFactory('privy')
 
-    const provider = factory.create({ chainManager: mockChainManager }, {
+    const provider = await factory.create({ chainManager: mockChainManager }, {
       privyClient: mockPrivyClient,
       authorizationContext: getMockAuthorizationContext(),
     } as NodeOptionsMap['privy'])
@@ -80,11 +80,11 @@ describe('NodeHostedWalletProviderRegistry', () => {
     expect(factory.validateOptions?.({})).toBe(false)
   })
 
-  it('creates a TurnkeyHostedWalletProvider instance', () => {
+  it('creates a TurnkeyHostedWalletProvider instance', async () => {
     const registry = new NodeHostedWalletProviderRegistry()
     const factory = registry.getFactory('turnkey')
 
-    const provider = factory.create(
+    const provider = await factory.create(
       { chainManager: mockChainManager },
       {
         client: mockTurnkeyClient,

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

@@ -3,11 +3,9 @@ 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 { SwapProvider } from '@/swap/core/SwapProvider.js'
-import type { LendProviderConfig, SwapProviderConfig } 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 { NodeToActionsOptionsMap } from '@/wallet/node/providers/hosted/types/index.js'
@@ -39,13 +37,8 @@ export class TurnkeyHostedWalletProvider extends HostedWalletProvider<
       | TurnkeyServerClient
       | TurnkeySDKClientBase,
     chainManager: ChainManager,
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    },
-    swapProviders?: {
-      uniswap?: SwapProvider<SwapProviderConfig>
-    },
+    lendProviders?: LendProviders,
+    swapProviders?: SwapProviders,
     supportedAssets?: Asset[],
   ) {
     super(chainManager, lendProviders, swapProviders, supportedAssets)

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

@@ -1,11 +1,9 @@
 import type { AuthorizationContext, PrivyClient } from '@privy-io/node'
 import { type Address, type LocalAccount } from 'viem'
 
-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 { LendProviders, SwapProviders } from '@/types/providers.js'
 import { EOAWallet } from '@/wallet/core/wallets/eoa/EOAWallet.js'
 import { createSigner } from '@/wallet/node/wallets/hosted/privy/utils/createSigner.js'
 
@@ -35,13 +33,8 @@ export class PrivyWallet extends EOAWallet {
     walletId: string,
     address: Address,
     chainManager: ChainManager,
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    },
-    swapProviders?: {
-      uniswap?: SwapProvider<SwapProviderConfig>
-    },
+    lendProviders?: LendProviders,
+    swapProviders?: SwapProviders,
     supportedAssets?: Asset[],
     authorizationContext?: AuthorizationContext,
   ) {
@@ -58,13 +51,8 @@ export class PrivyWallet extends EOAWallet {
     walletId: string
     address: Address
     chainManager: ChainManager
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    }
-    swapProviders?: {
-      uniswap?: SwapProvider<SwapProviderConfig>
-    }
+    lendProviders?: LendProviders
+    swapProviders?: SwapProviders
     supportedAssets?: Asset[]
   }): Promise<PrivyWallet> {
     const wallet = new PrivyWallet(

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

@@ -3,11 +3,9 @@ import type { TurnkeyClient } from '@turnkey/http'
 import type { TurnkeyServerClient } from '@turnkey/sdk-server'
 import type { Address, LocalAccount } from 'viem'
 
-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 { LendProviders, SwapProviders } from '@/types/providers.js'
 import { EOAWallet } from '@/wallet/core/wallets/eoa/EOAWallet.js'
 import { createSigner } from '@/wallet/node/wallets/hosted/turnkey/utils/createSigner.js'
 
@@ -47,13 +45,8 @@ export class TurnkeyWallet extends EOAWallet {
     organizationId: string
     signWith: string
     ethereumAddress?: string
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    }
-    swapProviders?: {
-      uniswap?: SwapProvider<SwapProviderConfig>
-    }
+    lendProviders?: LendProviders
+    swapProviders?: SwapProviders
     supportedAssets?: Asset[]
   }) {
     const {
@@ -79,13 +72,8 @@ export class TurnkeyWallet extends EOAWallet {
     organizationId: string
     signWith: string
     ethereumAddress?: string
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    }
-    swapProviders?: {
-      uniswap?: SwapProvider<SwapProviderConfig>
-    }
+    lendProviders?: LendProviders
+    swapProviders?: SwapProviders
     supportedAssets?: Asset[]
   }): Promise<TurnkeyWallet> {
     const wallet = new TurnkeyWallet(params)

package/src/wallet/react/providers/hosted/dynamic/DynamicHostedWalletProvider.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 { SwapProvider } from '@/swap/core/SwapProvider.js'
-import type { LendProviderConfig, SwapProviderConfig } 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 { ReactToActionsOptionsMap } from '@/wallet/react/providers/hosted/types/index.js'
@@ -26,15 +25,11 @@ export class DynamicHostedWalletProvider extends HostedWalletProvider<
    */
   constructor(
     chainManager: ChainManager,
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    },
-    swapProviders?: {
-      uniswap?: SwapProvider<SwapProviderConfig>
-    },
+    lendProviders?: LendProviders,
+    swapProviders?: SwapProviders,
+    supportedAssets?: Asset[],
   ) {
-    super(chainManager, lendProviders, swapProviders)
+    super(chainManager, lendProviders, swapProviders, supportedAssets)
   }
 
   async toActionsWallet(
@@ -45,6 +40,7 @@ export class DynamicHostedWalletProvider extends HostedWalletProvider<
       chainManager: this.chainManager,
       lendProviders: this.lendProviders,
       swapProviders: this.swapProviders,
+      supportedAssets: this.supportedAssets,
     })
   }
 

package/src/wallet/react/providers/hosted/privy/PrivyHostedWalletProvider.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 { SwapProvider } from '@/swap/core/SwapProvider.js'
-import type { LendProviderConfig, SwapProviderConfig } 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 { ReactToActionsOptionsMap } from '@/wallet/react/providers/hosted/types/index.js'
@@ -25,15 +24,11 @@ export class PrivyHostedWalletProvider extends HostedWalletProvider<
    */
   constructor(
     chainManager: ChainManager,
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    },
-    swapProviders?: {
-      uniswap?: SwapProvider<SwapProviderConfig>
-    },
+    lendProviders?: LendProviders,
+    swapProviders?: SwapProviders,
+    supportedAssets?: Asset[],
   ) {
-    super(chainManager, lendProviders, swapProviders)
+    super(chainManager, lendProviders, swapProviders, supportedAssets)
   }
 
   async toActionsWallet(
@@ -45,6 +40,7 @@ export class PrivyHostedWalletProvider extends HostedWalletProvider<
       connectedWallet,
       lendProviders: this.lendProviders,
       swapProviders: this.swapProviders,
+      supportedAssets: this.supportedAssets,
     })
     return wallet
   }

package/src/wallet/react/providers/hosted/turnkey/TurnkeyHostedWalletProvider.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 { SwapProvider } from '@/swap/core/SwapProvider.js'
-import type { LendProviderConfig, SwapProviderConfig } 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 { ReactToActionsOptionsMap } from '@/wallet/react/providers/hosted/types/index.js'
@@ -29,15 +28,11 @@ export class TurnkeyHostedWalletProvider extends HostedWalletProvider<
    */
   constructor(
     chainManager: ChainManager,
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    },
-    swapProviders?: {
-      uniswap?: SwapProvider<SwapProviderConfig>
-    },
+    lendProviders?: LendProviders,
+    swapProviders?: SwapProviders,
+    supportedAssets?: Asset[],
   ) {
-    super(chainManager, lendProviders, swapProviders)
+    super(chainManager, lendProviders, swapProviders, supportedAssets)
   }
 
   /**
@@ -63,6 +58,7 @@ export class TurnkeyHostedWalletProvider extends HostedWalletProvider<
       chainManager: this.chainManager,
       lendProviders: this.lendProviders,
       swapProviders: this.swapProviders,
+      supportedAssets: this.supportedAssets,
     })
   }
 

package/src/wallet/react/providers/registry/ReactHostedWalletProviderRegistry.ts

@@ -1,7 +1,4 @@
 import { HostedWalletProviderRegistry } from '@/wallet/core/providers/hosted/registry/HostedWalletProviderRegistry.js'
-import { DynamicHostedWalletProvider } from '@/wallet/react/providers/hosted/dynamic/DynamicHostedWalletProvider.js'
-import { PrivyHostedWalletProvider } from '@/wallet/react/providers/hosted/privy/PrivyHostedWalletProvider.js'
-import { TurnkeyHostedWalletProvider } from '@/wallet/react/providers/hosted/turnkey/TurnkeyHostedWalletProvider.js'
 import type {
   ReactHostedProviderInstanceMap,
   ReactOptionsMap,
@@ -12,10 +9,8 @@ import type {
  * React hosted wallet provider registry
  * @description
  * Environment-scoped registry that binds React/browser provider keys to their
- * factory implementations. This ensures browser-only hosted providers are
- * discoverable at runtime without importing Node-only code. The registry
- * pre-registers 'dynamic' and 'privy' providers and can be extended with
- * additional providers via `register`.
+ * factory implementations. Provider code is loaded lazily via dynamic import()
+ * so that unused wallet SDKs are not included in the bundle.
  */
 export class ReactHostedWalletProviderRegistry extends HostedWalletProviderRegistry<
   ReactHostedProviderInstanceMap,
@@ -29,11 +24,17 @@ export class ReactHostedWalletProviderRegistry extends HostedWalletProviderRegis
       validateOptions(_options): _options is ReactOptionsMap['dynamic'] {
         return true
       },
-      create({ chainManager, lendProviders, swapProviders }, _options) {
+      async create(
+        { chainManager, lendProviders, swapProviders, supportedAssets },
+        _options,
+      ) {
+        const { DynamicHostedWalletProvider } =
+          await import('@/wallet/react/providers/hosted/dynamic/DynamicHostedWalletProvider.js')
         return new DynamicHostedWalletProvider(
           chainManager,
           lendProviders,
           swapProviders,
+          supportedAssets,
         )
       },
     })
@@ -43,11 +44,17 @@ export class ReactHostedWalletProviderRegistry extends HostedWalletProviderRegis
       validateOptions(_options): _options is ReactOptionsMap['privy'] {
         return true
       },
-      create({ chainManager, lendProviders, swapProviders }, _options) {
+      async create(
+        { chainManager, lendProviders, swapProviders, supportedAssets },
+        _options,
+      ) {
+        const { PrivyHostedWalletProvider } =
+          await import('@/wallet/react/providers/hosted/privy/PrivyHostedWalletProvider.js')
         return new PrivyHostedWalletProvider(
           chainManager,
           lendProviders,
           swapProviders,
+          supportedAssets,
         )
       },
     })
@@ -57,11 +64,17 @@ export class ReactHostedWalletProviderRegistry extends HostedWalletProviderRegis
       validateOptions(_options): _options is ReactOptionsMap['turnkey'] {
         return true
       },
-      create({ chainManager, lendProviders, swapProviders }, _options) {
+      async create(
+        { chainManager, lendProviders, swapProviders, supportedAssets },
+        _options,
+      ) {
+        const { TurnkeyHostedWalletProvider } =
+          await import('@/wallet/react/providers/hosted/turnkey/TurnkeyHostedWalletProvider.js')
         return new TurnkeyHostedWalletProvider(
           chainManager,
           lendProviders,
           swapProviders,
+          supportedAssets,
         )
       },
     })

package/src/wallet/react/providers/registry/__tests__/ReactHostedWalletProviderRegistry.spec.ts

@@ -49,11 +49,11 @@ describe('ReactHostedWalletProviderRegistry', () => {
     ).toBe(true)
   })
 
-  it('creates a DynamicHostedWalletProvider instance', () => {
+  it('creates a DynamicHostedWalletProvider instance', async () => {
     const registry = new ReactHostedWalletProviderRegistry()
     const factory = registry.getFactory('dynamic')
 
-    const provider = factory.create(
+    const provider = await factory.create(
       { chainManager: mockChainManager },
       undefined as ReactOptionsMap['dynamic'],
     )
@@ -71,11 +71,11 @@ describe('ReactHostedWalletProviderRegistry', () => {
     ).toBe(true)
   })
 
-  it('creates a PrivyHostedWalletProvider instance', () => {
+  it('creates a PrivyHostedWalletProvider instance', async () => {
     const registry = new ReactHostedWalletProviderRegistry()
     const factory = registry.getFactory('privy')
 
-    const provider = factory.create(
+    const provider = await factory.create(
       { chainManager: mockChainManager },
       undefined as ReactOptionsMap['privy'],
     )
@@ -93,11 +93,11 @@ describe('ReactHostedWalletProviderRegistry', () => {
     ).toBe(true)
   })
 
-  it('creates a TurnkeyHostedWalletProvider instance', () => {
+  it('creates a TurnkeyHostedWalletProvider instance', async () => {
     const registry = new ReactHostedWalletProviderRegistry()
     const factory = registry.getFactory('turnkey')
 
-    const provider = factory.create(
+    const provider = await factory.create(
       { chainManager: mockChainManager },
       undefined as ReactOptionsMap['turnkey'],
     )

package/src/wallet/react/wallets/hosted/dynamic/DynamicWallet.ts

@@ -1,9 +1,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 { SwapProvider } from '@/swap/core/SwapProvider.js'
-import type { LendProviderConfig, SwapProviderConfig } from '@/types/actions.js'
+import type { Asset } from '@/types/asset.js'
+import type { LendProviders, SwapProviders } from '@/types/providers.js'
 import { EOAWallet } from '@/wallet/core/wallets/eoa/EOAWallet.js'
 import type { DynamicHostedWalletToActionsWalletOptions } from '@/wallet/react/providers/hosted/types/index.js'
 import { createSigner } from '@/wallet/react/wallets/hosted/dynamic/utils/createSigner.js'
@@ -27,34 +26,27 @@ export class DynamicWallet extends EOAWallet {
   private constructor(
     chainManager: ChainManager,
     dynamicWallet: DynamicHostedWalletToActionsWalletOptions['wallet'],
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    },
-    swapProviders?: {
-      uniswap?: SwapProvider<SwapProviderConfig>
-    },
+    lendProviders?: LendProviders,
+    swapProviders?: SwapProviders,
+    supportedAssets?: Asset[],
   ) {
-    super(chainManager, lendProviders, swapProviders)
+    super(chainManager, lendProviders, swapProviders, supportedAssets)
     this.dynamicWallet = dynamicWallet
   }
 
   static async create(params: {
     dynamicWallet: DynamicHostedWalletToActionsWalletOptions['wallet']
     chainManager: ChainManager
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    }
-    swapProviders?: {
-      uniswap?: SwapProvider<SwapProviderConfig>
-    }
+    lendProviders?: LendProviders
+    swapProviders?: SwapProviders
+    supportedAssets?: Asset[]
   }): Promise<DynamicWallet> {
     const wallet = new DynamicWallet(
       params.chainManager,
       params.dynamicWallet,
       params.lendProviders,
       params.swapProviders,
+      params.supportedAssets,
     )
     await wallet.initialize()
     return wallet

package/src/wallet/react/wallets/hosted/dynamic/__mocks__/DynamicWalletMock.ts

@@ -1,8 +1,7 @@
 import { vi } from 'vitest'
 
-import type { LendProvider } from '@/lend/core/LendProvider.js'
 import type { ChainManager } from '@/services/ChainManager.js'
-import type { LendProviderConfig } from '@/types/actions.js'
+import type { LendProviders } from '@/types/providers.js'
 import type { Wallet } from '@/wallet/core/wallets/abstract/Wallet.js'
 import type { DynamicHostedWalletToActionsWalletOptions } from '@/wallet/react/providers/hosted/types/index.js'
 
@@ -17,10 +16,7 @@ export class DynamicWalletMock {
     async (_params: {
       chainManager: ChainManager
       dynamicWallet: DynamicHostedWalletToActionsWalletOptions['wallet']
-      lendProviders?: {
-        morpho?: LendProvider<LendProviderConfig>
-        aave?: LendProvider<LendProviderConfig>
-      }
+      lendProviders?: LendProviders
     }): Promise<Wallet> => {
       return {} as unknown as Wallet
     },

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

@@ -1,10 +1,9 @@
 import type { ConnectedWallet } from '@privy-io/react-auth'
 import type { Address, LocalAccount } from 'viem'
 
-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 { LendProviders, SwapProviders } from '@/types/providers.js'
 import { EOAWallet } from '@/wallet/core/wallets/eoa/EOAWallet.js'
 import { createSigner } from '@/wallet/react/wallets/hosted/privy/utils/createSigner.js'
 
@@ -21,34 +20,27 @@ export class PrivyWallet extends EOAWallet {
   private constructor(
     chainManager: ChainManager,
     connectedWallet: ConnectedWallet,
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    },
-    swapProviders?: {
-      uniswap?: SwapProvider<SwapProviderConfig>
-    },
+    lendProviders?: LendProviders,
+    swapProviders?: SwapProviders,
+    supportedAssets?: Asset[],
   ) {
-    super(chainManager, lendProviders, swapProviders)
+    super(chainManager, lendProviders, swapProviders, supportedAssets)
     this.connectedWallet = connectedWallet
   }
 
   static async create(params: {
     chainManager: ChainManager
     connectedWallet: ConnectedWallet
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    }
-    swapProviders?: {
-      uniswap?: SwapProvider<SwapProviderConfig>
-    }
+    lendProviders?: LendProviders
+    swapProviders?: SwapProviders
+    supportedAssets?: Asset[]
   }): Promise<PrivyWallet> {
     const wallet = new PrivyWallet(
       params.chainManager,
       params.connectedWallet,
       params.lendProviders,
       params.swapProviders,
+      params.supportedAssets,
     )
     await wallet.initialize()
     return wallet

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

@@ -1,10 +1,9 @@
 import type { TurnkeySDKClientBase } from '@turnkey/react-wallet-kit'
 import type { Address, LocalAccount } from 'viem'
 
-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 { LendProviders, SwapProviders } from '@/types/providers.js'
 import { EOAWallet } from '@/wallet/core/wallets/eoa/EOAWallet.js'
 import { createSigner } from '@/wallet/react/wallets/hosted/turnkey/utils/createSigner.js'
 
@@ -41,13 +40,9 @@ export class TurnkeyWallet extends EOAWallet {
     organizationId: string
     signWith: string
     ethereumAddress?: string
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    }
-    swapProviders?: {
-      uniswap?: SwapProvider<SwapProviderConfig>
-    }
+    lendProviders?: LendProviders
+    swapProviders?: SwapProviders
+    supportedAssets?: Asset[]
   }) {
     const {
       chainManager,
@@ -57,8 +52,9 @@ export class TurnkeyWallet extends EOAWallet {
       ethereumAddress,
       lendProviders,
       swapProviders,
+      supportedAssets,
     } = params
-    super(chainManager, lendProviders, swapProviders)
+    super(chainManager, lendProviders, swapProviders, supportedAssets)
     this.client = client
     this.organizationId = organizationId
     this.signWith = signWith
@@ -71,13 +67,9 @@ export class TurnkeyWallet extends EOAWallet {
     organizationId: string
     signWith: string
     ethereumAddress?: string
-    lendProviders?: {
-      morpho?: LendProvider<LendProviderConfig>
-      aave?: LendProvider<LendProviderConfig>
-    }
-    swapProviders?: {
-      uniswap?: SwapProvider<SwapProviderConfig>
-    }
+    lendProviders?: LendProviders
+    swapProviders?: SwapProviders
+    supportedAssets?: Asset[]
   }): Promise<TurnkeyWallet> {
     const wallet = new TurnkeyWallet(params)
     await wallet.initialize()