@oydual31/more-vaults-sdk 0.3.2 → 0.3.3

package/dist/{spokeRoutes-DK7cIW4z.d.cts → spokeRoutes-BIafSbQ3.d.cts}

@@ -1,4 +1,4 @@
-import { Address, WalletClient, PublicClient, Hash } from 'viem';
+import { Address, PublicClient, WalletClient, Hash } from 'viem';
 
 /**
  * Wait for a transaction receipt with generous timeout and retry logic.
@@ -193,6 +193,17 @@ declare function waitForAsyncRequest(publicClient: PublicClient, vault: Address,
     refunded: boolean;
     result: bigint;
 }) => void): Promise<AsyncRequestFinalResult>;
+/**
+ * Detect whether an OFT address is a Stargate V2 pool by calling `stargateType()`.
+ *
+ * Stargate pools implement this function (returns 0=Pool, 1=OFT).
+ * Standard OFTs revert because they don't have it.
+ *
+ * @param publicClient  Viem public client on the OFT's chain
+ * @param oft           OFT contract address
+ * @returns             true if the contract is a Stargate V2 pool/OFT
+ */
+declare function detectStargateOft(publicClient: PublicClient, oft: Address): Promise<boolean>;
 
 interface UserPosition {
     /** Vault share balance */
@@ -618,4 +629,4 @@ declare function getOutboundRoutes(hubChainId: number, vault: Address): Promise<
  */
 declare function quoteRouteDepositFee(route: InboundRoute, hubChainId: number, amount: bigint, userAddress: Address): Promise<bigint>;
 
-export { type AsyncRequestFinalResult as A, getVaultDistribution as B, getVaultDistributionWithTopology as C, type DepositBlockReason as D, getVaultMetadata as E, getVaultStatus as F, getVaultSummary as G, getVaultTopology as H, type InboundRoute as I, isAsyncMode as J, isOnHubChain as K, previewDeposit as L, type MaxWithdrawable as M, NATIVE_SYMBOL as N, OMNI_FACTORY_ADDRESS as O, previewRedeem as P, quoteLzFee as Q, quoteRouteDepositFee as R, type SpokeBalance as S, waitForAsyncRequest as T, type UserBalances as U, type VaultDistribution as V, waitForTx as W, type AsyncRequestStatus as a, type AsyncRequestStatusInfo as b, type DepositEligibility as c, type InboundRouteWithBalance as d, type MultiChainUserPosition as e, type OutboundRoute as f, type UserPosition as g, type VaultMetadata as h, type VaultMode as i, type VaultStatus as j, type VaultSummary as k, type VaultTopology as l, canDeposit as m, discoverVaultTopology as n, ensureAllowance as o, getAllVaultChainIds as p, getAsyncRequestStatus as q, getAsyncRequestStatusLabel as r, getFullVaultTopology as s, getInboundRoutes as t, getMaxWithdrawable as u, getOutboundRoutes as v, getUserBalances as w, getUserBalancesForRoutes as x, getUserPosition as y, getUserPositionMultiChain as z };
+export { type AsyncRequestFinalResult as A, getUserPositionMultiChain as B, getVaultDistribution as C, type DepositBlockReason as D, getVaultDistributionWithTopology as E, getVaultMetadata as F, getVaultStatus as G, getVaultSummary as H, type InboundRoute as I, getVaultTopology as J, isAsyncMode as K, isOnHubChain as L, type MaxWithdrawable as M, NATIVE_SYMBOL as N, OMNI_FACTORY_ADDRESS as O, previewDeposit as P, previewRedeem as Q, quoteLzFee as R, type SpokeBalance as S, quoteRouteDepositFee as T, type UserBalances as U, type VaultDistribution as V, waitForAsyncRequest as W, waitForTx as X, type AsyncRequestStatus as a, type AsyncRequestStatusInfo as b, type DepositEligibility as c, type InboundRouteWithBalance as d, type MultiChainUserPosition as e, type OutboundRoute as f, type UserPosition as g, type VaultMetadata as h, type VaultMode as i, type VaultStatus as j, type VaultSummary as k, type VaultTopology as l, canDeposit as m, detectStargateOft as n, discoverVaultTopology as o, ensureAllowance as p, getAllVaultChainIds as q, getAsyncRequestStatus as r, getAsyncRequestStatusLabel as s, getFullVaultTopology as t, getInboundRoutes as u, getMaxWithdrawable as v, getOutboundRoutes as w, getUserBalances as x, getUserBalancesForRoutes as y, getUserPosition as z };

package/dist/{spokeRoutes-DK7cIW4z.d.ts → spokeRoutes-BIafSbQ3.d.ts}

@@ -1,4 +1,4 @@
-import { Address, WalletClient, PublicClient, Hash } from 'viem';
+import { Address, PublicClient, WalletClient, Hash } from 'viem';
 
 /**
  * Wait for a transaction receipt with generous timeout and retry logic.
@@ -193,6 +193,17 @@ declare function waitForAsyncRequest(publicClient: PublicClient, vault: Address,
     refunded: boolean;
     result: bigint;
 }) => void): Promise<AsyncRequestFinalResult>;
+/**
+ * Detect whether an OFT address is a Stargate V2 pool by calling `stargateType()`.
+ *
+ * Stargate pools implement this function (returns 0=Pool, 1=OFT).
+ * Standard OFTs revert because they don't have it.
+ *
+ * @param publicClient  Viem public client on the OFT's chain
+ * @param oft           OFT contract address
+ * @returns             true if the contract is a Stargate V2 pool/OFT
+ */
+declare function detectStargateOft(publicClient: PublicClient, oft: Address): Promise<boolean>;
 
 interface UserPosition {
     /** Vault share balance */
@@ -618,4 +629,4 @@ declare function getOutboundRoutes(hubChainId: number, vault: Address): Promise<
  */
 declare function quoteRouteDepositFee(route: InboundRoute, hubChainId: number, amount: bigint, userAddress: Address): Promise<bigint>;
 
-export { type AsyncRequestFinalResult as A, getVaultDistribution as B, getVaultDistributionWithTopology as C, type DepositBlockReason as D, getVaultMetadata as E, getVaultStatus as F, getVaultSummary as G, getVaultTopology as H, type InboundRoute as I, isAsyncMode as J, isOnHubChain as K, previewDeposit as L, type MaxWithdrawable as M, NATIVE_SYMBOL as N, OMNI_FACTORY_ADDRESS as O, previewRedeem as P, quoteLzFee as Q, quoteRouteDepositFee as R, type SpokeBalance as S, waitForAsyncRequest as T, type UserBalances as U, type VaultDistribution as V, waitForTx as W, type AsyncRequestStatus as a, type AsyncRequestStatusInfo as b, type DepositEligibility as c, type InboundRouteWithBalance as d, type MultiChainUserPosition as e, type OutboundRoute as f, type UserPosition as g, type VaultMetadata as h, type VaultMode as i, type VaultStatus as j, type VaultSummary as k, type VaultTopology as l, canDeposit as m, discoverVaultTopology as n, ensureAllowance as o, getAllVaultChainIds as p, getAsyncRequestStatus as q, getAsyncRequestStatusLabel as r, getFullVaultTopology as s, getInboundRoutes as t, getMaxWithdrawable as u, getOutboundRoutes as v, getUserBalances as w, getUserBalancesForRoutes as x, getUserPosition as y, getUserPositionMultiChain as z };
+export { type AsyncRequestFinalResult as A, getUserPositionMultiChain as B, getVaultDistribution as C, type DepositBlockReason as D, getVaultDistributionWithTopology as E, getVaultMetadata as F, getVaultStatus as G, getVaultSummary as H, type InboundRoute as I, getVaultTopology as J, isAsyncMode as K, isOnHubChain as L, type MaxWithdrawable as M, NATIVE_SYMBOL as N, OMNI_FACTORY_ADDRESS as O, previewDeposit as P, previewRedeem as Q, quoteLzFee as R, type SpokeBalance as S, quoteRouteDepositFee as T, type UserBalances as U, type VaultDistribution as V, waitForAsyncRequest as W, waitForTx as X, type AsyncRequestStatus as a, type AsyncRequestStatusInfo as b, type DepositEligibility as c, type InboundRouteWithBalance as d, type MultiChainUserPosition as e, type OutboundRoute as f, type UserPosition as g, type VaultMetadata as h, type VaultMode as i, type VaultStatus as j, type VaultSummary as k, type VaultTopology as l, canDeposit as m, detectStargateOft as n, discoverVaultTopology as o, ensureAllowance as p, getAllVaultChainIds as q, getAsyncRequestStatus as r, getAsyncRequestStatusLabel as s, getFullVaultTopology as t, getInboundRoutes as u, getMaxWithdrawable as v, getOutboundRoutes as w, getUserBalances as x, getUserBalancesForRoutes as y, getUserPosition as z };

package/dist/viem/index.cjs

@@ -1470,6 +1470,27 @@ async function waitForAsyncRequest(publicClient, vault, guid, pollInterval = 3e4
     `[MoreVaults] Async request ${guid} did not finalize within ${timeout / 1e3}s. The request may still complete \u2014 check https://layerzeroscan.com/tx/${guid}`
   );
 }
+var STARGATE_TYPE_ABI = [
+  {
+    type: "function",
+    name: "stargateType",
+    inputs: [],
+    outputs: [{ type: "uint8" }],
+    stateMutability: "view"
+  }
+];
+async function detectStargateOft(publicClient, oft) {
+  try {
+    await publicClient.readContract({
+      address: viem.getAddress(oft),
+      abi: STARGATE_TYPE_ABI,
+      functionName: "stargateType"
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
 var PUBLIC_RPCS = {
   1: [
     "https://ethereum-rpc.publicnode.com",
@@ -1868,21 +1889,11 @@ var COMPOSER_ABI = [
     stateMutability: "view"
   }
 ];
-var STARGATE_ASSETS = /* @__PURE__ */ new Set(["stgUSDC", "USDT", "WETH"]);
 function buildLzComposeOption(gas, nativeValue) {
   const gasHex = gas.toString(16).padStart(32, "0");
   const valueHex = nativeValue.toString(16).padStart(32, "0");
   return `0x00030300220000${gasHex}${valueHex}`;
 }
-function isStargateOft(oft) {
-  for (const [symbol, chainMap] of Object.entries(OFT_ROUTES)) {
-    if (!STARGATE_ASSETS.has(symbol)) continue;
-    for (const entry of Object.values(chainMap)) {
-      if (viem.getAddress(entry.oft) === oft) return true;
-    }
-  }
-  return false;
-}
 async function resolveComposeNativeValue(hubClient, vault, composerAddress, spokeEid, receiverBytes32) {
   const [readFeeResult, shareOftResult] = await Promise.allSettled([
     hubClient.readContract({
@@ -1946,7 +1957,7 @@ async function depositFromSpoke(walletClient, publicClient, vault, spokeOFT, hub
   if (composerAddress === viem.zeroAddress) throw new Error(`No composer registered for vault ${vault} on hub chainId ${hubChainId}`);
   const composerBytes32 = viem.pad(composerAddress, { size: 32 });
   const receiverBytes32 = viem.pad(viem.getAddress(receiver), { size: 32 });
-  const isStargate = isStargateOft(oft);
+  const isStargate = await detectStargateOft(publicClient, oft);
   let resolvedExtraOptions;
   if (extraOptions !== "0x") {
     resolvedExtraOptions = extraOptions;
@@ -2043,7 +2054,7 @@ async function depositFromSpoke(walletClient, publicClient, vault, spokeOFT, hub
     account,
     chain: walletClient.chain
   });
-  const stargate = isStargateOft(viem.getAddress(spokeOFT));
+  const stargate = isStargate;
   let composeData;
   if (stargate) {
     const hubBlockStart = await hubClient.getBlockNumber();
@@ -2077,7 +2088,7 @@ async function quoteDepositFromSpokeFee(publicClient, vault, spokeOFT, hubEid, s
     args: [viem.getAddress(vault)]
   });
   const composerBytes32 = viem.pad(composerAddress, { size: 32 });
-  const isStargate = isStargateOft(oft);
+  const isStargate = await detectStargateOft(publicClient, oft);
   let resolvedExtraOptions;
   if (extraOptions !== "0x") {
     resolvedExtraOptions = extraOptions;
@@ -2146,13 +2157,16 @@ async function waitForCompose(hubPublicClient, composeData, receiver, pollInterv
   const endpoint = viem.getAddress(composeData.endpoint);
   const receiverNeedle = viem.getAddress(receiver).slice(2).toLowerCase();
   const startBlock = composeData.hubBlockStart;
-  const knownFromAddresses = [];
   const hubChainId = composeData.hubChainId;
-  for (const [symbol, chainMap] of Object.entries(OFT_ROUTES)) {
-    if (!STARGATE_ASSETS.has(symbol)) continue;
+  const candidateAddresses = [];
+  for (const chainMap of Object.values(OFT_ROUTES)) {
     const entry = chainMap[hubChainId];
-    if (entry) knownFromAddresses.push(viem.getAddress(entry.oft));
+    if (entry) candidateAddresses.push(viem.getAddress(entry.oft));
   }
+  const stargateChecks = await Promise.all(
+    candidateAddresses.map(async (addr) => ({ addr, isSg: await detectStargateOft(hubPublicClient, addr) }))
+  );
+  const knownFromAddresses = stargateChecks.filter((c) => c.isSg).map((c) => c.addr);
   let attempt = 0;
   let scannedUpTo = startBlock - 1n;
   while (Date.now() < deadline) {
@@ -2485,14 +2499,7 @@ async function preflightSpokeDeposit(spokePublicClient, vault, spokeOFT, hubEid,
   Have:  ${spokeNativeBalance} wei`
     );
   }
-  const STARGATE_ASSETS3 = /* @__PURE__ */ new Set(["stgUSDC", "USDT", "WETH"]);
-  let isStargate = false;
-  for (const [symbol, chainMap] of Object.entries(OFT_ROUTES)) {
-    if (!STARGATE_ASSETS3.has(symbol)) continue;
-    for (const entry of Object.values(chainMap)) {
-      if (viem.getAddress(entry.oft) === oft) isStargate = true;
-    }
-  }
+  const isStargate = await detectStargateOft(spokePublicClient, oft);
   let hubNativeBalance = 0n;
   let estimatedComposeFee = 0n;
   if (isStargate) {
@@ -2994,7 +3001,6 @@ async function bridgeAssetsToSpoke(walletClient, publicClient, assetOFT, spokeCh
   });
   return { txHash };
 }
-var STARGATE_ASSETS2 = /* @__PURE__ */ new Set(["stgUSDC", "USDT", "WETH"]);
 var FACTORY_COMPOSER_ABI2 = [
   {
     type: "function",
@@ -3044,7 +3050,6 @@ async function resolveRedeemAddresses(hubPublicClient, vault, hubChainId, spokeC
   const spokeShareOft = viem.getAddress(`0x${spokeShareOftBytes32.slice(-40)}`);
   let hubAssetOft = null;
   let spokeAsset = null;
-  let isStargate = false;
   let symbol = "";
   for (const [sym, chainMap] of Object.entries(OFT_ROUTES)) {
     const hubEntry = chainMap[hubChainId];
@@ -3053,7 +3058,6 @@ async function resolveRedeemAddresses(hubPublicClient, vault, hubChainId, spokeC
     if (viem.getAddress(hubEntry.token) === viem.getAddress(hubAsset)) {
       hubAssetOft = viem.getAddress(hubEntry.oft);
       spokeAsset = viem.getAddress(spokeEntry.token);
-      isStargate = STARGATE_ASSETS2.has(sym);
       symbol = sym;
       break;
     }
@@ -3063,6 +3067,7 @@ async function resolveRedeemAddresses(hubPublicClient, vault, hubChainId, spokeC
       `[MoreVaults] No OFT route found for vault asset ${hubAsset} between hub chain ${hubChainId} and spoke chain ${spokeChainId}`
     );
   }
+  const isStargate = await detectStargateOft(hubPublicClient, hubAssetOft);
   return {
     hubChainId,
     spokeChainId,
@@ -4001,6 +4006,7 @@ exports.depositFromSpoke = depositFromSpoke;
 exports.depositFromSpokeAsync = depositFromSpoke;
 exports.depositMultiAsset = depositMultiAsset;
 exports.depositSimple = depositSimple;
+exports.detectStargateOft = detectStargateOft;
 exports.discoverVaultTopology = discoverVaultTopology;
 exports.encodeCuratorAction = encodeCuratorAction;
 exports.encodeUniswapV3SwapCalldata = encodeUniswapV3SwapCalldata;