@continuumdao/ctm-mpc-defi 0.2.0 → 0.2.1

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

@@ -1,4 +1,5 @@
-import { getAddress, zeroAddress, formatUnits, parseUnits, encodeFunctionData, erc20Abi, defineChain, createPublicClient, http, parseGwei, serializeTransaction, keccak256, decodeFunctionData } from 'viem';
+import { getAddress, zeroAddress, formatUnits, parseUnits, encodeFunctionData, erc20Abi, decodeFunctionData, defineChain, createPublicClient, http, parseGwei, serializeTransaction, keccak256 } from 'viem';
+import { nodeFetchWithReadAuth, fetchChainFeeParams, gasLimitFromEstimateAndChainConfig, gweiToDecimalString, proposalTxParamsToFeeSnapshot, alignEip1559FeesWithLatestBase, getClientIdFromKeyGenResult } from '@continuumdao/continuum-node-sdk';
 
 // src/core/registry.ts
 var modules = [];
@@ -90,18 +91,6 @@ var UNISWAP_TRADE_BASE_DEFAULT = "https://trade-api.gateway.uniswap.org/v1";
 var UNISWAP_UNIVERSAL_ROUTER_VERSION_DEFAULT = "2.0";
 var UNISWAP_SWAP_DEFAULT_EXPIRY_MINUTES = 30;
 var UNISWAP_SWAP_DEFAULT_DEADLINE_SEC_OFFSET = UNISWAP_SWAP_DEFAULT_EXPIRY_MINUTES * 60;
-
-// src/core/nodeRead.ts
-function nodeFetchWithReadAuth(url, init, auth) {
-  const method = (init?.method ?? "GET").toUpperCase();
-  const headers = new Headers(init?.headers);
-  if (auth.bearerOnGet && method === "GET" && auth.jwt && auth.jwt.trim()) {
-    headers.set("Authorization", `Bearer ${auth.jwt.trim()}`);
-  }
-  return fetch(url, { ...init, headers });
-}
-
-// src/protocols/evm/uniswap-v4/quote.ts
 var DEFAULT_TRADE_BASE = "https://trade-api.gateway.uniswap.org/v1";
 var UNISWAP_QUOTE_HEADERS_BASE = {
   "Content-Type": "application/json",
@@ -455,23 +444,65 @@ function formatUniswapQuoteForDisplay(res, args) {
   return { title: "Quote received", lines, rawJson };
 }
 
-// src/core/keygen.ts
-function firstClientIdFromKeyGen(data) {
-  const map = data?.ClientKeys;
-  if (!map || typeof map !== "object") return null;
-  for (const v of Object.values(map)) {
-    if (typeof v === "string" && v.trim()) return v.trim();
-  }
-  return null;
+// src/core/purpose.ts
+function mergePurposeText(purposeText, purposeSuffix) {
+  const t = purposeText.trim();
+  const suffix = (purposeSuffix ?? "").trim();
+  if (!suffix) return t;
+  return t ? `${t}
+
+${suffix}` : suffix;
 }
 
-// src/chains/evm/txParams.ts
-function gasLimitFromEstimateAndChainConfig(estimatedGas, chainGasLimit) {
-  if (chainGasLimit == null || !Number.isFinite(chainGasLimit) || chainGasLimit <= 0) {
-    return estimatedGas;
+// src/core/envelope.ts
+function finalizeMultisign(input) {
+  const { keyGen, destinationChainID, legs } = input;
+  if (legs.length === 0) {
+    throw new Error("finalizeMultisign requires at least one leg");
+  }
+  const ph = (keyGen.pubkeyhex ?? "").trim();
+  if (!ph) throw new Error("keyGen pubKey (pubkeyhex) is required");
+  const keyList = keyGen.keylist ?? [];
+  const clientId = getClientIdFromKeyGenResult(keyGen);
+  const first = legs[0];
+  const messageHashes = legs.map((l) => l.msgHash);
+  const messageRawBatch = legs.map((l) => l.msgRaw);
+  const batchMeta = legs.map((l) => ({
+    destinationAddress: l.destinationAddress,
+    signatureText: l.signatureText,
+    ...l.audit
+  }));
+  const proposalTxParams = legs.map((l) => l.proposalTxParams).filter((p) => p != null && typeof p === "object");
+  const extraPayload = {
+    batchMeta,
+    ...input.extraJSON ?? {}
+  };
+  const extraJSON = JSON.stringify(extraPayload);
+  const bodyForSign = {
+    keyList,
+    pubKey: ph,
+    msgHash: messageHashes[0],
+    msgRaw: first.msgRaw,
+    destinationChainID,
+    destinationAddress: input.destinationAddress ?? first.destinationAddress,
+    extraJSON,
+    signatureText: first.signatureText,
+    purpose: mergePurposeText(input.purposeText, input.purposeSuffix),
+    ...first.feeSnapshot
+  };
+  if (legs.length > 1) {
+    bodyForSign.messageHashes = messageHashes;
+    bodyForSign.messageRawBatch = messageRawBatch;
+  }
+  if (proposalTxParams.length > 0) {
+    bodyForSign.proposalTxParams = proposalTxParams;
+  }
+  const valueWei = first.valueWei;
+  if (valueWei != null && valueWei > 0n) {
+    bodyForSign.value = valueWei.toString();
   }
-  const cfg = BigInt(Math.floor(chainGasLimit));
-  return cfg > estimatedGas ? cfg : estimatedGas;
+  if (clientId) bodyForSign.clientId = clientId;
+  return { bodyForSign, messageToSign: JSON.stringify(bodyForSign) };
 }
 function routerSwapGasLimitFromEstimate(estimatedGas, chainGasLimit) {
   if (chainGasLimit != null && Number.isFinite(chainGasLimit) && chainGasLimit > 0) {
@@ -479,76 +510,168 @@ function routerSwapGasLimitFromEstimate(estimatedGas, chainGasLimit) {
   }
   return (estimatedGas * 12n + 9n) / 10n;
 }
-async function fetchChainFeeParams(rpcUrl, chainId) {
-  const url = rpcUrl.trim();
-  if (!url) return { isEip1559: false };
-  const chainIdNum = typeof chainId === "string" ? parseInt(chainId, 10) : chainId;
-  if (Number.isNaN(chainIdNum)) return { isEip1559: false };
-  const chain = defineChain({
-    id: chainIdNum,
-    name: "Discovery",
+
+// src/chains/evm/buildBatch.ts
+async function buildEvmMultisignBatch(args) {
+  const { context, steps } = args;
+  const {
+    chainId,
+    rpcUrl,
+    executorAddress,
+    chainDetail,
+    useCustomGas,
+    customGasChainDetails,
+    keyGen,
+    purposeText
+  } = context;
+  if (steps.length === 0) throw new Error("buildEvmMultisignBatch requires at least one step");
+  const ch = defineChain({
+    id: chainId,
+    name: "Destination",
     nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
-    rpcUrls: { default: { http: [url] } }
+    rpcUrls: { default: { http: [rpcUrl] } }
   });
-  const publicClient = createPublicClient({
-    chain,
-    transport: http(url)
-  });
-  const getGasPriceGwei = async () => {
-    const gasPriceWei = await publicClient.getGasPrice();
-    return parseFloat(formatUnits(gasPriceWei, 9));
-  };
-  try {
-    const block = await publicClient.getBlock({ blockTag: "latest" });
-    const baseFeePerGas = block?.baseFeePerGas;
-    if (baseFeePerGas == null || baseFeePerGas === void 0) {
-      const gasPriceGwei2 = await getGasPriceGwei();
-      return { isEip1559: false, gasPriceGwei: gasPriceGwei2 };
+  const publicClient = createPublicClient({ chain: ch, transport: http(rpcUrl) });
+  const feeParams = await fetchChainFeeParams(rpcUrl, chainId);
+  const legacy = Boolean(chainDetail?.legacy) || !feeParams.isEip1559;
+  const latestBaseFeeWei = !legacy ? (await publicClient.getBlock({ blockTag: "latest" })).baseFeePerGas ?? 0n : 0n;
+  const gasLimitConfig = useCustomGas && chainDetail?.gasLimit != null ? Number(chainDetail.gasLimit) : void 0;
+  const chainGasLimitRouter = chainDetail?.gasLimit != null && Number.isFinite(Number(chainDetail.gasLimit)) && Number(chainDetail.gasLimit) > 0 ? Number(chainDetail.gasLimit) : void 0;
+  const gasFeeMultiplier = useCustomGas && chainDetail?.gasMultiplier != null ? Number(chainDetail.gasMultiplier) : void 0;
+  const executor = getAddress(executorAddress);
+  const baseNonce = await publicClient.getTransactionCount({ address: executor, blockTag: "pending" });
+  const legs = [];
+  for (let i = 0; i < steps.length; i++) {
+    const step = steps[i];
+    const currentNonce = baseNonce + i;
+    let estimatedGas;
+    if (args.estimateGasForStep) {
+      estimatedGas = await args.estimateGasForStep({ step, index: i, publicClient, executor });
+    } else {
+      try {
+        estimatedGas = await publicClient.estimateGas({
+          to: step.to,
+          data: step.data,
+          value: step.value,
+          account: executor
+        });
+      } catch {
+        estimatedGas = step.fallbackGas ?? 100000n;
+      }
     }
-    const baseFeeGwei = parseFloat(formatUnits(baseFeePerGas, 9));
-    let priorityFeeGwei;
-    try {
-      const priorityWei = await publicClient.estimateMaxPriorityFeePerGas();
-      priorityFeeGwei = parseFloat(formatUnits(priorityWei, 9));
-    } catch {
+    let gasLimitI;
+    if (args.resolveGasLimit) {
+      gasLimitI = await args.resolveGasLimit({ step, index: i, estimatedGas, publicClient });
+    } else if (step.routerSwap) {
+      gasLimitI = routerSwapGasLimitFromEstimate(estimatedGas, chainGasLimitRouter);
+    } else {
+      gasLimitI = useCustomGas ? gasLimitFromEstimateAndChainConfig(estimatedGas, gasLimitConfig) : estimatedGas;
     }
-    const gasPriceGwei = await getGasPriceGwei();
-    return {
-      isEip1559: true,
-      baseFeeGwei,
-      priorityFeeGwei,
-      gasPriceGwei
-    };
-  } catch {
-    try {
-      const gasPriceWei = await publicClient.getGasPrice();
-      const gasPriceGwei = parseFloat(formatUnits(gasPriceWei, 9));
-      return { isEip1559: false, gasPriceGwei };
-    } catch {
-      return { isEip1559: false };
+    let proposalTxParams;
+    let feeSnapshot;
+    let serialized;
+    if (legacy) {
+      let gasPriceWei = await publicClient.getGasPrice();
+      if (useCustomGas && gasFeeMultiplier != null && gasFeeMultiplier > 0) {
+        gasPriceWei = gasPriceWei * BigInt(100 + gasFeeMultiplier) / 100n;
+      }
+      if (useCustomGas && chainDetail?.gasPrice != null && chainDetail.gasPrice > 0) {
+        const configured = parseGwei(gweiToDecimalString(Number(chainDetail.gasPrice)));
+        if (configured > gasPriceWei) gasPriceWei = configured;
+      }
+      serialized = serializeTransaction({
+        type: "legacy",
+        to: step.to,
+        data: step.data,
+        value: step.value,
+        gas: gasLimitI,
+        gasPrice: gasPriceWei,
+        nonce: currentNonce,
+        chainId
+      });
+      proposalTxParams = {
+        nonce: currentNonce,
+        gasLimit: gasLimitI.toString(),
+        txType: "legacy",
+        gasPrice: gasPriceWei.toString()
+      };
+      feeSnapshot = proposalTxParamsToFeeSnapshot(proposalTxParams);
+    } else {
+      const fetchedBase = feeParams.baseFeeGwei ?? 0;
+      const fetchedPriority = feeParams.priorityFeeGwei ?? 0;
+      const configuredBase = useCustomGas && chainDetail?.baseFee != null ? Number(chainDetail.baseFee) : 0;
+      const configuredPriority = useCustomGas && chainDetail?.priorityFee != null ? Number(chainDetail.priorityFee) : 0;
+      const effectiveBaseFeeGwei = Math.max(fetchedBase, configuredBase);
+      const effectivePriorityFeeGwei = Math.max(fetchedPriority, configuredPriority);
+      const baseFeeMultiplierPct = useCustomGas && chainDetail?.baseFeeMultiplier != null ? Math.max(100, Number(chainDetail.baseFeeMultiplier)) : 100;
+      const baseComponentGwei = effectiveBaseFeeGwei * baseFeeMultiplierPct / 100;
+      const maxFeePerGasGwei = baseComponentGwei + effectivePriorityFeeGwei;
+      let maxPriorityFeePerGas = effectivePriorityFeeGwei > 0 ? parseGwei(gweiToDecimalString(effectivePriorityFeeGwei)) : parseGwei("1");
+      let maxFeePerGas = parseGwei(gweiToDecimalString(maxFeePerGasGwei));
+      if (useCustomGas && gasFeeMultiplier != null && gasFeeMultiplier > 0) {
+        maxPriorityFeePerGas = maxPriorityFeePerGas * BigInt(100 + gasFeeMultiplier) / 100n;
+        maxFeePerGas = maxFeePerGas * BigInt(100 + gasFeeMultiplier) / 100n;
+      }
+      ({ maxFeePerGas, maxPriorityFeePerGas } = alignEip1559FeesWithLatestBase(
+        maxFeePerGas,
+        maxPriorityFeePerGas,
+        latestBaseFeeWei
+      ));
+      serialized = serializeTransaction({
+        type: "eip1559",
+        to: step.to,
+        data: step.data,
+        value: step.value,
+        gas: gasLimitI,
+        maxFeePerGas,
+        maxPriorityFeePerGas,
+        nonce: currentNonce,
+        chainId
+      });
+      proposalTxParams = {
+        nonce: currentNonce,
+        gasLimit: gasLimitI.toString(),
+        txType: "eip1559",
+        maxFeePerGas: maxFeePerGas.toString(),
+        maxPriorityFeePerGas: maxPriorityFeePerGas.toString()
+      };
+      feeSnapshot = i === 0 ? proposalTxParamsToFeeSnapshot(proposalTxParams) : {};
+    }
+    const h = keccak256(serialized);
+    const msgHash = h.startsWith("0x") ? h.slice(2) : h;
+    const batchMetaExtra = args.buildBatchMeta({ step, index: i, gasLimit: gasLimitI });
+    legs.push({
+      msgHash,
+      msgRaw: i === 0 && args.firstMsgRawNo0x != null ? args.firstMsgRawNo0x : serialized,
+      destinationAddress: step.to,
+      signatureText: typeof batchMetaExtra.signatureText === "string" ? batchMetaExtra.signatureText : JSON.stringify(batchMetaExtra.signatureText ?? {}),
+      audit: batchMetaExtra,
+      feeSnapshot: i === 0 ? feeSnapshot : {},
+      proposalTxParams,
+      valueWei: i === 0 ? step.value : void 0
+    });
+    if (i === 0 && args.firstMsgRawNo0x != null) {
+      legs[0].msgRaw = args.firstMsgRawNo0x;
     }
   }
-}
-function finalizeEip1559Fees(maxFeePerGas, maxPriorityFeePerGas, floor, baseWei) {
-  let maxP = maxPriorityFeePerGas;
-  let maxF = maxFeePerGas;
-  if (baseWei > 0n && maxF < baseWei + maxP) {
-    maxF = baseWei + maxP + parseGwei("0.001");
-  }
-  if (maxF < maxP) {
-    maxF = baseWei > 0n ? baseWei + maxP + parseGwei("0.001") : maxP * 2n;
+  const extraJSON = {};
+  if (useCustomGas && customGasChainDetails && Object.keys(customGasChainDetails).length > 0) {
+    extraJSON.customGasChainDetails = customGasChainDetails;
+  }
+  const result = finalizeMultisign({
+    keyGen,
+    purposeText,
+    purposeSuffix: args.purposeSuffix,
+    destinationChainID: String(chainId),
+    destinationAddress: args.destinationAddress ?? steps[0].to,
+    legs,
+    extraJSON: Object.keys(extraJSON).length > 0 ? extraJSON : void 0
+  });
+  const pv = args.payableValueWei;
+  if (pv != null && pv > 0n) {
+    result.bodyForSign.value = pv.toString();
   }
-  return { maxFeePerGas: maxF, maxPriorityFeePerGas: maxP };
-}
-function alignEip1559FeesWithLatestBase(maxFeePerGas, maxPriorityFeePerGas, latestBlockBaseFeeWei) {
-  return finalizeEip1559Fees(maxFeePerGas, maxPriorityFeePerGas, null, latestBlockBaseFeeWei);
-}
-function gweiToDecimalString(n) {
-  if (!Number.isFinite(n)) return "0";
-  if (n === 0) return "0";
-  const s = String(n);
-  if (s.indexOf("e") !== -1 || s.indexOf("E") !== -1) return n.toFixed(9).replace(/\.?0+$/, "") || "0";
-  return s;
+  return result;
 }
 
 // src/protocols/evm/uniswap-v4/swapMultisign.ts
@@ -737,6 +860,35 @@ async function uniswapCreateSwap(args) {
   }
   return parsed;
 }
+async function estimateUniswapRouterSwapGas(args) {
+  const fromTradeApi = parseOptionalGasLimitString(args.swapRecord.gasLimit) ?? parseOptionalGasLimitString(args.swapRecord.gas);
+  if (fromTradeApi != null && fromTradeApi > 0n) {
+    return { baseGasUnits: fromTradeApi, source: "tradeApi" };
+  }
+  try {
+    const est = await args.publicClient.estimateGas({
+      to: args.to,
+      data: args.data,
+      value: args.value,
+      account: args.executor
+    });
+    return { baseGasUnits: est, source: "rpcEstimate" };
+  } catch (e) {
+    const estimateGasError = e instanceof Error ? e.message : String(e);
+    const minRouterGas = 500000n;
+    if (args.useCustomGas) {
+      const cfg = args.chainDetail?.gasLimit != null ? parseOptionalGasLimitString(String(args.chainDetail.gasLimit)) : null;
+      if (cfg != null && cfg >= minRouterGas) {
+        return { baseGasUnits: cfg, source: "estimateFailedFallback", estimateGasError };
+      }
+    }
+    return {
+      baseGasUnits: DEFAULT_UNIVERSAL_ROUTER_GAS_FALLBACK,
+      source: "estimateFailedFallback",
+      estimateGasError
+    };
+  }
+}
 var permit2ApproveRouterAbi = [
   {
     name: "approve",
@@ -837,10 +989,6 @@ function permit2SpenderAndApproveWeiFromSwapCalldata(dataHex, tokenIn, quoteInpu
   }
 }
 async function buildEvmMultisignBodyUniswapV4NativeInOnly(args, quoteInputWei) {
-  const ph = (args.keyGen.pubkeyhex ?? "").trim();
-  if (!ph) throw new Error("keyGen pubKey (pubkeyhex) is required");
-  const keyList = args.keyGen.keylist ?? [];
-  const clientId = firstClientIdFromKeyGen(args.keyGen);
   const toRouter = getAddress(
     (args.swap.to ?? "").trim().startsWith("0x") ? args.swap.to.trim() : `0x${args.swap.to.trim()}`
   );
@@ -858,214 +1006,90 @@ async function buildEvmMultisignBodyUniswapV4NativeInOnly(args, quoteInputWei) {
       "Native (ETH) in swap: could not determine payable value (no `swap.value`, no `execute` amount in calldata, and quote input is zero). Refresh the quote and request /swap again."
     );
   }
-  const ch = defineChain({
-    id: args.chainId,
-    name: "Destination",
-    nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
-    rpcUrls: { default: { http: [args.rpcUrl] } }
-  });
-  const publicClient = createPublicClient({ chain: ch, transport: http(args.rpcUrl) });
-  const feeParams = await fetchChainFeeParams(args.rpcUrl, args.chainId);
-  const legacy = Boolean(args.chainDetail?.legacy) || !feeParams.isEip1559;
-  const latestBaseFeeWeiNativeIn = !legacy ? (await publicClient.getBlock({ blockTag: "latest" })).baseFeePerGas ?? 0n : 0n;
-  const useCustomGas = args.useCustomGas;
-  const chainGasLimitRouter = args.chainDetail?.gasLimit != null && Number.isFinite(Number(args.chainDetail.gasLimit)) && Number(args.chainDetail.gasLimit) > 0 ? Number(args.chainDetail.gasLimit) : void 0;
-  const gasFeeMultiplier = useCustomGas && args.chainDetail?.gasMultiplier != null ? Number(args.chainDetail.gasMultiplier) : void 0;
-  const nonce = await publicClient.getTransactionCount({ address: args.executorAddress, blockTag: "pending" });
-  const proposalTxParamsBatch = [];
-  const messageHashes = [];
-  const messageRawBatch = [];
   const swapRecord = args.swap;
-  const fromTradeApi = parseOptionalGasLimitString(swapRecord.gasLimit) ?? parseOptionalGasLimitString(swapRecord.gas);
   let gasBuildSource = "rpcEstimate";
   let estimateGasError;
-  let baseGasUnits1;
-  if (fromTradeApi != null && fromTradeApi > 0n) {
-    baseGasUnits1 = fromTradeApi;
-    gasBuildSource = "tradeApi";
-  } else {
-    try {
-      baseGasUnits1 = await publicClient.estimateGas({
+  let swapBaseGasUnits = DEFAULT_UNIVERSAL_ROUTER_GAS_FALLBACK;
+  const dataNo0x = dataHex.startsWith("0x") ? dataHex.slice(2) : dataHex;
+  const purposeSuffix = "Uniswap V4: 1-tx batch \u2014 native gas token in (no ERC-20 approve) \u2014 single payable swap (Trade /swap).";
+  return buildEvmMultisignBatch({
+    context: {
+      chainCategory: "evm",
+      keyGen: args.keyGen,
+      purposeText: args.purposeText,
+      chainId: args.chainId,
+      rpcUrl: args.rpcUrl,
+      executorAddress: args.executorAddress,
+      chainDetail: args.chainDetail,
+      useCustomGas: args.useCustomGas,
+      customGasChainDetails: args.customGasChainDetails
+    },
+    steps: [
+      {
         to: toRouter,
         data: dataHex,
         value: valueWei,
-        account: args.executorAddress
-      });
-      gasBuildSource = "rpcEstimate";
-    } catch (e) {
-      estimateGasError = e instanceof Error ? e.message : String(e);
-      const minRouterGas = 500000n;
-      if (useCustomGas) {
-        const cfg = args.chainDetail?.gasLimit != null ? parseOptionalGasLimitString(String(args.chainDetail.gasLimit)) : null;
-        if (cfg != null && cfg >= minRouterGas) {
-          baseGasUnits1 = cfg;
-        } else {
-          baseGasUnits1 = DEFAULT_UNIVERSAL_ROUTER_GAS_FALLBACK;
-        }
-      } else {
-        baseGasUnits1 = DEFAULT_UNIVERSAL_ROUTER_GAS_FALLBACK;
-      }
-      gasBuildSource = "estimateFailedFallback";
-    }
-  }
-  const gasLimit1 = routerSwapGasLimitFromEstimate(baseGasUnits1, chainGasLimitRouter);
-  const currentNonce0 = nonce;
-  let firstTxFeePayload = {};
-  if (legacy) {
-    let gasPriceWei1 = await publicClient.getGasPrice();
-    if (useCustomGas && gasFeeMultiplier != null && gasFeeMultiplier > 0) {
-      gasPriceWei1 = gasPriceWei1 * BigInt(100 + gasFeeMultiplier) / 100n;
-    }
-    if (useCustomGas && args.chainDetail?.gasPrice != null && args.chainDetail.gasPrice > 0) {
-      const configured = parseGwei(gweiToDecimalString(Number(args.chainDetail.gasPrice)));
-      if (configured > gasPriceWei1) gasPriceWei1 = configured;
-    }
-    firstTxFeePayload = { txNonce: nonce, txGasLimit: gasLimit1.toString(), txGasPrice: gasPriceWei1.toString() };
-    const ser0 = serializeTransaction({
-      type: "legacy",
-      to: toRouter,
-      data: dataHex,
-      value: valueWei,
-      gas: gasLimit1,
-      gasPrice: gasPriceWei1,
-      nonce: currentNonce0,
-      chainId: args.chainId
-    });
-    const h0 = keccak256(ser0);
-    messageHashes.push(h0.startsWith("0x") ? h0.slice(2) : h0);
-    messageRawBatch.push(ser0);
-    proposalTxParamsBatch.push({
-      nonce: currentNonce0,
-      gasLimit: gasLimit1.toString(),
-      txType: "legacy",
-      gasPrice: gasPriceWei1.toString()
-    });
-  } else {
-    const fetchedBase1 = feeParams.baseFeeGwei ?? 0;
-    const fetchedPriority1 = feeParams.priorityFeeGwei ?? 0;
-    const configuredBase1 = useCustomGas && args.chainDetail?.baseFee != null ? Number(args.chainDetail.baseFee) : 0;
-    const configuredPriority1 = useCustomGas && args.chainDetail?.priorityFee != null ? Number(args.chainDetail.priorityFee) : 0;
-    const effectiveBaseFeeGwei1 = Math.max(fetchedBase1, configuredBase1);
-    const effectivePriorityFeeGwei1 = Math.max(fetchedPriority1, configuredPriority1);
-    const baseFeeMultiplierPct1 = useCustomGas && args.chainDetail?.baseFeeMultiplier != null ? Math.max(100, Number(args.chainDetail.baseFeeMultiplier)) : 100;
-    const baseComponentGwei1 = effectiveBaseFeeGwei1 * baseFeeMultiplierPct1 / 100;
-    const maxFeePerGasGwei1 = baseComponentGwei1 + effectivePriorityFeeGwei1;
-    let maxPriorityFeePerGas1 = effectivePriorityFeeGwei1 > 0 ? parseGwei(gweiToDecimalString(effectivePriorityFeeGwei1)) : parseGwei("1");
-    let maxFeePerGas1 = parseGwei(gweiToDecimalString(maxFeePerGasGwei1));
-    if (useCustomGas && gasFeeMultiplier != null && gasFeeMultiplier > 0) {
-      maxPriorityFeePerGas1 = maxPriorityFeePerGas1 * BigInt(100 + gasFeeMultiplier) / 100n;
-      maxFeePerGas1 = maxFeePerGas1 * BigInt(100 + gasFeeMultiplier) / 100n;
-    }
-    ({ maxFeePerGas: maxFeePerGas1, maxPriorityFeePerGas: maxPriorityFeePerGas1 } = alignEip1559FeesWithLatestBase(maxFeePerGas1, maxPriorityFeePerGas1, latestBaseFeeWeiNativeIn));
-    firstTxFeePayload = {
-      txNonce: nonce,
-      txGasLimit: gasLimit1.toString(),
-      txMaxFeePerGas: maxFeePerGas1.toString(),
-      txMaxPriorityFeePerGas: maxPriorityFeePerGas1.toString()
-    };
-    const ser0 = serializeTransaction({
-      type: "eip1559",
-      to: toRouter,
-      data: dataHex,
-      value: valueWei,
-      gas: gasLimit1,
-      maxFeePerGas: maxFeePerGas1,
-      maxPriorityFeePerGas: maxPriorityFeePerGas1,
-      nonce: currentNonce0,
-      chainId: args.chainId
-    });
-    const h0 = keccak256(ser0);
-    messageHashes.push(h0.startsWith("0x") ? h0.slice(2) : h0);
-    messageRawBatch.push(ser0);
-    proposalTxParamsBatch.push({
-      nonce: currentNonce0,
-      gasLimit: gasLimit1.toString(),
-      txType: "eip1559",
-      maxFeePerGas: maxFeePerGas1.toString(),
-      maxPriorityFeePerGas: maxPriorityFeePerGas1.toString()
-    });
-  }
-  const dataNo0x = dataHex.startsWith("0x") ? dataHex.slice(2) : dataHex;
-  const audit = {
-    skipPermit2Batch: true,
-    inputKind: "native_eth",
-    noErc20Approve: true,
-    quoteInputWei: quoteInputWei.toString(),
-    swapValueWei: valueWei.toString(),
-    uniswapCreateSwap: {
-      requestId: args.createSwapResponse.requestId,
-      gasFee: args.createSwapResponse.gasFee,
-      gasBuildSwap: {
-        useCustomGas,
-        source: gasBuildSource,
-        baseGasUnits: baseGasUnits1.toString(),
-        ...estimateGasError != null && estimateGasError !== "" ? { estimateGasError } : {}
-      },
-      swap: {
-        to: args.createSwapResponse.swap.to,
-        value: args.createSwapResponse.swap.value,
-        dataNibbles: (() => {
-          const t = (args.createSwapResponse.swap.data ?? "").toString().trim();
-          return t.startsWith("0x") ? t.length - 2 : t.length;
-        })()
+        routerSwap: true,
+        fallbackGas: DEFAULT_UNIVERSAL_ROUTER_GAS_FALLBACK
       }
+    ],
+    purposeSuffix,
+    firstMsgRawNo0x: dataNo0x,
+    destinationAddress: toRouter,
+    estimateGasForStep: async ({ publicClient, executor }) => {
+      const r = await estimateUniswapRouterSwapGas({
+        publicClient,
+        executor,
+        to: toRouter,
+        data: dataHex,
+        value: valueWei,
+        swapRecord,
+        useCustomGas: args.useCustomGas,
+        chainDetail: args.chainDetail
+      });
+      gasBuildSource = r.source;
+      estimateGasError = r.estimateGasError;
+      swapBaseGasUnits = r.baseGasUnits;
+      return r.baseGasUnits;
     },
-    fullQuoteFromPermitSnapshot: args.fullQuoteSnapshot,
-    originalPurpose: args.purposeText
-  };
-  const batchMeta = [
-    {
-      destinationAddress: toRouter,
+    buildBatchMeta: () => ({
       signatureText: JSON.stringify({
         kind: "UniswapV4",
         name: "UniversalRouter (payable, native in)",
         note: "Single tx from Trade POST /swap; no ERC-20 approve. Calldata in messageHashes[0] / messageRawBatch[0]."
       }),
       evm: { type: "uniswap_v4_swap_tx", version: 1, chainId: String(args.chainId) },
-      uniswapV4: audit
-    }
-  ];
-  const extraPayload = { batchMeta };
-  if (useCustomGas) {
-    const snap = args.customGasChainDetails;
-    if (snap && typeof snap === "object" && !Array.isArray(snap) && Object.keys(snap).length > 0) {
-      extraPayload.customGasChainDetails = snap;
-    }
-  }
-  const extraJSON = JSON.stringify(extraPayload);
-  const firstSigText = batchMeta[0].signatureText;
-  const bodyForSign = {
-    keyList,
-    pubKey: ph,
-    msgHash: messageHashes[0],
-    msgRaw: dataNo0x,
-    messageHashes,
-    messageRawBatch,
-    destinationChainID: String(args.chainId),
-    destinationAddress: toRouter,
-    extraJSON,
-    signatureText: firstSigText,
-    purpose: (() => {
-      const t = args.purposeText.trim();
-      const batchDesc = "Uniswap V4: 1-tx batch \u2014 native gas token in (no ERC-20 approve) \u2014 single payable swap (Trade /swap).";
-      return (t ? `${t}
-
-` : "") + batchDesc;
-    })(),
-    ...firstTxFeePayload,
-    proposalTxParams: proposalTxParamsBatch
-  };
-  if (valueWei > 0n) {
-    bodyForSign.value = valueWei.toString();
-  }
-  if (clientId) bodyForSign.clientId = clientId;
-  return { bodyForSign, messageToSign: JSON.stringify(bodyForSign) };
+      uniswapV4: {
+        skipPermit2Batch: true,
+        inputKind: "native_eth",
+        noErc20Approve: true,
+        quoteInputWei: quoteInputWei.toString(),
+        swapValueWei: valueWei.toString(),
+        uniswapCreateSwap: {
+          requestId: args.createSwapResponse.requestId,
+          gasFee: args.createSwapResponse.gasFee,
+          gasBuildSwap: {
+            useCustomGas: args.useCustomGas,
+            source: gasBuildSource,
+            baseGasUnits: swapBaseGasUnits.toString(),
+            ...estimateGasError != null && estimateGasError !== "" ? { estimateGasError } : {}
+          },
+          swap: {
+            to: args.createSwapResponse.swap.to,
+            value: args.createSwapResponse.swap.value,
+            dataNibbles: (() => {
+              const t = (args.createSwapResponse.swap.data ?? "").toString().trim();
+              return t.startsWith("0x") ? t.length - 2 : t.length;
+            })()
+          }
+        },
+        fullQuoteFromPermitSnapshot: args.fullQuoteSnapshot,
+        originalPurpose: args.purposeText
+      }
+    })
+  });
 }
 async function buildEvmMultisignBodyUniswapV4SkipPermit2Batch(args) {
-  const ph = (args.keyGen.pubkeyhex ?? "").trim();
-  if (!ph) throw new Error("keyGen pubKey (pubkeyhex) is required");
-  const keyList = args.keyGen.keylist ?? [];
-  const clientId = firstClientIdFromKeyGen(args.keyGen);
   const tokenIn = getAddress(args.tokenIn);
   const parsedInOut = parseUniswapQuoteClassicInOut(args.fullQuoteSnapshot);
   const quoteInputWei = parsedInOut?.inputWei;
@@ -1120,298 +1144,33 @@ async function buildEvmMultisignBodyUniswapV4SkipPermit2Batch(args) {
       return 0n;
     }
   })();
-  const ch = defineChain({
-    id: args.chainId,
-    name: "Destination",
-    nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
-    rpcUrls: { default: { http: [args.rpcUrl] } }
-  });
-  const publicClient = createPublicClient({ chain: ch, transport: http(args.rpcUrl) });
-  const feeParams = await fetchChainFeeParams(args.rpcUrl, args.chainId);
-  const legacy = Boolean(args.chainDetail?.legacy) || !feeParams.isEip1559;
-  const latestBaseFeeWeiSkipBatch = !legacy ? (await publicClient.getBlock({ blockTag: "latest" })).baseFeePerGas ?? 0n : 0n;
-  const useCustomGas = args.useCustomGas;
-  const gasLimitConfig = useCustomGas && args.chainDetail?.gasLimit != null ? Number(args.chainDetail.gasLimit) : void 0;
-  const chainGasLimitRouter = args.chainDetail?.gasLimit != null && Number.isFinite(Number(args.chainDetail.gasLimit)) && Number(args.chainDetail.gasLimit) > 0 ? Number(args.chainDetail.gasLimit) : void 0;
-  const gasFeeMultiplier = useCustomGas && args.chainDetail?.gasMultiplier != null ? Number(args.chainDetail.gasMultiplier) : void 0;
-  const nonce = await publicClient.getTransactionCount({ address: args.executorAddress, blockTag: "pending" });
-  const proposalTxParamsBatch = [];
-  const messageHashes = [];
-  const messageRawBatch = [];
-  const approveMsgRawNo0x = approveData.startsWith("0x") ? approveData.slice(2) : approveData;
-  let firstTxFeePayload = {};
-  const approveGas = await publicClient.estimateGas({
-    to: tokenIn,
-    data: approveData,
-    value: 0n,
-    account: args.executorAddress
-  });
-  const gasLimit0 = useCustomGas ? gasLimitFromEstimateAndChainConfig(approveGas, gasLimitConfig) : approveGas;
-  const currentNonce0 = nonce;
-  if (legacy) {
-    let gasPriceWei = await publicClient.getGasPrice();
-    if (useCustomGas && gasFeeMultiplier != null && gasFeeMultiplier > 0) {
-      gasPriceWei = gasPriceWei * BigInt(100 + gasFeeMultiplier) / 100n;
-    }
-    if (useCustomGas && args.chainDetail?.gasPrice != null && args.chainDetail.gasPrice > 0) {
-      const configured = parseGwei(gweiToDecimalString(Number(args.chainDetail.gasPrice)));
-      if (configured > gasPriceWei) gasPriceWei = configured;
-    }
-    firstTxFeePayload = { txNonce: nonce, txGasLimit: gasLimit0.toString(), txGasPrice: gasPriceWei.toString() };
-    const ser0 = serializeTransaction({
-      type: "legacy",
-      to: tokenIn,
-      data: approveData,
-      value: 0n,
-      gas: gasLimit0,
-      gasPrice: gasPriceWei,
-      nonce: currentNonce0,
-      chainId: args.chainId
-    });
-    const h0 = keccak256(ser0);
-    messageHashes.push(h0.startsWith("0x") ? h0.slice(2) : h0);
-    messageRawBatch.push(ser0);
-    proposalTxParamsBatch.push({
-      nonce: currentNonce0,
-      gasLimit: gasLimit0.toString(),
-      txType: "legacy",
-      gasPrice: gasPriceWei.toString()
-    });
-  } else {
-    const fetchedBase = feeParams.baseFeeGwei ?? 0;
-    const fetchedPriority = feeParams.priorityFeeGwei ?? 0;
-    const configuredBase = useCustomGas && args.chainDetail?.baseFee != null ? Number(args.chainDetail.baseFee) : 0;
-    const configuredPriority = useCustomGas && args.chainDetail?.priorityFee != null ? Number(args.chainDetail.priorityFee) : 0;
-    const effectiveBaseFeeGwei = Math.max(fetchedBase, configuredBase);
-    const effectivePriorityFeeGwei = Math.max(fetchedPriority, configuredPriority);
-    const baseFeeMultiplierPct = useCustomGas && args.chainDetail?.baseFeeMultiplier != null ? Math.max(100, Number(args.chainDetail.baseFeeMultiplier)) : 100;
-    const baseComponentGwei = effectiveBaseFeeGwei * baseFeeMultiplierPct / 100;
-    const maxFeePerGasGwei = baseComponentGwei + effectivePriorityFeeGwei;
-    let maxPriorityFeePerGas = effectivePriorityFeeGwei > 0 ? parseGwei(gweiToDecimalString(effectivePriorityFeeGwei)) : parseGwei("1");
-    let maxFeePerGas = parseGwei(gweiToDecimalString(maxFeePerGasGwei));
-    if (useCustomGas && gasFeeMultiplier != null && gasFeeMultiplier > 0) {
-      maxPriorityFeePerGas = maxPriorityFeePerGas * BigInt(100 + gasFeeMultiplier) / 100n;
-      maxFeePerGas = maxFeePerGas * BigInt(100 + gasFeeMultiplier) / 100n;
-    }
-    ({ maxFeePerGas, maxPriorityFeePerGas } = alignEip1559FeesWithLatestBase(
-      maxFeePerGas,
-      maxPriorityFeePerGas,
-      latestBaseFeeWeiSkipBatch
-    ));
-    firstTxFeePayload = {
-      txNonce: nonce,
-      txGasLimit: gasLimit0.toString(),
-      txMaxFeePerGas: maxFeePerGas.toString(),
-      txMaxPriorityFeePerGas: maxPriorityFeePerGas.toString()
-    };
-    const ser0 = serializeTransaction({
-      type: "eip1559",
-      to: tokenIn,
-      data: approveData,
-      value: 0n,
-      gas: gasLimit0,
-      maxFeePerGas,
-      maxPriorityFeePerGas,
-      nonce: currentNonce0,
-      chainId: args.chainId
-    });
-    const h0 = keccak256(ser0);
-    messageHashes.push(h0.startsWith("0x") ? h0.slice(2) : h0);
-    messageRawBatch.push(ser0);
-    proposalTxParamsBatch.push({
-      nonce: currentNonce0,
-      gasLimit: gasLimit0.toString(),
-      txType: "eip1559",
-      maxFeePerGas: maxFeePerGas.toString(),
-      maxPriorityFeePerGas: maxPriorityFeePerGas.toString()
-    });
-  }
+  const swapRecord = args.swap;
+  const swapMsgIndex = usePermit2Triple ? 2 : 1;
+  let gasBuildSource = "rpcEstimate";
+  let estimateGasError;
+  let swapBaseGasUnits = DEFAULT_UNIVERSAL_ROUTER_GAS_FALLBACK;
+  const steps = [
+    { to: tokenIn, data: approveData, value: 0n, fallbackGas: 100000n }
+  ];
   if (usePermit2Triple) {
     const permit2ApproveData = encodeFunctionData({
       abi: permit2ApproveRouterAbi,
       functionName: "approve",
       args: [tokenIn, permit2Spender, approveAmountWei, Number(expiration48)]
     });
-    const approveP2Gas = await publicClient.estimateGas({
-      to: PERMIT2_ADDRESS,
-      data: permit2ApproveData,
-      value: 0n,
-      account: args.executorAddress
-    });
-    const gasLimitP2 = useCustomGas ? gasLimitFromEstimateAndChainConfig(approveP2Gas, gasLimitConfig) : approveP2Gas;
-    const currentNonceP2 = nonce + 1;
-    if (legacy) {
-      let gasPriceWeiP2 = await publicClient.getGasPrice();
-      if (useCustomGas && gasFeeMultiplier != null && gasFeeMultiplier > 0) {
-        gasPriceWeiP2 = gasPriceWeiP2 * BigInt(100 + gasFeeMultiplier) / 100n;
-      }
-      if (useCustomGas && args.chainDetail?.gasPrice != null && args.chainDetail.gasPrice > 0) {
-        const configured = parseGwei(gweiToDecimalString(Number(args.chainDetail.gasPrice)));
-        if (configured > gasPriceWeiP2) gasPriceWeiP2 = configured;
-      }
-      const serP2 = serializeTransaction({
-        type: "legacy",
-        to: PERMIT2_ADDRESS,
-        data: permit2ApproveData,
-        value: 0n,
-        gas: gasLimitP2,
-        gasPrice: gasPriceWeiP2,
-        nonce: currentNonceP2,
-        chainId: args.chainId
-      });
-      const hP2 = keccak256(serP2);
-      messageHashes.push(hP2.startsWith("0x") ? hP2.slice(2) : hP2);
-      messageRawBatch.push(serP2);
-      proposalTxParamsBatch.push({
-        nonce: currentNonceP2,
-        gasLimit: gasLimitP2.toString(),
-        txType: "legacy",
-        gasPrice: gasPriceWeiP2.toString()
-      });
-    } else {
-      const fetchedBaseP2 = feeParams.baseFeeGwei ?? 0;
-      const fetchedPriorityP2 = feeParams.priorityFeeGwei ?? 0;
-      const configuredBaseP2 = useCustomGas && args.chainDetail?.baseFee != null ? Number(args.chainDetail.baseFee) : 0;
-      const configuredPriorityP2 = useCustomGas && args.chainDetail?.priorityFee != null ? Number(args.chainDetail.priorityFee) : 0;
-      const effectiveBaseFeeGweiP2 = Math.max(fetchedBaseP2, configuredBaseP2);
-      const effectivePriorityFeeGweiP2 = Math.max(fetchedPriorityP2, configuredPriorityP2);
-      const baseFeeMultiplierPctP2 = useCustomGas && args.chainDetail?.baseFeeMultiplier != null ? Math.max(100, Number(args.chainDetail.baseFeeMultiplier)) : 100;
-      const baseComponentGweiP2 = effectiveBaseFeeGweiP2 * baseFeeMultiplierPctP2 / 100;
-      const maxFeePerGasGweiP2 = baseComponentGweiP2 + effectivePriorityFeeGweiP2;
-      let maxPriorityFeePerGasP2 = effectivePriorityFeeGweiP2 > 0 ? parseGwei(gweiToDecimalString(effectivePriorityFeeGweiP2)) : parseGwei("1");
-      let maxFeePerGasP2 = parseGwei(gweiToDecimalString(maxFeePerGasGweiP2));
-      if (useCustomGas && gasFeeMultiplier != null && gasFeeMultiplier > 0) {
-        maxPriorityFeePerGasP2 = maxPriorityFeePerGasP2 * BigInt(100 + gasFeeMultiplier) / 100n;
-        maxFeePerGasP2 = maxFeePerGasP2 * BigInt(100 + gasFeeMultiplier) / 100n;
-      }
-      ({ maxFeePerGas: maxFeePerGasP2, maxPriorityFeePerGas: maxPriorityFeePerGasP2 } = alignEip1559FeesWithLatestBase(maxFeePerGasP2, maxPriorityFeePerGasP2, latestBaseFeeWeiSkipBatch));
-      const serP2 = serializeTransaction({
-        type: "eip1559",
-        to: PERMIT2_ADDRESS,
-        data: permit2ApproveData,
-        value: 0n,
-        gas: gasLimitP2,
-        maxFeePerGas: maxFeePerGasP2,
-        maxPriorityFeePerGas: maxPriorityFeePerGasP2,
-        nonce: currentNonceP2,
-        chainId: args.chainId
-      });
-      const hP2 = keccak256(serP2);
-      messageHashes.push(hP2.startsWith("0x") ? hP2.slice(2) : hP2);
-      messageRawBatch.push(serP2);
-      proposalTxParamsBatch.push({
-        nonce: currentNonceP2,
-        gasLimit: gasLimitP2.toString(),
-        txType: "eip1559",
-        maxFeePerGas: maxFeePerGasP2.toString(),
-        maxPriorityFeePerGas: maxPriorityFeePerGasP2.toString()
-      });
-    }
-  }
-  const swapRecord = args.swap;
-  const fromTradeApi = parseOptionalGasLimitString(swapRecord.gasLimit) ?? parseOptionalGasLimitString(swapRecord.gas);
-  let gasBuildSource = "rpcEstimate";
-  let estimateGasError;
-  let baseGasUnits1;
-  if (fromTradeApi != null && fromTradeApi > 0n) {
-    baseGasUnits1 = fromTradeApi;
-    gasBuildSource = "tradeApi";
-  } else {
-    try {
-      baseGasUnits1 = await publicClient.estimateGas({
-        to: toRouter,
-        data: dataHex,
-        value: valueWei,
-        account: args.executorAddress
-      });
-      gasBuildSource = "rpcEstimate";
-    } catch (e) {
-      estimateGasError = e instanceof Error ? e.message : String(e);
-      const minRouterGas = 500000n;
-      if (useCustomGas) {
-        const cfg = args.chainDetail?.gasLimit != null ? parseOptionalGasLimitString(String(args.chainDetail.gasLimit)) : null;
-        if (cfg != null && cfg >= minRouterGas) {
-          baseGasUnits1 = cfg;
-        } else {
-          baseGasUnits1 = DEFAULT_UNIVERSAL_ROUTER_GAS_FALLBACK;
-        }
-      } else {
-        baseGasUnits1 = DEFAULT_UNIVERSAL_ROUTER_GAS_FALLBACK;
-      }
-      gasBuildSource = "estimateFailedFallback";
-    }
-  }
-  const gasLimit1 = routerSwapGasLimitFromEstimate(baseGasUnits1, chainGasLimitRouter);
-  const currentNonce1 = nonce + (usePermit2Triple ? 2 : 1);
-  if (legacy) {
-    let gasPriceWei1 = await publicClient.getGasPrice();
-    if (useCustomGas && gasFeeMultiplier != null && gasFeeMultiplier > 0) {
-      gasPriceWei1 = gasPriceWei1 * BigInt(100 + gasFeeMultiplier) / 100n;
-    }
-    if (useCustomGas && args.chainDetail?.gasPrice != null && args.chainDetail.gasPrice > 0) {
-      const configured = parseGwei(gweiToDecimalString(Number(args.chainDetail.gasPrice)));
-      if (configured > gasPriceWei1) gasPriceWei1 = configured;
-    }
-    const ser1 = serializeTransaction({
-      type: "legacy",
-      to: toRouter,
-      data: dataHex,
-      value: valueWei,
-      gas: gasLimit1,
-      gasPrice: gasPriceWei1,
-      nonce: currentNonce1,
-      chainId: args.chainId
-    });
-    const h1 = keccak256(ser1);
-    messageHashes.push(h1.startsWith("0x") ? h1.slice(2) : h1);
-    messageRawBatch.push(ser1);
-    proposalTxParamsBatch.push({
-      nonce: currentNonce1,
-      gasLimit: gasLimit1.toString(),
-      txType: "legacy",
-      gasPrice: gasPriceWei1.toString()
-    });
-  } else {
-    const fetchedBase1 = feeParams.baseFeeGwei ?? 0;
-    const fetchedPriority1 = feeParams.priorityFeeGwei ?? 0;
-    const configuredBase1 = useCustomGas && args.chainDetail?.baseFee != null ? Number(args.chainDetail.baseFee) : 0;
-    const configuredPriority1 = useCustomGas && args.chainDetail?.priorityFee != null ? Number(args.chainDetail.priorityFee) : 0;
-    const effectiveBaseFeeGwei1 = Math.max(fetchedBase1, configuredBase1);
-    const effectivePriorityFeeGwei1 = Math.max(fetchedPriority1, configuredPriority1);
-    const baseFeeMultiplierPct1 = useCustomGas && args.chainDetail?.baseFeeMultiplier != null ? Math.max(100, Number(args.chainDetail.baseFeeMultiplier)) : 100;
-    const baseComponentGwei1 = effectiveBaseFeeGwei1 * baseFeeMultiplierPct1 / 100;
-    const maxFeePerGasGwei1 = baseComponentGwei1 + effectivePriorityFeeGwei1;
-    let maxPriorityFeePerGas1 = effectivePriorityFeeGwei1 > 0 ? parseGwei(gweiToDecimalString(effectivePriorityFeeGwei1)) : parseGwei("1");
-    let maxFeePerGas1 = parseGwei(gweiToDecimalString(maxFeePerGasGwei1));
-    if (useCustomGas && gasFeeMultiplier != null && gasFeeMultiplier > 0) {
-      maxPriorityFeePerGas1 = maxPriorityFeePerGas1 * BigInt(100 + gasFeeMultiplier) / 100n;
-      maxFeePerGas1 = maxFeePerGas1 * BigInt(100 + gasFeeMultiplier) / 100n;
-    }
-    ({ maxFeePerGas: maxFeePerGas1, maxPriorityFeePerGas: maxPriorityFeePerGas1 } = alignEip1559FeesWithLatestBase(maxFeePerGas1, maxPriorityFeePerGas1, latestBaseFeeWeiSkipBatch));
-    const ser1 = serializeTransaction({
-      type: "eip1559",
-      to: toRouter,
-      data: dataHex,
-      value: valueWei,
-      gas: gasLimit1,
-      maxFeePerGas: maxFeePerGas1,
-      maxPriorityFeePerGas: maxPriorityFeePerGas1,
-      nonce: currentNonce1,
-      chainId: args.chainId
-    });
-    const h1 = keccak256(ser1);
-    messageHashes.push(h1.startsWith("0x") ? h1.slice(2) : h1);
-    messageRawBatch.push(ser1);
-    proposalTxParamsBatch.push({
-      nonce: currentNonce1,
-      gasLimit: gasLimit1.toString(),
-      txType: "eip1559",
-      maxFeePerGas: maxFeePerGas1.toString(),
-      maxPriorityFeePerGas: maxPriorityFeePerGas1.toString()
-    });
-  }
-  const swapMsgIndex = usePermit2Triple ? 2 : 1;
-  const audit = {
+    steps.push({ to: PERMIT2_ADDRESS, data: permit2ApproveData, value: 0n, fallbackGas: 100000n });
+  }
+  steps.push({
+    to: toRouter,
+    data: dataHex,
+    value: valueWei,
+    routerSwap: true,
+    fallbackGas: DEFAULT_UNIVERSAL_ROUTER_GAS_FALLBACK
+  });
+  const swapStepIndex = steps.length - 1;
+  const approveMsgRawNo0x = approveData.startsWith("0x") ? approveData.slice(2) : approveData;
+  const purposeSuffix = usePermit2Triple ? "Uniswap V4: 3-tx batch (classic allowance) \u2014 (1) ERC-20 approve allowance hub, (2) hub approve(Universal Router), (3) swap (Trade /swap)." : "Uniswap V4: 2-tx batch (classic allowance, dispatcher) \u2014 (1) ERC-20 approve swap.to (dispatcher pulls tokens), (2) swap (Trade /swap).";
+  const buildSwapAudit = () => ({
     skipPermit2Batch: true,
     approvalPath: usePermit2Triple ? "permit2_triple" : "dispatcher",
     approveAmount: {
@@ -1425,9 +1184,9 @@ async function buildEvmMultisignBodyUniswapV4SkipPermit2Batch(args) {
       requestId: args.createSwapResponse.requestId,
       gasFee: args.createSwapResponse.gasFee,
       gasBuildSwap: {
-        useCustomGas,
+        useCustomGas: args.useCustomGas,
         source: gasBuildSource,
-        baseGasUnits: baseGasUnits1.toString(),
+        baseGasUnits: swapBaseGasUnits.toString(),
         ...estimateGasError != null && estimateGasError !== "" ? { estimateGasError } : {}
       },
       swap: {
@@ -1469,92 +1228,98 @@ async function buildEvmMultisignBodyUniswapV4SkipPermit2Batch(args) {
         note: "Dispatcher pulls via ERC20.transferFrom(user, universalRouter, amount); allowance must be on swap.to (see cast trace TRANSFER_FROM_FAILED when only the hub is approved)."
       }
     }
-  };
-  const batchMeta = [
-    {
-      destinationAddress: tokenIn,
-      signatureText: JSON.stringify({
-        kind: "UniswapV4",
-        name: "ERC20.approve",
-        to: usePermit2Triple ? "allowance hub" : "dispatcher(swap.to)",
-        function: "approve(address spender, uint256 amount)",
-        spender: erc20ApproveSpender,
-        amountWei: approveAmountWei.toString()
-      }),
-      evm: {
-        type: usePermit2Triple ? "uniswap_v4_skip_permit2_approve" : "uniswap_v4_skip_permit2_dispatcher_approve",
-        version: 1,
-        chainId: String(args.chainId),
-        ...usePermit2Triple ? { permit2: PERMIT2_ADDRESS } : { dispatcher: toRouter }
+  });
+  return buildEvmMultisignBatch({
+    context: {
+      chainCategory: "evm",
+      keyGen: args.keyGen,
+      purposeText: args.purposeText,
+      chainId: args.chainId,
+      rpcUrl: args.rpcUrl,
+      executorAddress: args.executorAddress,
+      chainDetail: args.chainDetail,
+      useCustomGas: args.useCustomGas,
+      customGasChainDetails: args.customGasChainDetails
+    },
+    steps,
+    purposeSuffix,
+    firstMsgRawNo0x: approveMsgRawNo0x,
+    destinationAddress: tokenIn,
+    payableValueWei: valueWei > 0n ? valueWei : void 0,
+    estimateGasForStep: async ({ step, index, publicClient, executor }) => {
+      if (index !== swapStepIndex) {
+        return publicClient.estimateGas({
+          to: step.to,
+          data: step.data,
+          value: step.value,
+          account: executor
+        });
       }
-    }
-  ];
-  if (usePermit2Triple) {
-    batchMeta.push({
-      destinationAddress: PERMIT2_ADDRESS,
-      signatureText: JSON.stringify({
-        kind: "UniswapV4",
-        name: "AllowanceHub.approve",
-        function: "approve(address token, address spender, uint160 amount, uint48 expiration)",
-        token: tokenIn,
-        spender: permit2Spender,
-        amountWei: approveAmountWei.toString(),
-        expiration: expiration48.toString()
-      }),
-      evm: {
-        type: "uniswap_v4_skip_permit2_permit2_approve",
-        version: 1,
-        chainId: String(args.chainId),
-        permit2: PERMIT2_ADDRESS,
-        permit2Spender
+      const r = await estimateUniswapRouterSwapGas({
+        publicClient,
+        executor,
+        to: toRouter,
+        data: dataHex,
+        value: valueWei,
+        swapRecord,
+        useCustomGas: args.useCustomGas,
+        chainDetail: args.chainDetail
+      });
+      gasBuildSource = r.source;
+      estimateGasError = r.estimateGasError;
+      swapBaseGasUnits = r.baseGasUnits;
+      return r.baseGasUnits;
+    },
+    buildBatchMeta: ({ index }) => {
+      if (index === 0) {
+        return {
+          signatureText: JSON.stringify({
+            kind: "UniswapV4",
+            name: "ERC20.approve",
+            to: usePermit2Triple ? "allowance hub" : "dispatcher(swap.to)",
+            function: "approve(address spender, uint256 amount)",
+            spender: erc20ApproveSpender,
+            amountWei: approveAmountWei.toString()
+          }),
+          evm: {
+            type: usePermit2Triple ? "uniswap_v4_skip_permit2_approve" : "uniswap_v4_skip_permit2_dispatcher_approve",
+            version: 1,
+            chainId: String(args.chainId),
+            ...usePermit2Triple ? { permit2: PERMIT2_ADDRESS } : { dispatcher: toRouter }
+          }
+        };
       }
-    });
-  }
-  batchMeta.push({
-    destinationAddress: toRouter,
-    signatureText: JSON.stringify({
-      kind: "UniswapV4",
-      name: "UniversalRouter.execute",
-      note: `Calldata from Trade API POST /swap; signed tx hash in messageHashes[${swapMsgIndex}].`
-    }),
-    evm: { type: "uniswap_v4_swap_tx", version: 1, chainId: String(args.chainId) },
-    uniswapV4: audit
-  });
-  const extraPayload = { batchMeta };
-  if (useCustomGas) {
-    const snap = args.customGasChainDetails;
-    if (snap && typeof snap === "object" && !Array.isArray(snap) && Object.keys(snap).length > 0) {
-      extraPayload.customGasChainDetails = snap;
+      if (usePermit2Triple && index === 1) {
+        return {
+          signatureText: JSON.stringify({
+            kind: "UniswapV4",
+            name: "AllowanceHub.approve",
+            function: "approve(address token, address spender, uint160 amount, uint48 expiration)",
+            token: tokenIn,
+            spender: permit2Spender,
+            amountWei: approveAmountWei.toString(),
+            expiration: expiration48.toString()
+          }),
+          evm: {
+            type: "uniswap_v4_skip_permit2_permit2_approve",
+            version: 1,
+            chainId: String(args.chainId),
+            permit2: PERMIT2_ADDRESS,
+            permit2Spender
+          }
+        };
+      }
+      return {
+        signatureText: JSON.stringify({
+          kind: "UniswapV4",
+          name: "UniversalRouter.execute",
+          note: `Calldata from Trade API POST /swap; signed tx hash in messageHashes[${swapMsgIndex}].`
+        }),
+        evm: { type: "uniswap_v4_swap_tx", version: 1, chainId: String(args.chainId) },
+        uniswapV4: buildSwapAudit()
+      };
     }
-  }
-  const extraJSON = JSON.stringify(extraPayload);
-  const firstSigText = batchMeta[0].signatureText;
-  const bodyForSign = {
-    keyList,
-    pubKey: ph,
-    msgHash: messageHashes[0],
-    msgRaw: approveMsgRawNo0x,
-    messageHashes,
-    messageRawBatch,
-    destinationChainID: String(args.chainId),
-    destinationAddress: tokenIn,
-    extraJSON,
-    signatureText: firstSigText,
-    purpose: (() => {
-      const t = args.purposeText.trim();
-      const batchDesc = usePermit2Triple ? "Uniswap V4: 3-tx batch (classic allowance) \u2014 (1) ERC-20 approve allowance hub, (2) hub approve(Universal Router), (3) swap (Trade /swap)." : "Uniswap V4: 2-tx batch (classic allowance, dispatcher) \u2014 (1) ERC-20 approve swap.to (dispatcher pulls tokens), (2) swap (Trade /swap).";
-      return (t ? `${t}
-
-` : "") + batchDesc;
-    })(),
-    ...firstTxFeePayload,
-    proposalTxParams: proposalTxParamsBatch
-  };
-  if (valueWei > 0n) {
-    bodyForSign.value = valueWei.toString();
-  }
-  if (clientId) bodyForSign.clientId = clientId;
-  return { bodyForSign, messageToSign: JSON.stringify(bodyForSign) };
+  });
 }
 
 // src/protocols/evm/uniswap-v4/support.ts