@continuumdao/ctm-mpc-defi 0.1.3 → 0.2.0

package/dist/protocols/evm/uniswap-v4/index.d.cts

@@ -160,7 +160,8 @@ declare function formatUniswapQuoteForDisplay(res: Record<string, unknown>, args
 };
 
 /**
- * When `batchIndex` is set, allow per-item `batchMeta[i].evm` when present; else top-level `evm` in ExtraJSON.
+ * When `batchIndex` is set, check `batchMeta[i].evm`. Without `batchIndex`, also check `batchMeta[0]`
+ * (native ETH-in single-tx requests store evm only under batchMeta, not top-level extraJSON.evm).
  */
 declare function isUniswapV4SwapEvmSignRequest(detail: Record<string, unknown> | null | undefined, batchIndex?: number): boolean;
 /**

package/dist/protocols/evm/uniswap-v4/index.d.ts

@@ -160,7 +160,8 @@ declare function formatUniswapQuoteForDisplay(res: Record<string, unknown>, args
 };
 
 /**
- * When `batchIndex` is set, allow per-item `batchMeta[i].evm` when present; else top-level `evm` in ExtraJSON.
+ * When `batchIndex` is set, check `batchMeta[i].evm`. Without `batchIndex`, also check `batchMeta[0]`
+ * (native ETH-in single-tx requests store evm only under batchMeta, not top-level extraJSON.evm).
  */
 declare function isUniswapV4SwapEvmSignRequest(detail: Record<string, unknown> | null | undefined, batchIndex?: number): boolean;
 /**

package/dist/protocols/evm/uniswap-v4/index.js

@@ -578,16 +578,36 @@ function parseExtraJsonObject(detail) {
   }
   return null;
 }
+function uniswapV4EvmTypeFromBatchMeta(ex, batchIndex) {
+  if (!ex) return false;
+  const bm = ex.batchMeta;
+  if (!Array.isArray(bm) || !bm[batchIndex] || typeof bm[batchIndex] !== "object" || Array.isArray(bm[batchIndex])) {
+    return false;
+  }
+  const evm0 = bm[batchIndex].evm;
+  if (!evm0 || typeof evm0 !== "object" || Array.isArray(evm0)) return false;
+  return String(evm0.type ?? "") === "uniswap_v4_swap_tx";
+}
+function uniswapV4AuditFromDetail(ex, batchIndex) {
+  if (!ex) return void 0;
+  const index = batchIndex != null && batchIndex >= 0 ? batchIndex : 0;
+  const bm = ex.batchMeta;
+  if (Array.isArray(bm) && bm[index] && typeof bm[index] === "object" && !Array.isArray(bm[index])) {
+    const nested = bm[index].uniswapV4;
+    if (nested && typeof nested === "object" && !Array.isArray(nested)) {
+      return nested;
+    }
+  }
+  const root = ex.uniswapV4;
+  if (root && typeof root === "object" && !Array.isArray(root)) return root;
+  return void 0;
+}
 function isUniswapV4SwapEvmSignRequest(detail, batchIndex) {
   const ex = parseExtraJsonObject(detail);
-  if (batchIndex != null && batchIndex >= 0 && ex) {
-    const bm = ex.batchMeta;
-    if (Array.isArray(bm) && bm[batchIndex] && typeof bm[batchIndex] === "object" && !Array.isArray(bm[batchIndex])) {
-      const evm0 = bm[batchIndex].evm;
-      if (evm0 && typeof evm0 === "object" && !Array.isArray(evm0)) {
-        if (String(evm0.type ?? "") === "uniswap_v4_swap_tx") return true;
-      }
-    }
+  if (batchIndex != null && batchIndex >= 0) {
+    if (uniswapV4EvmTypeFromBatchMeta(ex, batchIndex)) return true;
+  } else if (uniswapV4EvmTypeFromBatchMeta(ex, 0)) {
+    return true;
   }
   const evm = ex?.evm;
   if (!evm || typeof evm !== "object" || Array.isArray(evm)) return false;
@@ -617,10 +637,10 @@ function resolveRouterSwapGasUnitsFromSignRequest(detail, batchIndex) {
     }
   }
   const ex = parseExtraJsonObject(detail);
-  const u4 = ex?.uniswapV4;
-  if (u4 && typeof u4 === "object") {
+  const u4 = uniswapV4AuditFromDetail(ex, batchIndex);
+  if (u4) {
     const uc = u4.uniswapCreateSwap;
-    const gb = uc?.gasBuild;
+    const gb = uc?.gasBuildSwap ?? uc?.gasBuild;
     const base = parseOptionalGasLimitString(gb?.baseGasUnits);
     if (base != null && base > 0n) return base;
     const snap = u4.fullQuoteFromPermitSnapshot;