@oydual31/more-vaults-sdk 0.2.7 → 0.2.9

package/package.json

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

package/src/viem/chains.ts

@@ -89,13 +89,26 @@ export const OFT_ROUTES = {
     [10    /* optimism        */]: { oft: '0x19cFCE47eD54a88614648DC3f19A5980097007dD' as `0x${string}`, token: '0x94b008aA00579c1307B0EF2c499aD98a8ce58e58' as `0x${string}` },
   },
   /**
-   * PYUSD — PayPal USD OFT (issued by PayPal/Flow).
+   * USDF — USD Flow OFT. Bridges PYUSD (Ethereum) ↔ USDF (Flow EVM).
+   * On Ethereum: underlying is PayPal USD (PYUSD, 0x6c3ea9...).
+   * On Flow: the OFT itself IS the token (USDF, 0x2aabea...).
    * Routes verified: Eth→Flow ✓
    */
-  PYUSD: {
+  USDF: {
     [747   /* flowEVMMainnet */]: { oft: '0x2aabea2058b5ac2d339b163c6ab6f2b6d53aabed' as `0x${string}`, token: '0x2aabea2058b5ac2d339b163c6ab6f2b6d53aabed' as `0x${string}` },
     [1     /* ethereum       */]: { oft: '0xfa0e06b54986ad96de87a8c56fea76fbd8d493f8' as `0x${string}`, token: '0x6c3ea9036406852006290770BEdFcAbA0e23A0e8' as `0x${string}` },
   },
+  /**
+   * PYUSD — PayPal USD bridged via OFTAdapter (Paxos / LayerZero).
+   * Lock/mint architecture: locks PYUSD on Arbitrum, mints PYUSD0 on Flow EVM.
+   * On Arbitrum: OFTAdapter wraps native PYUSD (0x46850a...).
+   * On Flow: OFTAdapter wraps PYUSD0 (0x99aF3E...), which is the native Paxos token.
+   * Routes verified: Arb↔Flow ✓ (EID 30336). No Eth or Base peers.
+   */
+  PYUSD: {
+    [747   /* flowEVMMainnet */]: { oft: '0x26d27d5AF2F6f1c14F40013C8619d97aaf015509' as `0x${string}`, token: '0x99aF3EeA856556646C98c8B9b2548Fe815240750' as `0x${string}` },
+    [42161 /* arbitrum       */]: { oft: '0x3CD2b89C49D130C08f1d683225b2e5DeB63ff876' as `0x${string}`, token: '0x46850aD61C2B7d64d08c9C754F45254596696984' as `0x${string}` },
+  },
   /**
    * WFLOW — Wrapped FLOW NativeOFTAdapter (issued by Flow Foundation).
    * Routes verified: Eth→Flow ✓
@@ -217,7 +230,7 @@ export const OFT_ROUTES = {
 /**
  * oftCmd for Stargate v2 taxi mode (immediate per-message delivery).
  * Pass as `oftCmd` in SendParam when using stgUSDC, USDT, or WETH OFT_ROUTES entries.
- * Non-Stargate OFTs (PYUSD, WFLOW, sUSDe, USDe, weETH, rsETH) use empty bytes — pass `'0x'` instead.
+ * Non-Stargate OFTs (USDF, WFLOW, sUSDe, USDe, weETH, rsETH) use empty bytes — pass `'0x'` instead.
  */
 export const STARGATE_TAXI_CMD = '0x01' as const
 

package/src/viem/index.ts

@@ -71,6 +71,7 @@ export {
   redeemAsync,
   smartRedeem,
   bridgeSharesToHub,
+  quoteShareBridgeFee,
   bridgeAssetsToSpoke,
   resolveRedeemAddresses,
 } from './redeemFlows'

package/src/viem/redeemFlows.ts

@@ -8,7 +8,7 @@ import {
   pad,
   zeroAddress,
 } from 'viem'
-import { VAULT_ABI, BRIDGE_ABI, OFT_ABI, CONFIG_ABI, ERC20_ABI } from './abis'
+import { VAULT_ABI, BRIDGE_ABI, OFT_ABI, CONFIG_ABI, ERC20_ABI, METADATA_ABI } from './abis'
 import type {
   VaultAddresses,
   RedeemResult,
@@ -354,6 +354,50 @@ export async function smartRedeem(
   return redeemShares(walletClient, publicClient, addresses, shares, receiver, owner)
 }
 
+/**
+ * Quote the LZ fee for bridging shares from spoke to hub via SHARE_OFT.
+ *
+ * **IMPORTANT**: `amountLD` must be in SHARE_OFT native decimals (e.g. 18),
+ * NOT vault decimals (e.g. 8). Use the raw `SHARE_OFT.balanceOf(user)` value,
+ * or `getUserPositionMultiChain().rawSpokeShares[chainId]`.
+ *
+ * @param spokePublicClient  Public client on the SPOKE chain
+ * @param shareOFT           SHARE_OFT address on the spoke chain
+ * @param hubChainEid        LayerZero Endpoint ID for the hub chain
+ * @param amountLD           Shares in SHARE_OFT native decimals (raw balanceOf)
+ * @param receiver           Receiver address on the hub chain
+ * @returns                  LZ native fee in wei
+ */
+export async function quoteShareBridgeFee(
+  spokePublicClient: PublicClient,
+  shareOFT: Address,
+  hubChainEid: number,
+  amountLD: bigint,
+  receiver: Address,
+): Promise<bigint> {
+  const oft = getAddress(shareOFT)
+  const toBytes32 = pad(getAddress(receiver), { size: 32 })
+
+  const sendParam = {
+    dstEid: hubChainEid,
+    to: toBytes32,
+    amountLD,
+    minAmountLD: amountLD,
+    extraOptions: '0x' as `0x${string}`,
+    composeMsg: '0x' as `0x${string}`,
+    oftCmd: '0x' as `0x${string}`,
+  }
+
+  const feeResult = await spokePublicClient.readContract({
+    address: oft,
+    abi: OFT_ABI,
+    functionName: 'quoteSend',
+    args: [sendParam, false],
+  }) as { nativeFee: bigint; lzTokenFee: bigint }
+
+  return feeResult.nativeFee
+}
+
 /**
  * R6 — Bridge shares from spoke to hub chain via OFT.
  *
@@ -362,24 +406,20 @@ export async function smartRedeem(
  *   2. `smartRedeem()` — redeem shares on hub → underlying (auto-detects async)
  *   3. `bridgeAssetsToSpoke()` — bridge assets from hub → spoke via asset OFT
  *
- * The steps happen on different chains and cannot be combined.
- * The frontend must switch chains between steps.
+ * **IMPORTANT**: The `shares` parameter must be in SHARE_OFT decimals (the raw
+ * `balanceOf` from the spoke OFT), NOT in vault decimals. Use the user's actual
+ * SHARE_OFT balance, or convert with `vaultShares * 10^(oftDecimals - vaultDecimals)`.
  *
  * **User transactions on spoke chain**: 1 approve (shares to shareOFT) + 1 OFT.send().
  * **Gas**: Requires native token on spoke for LZ fees, and gas on hub for steps 2+3.
  *
- * ## Tested flows
- *
- * - [x] SHARE_OFT bridge (Eth→Base, vault 0x8f74...ba6):
- *       Delivery ~7 min. Required enforcedOptions on Eth SHARE_OFT for dstEid=30184.
- *
  * @param walletClient   Wallet client on the SPOKE chain
  * @param publicClient   Public client on the SPOKE chain
  * @param shareOFT       OFTAdapter address for vault shares on the spoke chain
  * @param hubChainEid    LayerZero Endpoint ID for the hub chain
- * @param shares         Amount of vault shares to bridge
+ * @param shares         Amount of shares in SHARE_OFT decimals (use raw balanceOf)
  * @param receiver       Receiver address on the HUB chain
- * @param lzFee          msg.value for OFT send (quote via OFT.quoteSend)
+ * @param lzFee          msg.value for OFT send (from quoteShareBridgeFee)
  * @returns              Transaction hash of the OFT.send() call
  */
 export async function bridgeSharesToHub(

package/src/viem/userHelpers.ts

@@ -527,9 +527,12 @@ const COMPOSER_SHARE_OFT_ABI = [
 export interface MultiChainUserPosition {
   /** Shares held directly on the hub vault (vault.balanceOf) */
   hubShares: bigint
-  /** Per-spoke SHARE_OFT balances: { [chainId]: bigint } */
+  /** Per-spoke SHARE_OFT balances normalized to vault decimals: { [chainId]: bigint } */
   spokeShares: Record<number, bigint>
-  /** hubShares + sum of all spokeShares */
+  /** Per-spoke SHARE_OFT raw balances in OFT native decimals: { [chainId]: bigint }
+   *  Use these for bridgeSharesToHub() and quoteShareBridgeFee() */
+  rawSpokeShares: Record<number, bigint>
+  /** hubShares + sum of all spokeShares (in vault decimals) */
   totalShares: bigint
   /** convertToAssets(totalShares) on the hub */
   estimatedAssets: bigint
@@ -584,6 +587,7 @@ export async function getUserPositionMultiChain(
 
   // Step 3: resolve SHARE_OFT addresses for spokes (if any)
   const spokeShares: Record<number, bigint> = {}
+  const rawSpokeShares: Record<number, bigint> = {}
 
   if (topo.spokeChainIds.length > 0) {
     // Get hub SHARE_OFT via factory → composer → SHARE_OFT
@@ -610,7 +614,7 @@ export async function getUserPositionMultiChain(
       const spokePromises = topo.spokeChainIds.map(async (spokeChainId) => {
         try {
           const spokeEid = CHAIN_ID_TO_EID[spokeChainId]
-          if (!spokeEid) return { chainId: spokeChainId, balance: 0n }
+          if (!spokeEid) return { chainId: spokeChainId, balance: 0n, rawBalance: 0n }
 
           // Get spoke SHARE_OFT address from hub peers()
           const spokeOftBytes32 = await (hubClient as PublicClient).readContract({
@@ -622,12 +626,12 @@ export async function getUserPositionMultiChain(
 
           const spokeOft = getAddress(`0x${spokeOftBytes32.slice(-40)}`) as Address
           if (spokeOft === '0x0000000000000000000000000000000000000000') {
-            return { chainId: spokeChainId, balance: 0n }
+            return { chainId: spokeChainId, balance: 0n, rawBalance: 0n }
           }
 
           // Read balance + decimals on spoke chain
           const spokeClient = createChainClient(spokeChainId)
-          if (!spokeClient) return { chainId: spokeChainId, balance: 0n }
+          if (!spokeClient) return { chainId: spokeChainId, balance: 0n, rawBalance: 0n }
 
           const [rawBalance, spokeOftDecimals] = await (spokeClient as PublicClient).multicall({
             contracts: [
@@ -648,15 +652,16 @@ export async function getUserPositionMultiChain(
             balance = rawBalance
           }
 
-          return { chainId: spokeChainId, balance }
+          return { chainId: spokeChainId, balance, rawBalance }
         } catch {
-          return { chainId: spokeChainId, balance: 0n }
+          return { chainId: spokeChainId, balance: 0n, rawBalance: 0n }
         }
       })
 
       const results = await Promise.all(spokePromises)
-      for (const { chainId, balance } of results) {
+      for (const { chainId, balance, rawBalance } of results) {
         spokeShares[chainId] = balance
+        rawSpokeShares[chainId] = rawBalance
       }
     }
   }
@@ -686,6 +691,7 @@ export async function getUserPositionMultiChain(
   return {
     hubShares,
     spokeShares,
+    rawSpokeShares,
     totalShares,
     estimatedAssets,
     sharePrice,