@oydual31/more-vaults-sdk 1.1.5 → 1.1.7

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 = [
   {
@@ -2289,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 {
@@ -2347,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,
@@ -2360,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
     };
@@ -2434,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";
@@ -2491,31 +2513,34 @@ async function waitForCompose(hubPublicClient, composeData, receiver, pollInterv
           for (const log of logs) {
             const args = log.args;
             if (args.to && viem.getAddress(args.to) === composer && args.message?.toLowerCase().includes(receiverNeedle)) {
-              const hash = await hubPublicClient.readContract({
-                address: endpoint,
-                abi: LZ_ENDPOINT_ABI,
-                functionName: "composeQueue",
-                args: [viem.getAddress(args.from), composer, args.guid, args.index ?? 0]
-              });
-              if (hash !== EMPTY_HASH && hash !== RECEIVED_HASH) {
-                console.log(`[${elapsed}s] Poll #${attempt} \u2014 compose found! (block ${log.blockNumber}, scanned from ${startBlock})`);
-                return {
-                  ...composeData,
-                  from: viem.getAddress(args.from),
-                  to: composer,
-                  guid: args.guid,
-                  index: args.index ?? 0,
-                  message: args.message
-                };
+              try {
+                const hash = await hubPublicClient.readContract({
+                  address: endpoint,
+                  abi: LZ_ENDPOINT_ABI,
+                  functionName: "composeQueue",
+                  args: [viem.getAddress(args.from), composer, args.guid, args.index ?? 0]
+                });
+                if (hash !== EMPTY_HASH && hash !== RECEIVED_HASH) {
+                  console.log(`[${elapsed}s] Poll #${attempt} \u2014 compose found! (block ${log.blockNumber}, scanned from ${startBlock})`);
+                  return {
+                    ...composeData,
+                    from: viem.getAddress(args.from),
+                    to: composer,
+                    guid: args.guid,
+                    index: args.index ?? 0,
+                    message: args.message
+                  };
+                }
+              } catch {
               }
             }
           }
+          scannedUpTo = chunkEnd;
         } catch {
           break;
         }
         from = chunkEnd + 1n;
       }
-      scannedUpTo = currentBlock;
     } catch {
     }
     let guidMatchFound = false;