@eth-optimism/actions-sdk 0.0.4 → 0.2.0

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 type { LendConfig, LendProvider } from '@/types/lend/index.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'
@@ -94,11 +94,11 @@ describe('TurnkeyHostedWalletProvider', () => {
 
     it('forwards lendProvider when provided to constructor', async () => {
       const turnkeyClient = {} as unknown as TurnkeyClient
-      const mockLendProvider = {} as LendProvider<LendConfig>
+      const mockLendProvider = createMockLendProvider()
       const provider = new TurnkeyHostedWalletProvider(
         turnkeyClient,
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const spyTurnkeyWalletCreate = vi
         .spyOn(TurnkeyWallet, 'create')
@@ -113,7 +113,7 @@ describe('TurnkeyHostedWalletProvider', () => {
 
       expect(spyTurnkeyWalletCreate).toHaveBeenCalledWith(
         expect.objectContaining({
-          lendProvider: mockLendProvider,
+          lendProviders: { morpho: mockLendProvider },
         }),
       )
     })

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

@@ -1,8 +1,10 @@
 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 { LendConfig, LendProvider } from '@/types/lend/index.js'
+import type { LendProviderConfig } 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'
 
@@ -23,17 +25,22 @@ export class PrivyWallet extends EOAWallet {
    * @param walletId - Privy wallet identifier
    * @param address - Ethereum address of the wallet
    * @param chainManager - Chain manager for multi-chain operations
-   * @param lendProvider - Optional lend provider for DeFi operations
+   * @param lendProviders - Optional lend providers for DeFi operations
+   * @param supportedAssets - Optional list of supported assets
    */
   private constructor(
     privyClient: PrivyClient,
     walletId: string,
     address: Address,
     chainManager: ChainManager,
-    lendProvider?: LendProvider<LendConfig>,
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    },
+    supportedAssets?: Asset[],
     authorizationContext?: AuthorizationContext,
   ) {
-    super(chainManager, lendProvider)
+    super(chainManager, lendProviders, supportedAssets)
     this.privyClient = privyClient
     this.authorizationContext = authorizationContext
     this.walletId = walletId
@@ -46,14 +53,19 @@ export class PrivyWallet extends EOAWallet {
     walletId: string
     address: Address
     chainManager: ChainManager
-    lendProvider?: LendProvider<LendConfig>
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    }
+    supportedAssets?: Asset[]
   }): Promise<PrivyWallet> {
     const wallet = new PrivyWallet(
       params.privyClient,
       params.walletId,
       params.address,
       params.chainManager,
-      params.lendProvider,
+      params.lendProviders,
+      params.supportedAssets,
       params.authorizationContext,
     )
     await wallet.initialize()

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

@@ -3,8 +3,10 @@ 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 { LendConfig, LendProvider } from '@/types/lend/index.js'
+import type { LendProviderConfig } 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'
 
@@ -44,7 +46,11 @@ export class TurnkeyWallet extends EOAWallet {
     organizationId: string
     signWith: string
     ethereumAddress?: string
-    lendProvider?: LendProvider<LendConfig>
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    }
+    supportedAssets?: Asset[]
   }) {
     const {
       chainManager,
@@ -52,9 +58,10 @@ export class TurnkeyWallet extends EOAWallet {
       organizationId,
       signWith,
       ethereumAddress,
-      lendProvider,
+      lendProviders,
+      supportedAssets,
     } = params
-    super(chainManager, lendProvider)
+    super(chainManager, lendProviders, supportedAssets)
     this.client = client
     this.organizationId = organizationId
     this.signWith = signWith
@@ -67,7 +74,11 @@ export class TurnkeyWallet extends EOAWallet {
     organizationId: string
     signWith: string
     ethereumAddress?: string
-    lendProvider?: LendProvider<LendConfig>
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    }
+    supportedAssets?: Asset[]
   }): Promise<TurnkeyWallet> {
     const wallet = new TurnkeyWallet(params)
     await wallet.initialize()

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

@@ -1,7 +1,8 @@
 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 { 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'
@@ -21,9 +22,12 @@ export class DynamicHostedWalletProvider extends HostedWalletProvider<
    */
   constructor(
     chainManager: ChainManager,
-    lendProvider?: LendProvider<LendConfig>,
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    },
   ) {
-    super(chainManager, lendProvider)
+    super(chainManager, lendProviders)
   }
 
   async toActionsWallet(
@@ -32,7 +36,7 @@ export class DynamicHostedWalletProvider extends HostedWalletProvider<
     return DynamicWallet.create({
       dynamicWallet: params.wallet,
       chainManager: this.chainManager,
-      lendProvider: this.lendProvider,
+      lendProviders: this.lendProviders,
     })
   }
 

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

@@ -1,22 +1,36 @@
-import type { LocalAccount } from 'viem'
 import { describe, expect, it, vi } from 'vitest'
 
-import type { ChainManager } from '@/services/ChainManager.js'
-import { MockChainManager } from '@/test/MockChainManager.js'
-import type { LendConfig, LendProvider } from '@/types/lend/index.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'
-import * as createSignerUtil from '@/wallet/react/wallets/hosted/dynamic/utils/createSigner.js'
+// Mock @dynamic-labs packages to avoid import syntax errors
+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 }
 })
 
+// Mock createSigner to avoid importing @dynamic-labs
+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 { 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'
+import * as createSignerUtil from '@/wallet/react/wallets/hosted/dynamic/utils/createSigner.js'
+/* eslint-enable import/first */
+
 describe('DynamicHostedWalletProvider', () => {
   describe('toActionsWallet', () => {
     it('toActionsWallet delegates to DynamicWallet.create with correct args', async () => {
@@ -41,6 +55,7 @@ describe('DynamicHostedWalletProvider', () => {
       expect(DynamicWallet.create).toHaveBeenCalledWith({
         dynamicWallet: mockDynamicWallet,
         chainManager: mockChainManager,
+        lendProviders: {},
       })
       expect(result).toBe(mockResult)
     })
@@ -49,11 +64,10 @@ describe('DynamicHostedWalletProvider', () => {
       const mockChainManager = new MockChainManager({
         supportedChains: [1],
       }) as unknown as ChainManager
-      const mockLendProvider = {} as any
-      const provider = new DynamicHostedWalletProvider(
-        mockChainManager,
-        mockLendProvider as LendProvider<LendConfig>,
-      )
+      const mockLendProvider = createMockLendProvider()
+      const provider = new DynamicHostedWalletProvider(mockChainManager, {
+        morpho: mockLendProvider,
+      })
 
       const mockDynamicWallet = {
         __brand: 'dynamic-wallet',
@@ -69,7 +83,7 @@ describe('DynamicHostedWalletProvider', () => {
 
       expect(DynamicWallet.create).toHaveBeenCalledWith(
         expect.objectContaining({
-          lendProvider: mockLendProvider,
+          lendProviders: { morpho: mockLendProvider },
         }),
       )
     })

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

@@ -1,7 +1,8 @@
 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 { 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'
@@ -21,9 +22,12 @@ export class PrivyHostedWalletProvider extends HostedWalletProvider<
    */
   constructor(
     chainManager: ChainManager,
-    lendProvider?: LendProvider<LendConfig>,
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    },
   ) {
-    super(chainManager, lendProvider)
+    super(chainManager, lendProviders)
   }
 
   async toActionsWallet(
@@ -33,7 +37,7 @@ export class PrivyHostedWalletProvider extends HostedWalletProvider<
     const wallet = await PrivyWallet.create({
       chainManager: this.chainManager,
       connectedWallet,
-      lendProvider: this.lendProvider,
+      lendProviders: this.lendProviders,
     })
     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 type { LendConfig, LendProvider } from '@/types/lend/index.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 }
 })
 
@@ -40,6 +39,7 @@ describe('PrivyHostedWalletProvider (React)', () => {
       expect(PrivyWallet.create).toHaveBeenCalledWith({
         chainManager: mockChainManager,
         connectedWallet: mockConnectedWallet,
+        lendProviders: {},
       })
       expect(result).toBe(mockActionsWallet)
     })
@@ -48,11 +48,10 @@ describe('PrivyHostedWalletProvider (React)', () => {
       const mockChainManager = new MockChainManager({
         supportedChains: [1],
       }) as unknown as ChainManager
-      const mockLendProvider = {} as any
-      const provider = new PrivyHostedWalletProvider(
-        mockChainManager,
-        mockLendProvider as LendProvider<LendConfig>,
-      )
+      const mockLendProvider = createMockLendProvider()
+      const provider = new PrivyHostedWalletProvider(mockChainManager, {
+        morpho: mockLendProvider,
+      })
       const mockActionsWallet = {
         __brand: 'actions-wallet',
       } as unknown as PrivyWallet
@@ -67,7 +66,7 @@ describe('PrivyHostedWalletProvider (React)', () => {
 
       expect(PrivyWallet.create).toHaveBeenCalledWith(
         expect.objectContaining({
-          lendProvider: mockLendProvider,
+          lendProviders: { morpho: mockLendProvider },
         }),
       )
     })

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

@@ -1,7 +1,8 @@
 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 { 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'
@@ -27,9 +28,12 @@ export class TurnkeyHostedWalletProvider extends HostedWalletProvider<
    */
   constructor(
     chainManager: ChainManager,
-    lendProvider?: LendProvider<LendConfig>,
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    },
   ) {
-    super(chainManager, lendProvider)
+    super(chainManager, lendProviders)
   }
 
   /**
@@ -53,7 +57,7 @@ export class TurnkeyHostedWalletProvider extends HostedWalletProvider<
       signWith,
       ethereumAddress,
       chainManager: this.chainManager,
-      lendProvider: this.lendProvider,
+      lendProviders: this.lendProviders,
     })
   }
 

package/src/wallet/react/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 type { LendConfig, LendProvider } from '@/types/lend/index.js'
 import { TurnkeyHostedWalletProvider } from '@/wallet/react/providers/hosted/turnkey/TurnkeyHostedWalletProvider.js'
 import { TurnkeyWallet } from '@/wallet/react/wallets/hosted/turnkey/TurnkeyWallet.js'
 import * as createSignerUtil from '@/wallet/react/wallets/hosted/turnkey/utils/createSigner.js'
@@ -88,11 +88,10 @@ describe('TurnkeyHostedWalletProvider', () => {
 
     it('forwards lendProvider when provided to constructor', async () => {
       const turnkeyClient = {} as unknown as TurnkeySDKClientBase
-      const mockLendProvider = {} as unknown as LendProvider<LendConfig>
-      const provider = new TurnkeyHostedWalletProvider(
-        mockChainManager,
-        mockLendProvider,
-      )
+      const mockLendProvider = createMockLendProvider()
+      const provider = new TurnkeyHostedWalletProvider(mockChainManager, {
+        morpho: mockLendProvider,
+      })
       const spyTurnkeyWalletCreate = vi
         .spyOn(TurnkeyWallet, 'create')
         .mockResolvedValueOnce({
@@ -107,7 +106,7 @@ describe('TurnkeyHostedWalletProvider', () => {
 
       expect(spyTurnkeyWalletCreate).toHaveBeenCalledWith(
         expect.objectContaining({
-          lendProvider: mockLendProvider,
+          lendProviders: { morpho: mockLendProvider },
         }),
       )
     })

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

@@ -29,8 +29,8 @@ export class ReactHostedWalletProviderRegistry extends HostedWalletProviderRegis
       validateOptions(_options): _options is ReactOptionsMap['dynamic'] {
         return true
       },
-      create({ chainManager, lendProvider }, _options) {
-        return new DynamicHostedWalletProvider(chainManager, lendProvider)
+      create({ chainManager, lendProviders }, _options) {
+        return new DynamicHostedWalletProvider(chainManager, lendProviders)
       },
     })
 
@@ -39,8 +39,8 @@ export class ReactHostedWalletProviderRegistry extends HostedWalletProviderRegis
       validateOptions(_options): _options is ReactOptionsMap['privy'] {
         return true
       },
-      create({ chainManager, lendProvider }, _options) {
-        return new PrivyHostedWalletProvider(chainManager, lendProvider)
+      create({ chainManager, lendProviders }, _options) {
+        return new PrivyHostedWalletProvider(chainManager, lendProviders)
       },
     })
 
@@ -49,8 +49,8 @@ export class ReactHostedWalletProviderRegistry extends HostedWalletProviderRegis
       validateOptions(_options): _options is ReactOptionsMap['turnkey'] {
         return true
       },
-      create({ chainManager, lendProvider }, _options) {
-        return new TurnkeyHostedWalletProvider(chainManager, lendProvider)
+      create({ chainManager, lendProviders }, _options) {
+        return new TurnkeyHostedWalletProvider(chainManager, lendProviders)
       },
     })
   }

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

@@ -1,8 +1,8 @@
 import { unichain } from 'viem/chains'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 
+import { MockChainManager } from '@/services/__mocks__/MockChainManager.js'
 import type { ChainManager } from '@/services/ChainManager.js'
-import { MockChainManager } from '@/test/MockChainManager.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'
@@ -13,9 +13,8 @@ import { ReactHostedWalletProviderRegistry } from '@/wallet/react/providers/regi
 vi.mock(
   '@/wallet/react/providers/hosted/dynamic/DynamicHostedWalletProvider.js',
   async () => {
-    const { DynamicHostedWalletProviderMock } = await import(
-      '@/wallet/react/providers/hosted/dynamic/__mocks__/DynamicHostedWalletProviderMock.js'
-    )
+    const { DynamicHostedWalletProviderMock } =
+      await import('@/wallet/react/providers/hosted/dynamic/__mocks__/DynamicHostedWalletProviderMock.js')
     return { DynamicHostedWalletProvider: DynamicHostedWalletProviderMock }
   },
 )
@@ -24,9 +23,8 @@ vi.mock(
 vi.mock(
   '@/wallet/react/providers/hosted/privy/PrivyHostedWalletProvider.js',
   async () => {
-    const { PrivyHostedWalletProviderMock } = await import(
-      '@/wallet/react/providers/hosted/privy/__mocks__/PrivyHostedWalletProviderMock.js'
-    )
+    const { PrivyHostedWalletProviderMock } =
+      await import('@/wallet/react/providers/hosted/privy/__mocks__/PrivyHostedWalletProviderMock.js')
     return { PrivyHostedWalletProvider: PrivyHostedWalletProviderMock }
   },
 )

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

@@ -1,7 +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 { LendConfig, LendProvider } from '@/types/lend/index.js'
+import type { LendProviderConfig } from '@/types/actions.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'
@@ -23,21 +24,27 @@ export class DynamicWallet extends EOAWallet {
   private constructor(
     chainManager: ChainManager,
     dynamicWallet: DynamicHostedWalletToActionsWalletOptions['wallet'],
-    lendProvider?: LendProvider<LendConfig>,
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    },
   ) {
-    super(chainManager, lendProvider)
+    super(chainManager, lendProviders)
     this.dynamicWallet = dynamicWallet
   }
 
   static async create(params: {
     dynamicWallet: DynamicHostedWalletToActionsWalletOptions['wallet']
     chainManager: ChainManager
-    lendProvider?: LendProvider<LendConfig>
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    }
   }): Promise<DynamicWallet> {
     const wallet = new DynamicWallet(
       params.chainManager,
       params.dynamicWallet,
-      params.lendProvider,
+      params.lendProviders,
     )
     await wallet.initialize()
     return wallet

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

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

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

@@ -11,9 +11,9 @@ import { toAccount } from 'viem/accounts'
 import { unichain } from 'viem/chains'
 import { 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 { DynamicHostedWalletToActionsWalletOptions } from '@/wallet/react/providers/hosted/types/index.js'
 import { DynamicWallet } from '@/wallet/react/wallets/hosted/dynamic/DynamicWallet.js'