@eth-optimism/actions-sdk 0.0.4 → 0.2.0

package/src/types/lend/base.ts

@@ -30,7 +30,7 @@ export type LendMarketConfigMetadata = {
   /** Asset information for this market */
   asset: Asset
   /** Lending provider type */
-  lendProvider: 'morpho'
+  lendProvider: 'morpho' | 'aave'
 }
 
 /**
@@ -83,16 +83,13 @@ export interface LendTransaction {
   marketId: string
   /** Estimated APY at time of lending */
   apy: number
-  /** Transaction data for execution (optional) */
-  transactionData?: {
+  /** Transaction data for execution */
+  transactionData: {
     /** Approval transaction (if needed) */
     approval?: TransactionData
-    /** Main operation transaction (openPosition or closePosition) */
-    openPosition?: TransactionData
-    closePosition?: TransactionData
+    /** Main position transaction */
+    position: TransactionData
   }
-  /** Slippage tolerance used */
-  slippage?: number
 }
 
 /**
@@ -204,8 +201,6 @@ export interface LendMarket {
  * @description Configuration options for lending operations
  */
 export interface LendOptions {
-  /** Maximum slippage tolerance (basis points) */
-  slippage?: number
   /** Deadline for transaction (timestamp) */
   deadline?: number
   /** Gas limit override */
@@ -215,32 +210,16 @@ export interface LendOptions {
 }
 
 /**
- * Base lending provider configuration
- * @description Base configuration shared by all lending providers
+ * Individual lending provider configuration
+ * @description Configuration for a single lending provider
  */
-export interface BaseLendConfig {
-  /** Default slippage tolerance (basis points) */
-  defaultSlippage?: number
+export interface LendProviderConfig {
   /** Allowlist of markets available for lending */
   marketAllowlist?: LendMarketConfig[]
+  /** Blocklist of markets to exclude from lending */
+  marketBlocklist?: LendMarketConfig[]
 }
 
-/**
- * Morpho lending provider configuration
- * @description Configuration specific to Morpho lending provider
- */
-export interface MorphoLendConfig extends BaseLendConfig {
-  /** Lending provider name */
-  provider: 'morpho'
-  // Morpho-specific fields can be added here in the future
-}
-
-/**
- * Lending provider configuration
- * @description Union of all possible lending provider configurations
- */
-export type LendConfig = MorphoLendConfig
-
 /**
  * Market position information
  * @description Position details for a user in a lending market
@@ -284,8 +263,10 @@ export interface LendOpenPositionParams extends LendOpenPositionBaseParams {
 /**
  * Internal parameters for provider _openPosition method with amount already converted to wei
  */
-export interface LendOpenPositionInternalParams
-  extends Omit<LendOpenPositionBaseParams, 'walletAddress'> {
+export interface LendOpenPositionInternalParams extends Omit<
+  LendOpenPositionBaseParams,
+  'walletAddress'
+> {
   /** Amount to lend in wei */
   amountWei: bigint
   /** Wallet address for receiving shares and as owner (required in internal params) */

package/src/types/lend/contracts.ts

@@ -0,0 +1,18 @@
+import type { Address } from 'viem'
+
+/**
+ * Morpho contract addresses needed per chain
+ */
+export interface MorphoContracts {
+  /** Morpho Blue core contract - market state, positions, supply/withdraw */
+  morphoBlue: Address
+  /** Interest Rate Model contract - borrow rate calculation for APY */
+  irm: Address
+  /** MetaMorpho vault factory (optional, only for vault creation) */
+  metaMorphoFactory?: Address
+}
+
+/**
+ * Registry mapping chainId to Morpho contracts
+ */
+export type MorphoContractsRegistry = Record<number, MorphoContracts>

package/src/types/lend/index.ts

@@ -1,2 +1,3 @@
 export * from '@/types/lend/base.js'
+export * from '@/types/lend/contracts.js'
 export * from '@/types/lend/morpho.js'

package/src/utils/assets.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 
-import { MockUSDCAsset, MockWETHAsset } from '@/test/MockAssets.js'
+import { MockUSDCAsset, MockWETHAsset } from '@/__mocks__/MockAssets.js'
 import { isAssetSupportedOnChain } from '@/utils/assets.js'
 
 describe('Asset Utilities', () => {

package/src/utils/assets.ts

@@ -37,6 +37,15 @@ export function formatAssetAmount(amount: bigint, decimals: number): number {
   return parseFloat(result)
 }
 
+/**
+ * Check if asset is a native asset (e.g. ETH)
+ * @param asset - Asset definition
+ * @returns Whether the asset is native
+ */
+export function isNativeAsset(asset: Asset): boolean {
+  return asset.type === 'native'
+}
+
 /**
  * Check if asset is supported on a specific chain
  * @param asset - Asset definition
@@ -55,7 +64,7 @@ export function isAssetSupportedOnChain(
  * @param asset - Asset definition
  * @param chainId - Chain ID
  * @returns Asset address on the specified chain
- * @throws Error if asset is not supported on the chain
+ * @throws Error if asset is not supported on the chain or is a native asset
  */
 export function getAssetAddress(
   asset: Asset,
@@ -67,5 +76,10 @@ export function getAssetAddress(
       `Asset ${asset.metadata.symbol} is not supported on chain ${chainId}`,
     )
   }
+  if (address === 'native') {
+    throw new Error(
+      `Asset ${asset.metadata.symbol} is a native asset and has no contract address.`,
+    )
+  }
   return address
 }

package/src/utils/constants.ts

@@ -0,0 +1,4 @@
+/**
+ * Seconds per year for APY calculations (365 days)
+ */
+export const SECONDS_PER_YEAR = 31536000n

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

@@ -18,10 +18,8 @@ import type { SmartWallet } from '@/wallet/core/wallets/smart/abstract/SmartWall
 export class WalletNamespace<
   THostedProviderType extends string,
   TToActionsMap extends Record<THostedProviderType, unknown>,
-  H extends HostedWalletProvider<
-    THostedProviderType,
-    TToActionsMap
-  > = HostedWalletProvider<THostedProviderType, TToActionsMap>,
+  H extends HostedWalletProvider<THostedProviderType, TToActionsMap> =
+    HostedWalletProvider<THostedProviderType, TToActionsMap>,
   S extends SmartWalletProvider = SmartWalletProvider,
 > {
   private provider: WalletProvider<THostedProviderType, TToActionsMap, H, S>

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

@@ -3,16 +3,16 @@ import { getAddress } from 'viem'
 import { unichain } from 'viem/chains'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
-import type { SupportedChainId } from '@/constants/supportedChains.js'
-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 type { SupportedChainId } from '@/constants/supportedChains.js'
+import { createMockLendProvider } from '@/lend/__mocks__/MockLendProvider.js'
+import { MockChainManager } from '@/services/__mocks__/MockChainManager.js'
+import type { ChainManager } from '@/services/ChainManager.js'
 import { WalletNamespace } from '@/wallet/core/namespace/WalletNamespace.js'
 import { DefaultSmartWalletProvider } from '@/wallet/core/providers/smart/default/DefaultSmartWalletProvider.js'
 import { WalletProvider } from '@/wallet/core/providers/WalletProvider.js'
@@ -46,7 +46,7 @@ describe('WalletNamespace', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const walletProvider = new WalletProvider(
         hostedWalletProvider,
@@ -71,7 +71,7 @@ describe('WalletNamespace', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const walletProvider = new WalletProvider(
         hostedWalletProvider,
@@ -92,7 +92,7 @@ describe('WalletNamespace', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const walletProvider = new WalletProvider(
         hostedWalletProvider,
@@ -133,7 +133,7 @@ describe('WalletNamespace', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const walletProvider = new WalletProvider(
         hostedWalletProvider,
@@ -217,7 +217,7 @@ describe('WalletNamespace', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const walletProvider = new WalletProvider(
         hostedWalletProvider,
@@ -259,7 +259,7 @@ describe('WalletNamespace', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const walletProvider = new WalletProvider(
         hostedWalletProvider,
@@ -295,7 +295,7 @@ describe('WalletNamespace', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const walletProvider = new WalletProvider(
         hostedWalletProvider,
@@ -338,7 +338,7 @@ describe('WalletNamespace', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const walletProvider = new WalletProvider(
         hostedWalletProvider,
@@ -368,7 +368,7 @@ describe('WalletNamespace', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const walletProvider = new WalletProvider(
         hostedWalletProvider,

package/src/wallet/core/providers/__tests__/WalletProvider.spec.ts

@@ -2,16 +2,16 @@ import type { WaitForUserOperationReceiptReturnType } from 'viem/account-abstrac
 import { unichain } from 'viem/chains'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import type { SupportedChainId } from '@/constants/supportedChains.js'
-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 type { SupportedChainId } from '@/constants/supportedChains.js'
+import { createMockLendProvider } from '@/lend/__mocks__/MockLendProvider.js'
+import { MockChainManager } from '@/services/__mocks__/MockChainManager.js'
+import type { ChainManager } from '@/services/ChainManager.js'
 import { DefaultSmartWalletProvider } from '@/wallet/core/providers/smart/default/DefaultSmartWalletProvider.js'
 import { WalletProvider } from '@/wallet/core/providers/WalletProvider.js'
 import { Wallet } from '@/wallet/core/wallets/abstract/Wallet.js'
@@ -42,7 +42,7 @@ describe('WalletProvider', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const walletProvider = new WalletProvider(
         hostedWalletProvider,
@@ -96,7 +96,7 @@ describe('WalletProvider', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const walletProvider = new WalletProvider(
         hostedWalletProvider,
@@ -151,7 +151,7 @@ describe('WalletProvider', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const walletProvider = new WalletProvider(
         hostedWalletProvider,
@@ -204,7 +204,7 @@ describe('WalletProvider', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const walletProvider = new WalletProvider(
         hostedWalletProvider,
@@ -237,7 +237,7 @@ describe('WalletProvider', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const mockWalletAddress = getRandomAddress()
       const getWalletAddressSpy = vi
@@ -284,7 +284,7 @@ describe('WalletProvider', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const walletProvider = new WalletProvider(
         hostedWalletProvider,
@@ -318,7 +318,7 @@ describe('WalletProvider', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const walletProvider = new WalletProvider(
         hostedWalletProvider,
@@ -358,7 +358,7 @@ describe('WalletProvider', () => {
       })
       const smartWalletProvider = new DefaultSmartWalletProvider(
         mockChainManager,
-        mockLendProvider,
+        { morpho: mockLendProvider },
       )
       const walletProvider = new WalletProvider(
         hostedWalletProvider,

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

@@ -1,7 +1,9 @@
 import type { LocalAccount } from 'viem'
 
+import type { LendProvider } from '@/lend/core/LendProvider.js'
 import type { ChainManager } from '@/services/ChainManager.js'
-import type { LendConfig, LendProvider } from '@/types/lend/index.js'
+import type { LendProviderConfig } from '@/types/actions.js'
+import type { Asset } from '@/types/asset.js'
 import type { Wallet } from '@/wallet/core/wallets/abstract/Wallet.js'
 
 /**
@@ -15,14 +17,23 @@ export abstract class HostedWalletProvider<
   TOptionsMap extends Record<TType, unknown>,
 > {
   protected chainManager: ChainManager
-  protected lendProvider?: LendProvider<LendConfig>
+  protected lendProviders: {
+    morpho?: LendProvider<LendProviderConfig>
+    aave?: LendProvider<LendProviderConfig>
+  }
+  protected supportedAssets?: Asset[]
 
   protected constructor(
     chainManager: ChainManager,
-    lendProvider?: LendProvider<LendConfig>,
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    },
+    supportedAssets?: Asset[],
   ) {
     this.chainManager = chainManager
-    this.lendProvider = lendProvider
+    this.lendProviders = lendProviders || {}
+    this.supportedAssets = supportedAssets
   }
   /**
    * Convert a hosted wallet to an Actions wallet

package/src/wallet/core/providers/hosted/registry/__tests__/HostedWalletProviderRegistry.spec.ts

@@ -2,12 +2,12 @@ import type { PrivyClient } from '@privy-io/node'
 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 { HostedWalletProviderRegistry } from '@/wallet/core/providers/hosted/registry/HostedWalletProviderRegistry.js'
 import { PrivyHostedWalletProvider } from '@/wallet/node/providers/hosted/privy/PrivyHostedWalletProvider.js'
 import type { NodeOptionsMap } from '@/wallet/node/providers/hosted/types/index.js'

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

@@ -1,5 +1,7 @@
+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 type { HostedWalletProvider } from '@/wallet/core/providers/hosted/abstract/HostedWalletProvider.js'
 
 /**
@@ -10,7 +12,11 @@ import type { HostedWalletProvider } from '@/wallet/core/providers/hosted/abstra
  */
 export interface HostedProviderDeps {
   chainManager: ChainManager
-  lendProvider?: LendProvider<LendConfig>
+  lendProviders?: {
+    morpho?: LendProvider<LendProviderConfig>
+    aave?: LendProvider<LendProviderConfig>
+  }
+  supportedAssets?: Asset[]
 }
 
 /**

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

@@ -2,8 +2,10 @@ 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 { LendConfig, LendProvider } from '@/types/lend/index.js'
+import type { LendProviderConfig } from '@/types/actions.js'
+import type { Asset } from '@/types/asset.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'
@@ -24,25 +26,36 @@ import { SmartWalletDeploymentError } from '@/wallet/core/wallets/smart/error/er
 export class DefaultSmartWalletProvider extends SmartWalletProvider {
   /** Manages supported blockchain networks */
   private chainManager: ChainManager
-  /** Provider for lending market operations */
-  private lendProvider?: LendProvider<LendConfig>
+  /** Providers for lending market operations */
+  private lendProviders: {
+    morpho?: LendProvider<LendProviderConfig>
+    aave?: LendProvider<LendProviderConfig>
+  }
+  /** Supported assets for this wallet provider */
+  private supportedAssets?: Asset[]
   /** Optional 16-byte attribution suffix appended to callData */
   private attributionSuffix?: Hex
 
   /**
    * Initialize the Smart Wallet Provider
    * @param chainManager - Manages supported blockchain networks
-   * @param paymasterAndBundlerUrl - URL for ERC-4337 bundler and paymaster services
-   * @param lendProvider - Provider for lending market operations
+   * @param lendProviders - Providers for lending market operations
+   * @param supportedAssets - Optional list of supported assets
+   * @param attributionSuffix - Optional attribution suffix
    */
   constructor(
     chainManager: ChainManager,
-    lendProvider?: LendProvider<LendConfig>,
+    lendProviders?: {
+      morpho?: LendProvider<LendProviderConfig>
+      aave?: LendProvider<LendProviderConfig>
+    },
+    supportedAssets?: Asset[],
     attributionSuffix?: string,
   ) {
     super()
     this.chainManager = chainManager
-    this.lendProvider = lendProvider
+    this.lendProviders = lendProviders || {}
+    this.supportedAssets = supportedAssets
     if (attributionSuffix) {
       this.attributionSuffix =
         DefaultSmartWalletProvider.computeAttributionSuffix(attributionSuffix)
@@ -79,7 +92,8 @@ export class DefaultSmartWalletProvider extends SmartWalletProvider {
       signers,
       signer,
       chainManager: this.chainManager,
-      lendProvider: this.lendProvider,
+      lendProviders: this.lendProviders,
+      supportedAssets: this.supportedAssets,
       nonce,
       attributionSuffix: this.attributionSuffix,
     })
@@ -167,7 +181,8 @@ export class DefaultSmartWalletProvider extends SmartWalletProvider {
       signers,
       signer,
       chainManager: this.chainManager,
-      lendProvider: this.lendProvider,
+      lendProviders: this.lendProviders,
+      supportedAssets: this.supportedAssets,
       deploymentAddress: walletAddress,
       attributionSuffix: this.attributionSuffix,
     })