@oydual31/more-vaults-sdk 0.3.1 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oydual31/more-vaults-sdk",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "TypeScript SDK for MoreVaults protocol — viem/wagmi and ethers.js",
   "type": "module",
   "exports": {

package/src/viem/chains.ts

@@ -261,6 +261,23 @@ export const LZ_TIMEOUTS = {
   FULL_SPOKE_REDEEM: 3_600_000, // 60 min
 } as const
 
+/**
+ * Uniswap V3 SwapRouter addresses per chain.
+ * Used by curator swap helpers to build calldata for on-chain swaps.
+ *
+ * Note on struct differences:
+ *   - SwapRouter (Eth/Arb/Op, 0xE592...): exactInputSingle struct includes `deadline`
+ *   - SwapRouter02 (Base, 0x2626...): exactInputSingle struct does NOT include `deadline`
+ *   - FlowSwap V3 (Flow EVM, 0xeEDC...): derived from original UniV3, includes `deadline`
+ */
+export const UNISWAP_V3_ROUTERS: Record<number, `0x${string}`> = {
+  [8453]:  '0x2626664c2603336E57B271c5C0b26F421741e481', // Base — SwapRouter02 (no deadline)
+  [1]:     '0xE592427A0AEce92De3Edee1F18E0157C05861564', // Ethereum — SwapRouter
+  [42161]: '0xE592427A0AEce92De3Edee1F18E0157C05861564', // Arbitrum — SwapRouter
+  [10]:    '0xE592427A0AEce92De3Edee1F18E0157C05861564', // Optimism — SwapRouter
+  [747]:   '0xeEDC6Ff75e1b10B903D9013c358e446a73d35341',  // Flow EVM — FlowSwap V3 SwapRouter
+}
+
 // ---------------------------------------------------------------------------
 // Legacy flat exports — kept for backwards compat, prefer OFT_ROUTES
 // ---------------------------------------------------------------------------

package/src/viem/curatorStatus.ts

@@ -6,8 +6,8 @@
  */
 
 import { type Address, type PublicClient, getAddress } from 'viem'
-import { MULTICALL_ABI, CURATOR_CONFIG_ABI, VAULT_ANALYSIS_ABI, REGISTRY_ABI, METADATA_ABI } from './abis.js'
-import type { CuratorVaultStatus, PendingAction, VaultAnalysis, AssetInfo } from './types.js'
+import { MULTICALL_ABI, CURATOR_CONFIG_ABI, VAULT_ANALYSIS_ABI, REGISTRY_ABI, METADATA_ABI, ERC20_ABI, VAULT_ABI } from './abis.js'
+import type { CuratorVaultStatus, PendingAction, VaultAnalysis, AssetInfo, AssetBalance, VaultAssetBreakdown } from './types.js'
 
 // ─────────────────────────────────────────────────────────────────────────────
 
@@ -253,3 +253,67 @@ export async function checkProtocolWhitelist(
   return out
 }
 
+// ─────────────────────────────────────────────────────────────────────────────
+
+/**
+ * Get the vault's per-asset balance breakdown on the hub chain.
+ *
+ * Returns the balance of every available asset held by the vault, plus
+ * totalAssets and totalSupply for context. Useful for portfolio views
+ * that need to show individual holdings rather than a single USD-denominated total.
+ *
+ * @param publicClient  Viem public client (must be on the vault's hub chain)
+ * @param vault         Vault address (diamond proxy)
+ * @returns             VaultAssetBreakdown with per-asset balances
+ */
+export async function getVaultAssetBreakdown(
+  publicClient: PublicClient,
+  vault: Address,
+): Promise<VaultAssetBreakdown> {
+  const v = getAddress(vault)
+
+  // Step 1: get available assets list
+  const availableRaw = await publicClient.readContract({
+    address: v,
+    abi: VAULT_ANALYSIS_ABI,
+    functionName: 'getAvailableAssets',
+  }) as Address[]
+
+  const addresses = availableRaw.map(getAddress)
+
+  // Step 2: multicall — balanceOf + metadata for each asset + totalAssets + totalSupply + vault decimals
+  const results = await publicClient.multicall({
+    contracts: [
+      // Per-asset: balanceOf, name, symbol, decimals
+      ...addresses.flatMap((addr) => [
+        { address: addr, abi: ERC20_ABI, functionName: 'balanceOf' as const, args: [v] as [Address] },
+        { address: addr, abi: METADATA_ABI, functionName: 'name' as const },
+        { address: addr, abi: METADATA_ABI, functionName: 'symbol' as const },
+        { address: addr, abi: METADATA_ABI, functionName: 'decimals' as const },
+      ]),
+      // Vault totals
+      { address: v, abi: VAULT_ABI, functionName: 'totalAssets' as const },
+      { address: v, abi: VAULT_ABI, functionName: 'totalSupply' as const },
+      { address: v, abi: METADATA_ABI, functionName: 'decimals' as const },
+    ],
+    allowFailure: true,
+  })
+
+  const perAssetFields = 4 // balanceOf, name, symbol, decimals
+  const assets: AssetBalance[] = addresses.map((addr, i) => {
+    const base = i * perAssetFields
+    const balance  = results[base]?.status === 'success'     ? (results[base].result as bigint)   : 0n
+    const name     = results[base + 1]?.status === 'success' ? (results[base + 1].result as string) : ''
+    const symbol   = results[base + 2]?.status === 'success' ? (results[base + 2].result as string) : ''
+    const decimals = results[base + 3]?.status === 'success' ? (results[base + 3].result as number) : 18
+
+    return { address: addr, name, symbol, decimals, balance }
+  })
+
+  const totalsBase = addresses.length * perAssetFields
+  const totalAssets      = results[totalsBase]?.status === 'success'     ? (results[totalsBase].result as bigint)   : 0n
+  const totalSupply      = results[totalsBase + 1]?.status === 'success' ? (results[totalsBase + 1].result as bigint) : 0n
+  const underlyingDecimals = results[totalsBase + 2]?.status === 'success' ? (results[totalsBase + 2].result as number) : 6
+
+  return { assets, totalAssets, totalSupply, underlyingDecimals }
+}

package/src/viem/curatorSwaps.ts

@@ -0,0 +1,239 @@
+/**
+ * Curator swap helpers for Uniswap V3-compatible DEXes.
+ *
+ * Provides typed helpers to build CuratorAction objects and raw calldata for
+ * Uniswap V3 exactInputSingle swaps, automatically resolving the correct router
+ * and ABI variant (SwapRouter vs SwapRouter02) per chain.
+ *
+ * Supported chains and routers:
+ *   - Base (8453):        SwapRouter02 0x2626...  — NO deadline field
+ *   - Ethereum (1):       SwapRouter   0xE592...  — HAS deadline field
+ *   - Arbitrum (42161):   SwapRouter   0xE592...  — HAS deadline field
+ *   - Optimism (10):      SwapRouter   0xE592...  — HAS deadline field
+ *   - Flow EVM (747):     FlowSwap V3  0xeEDC...  — HAS deadline field
+ *
+ * @module curatorSwaps
+ */
+
+import { type Address, encodeFunctionData } from 'viem'
+import { UNISWAP_V3_ROUTERS } from './chains.js'
+import type { CuratorAction } from './types.js'
+
+// ─────────────────────────────────────────────────────────────────────────────
+// ABI constants
+// ─────────────────────────────────────────────────────────────────────────────
+
+/**
+ * Uniswap V3 SwapRouter exactInputSingle ABI.
+ * Used for: Ethereum (1), Arbitrum (42161), Optimism (10), Flow EVM (747).
+ * Struct includes `deadline` field.
+ */
+const UNISWAP_V3_SWAP_ROUTER_ABI = [
+  {
+    type: 'function',
+    name: 'exactInputSingle',
+    inputs: [
+      {
+        type: 'tuple',
+        name: 'params',
+        components: [
+          { name: 'tokenIn',           type: 'address' },
+          { name: 'tokenOut',          type: 'address' },
+          { name: 'fee',               type: 'uint24'  },
+          { name: 'recipient',         type: 'address' },
+          { name: 'deadline',          type: 'uint256' },
+          { name: 'amountIn',          type: 'uint256' },
+          { name: 'amountOutMinimum',  type: 'uint256' },
+          { name: 'sqrtPriceLimitX96', type: 'uint160' },
+        ],
+      },
+    ],
+    outputs: [{ name: 'amountOut', type: 'uint256' }],
+    stateMutability: 'payable',
+  },
+] as const
+
+/**
+ * Uniswap V3 SwapRouter02 exactInputSingle ABI.
+ * Used for: Base (8453).
+ * Struct does NOT include `deadline` field — SwapRouter02 removed it.
+ */
+const UNISWAP_V3_SWAP_ROUTER02_ABI = [
+  {
+    type: 'function',
+    name: 'exactInputSingle',
+    inputs: [
+      {
+        type: 'tuple',
+        name: 'params',
+        components: [
+          { name: 'tokenIn',           type: 'address' },
+          { name: 'tokenOut',          type: 'address' },
+          { name: 'fee',               type: 'uint24'  },
+          { name: 'recipient',         type: 'address' },
+          { name: 'amountIn',          type: 'uint256' },
+          { name: 'amountOutMinimum',  type: 'uint256' },
+          { name: 'sqrtPriceLimitX96', type: 'uint160' },
+        ],
+      },
+    ],
+    outputs: [{ name: 'amountOut', type: 'uint256' }],
+    stateMutability: 'payable',
+  },
+] as const
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Chain variant detection
+// ─────────────────────────────────────────────────────────────────────────────
+
+/**
+ * Chains that use SwapRouter02 (no deadline in struct).
+ * All other chains in UNISWAP_V3_ROUTERS use the original SwapRouter.
+ */
+const SWAP_ROUTER02_CHAINS = new Set([8453])
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Calldata encoding
+// ─────────────────────────────────────────────────────────────────────────────
+
+/**
+ * Encode Uniswap V3 exactInputSingle calldata directly.
+ * For curators who want raw calldata without the CuratorAction wrapper.
+ *
+ * Automatically selects the correct ABI variant (SwapRouter vs SwapRouter02)
+ * based on the chainId. The deadline (for SwapRouter chains) is set to
+ * `now + 20 minutes` to prevent stale transactions from executing.
+ *
+ * @param params.chainId       EVM chain ID — must be present in UNISWAP_V3_ROUTERS
+ * @param params.tokenIn       Input token address
+ * @param params.tokenOut      Output token address
+ * @param params.fee           Pool fee tier: 100, 500, 3000, or 10000
+ * @param params.amountIn      Exact input amount (in tokenIn units)
+ * @param params.minAmountOut  Minimum acceptable output (slippage protection)
+ * @param params.recipient     Address to receive the output tokens (usually the vault)
+ * @returns                    The router contract address and ABI-encoded calldata
+ * @throws                     If no router is configured for the given chainId
+ */
+export function encodeUniswapV3SwapCalldata(params: {
+  chainId: number
+  tokenIn: Address
+  tokenOut: Address
+  fee: number
+  amountIn: bigint
+  minAmountOut: bigint
+  recipient: Address
+}): { targetContract: Address; swapCallData: `0x${string}` } {
+  const { chainId, tokenIn, tokenOut, fee, amountIn, minAmountOut, recipient } = params
+
+  const router = UNISWAP_V3_ROUTERS[chainId]
+  if (!router) {
+    throw new Error(
+      `[MoreVaults] No Uniswap V3 router configured for chainId ${chainId}. ` +
+      `Supported chains: ${Object.keys(UNISWAP_V3_ROUTERS).join(', ')}`
+    )
+  }
+
+  let swapCallData: `0x${string}`
+
+  if (SWAP_ROUTER02_CHAINS.has(chainId)) {
+    // SwapRouter02 (Base) — no deadline field
+    swapCallData = encodeFunctionData({
+      abi: UNISWAP_V3_SWAP_ROUTER02_ABI,
+      functionName: 'exactInputSingle',
+      args: [
+        {
+          tokenIn,
+          tokenOut,
+          fee,
+          recipient,
+          amountIn,
+          amountOutMinimum: minAmountOut,
+          sqrtPriceLimitX96: 0n,
+        },
+      ],
+    })
+  } else {
+    // Original SwapRouter (Eth/Arb/Op/Flow EVM) — has deadline field
+    const deadline = BigInt(Math.floor(Date.now() / 1000) + 1200) // now + 20 minutes
+    swapCallData = encodeFunctionData({
+      abi: UNISWAP_V3_SWAP_ROUTER_ABI,
+      functionName: 'exactInputSingle',
+      args: [
+        {
+          tokenIn,
+          tokenOut,
+          fee,
+          recipient,
+          deadline,
+          amountIn,
+          amountOutMinimum: minAmountOut,
+          sqrtPriceLimitX96: 0n,
+        },
+      ],
+    })
+  }
+
+  return { targetContract: router, swapCallData }
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// CuratorAction builder
+// ─────────────────────────────────────────────────────────────────────────────
+
+/**
+ * Build a CuratorAction for a Uniswap V3 exactInputSingle swap.
+ *
+ * Automatically resolves the router address from UNISWAP_V3_ROUTERS and
+ * selects the correct ABI struct (with or without deadline) based on chainId.
+ *
+ * The returned action is a `swap` variant ready to be passed to
+ * `buildCuratorBatch` and then `submitActions`.
+ *
+ * @param params.chainId       EVM chain ID — must be present in UNISWAP_V3_ROUTERS
+ * @param params.tokenIn       Input token address
+ * @param params.tokenOut      Output token address
+ * @param params.fee           Pool fee tier: 100, 500, 3000, or 10000
+ * @param params.amountIn      Exact input amount (in tokenIn units)
+ * @param params.minAmountOut  Minimum acceptable output (slippage protection)
+ * @param params.recipient     Address to receive output tokens (usually the vault)
+ * @returns                    A typed CuratorAction ready for buildCuratorBatch
+ * @throws                     If no router is configured for the given chainId
+ *
+ * @example
+ * ```typescript
+ * const action = buildUniswapV3Swap({
+ *   chainId: 8453,
+ *   tokenIn:  '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913', // USDC
+ *   tokenOut: '0x4200000000000000000000000000000000000006', // WETH
+ *   fee: 500,           // 0.05% pool
+ *   amountIn: 150_000n, // 0.15 USDC (6 decimals)
+ *   minAmountOut: 1n,   // accept any amount (set properly in production)
+ *   recipient: VAULT,
+ * })
+ * const batch = buildCuratorBatch([action])
+ * await submitActions(walletClient, publicClient, vault, batch)
+ * ```
+ */
+export function buildUniswapV3Swap(params: {
+  chainId: number
+  tokenIn: Address
+  tokenOut: Address
+  fee: number
+  amountIn: bigint
+  minAmountOut: bigint
+  recipient: Address
+}): CuratorAction {
+  const { targetContract, swapCallData } = encodeUniswapV3SwapCalldata(params)
+
+  return {
+    type: 'swap',
+    params: {
+      targetContract,
+      tokenIn: params.tokenIn,
+      tokenOut: params.tokenOut,
+      maxAmountIn: params.amountIn,
+      minAmountOut: params.minAmountOut,
+      swapCallData,
+    },
+  }
+}

package/src/viem/index.ts

@@ -2,7 +2,7 @@
 // Provides typed helpers for all deposit, redeem, and cross-chain vault flows.
 
 // --- Chain constants ---
-export { CHAIN_IDS, LZ_EIDS, EID_TO_CHAIN_ID, CHAIN_ID_TO_EID, OFT_ROUTES, STARGATE_TAXI_CMD, USDC_STARGATE_OFT, USDC_TOKEN, LZ_TIMEOUTS } from './chains'
+export { CHAIN_IDS, LZ_EIDS, EID_TO_CHAIN_ID, CHAIN_ID_TO_EID, OFT_ROUTES, STARGATE_TAXI_CMD, USDC_STARGATE_OFT, USDC_TOKEN, LZ_TIMEOUTS, UNISWAP_V3_ROUTERS } from './chains'
 
 // --- ABIs ---
 export {
@@ -42,7 +42,9 @@ export type {
   CuratorAction,
   CuratorVaultStatus,
   AssetInfo,
+  AssetBalance,
   VaultAnalysis,
+  VaultAssetBreakdown,
 } from './types'
 export { ActionType } from './types'
 
@@ -162,6 +164,7 @@ export {
   isCurator,
   getVaultAnalysis,
   checkProtocolWhitelist,
+  getVaultAssetBreakdown,
 } from './curatorStatus'
 export {
   encodeCuratorAction,
@@ -170,6 +173,10 @@ export {
   executeActions,
   vetoActions,
 } from './curatorMulticall'
+export {
+  buildUniswapV3Swap,
+  encodeUniswapV3SwapCalldata,
+} from './curatorSwaps'
 
 // --- wagmi compatibility ---
 // Re-export viem's PublicClient type for wagmi compatibility.

package/src/viem/types.ts

@@ -177,3 +177,19 @@ export interface VaultAnalysis {
   /** Registry address for global protocol whitelist checks */
   registryAddress: Address | null
 }
+
+export interface AssetBalance extends AssetInfo {
+  /** Raw balance held by the vault */
+  balance: bigint
+}
+
+export interface VaultAssetBreakdown {
+  /** Per-asset balances held by the vault on the hub chain */
+  assets: AssetBalance[]
+  /** totalAssets() as reported by the vault (all positions converted to underlying) */
+  totalAssets: bigint
+  /** totalSupply() of vault shares */
+  totalSupply: bigint
+  /** Vault underlying token decimals */
+  underlyingDecimals: number
+}