@oydual31/more-vaults-sdk 1.1.4 → 1.1.6

package/dist/viem/index.cjs

@@ -2148,6 +2148,9 @@ function parseContractError(err, vault, caller) {
 }
 
 // src/viem/crossChainFlows.ts
+function isNativeDropCapError(e) {
+  return String(e).includes("0x0084ce02");
+}
 var LZ_ENDPOINT = "0x1a44076050125825900e736c501f859c50fe728c";
 var FACTORY_COMPOSER_ABI = [
   {
@@ -2187,9 +2190,15 @@ async function resolveComposeNativeValue(hubClient, vault, composerAddress, spok
     })
   ]);
   const readFee = readFeeResult.status === "fulfilled" ? readFeeResult.value : 0n;
-  if (shareOftResult.status === "fulfilled") {
+  if (readFeeResult.status === "rejected") {
+    console.warn("[more-vaults-sdk] resolveComposeNativeValue: quoteAccountingFee failed", readFeeResult.reason);
+  }
+  if (shareOftResult.status === "rejected") {
+    console.warn("[more-vaults-sdk] resolveComposeNativeValue: SHARE_OFT() failed on composer", composerAddress, shareOftResult.reason);
+  } else {
     try {
       const shareOft = shareOftResult.value;
+      console.warn("[more-vaults-sdk] resolveComposeNativeValue: calling quoteSend on", shareOft, "dstEid", spokeEid);
       const feeQuote = await hubClient.readContract({
         address: shareOft,
         abi: OFT_ABI,
@@ -2204,11 +2213,13 @@ async function resolveComposeNativeValue(hubClient, vault, composerAddress, spok
           oftCmd: "0x"
         }, false]
       });
+      console.warn("[more-vaults-sdk] resolveComposeNativeValue: quoteSend ok", feeQuote.nativeFee);
       return readFee + feeQuote.nativeFee;
     } catch (e) {
       console.warn("[more-vaults-sdk] resolveComposeNativeValue: quoteSend failed, using fallback", e);
     }
   }
+  console.warn("[more-vaults-sdk] resolveComposeNativeValue: using fallback readFee*5 =", readFee * 5n);
   return readFee > 0n ? readFee * 5n : 500000000000000n;
 }
 function resolveOftCmd(_oft) {
@@ -2281,6 +2292,22 @@ async function depositFromSpoke(walletClient, publicClient, vault, spokeOFT, hub
     ],
     [hopSendParam, minMsgValue]
   );
+  let needsPendingCompose = isStargate;
+  if (!isStargate && resolvedExtraOptions !== "0x") {
+    try {
+      await publicClient.readContract({
+        address: oft,
+        abi: OFT_ABI,
+        functionName: "quoteSend",
+        args: [{ dstEid: hubEid, to: composerBytes32, amountLD: amount, minAmountLD: amount, extraOptions: resolvedExtraOptions, composeMsg: composeMsgBytes, oftCmd: resolvedOftCmd }, false]
+      });
+    } catch (e) {
+      if (isNativeDropCapError(e)) {
+        resolvedExtraOptions = "0x";
+        needsPendingCompose = true;
+      }
+    }
+  }
   let resolvedMinAmountLD = minAmountLD;
   if (resolvedMinAmountLD === void 0) {
     try {
@@ -2339,9 +2366,8 @@ async function depositFromSpoke(walletClient, publicClient, vault, spokeOFT, hub
     account,
     chain: walletClient.chain
   });
-  const stargate = isStargate;
   let composeData;
-  if (stargate) {
+  if (needsPendingCompose) {
     const hubBlockStart = await hubClient.getBlockNumber();
     composeData = {
       endpoint: LZ_ENDPOINT,
@@ -2352,7 +2378,7 @@ async function depositFromSpoke(walletClient, publicClient, vault, spokeOFT, hub
       index: 0,
       message: "0x",
       // resolved by waitForCompose — from ComposeSent event
-      isStargate: true,
+      isStargate,
       hubChainId,
       hubBlockStart
     };
@@ -2426,12 +2452,16 @@ async function quoteDepositFromSpokeFee(publicClient, vault, spokeOFT, hubEid, s
     composeMsg: composeMsgBytes,
     oftCmd: resolvedOftCmd
   };
-  const fee = await publicClient.readContract({
-    address: oft,
-    abi: OFT_ABI,
-    functionName: "quoteSend",
-    args: [sendParam, false]
-  });
+  let fee;
+  try {
+    fee = await publicClient.readContract({ address: oft, abi: OFT_ABI, functionName: "quoteSend", args: [sendParam, false] });
+  } catch (e) {
+    if (isNativeDropCapError(e)) {
+      fee = await publicClient.readContract({ address: oft, abi: OFT_ABI, functionName: "quoteSend", args: [{ ...sendParam, extraOptions: "0x" }, false] });
+    } else {
+      throw e;
+    }
+  }
   return fee.nativeFee;
 }
 var EMPTY_HASH = "0x0000000000000000000000000000000000000000000000000000000000000000";