@oydual31/more-vaults-sdk 1.1.16 → 1.1.18

package/dist/{curatorBridge-BMSgDsUE.d.cts → curatorBridge-PVqdHUEp.d.cts}

@@ -29,6 +29,19 @@ interface AsyncRequestResult {
     /** Cross-chain request GUID to track via getRequestInfo / getFinalizationResult */
     guid: `0x${string}`;
 }
+interface RedeemCostEstimate {
+    /** Which redeem flow will be used based on vault configuration */
+    flow: 'direct' | 'queue-no-timelock' | 'queue-timelock' | 'async';
+    /** Gas estimate per transaction step */
+    steps: {
+        label: string;
+        gasEstimate: bigint;
+    }[];
+    /** Sum of gasEstimate across all steps */
+    totalGasEstimate: bigint;
+    /** LayerZero fee in native token wei (0 for non-async vaults) */
+    lzFee: bigint;
+}
 /**
  * ActionType enum values matching MoreVaultsLib.ActionType on-chain.
  * DEPOSIT=0, MINT=1, WITHDRAW=2, REDEEM=3, MULTI_ASSETS_DEPOSIT=4, ACCRUE_FEES=5
@@ -1266,4 +1279,4 @@ declare function quoteCuratorBridgeFee(publicClient: PublicClient, vault: Addres
  */
 declare function executeCuratorBridge(walletClient: WalletClient, publicClient: PublicClient, vault: Address, token: Address, params: CuratorBridgeParams): Promise<Hash>;
 
-export { clearDepositFlow as $, type AsyncRequestResult as A, type BatchSwapParams as B, type ComposeData as C, type DepositResult as D, type ERC7540RequestStatus as E, type FlowStorage as F, type OutboundRoute as G, type SpokeBalance as H, type InboundRoute as I, type SwapParams as J, type UserPosition as K, LocalStorageAdapter as L, type MultiChainPortfolio as M, NATIVE_SYMBOL as N, OMNI_FACTORY_ADDRESS as O, type PendingAction as P, type VaultDistribution as Q, type RedeemResult as R, type SpokeDepositResult as S, type VaultMetadata as T, type UserBalances as U, type VaultAddresses as V, type VaultMode as W, type VaultStatus as X, type VaultSummary as Y, type VaultTopology as Z, canDeposit as _, type CuratorVaultStatus as a, detectStargateOft as a0, discoverVaultTopology as a1, encodeBridgeParams as a2, ensureAllowance as a3, executeCuratorBridge as a4, findBridgeRoute as a5, getAllVaultChainIds as a6, getAsyncRequestStatus as a7, getAsyncRequestStatusLabel as a8, getDefaultStorage as a9, getFullVaultTopology as aa, getInboundRoutes as ab, getMaxWithdrawable as ac, getOutboundRoutes as ad, getUserBalances as ae, getUserBalancesForRoutes as af, getUserPosition as ag, getUserPositionMultiChain as ah, getVaultDistribution as ai, getVaultDistributionWithTopology as aj, getVaultMetadata as ak, getVaultStatus as al, getVaultSummary as am, getVaultTopology as an, isAsyncMode as ao, isOnHubChain as ap, loadDepositFlow as aq, previewDeposit as ar, previewRedeem as as, quoteCuratorBridgeFee as at, quoteLzFee as au, quoteRouteDepositFee as av, saveDepositFlow as aw, waitForAsyncRequest as ax, waitForTx as ay, type VaultAnalysis as b, type VaultAssetBreakdown as c, type CuratorAction as d, type SubmitActionsResult as e, type VaultConfiguration as f, type SubVaultInfo as g, type SubVaultPosition as h, type VaultPortfolio as i, ActionType as j, type ActionTypeValue as k, type AssetBalance as l, type AssetInfo as m, type AsyncRequestFinalResult as n, type AsyncRequestStatus as o, type AsyncRequestStatusInfo as p, type BridgeParams as q, type ChainPortfolio as r, type CrossChainRequestInfo as s, type CuratorBridgeParams as t, type DepositBlockReason as u, type DepositEligibility as v, type DepositFlowState as w, type InboundRouteWithBalance as x, type MaxWithdrawable as y, type MultiChainUserPosition as z };
+export { canDeposit as $, type AsyncRequestResult as A, type BatchSwapParams as B, type ComposeData as C, type DepositResult as D, type ERC7540RequestStatus as E, type FlowStorage as F, type MultiChainUserPosition as G, type OutboundRoute as H, type InboundRoute as I, type SpokeBalance as J, type SwapParams as K, LocalStorageAdapter as L, type MultiChainPortfolio as M, NATIVE_SYMBOL as N, OMNI_FACTORY_ADDRESS as O, type PendingAction as P, type UserPosition as Q, type RedeemCostEstimate as R, type SpokeDepositResult as S, type VaultDistribution as T, type UserBalances as U, type VaultAddresses as V, type VaultMetadata as W, type VaultMode as X, type VaultStatus as Y, type VaultSummary as Z, type VaultTopology as _, type RedeemResult as a, clearDepositFlow as a0, detectStargateOft as a1, discoverVaultTopology as a2, encodeBridgeParams as a3, ensureAllowance as a4, executeCuratorBridge as a5, findBridgeRoute as a6, getAllVaultChainIds as a7, getAsyncRequestStatus as a8, getAsyncRequestStatusLabel as a9, getDefaultStorage as aa, getFullVaultTopology as ab, getInboundRoutes as ac, getMaxWithdrawable as ad, getOutboundRoutes as ae, getUserBalances as af, getUserBalancesForRoutes as ag, getUserPosition as ah, getUserPositionMultiChain as ai, getVaultDistribution as aj, getVaultDistributionWithTopology as ak, getVaultMetadata as al, getVaultStatus as am, getVaultSummary as an, getVaultTopology as ao, isAsyncMode as ap, isOnHubChain as aq, loadDepositFlow as ar, previewDeposit as as, previewRedeem as at, quoteCuratorBridgeFee as au, quoteLzFee as av, quoteRouteDepositFee as aw, saveDepositFlow as ax, waitForAsyncRequest as ay, waitForTx as az, type CuratorVaultStatus as b, type VaultAnalysis as c, type VaultAssetBreakdown as d, type CuratorAction as e, type SubmitActionsResult as f, type VaultConfiguration as g, type SubVaultInfo as h, type SubVaultPosition as i, type VaultPortfolio as j, ActionType as k, type ActionTypeValue as l, type AssetBalance as m, type AssetInfo as n, type AsyncRequestFinalResult as o, type AsyncRequestStatus as p, type AsyncRequestStatusInfo as q, type BridgeParams as r, type ChainPortfolio as s, type CrossChainRequestInfo as t, type CuratorBridgeParams as u, type DepositBlockReason as v, type DepositEligibility as w, type DepositFlowState as x, type InboundRouteWithBalance as y, type MaxWithdrawable as z };

package/dist/{curatorBridge-BMSgDsUE.d.ts → curatorBridge-PVqdHUEp.d.ts}

@@ -29,6 +29,19 @@ interface AsyncRequestResult {
     /** Cross-chain request GUID to track via getRequestInfo / getFinalizationResult */
     guid: `0x${string}`;
 }
+interface RedeemCostEstimate {
+    /** Which redeem flow will be used based on vault configuration */
+    flow: 'direct' | 'queue-no-timelock' | 'queue-timelock' | 'async';
+    /** Gas estimate per transaction step */
+    steps: {
+        label: string;
+        gasEstimate: bigint;
+    }[];
+    /** Sum of gasEstimate across all steps */
+    totalGasEstimate: bigint;
+    /** LayerZero fee in native token wei (0 for non-async vaults) */
+    lzFee: bigint;
+}
 /**
  * ActionType enum values matching MoreVaultsLib.ActionType on-chain.
  * DEPOSIT=0, MINT=1, WITHDRAW=2, REDEEM=3, MULTI_ASSETS_DEPOSIT=4, ACCRUE_FEES=5
@@ -1266,4 +1279,4 @@ declare function quoteCuratorBridgeFee(publicClient: PublicClient, vault: Addres
  */
 declare function executeCuratorBridge(walletClient: WalletClient, publicClient: PublicClient, vault: Address, token: Address, params: CuratorBridgeParams): Promise<Hash>;
 
-export { clearDepositFlow as $, type AsyncRequestResult as A, type BatchSwapParams as B, type ComposeData as C, type DepositResult as D, type ERC7540RequestStatus as E, type FlowStorage as F, type OutboundRoute as G, type SpokeBalance as H, type InboundRoute as I, type SwapParams as J, type UserPosition as K, LocalStorageAdapter as L, type MultiChainPortfolio as M, NATIVE_SYMBOL as N, OMNI_FACTORY_ADDRESS as O, type PendingAction as P, type VaultDistribution as Q, type RedeemResult as R, type SpokeDepositResult as S, type VaultMetadata as T, type UserBalances as U, type VaultAddresses as V, type VaultMode as W, type VaultStatus as X, type VaultSummary as Y, type VaultTopology as Z, canDeposit as _, type CuratorVaultStatus as a, detectStargateOft as a0, discoverVaultTopology as a1, encodeBridgeParams as a2, ensureAllowance as a3, executeCuratorBridge as a4, findBridgeRoute as a5, getAllVaultChainIds as a6, getAsyncRequestStatus as a7, getAsyncRequestStatusLabel as a8, getDefaultStorage as a9, getFullVaultTopology as aa, getInboundRoutes as ab, getMaxWithdrawable as ac, getOutboundRoutes as ad, getUserBalances as ae, getUserBalancesForRoutes as af, getUserPosition as ag, getUserPositionMultiChain as ah, getVaultDistribution as ai, getVaultDistributionWithTopology as aj, getVaultMetadata as ak, getVaultStatus as al, getVaultSummary as am, getVaultTopology as an, isAsyncMode as ao, isOnHubChain as ap, loadDepositFlow as aq, previewDeposit as ar, previewRedeem as as, quoteCuratorBridgeFee as at, quoteLzFee as au, quoteRouteDepositFee as av, saveDepositFlow as aw, waitForAsyncRequest as ax, waitForTx as ay, type VaultAnalysis as b, type VaultAssetBreakdown as c, type CuratorAction as d, type SubmitActionsResult as e, type VaultConfiguration as f, type SubVaultInfo as g, type SubVaultPosition as h, type VaultPortfolio as i, ActionType as j, type ActionTypeValue as k, type AssetBalance as l, type AssetInfo as m, type AsyncRequestFinalResult as n, type AsyncRequestStatus as o, type AsyncRequestStatusInfo as p, type BridgeParams as q, type ChainPortfolio as r, type CrossChainRequestInfo as s, type CuratorBridgeParams as t, type DepositBlockReason as u, type DepositEligibility as v, type DepositFlowState as w, type InboundRouteWithBalance as x, type MaxWithdrawable as y, type MultiChainUserPosition as z };
+export { canDeposit as $, type AsyncRequestResult as A, type BatchSwapParams as B, type ComposeData as C, type DepositResult as D, type ERC7540RequestStatus as E, type FlowStorage as F, type MultiChainUserPosition as G, type OutboundRoute as H, type InboundRoute as I, type SpokeBalance as J, type SwapParams as K, LocalStorageAdapter as L, type MultiChainPortfolio as M, NATIVE_SYMBOL as N, OMNI_FACTORY_ADDRESS as O, type PendingAction as P, type UserPosition as Q, type RedeemCostEstimate as R, type SpokeDepositResult as S, type VaultDistribution as T, type UserBalances as U, type VaultAddresses as V, type VaultMetadata as W, type VaultMode as X, type VaultStatus as Y, type VaultSummary as Z, type VaultTopology as _, type RedeemResult as a, clearDepositFlow as a0, detectStargateOft as a1, discoverVaultTopology as a2, encodeBridgeParams as a3, ensureAllowance as a4, executeCuratorBridge as a5, findBridgeRoute as a6, getAllVaultChainIds as a7, getAsyncRequestStatus as a8, getAsyncRequestStatusLabel as a9, getDefaultStorage as aa, getFullVaultTopology as ab, getInboundRoutes as ac, getMaxWithdrawable as ad, getOutboundRoutes as ae, getUserBalances as af, getUserBalancesForRoutes as ag, getUserPosition as ah, getUserPositionMultiChain as ai, getVaultDistribution as aj, getVaultDistributionWithTopology as ak, getVaultMetadata as al, getVaultStatus as am, getVaultSummary as an, getVaultTopology as ao, isAsyncMode as ap, isOnHubChain as aq, loadDepositFlow as ar, previewDeposit as as, previewRedeem as at, quoteCuratorBridgeFee as au, quoteLzFee as av, quoteRouteDepositFee as aw, saveDepositFlow as ax, waitForAsyncRequest as ay, waitForTx as az, type CuratorVaultStatus as b, type VaultAnalysis as c, type VaultAssetBreakdown as d, type CuratorAction as e, type SubmitActionsResult as f, type VaultConfiguration as g, type SubVaultInfo as h, type SubVaultPosition as i, type VaultPortfolio as j, ActionType as k, type ActionTypeValue as l, type AssetBalance as m, type AssetInfo as n, type AsyncRequestFinalResult as o, type AsyncRequestStatus as p, type AsyncRequestStatusInfo as q, type BridgeParams as r, type ChainPortfolio as s, type CrossChainRequestInfo as t, type CuratorBridgeParams as u, type DepositBlockReason as v, type DepositEligibility as w, type DepositFlowState as x, type InboundRouteWithBalance as y, type MaxWithdrawable as z };

package/dist/ethers/index.cjs

@@ -742,6 +742,12 @@ var ComposeTimeoutError = class extends MoreVaultsError {
     this.guid = guid;
   }
 };
+var ComposeAlreadyExecutedError = class extends MoreVaultsError {
+  constructor() {
+    super("[MoreVaults] Compose already executed \u2014 deposit is complete, no action needed.");
+    this.name = "ComposeAlreadyExecutedError";
+  }
+};
 var WithdrawalTimelockActiveError = class extends MoreVaultsError {
   timelockEndsAt;
   requestTxHash;
@@ -1186,7 +1192,11 @@ async function waitForCompose(hubProvider, composeData, receiver, pollIntervalMs
                   logGuid,
                   logIndex
                 );
-                if (hash !== EMPTY_HASH && hash !== RECEIVED_HASH) {
+                if (hash === RECEIVED_HASH) {
+                  console.log(`[more-vaults-sdk] waitForCompose compose already executed (RECEIVED_HASH) \u2014 signaling done`);
+                  throw new ComposeAlreadyExecutedError();
+                }
+                if (hash !== EMPTY_HASH) {
                   console.log(`[${elapsed}s] Poll #${attempt} \u2014 compose found! (block ${log.blockNumber})`);
                   return {
                     ...composeData,
@@ -1198,16 +1208,19 @@ async function waitForCompose(hubProvider, composeData, receiver, pollIntervalMs
                   };
                 }
               }
-            } catch {
+            } catch (e) {
+              if (e instanceof ComposeAlreadyExecutedError) throw e;
             }
           }
-        } catch {
+        } catch (e) {
+          if (e instanceof ComposeAlreadyExecutedError) throw e;
           break;
         }
         from = chunkEnd + 1n;
       }
       scannedUpTo = currentBlock;
-    } catch {
+    } catch (e) {
+      if (e instanceof ComposeAlreadyExecutedError) throw e;
     }
     let guidMatchFound = false;
     for (const fromAddr of knownFromAddresses) {
@@ -1869,6 +1882,93 @@ async function bridgeSharesToHub(signer, shareOFT, hubChainEid, shares, receiver
   const receipt = await tx.wait();
   return { receipt };
 }
+async function estimateRedeemCost(provider, addresses, shares, receiver, owner, extraOptions = "0x") {
+  const vault = addresses.vault;
+  const status = await getVaultStatus(provider, vault);
+  if (status.mode === "paused") throw new VaultPausedError(vault);
+  if (status.recommendedDepositFlow === "depositAsync") {
+    const lzFee = await quoteLzFee(provider, vault, extraOptions);
+    const abiCoder = ethers.AbiCoder.defaultAbiCoder();
+    const actionCallData = abiCoder.encode(
+      ["uint256", "address", "address"],
+      [shares, receiver, owner]
+    );
+    const vaultContract2 = new ethers.Contract(vault, BRIDGE_ABI, provider);
+    let requestGas = 0n;
+    try {
+      const raw = await vaultContract2.initVaultActionRequest.estimateGas(
+        ActionType.REDEEM,
+        actionCallData,
+        0n,
+        extraOptions,
+        { value: lzFee, from: owner }
+      );
+      requestGas = BigInt(raw.toString()) * 130n / 100n;
+    } catch {
+    }
+    const approveGas = 60000n;
+    return {
+      flow: "async",
+      steps: [
+        { label: "approve shares to escrow", gasEstimate: approveGas },
+        { label: "initVaultActionRequest", gasEstimate: requestGas }
+      ],
+      totalGasEstimate: approveGas + requestGas,
+      lzFee
+    };
+  }
+  if (status.withdrawalQueueEnabled) {
+    const vaultNew = new ethers.Contract(vault, VAULT_ABI, provider);
+    let requestGas = 0n;
+    try {
+      const raw = await vaultNew.requestRedeem.estimateGas(shares, owner, { from: owner });
+      requestGas = BigInt(raw.toString());
+    } catch {
+      try {
+        const vaultLegacy = new ethers.Contract(vault, VAULT_REQUEST_REDEEM_LEGACY_ABI, provider);
+        const raw = await vaultLegacy.requestRedeem.estimateGas(shares, { from: owner });
+        requestGas = BigInt(raw.toString());
+      } catch {
+      }
+    }
+    if (status.withdrawalTimelockSeconds === 0n) {
+      let redeemGas2 = 0n;
+      try {
+        const raw = await vaultNew.redeem.estimateGas(shares, receiver, owner, { from: owner });
+        redeemGas2 = BigInt(raw.toString());
+      } catch {
+      }
+      return {
+        flow: "queue-no-timelock",
+        steps: [
+          { label: "requestRedeem", gasEstimate: requestGas },
+          { label: "redeemShares", gasEstimate: redeemGas2 }
+        ],
+        totalGasEstimate: requestGas + redeemGas2,
+        lzFee: 0n
+      };
+    }
+    return {
+      flow: "queue-timelock",
+      steps: [{ label: "requestRedeem", gasEstimate: requestGas }],
+      totalGasEstimate: requestGas,
+      lzFee: 0n
+    };
+  }
+  const vaultContract = new ethers.Contract(vault, VAULT_ABI, provider);
+  let redeemGas = 0n;
+  try {
+    const raw = await vaultContract.redeem.estimateGas(shares, receiver, owner, { from: owner });
+    redeemGas = BigInt(raw.toString());
+  } catch {
+  }
+  return {
+    flow: "direct",
+    steps: [{ label: "redeemShares", gasEstimate: redeemGas }],
+    totalGasEstimate: redeemGas,
+    lzFee: 0n
+  };
+}
 async function smartRedeem(signer, addresses, shares, receiver, owner, extraOptions = "0x") {
   const provider = signer.provider;
   const vault = addresses.vault;
@@ -3603,6 +3703,7 @@ exports.CHAIN_ID_TO_EID = CHAIN_ID_TO_EID;
 exports.CONFIG_ABI = CONFIG_ABI;
 exports.CURATOR_CONFIG_ABI = CURATOR_CONFIG_ABI;
 exports.CapacityFullError = CapacityFullError;
+exports.ComposeAlreadyExecutedError = ComposeAlreadyExecutedError;
 exports.ComposeTimeoutError = ComposeTimeoutError;
 exports.ComposerNotConfiguredError = ComposerNotConfiguredError;
 exports.DEX_ABI = DEX_ABI;
@@ -3669,6 +3770,7 @@ exports.encodeBridgeParams = encodeBridgeParams;
 exports.encodeCuratorAction = encodeCuratorAction;
 exports.encodeUniswapV3SwapCalldata = encodeUniswapV3SwapCalldata;
 exports.ensureAllowance = ensureAllowance;
+exports.estimateRedeemCost = estimateRedeemCost;
 exports.executeActions = executeActions;
 exports.executeCompose = executeCompose;
 exports.executeCuratorBridge = executeCuratorBridge;