@continuumdao/ctm-mpc-defi 0.1.4 → 0.2.1

package/dist/index.cjs

@@ -1,24 +1,9 @@
 'use strict';
 
+var continuumNodeSdk = require('@continuumdao/continuum-node-sdk');
 var viem = require('viem');
 
-// 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;
-}
-function requirePubKeyHex(keyGen) {
-  const ph = (keyGen.pubkeyhex ?? "").trim();
-  if (!ph) throw new Error("keyGen pubKey (pubkeyhex) is required");
-  return ph;
-}
-function keyListFromKeyGen(keyGen) {
-  return keyGen.keylist ?? [];
-}
+// src/core/index.ts
 
 // src/core/purpose.ts
 function mergePurposeText(purposeText, purposeSuffix) {
@@ -29,8 +14,6 @@ function mergePurposeText(purposeText, purposeSuffix) {
 
 ${suffix}` : suffix;
 }
-
-// src/core/envelope.ts
 function finalizeMultisign(input) {
   const { keyGen, destinationChainID, legs } = input;
   if (legs.length === 0) {
@@ -39,7 +22,7 @@ function finalizeMultisign(input) {
   const ph = (keyGen.pubkeyhex ?? "").trim();
   if (!ph) throw new Error("keyGen pubKey (pubkeyhex) is required");
   const keyList = keyGen.keylist ?? [];
-  const clientId = firstClientIdFromKeyGen(keyGen);
+  const clientId = continuumNodeSdk.getClientIdFromKeyGenResult(keyGen);
   const first = legs[0];
   const messageHashes = legs.map((l) => l.msgHash);
   const messageRawBatch = legs.map((l) => l.msgRaw);
@@ -104,85 +87,6 @@ function getProtocolModule(id) {
 function getActionsByChainCategory(category) {
   return modules.filter((m) => m.chainCategory === category).flatMap((m) => m.actions);
 }
-
-// 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/core/managementPostSig.ts
-function normalizeManagementNodeKey(nodeKey) {
-  const nk = nodeKey?.trim().replace(/^0x/i, "");
-  if (!nk || !/^[0-9a-fA-F]{128}$/.test(nk)) {
-    throw new Error("nodeKey is required (128 hex from GET /getNodeKey).");
-  }
-  return nk.toLowerCase();
-}
-function managementSigFields(nonce, nodeKey) {
-  return { nonce, clientSig: "", nodeKey: normalizeManagementNodeKey(nodeKey) };
-}
-function buildManagementPostBody(nonce, nodeKey, fields = {}) {
-  return { ...managementSigFields(nonce, nodeKey), ...fields };
-}
-function messageToSignManagementBody(body) {
-  return JSON.stringify({ ...body, clientSig: "" });
-}
-function withManagementClientSig(body, clientSig) {
-  return { ...body, clientSig: clientSig.trim().replace(/^0x/i, "") };
-}
-
-// src/core/managementNonce.ts
-function mpcAuthData(raw) {
-  const code = raw.Code ?? raw.code;
-  if (code !== 0 && code !== void 0) return void 0;
-  return raw.Data ?? raw.data;
-}
-async function fetchNodeKey(nodeUrl, readAuth = { bearerOnGet: false, jwt: null }) {
-  const base = nodeUrl.trim().replace(/\/$/, "");
-  const res = await nodeFetchWithReadAuth(`${base}/getNodeKey`, { cache: "no-store" }, readAuth);
-  const text = await res.text();
-  let raw;
-  try {
-    raw = JSON.parse(text);
-  } catch {
-    return { nodeKey: "", ok: false };
-  }
-  const data = mpcAuthData(raw);
-  const nk = typeof data === "string" ? data : data != null && typeof data === "object" && !Array.isArray(data) ? String(data.nodeKey ?? data.NodeKey ?? "") : data != null ? String(data) : "";
-  const trimmed = nk.trim().replace(/^0x/i, "");
-  if (!/^[0-9a-fA-F]{128}$/.test(trimmed)) {
-    return { nodeKey: "", ok: false };
-  }
-  return { nodeKey: trimmed.toLowerCase(), ok: res.ok };
-}
-async function fetchManagementNonce(nodeUrl, useEd25519, ed25519PublicKey, readAuth = { bearerOnGet: false, jwt: null }) {
-  const base = nodeUrl.trim().replace(/\/$/, "");
-  const path = useEd25519 ? "/getPublicMgtKeyNonce" : "/getNodeMgtKeyNonce";
-  const url = useEd25519 && ed25519PublicKey && /^[0-9a-fA-F]{64}$/.test(ed25519PublicKey.trim()) ? `${base}${path}?publicKey=${encodeURIComponent(ed25519PublicKey.trim())}` : `${base}${path}`;
-  const res = await nodeFetchWithReadAuth(url, { cache: "no-store" }, readAuth);
-  const text = await res.text();
-  let raw;
-  try {
-    raw = JSON.parse(text);
-  } catch {
-    return { nonce: 0, ok: false, code: -1 };
-  }
-  const code = raw.Code ?? raw.code;
-  const payload = mpcAuthData(raw) ?? raw.Data ?? raw.data;
-  let nonce = 0;
-  if (typeof payload === "number" && !Number.isNaN(payload)) {
-    nonce = payload;
-  } else if (payload && typeof payload === "object") {
-    const n = payload.nonce ?? payload.Nonce;
-    nonce = typeof n === "number" && !Number.isNaN(n) ? n : Number(n) || 0;
-  }
-  return { nonce, ok: res.ok && (code === 0 || code === void 0), code: code ?? -1 };
-}
 function isEvmNativeToken(address) {
   try {
     return viem.getAddress(address) === viem.zeroAddress;
@@ -197,161 +101,12 @@ function matchEvmTokenKind(kind, address) {
   }
   return true;
 }
-
-// src/chains/evm/txParams.ts
-function gasLimitFromEstimateAndChainConfig(estimatedGas, chainGasLimit) {
-  if (chainGasLimit == null || !Number.isFinite(chainGasLimit) || chainGasLimit <= 0) {
-    return estimatedGas;
-  }
-  const cfg = BigInt(Math.floor(chainGasLimit));
-  return cfg > estimatedGas ? cfg : estimatedGas;
-}
 function routerSwapGasLimitFromEstimate(estimatedGas, chainGasLimit) {
   if (chainGasLimit != null && Number.isFinite(chainGasLimit) && chainGasLimit > 0) {
-    return gasLimitFromEstimateAndChainConfig(estimatedGas, chainGasLimit);
+    return continuumNodeSdk.gasLimitFromEstimateAndChainConfig(estimatedGas, chainGasLimit);
   }
   return (estimatedGas * 12n + 9n) / 10n;
 }
-function composeFeePayloadToTxParams(p, legacy) {
-  const gl = p.txGasLimit ?? p.txgaslimit;
-  if (gl == null || String(gl).trim() === "") return void 0;
-  const n = p.txNonce ?? p.txnonce;
-  let nonce = 0;
-  if (typeof n === "bigint") nonce = Number(n);
-  else if (typeof n === "number") nonce = n;
-  else if (n != null) nonce = parseInt(String(n), 10);
-  if (!Number.isFinite(nonce)) nonce = 0;
-  const gasLimit = String(gl);
-  if (legacy) {
-    const gp = p.txGasPrice ?? p.txgasprice;
-    return {
-      nonce,
-      gasLimit,
-      txType: "legacy",
-      gasPrice: gp != null ? String(gp) : "0"
-    };
-  }
-  return {
-    nonce,
-    gasLimit,
-    txType: "eip1559",
-    maxFeePerGas: String(p.txMaxFeePerGas ?? ""),
-    maxPriorityFeePerGas: String(p.txMaxPriorityFeePerGas ?? "")
-  };
-}
-function triggerTxParamsFromComposeBody(body) {
-  const existing = body.txParams;
-  if (existing && typeof existing === "object" && !Array.isArray(existing)) {
-    const o = existing;
-    if (String(o.gasLimit ?? "").trim() !== "") {
-      return { ...o };
-    }
-  }
-  const pb = body.proposalTxParams;
-  if (Array.isArray(pb) && pb.length > 0 && typeof pb[0] === "object" && pb[0] !== null) {
-    const first = pb[0];
-    if (String(first.gasLimit ?? "").trim() !== "") {
-      return { ...first };
-    }
-  }
-  const fromSnapshot = composeFeePayloadToTxParams(
-    body,
-    body.txMaxFeePerGas == null && body.txMaxPriorityFeePerGas == null
-  );
-  if (fromSnapshot) return fromSnapshot;
-  return {
-    nonce: 0,
-    gasLimit: "",
-    txType: "legacy",
-    gasPrice: "0"
-  };
-}
-function proposalTxParamsToFeeSnapshot(params) {
-  if (params.txType === "legacy") {
-    return {
-      txNonce: params.nonce,
-      txGasLimit: params.gasLimit,
-      txGasPrice: params.gasPrice ?? "0"
-    };
-  }
-  return {
-    txNonce: params.nonce,
-    txGasLimit: params.gasLimit,
-    txMaxFeePerGas: params.maxFeePerGas ?? "",
-    txMaxPriorityFeePerGas: params.maxPriorityFeePerGas ?? ""
-  };
-}
-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 = viem.defineChain({
-    id: chainIdNum,
-    name: "Discovery",
-    nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
-    rpcUrls: { default: { http: [url] } }
-  });
-  const publicClient = viem.createPublicClient({
-    chain,
-    transport: viem.http(url)
-  });
-  const getGasPriceGwei = async () => {
-    const gasPriceWei = await publicClient.getGasPrice();
-    return parseFloat(viem.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 baseFeeGwei = parseFloat(viem.formatUnits(baseFeePerGas, 9));
-    let priorityFeeGwei;
-    try {
-      const priorityWei = await publicClient.estimateMaxPriorityFeePerGas();
-      priorityFeeGwei = parseFloat(viem.formatUnits(priorityWei, 9));
-    } catch {
-    }
-    const gasPriceGwei = await getGasPriceGwei();
-    return {
-      isEip1559: true,
-      baseFeeGwei,
-      priorityFeeGwei,
-      gasPriceGwei
-    };
-  } catch {
-    try {
-      const gasPriceWei = await publicClient.getGasPrice();
-      const gasPriceGwei = parseFloat(viem.formatUnits(gasPriceWei, 9));
-      return { isEip1559: false, gasPriceGwei };
-    } catch {
-      return { isEip1559: false };
-    }
-  }
-}
-function finalizeEip1559Fees(maxFeePerGas, maxPriorityFeePerGas, floor, baseWei) {
-  let maxP = maxPriorityFeePerGas;
-  let maxF = maxFeePerGas;
-  if (baseWei > 0n && maxF < baseWei + maxP) {
-    maxF = baseWei + maxP + viem.parseGwei("0.001");
-  }
-  if (maxF < maxP) {
-    maxF = baseWei > 0n ? baseWei + maxP + viem.parseGwei("0.001") : maxP * 2n;
-  }
-  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;
-}
 
 // src/chains/evm/buildBatch.ts
 async function buildEvmMultisignBatch(args) {
@@ -374,7 +129,7 @@ async function buildEvmMultisignBatch(args) {
     rpcUrls: { default: { http: [rpcUrl] } }
   });
   const publicClient = viem.createPublicClient({ chain: ch, transport: viem.http(rpcUrl) });
-  const feeParams = await fetchChainFeeParams(rpcUrl, chainId);
+  const feeParams = await continuumNodeSdk.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;
@@ -387,15 +142,19 @@ async function buildEvmMultisignBatch(args) {
     const step = steps[i];
     const currentNonce = baseNonce + i;
     let estimatedGas;
-    try {
-      estimatedGas = await publicClient.estimateGas({
-        to: step.to,
-        data: step.data,
-        value: step.value,
-        account: executor
-      });
-    } catch {
-      estimatedGas = step.fallbackGas ?? 100000n;
+    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;
+      }
     }
     let gasLimitI;
     if (args.resolveGasLimit) {
@@ -403,7 +162,7 @@ async function buildEvmMultisignBatch(args) {
     } else if (step.routerSwap) {
       gasLimitI = routerSwapGasLimitFromEstimate(estimatedGas, chainGasLimitRouter);
     } else {
-      gasLimitI = useCustomGas ? gasLimitFromEstimateAndChainConfig(estimatedGas, gasLimitConfig) : estimatedGas;
+      gasLimitI = useCustomGas ? continuumNodeSdk.gasLimitFromEstimateAndChainConfig(estimatedGas, gasLimitConfig) : estimatedGas;
     }
     let proposalTxParams;
     let feeSnapshot;
@@ -414,7 +173,7 @@ async function buildEvmMultisignBatch(args) {
         gasPriceWei = gasPriceWei * BigInt(100 + gasFeeMultiplier) / 100n;
       }
       if (useCustomGas && chainDetail?.gasPrice != null && chainDetail.gasPrice > 0) {
-        const configured = viem.parseGwei(gweiToDecimalString(Number(chainDetail.gasPrice)));
+        const configured = viem.parseGwei(continuumNodeSdk.gweiToDecimalString(Number(chainDetail.gasPrice)));
         if (configured > gasPriceWei) gasPriceWei = configured;
       }
       serialized = viem.serializeTransaction({
@@ -433,7 +192,7 @@ async function buildEvmMultisignBatch(args) {
         txType: "legacy",
         gasPrice: gasPriceWei.toString()
       };
-      feeSnapshot = proposalTxParamsToFeeSnapshot(proposalTxParams);
+      feeSnapshot = continuumNodeSdk.proposalTxParamsToFeeSnapshot(proposalTxParams);
     } else {
       const fetchedBase = feeParams.baseFeeGwei ?? 0;
       const fetchedPriority = feeParams.priorityFeeGwei ?? 0;
@@ -444,13 +203,13 @@ async function buildEvmMultisignBatch(args) {
       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 ? viem.parseGwei(gweiToDecimalString(effectivePriorityFeeGwei)) : viem.parseGwei("1");
-      let maxFeePerGas = viem.parseGwei(gweiToDecimalString(maxFeePerGasGwei));
+      let maxPriorityFeePerGas = effectivePriorityFeeGwei > 0 ? viem.parseGwei(continuumNodeSdk.gweiToDecimalString(effectivePriorityFeeGwei)) : viem.parseGwei("1");
+      let maxFeePerGas = viem.parseGwei(continuumNodeSdk.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 } = continuumNodeSdk.alignEip1559FeesWithLatestBase(
         maxFeePerGas,
         maxPriorityFeePerGas,
         latestBaseFeeWei
@@ -473,7 +232,7 @@ async function buildEvmMultisignBatch(args) {
         maxFeePerGas: maxFeePerGas.toString(),
         maxPriorityFeePerGas: maxPriorityFeePerGas.toString()
       };
-      feeSnapshot = i === 0 ? proposalTxParamsToFeeSnapshot(proposalTxParams) : {};
+      feeSnapshot = i === 0 ? continuumNodeSdk.proposalTxParamsToFeeSnapshot(proposalTxParams) : {};
     }
     const h = viem.keccak256(serialized);
     const msgHash = h.startsWith("0x") ? h.slice(2) : h;
@@ -517,30 +276,6 @@ var evmChainCategoryModule = {
   buildEvmMultisignBatch
 };
 
-// src/chains/evm/fees/customGas.ts
-function chainSnapshotForCustomGasExtraJSON(chainDetail) {
-  const lr = chainDetail.legacy;
-  const legacy = lr === true || typeof lr === "string" && lr.toLowerCase() === "true";
-  const push = (o, key, v) => {
-    if (v === void 0 || v === null) return;
-    if (typeof v === "string" && v.trim() === "") return;
-    o[key] = v;
-  };
-  const fields = {};
-  push(fields, "gasLimit", chainDetail.gasLimit);
-  if (legacy) {
-    push(fields, "gasMultiplier", chainDetail.gasMultiplier);
-    push(fields, "gasPrice", chainDetail.gasPrice);
-  } else {
-    push(fields, "gasMultiplier", chainDetail.gasMultiplier);
-    push(fields, "baseFee", chainDetail.baseFee);
-    push(fields, "priorityFee", chainDetail.priorityFee);
-    push(fields, "baseFeeMultiplier", chainDetail.baseFeeMultiplier);
-  }
-  push(fields, "legacy", legacy);
-  return fields;
-}
-
 // src/chains/evm/chainIdParse.ts
 function parseEvmChainIdToNumber(chainId) {
   if (chainId == null) return Number.NaN;
@@ -682,7 +417,7 @@ async function fetchEthereumAddressForKeyGen(managementNodeUrl, keyGenId, readAu
     throw new Error("keyGen is required");
   }
   const url = `${base}/getKeyGenResultById?id=${encodeURIComponent(id)}`;
-  const res = await nodeFetchWithReadAuth(url, { ...init, method: "GET", cache: "no-store" }, readAuth);
+  const res = await continuumNodeSdk.nodeFetchWithReadAuth(url, { ...init, method: "GET", cache: "no-store" }, readAuth);
   if (!res.ok) {
     const t = await res.text().catch(() => "");
     throw new Error(
@@ -988,6 +723,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",
@@ -1088,10 +852,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 = viem.getAddress(
     (args.swap.to ?? "").trim().startsWith("0x") ? args.swap.to.trim() : `0x${args.swap.to.trim()}`
   );
@@ -1109,214 +869,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 = viem.defineChain({
-    id: args.chainId,
-    name: "Destination",
-    nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
-    rpcUrls: { default: { http: [args.rpcUrl] } }
-  });
-  const publicClient = viem.createPublicClient({ chain: ch, transport: viem.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 = viem.parseGwei(gweiToDecimalString(Number(args.chainDetail.gasPrice)));
-      if (configured > gasPriceWei1) gasPriceWei1 = configured;
-    }
-    firstTxFeePayload = { txNonce: nonce, txGasLimit: gasLimit1.toString(), txGasPrice: gasPriceWei1.toString() };
-    const ser0 = viem.serializeTransaction({
-      type: "legacy",
-      to: toRouter,
-      data: dataHex,
-      value: valueWei,
-      gas: gasLimit1,
-      gasPrice: gasPriceWei1,
-      nonce: currentNonce0,
-      chainId: args.chainId
-    });
-    const h0 = viem.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 ? viem.parseGwei(gweiToDecimalString(effectivePriorityFeeGwei1)) : viem.parseGwei("1");
-    let maxFeePerGas1 = viem.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 = viem.serializeTransaction({
-      type: "eip1559",
-      to: toRouter,
-      data: dataHex,
-      value: valueWei,
-      gas: gasLimit1,
-      maxFeePerGas: maxFeePerGas1,
-      maxPriorityFeePerGas: maxPriorityFeePerGas1,
-      nonce: currentNonce0,
-      chainId: args.chainId
-    });
-    const h0 = viem.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 = viem.getAddress(args.tokenIn);
   const parsedInOut = parseUniswapQuoteClassicInOut(args.fullQuoteSnapshot);
   const quoteInputWei = parsedInOut?.inputWei;
@@ -1371,298 +1007,33 @@ async function buildEvmMultisignBodyUniswapV4SkipPermit2Batch(args) {
       return 0n;
     }
   })();
-  const ch = viem.defineChain({
-    id: args.chainId,
-    name: "Destination",
-    nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
-    rpcUrls: { default: { http: [args.rpcUrl] } }
-  });
-  const publicClient = viem.createPublicClient({ chain: ch, transport: viem.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 = viem.parseGwei(gweiToDecimalString(Number(args.chainDetail.gasPrice)));
-      if (configured > gasPriceWei) gasPriceWei = configured;
-    }
-    firstTxFeePayload = { txNonce: nonce, txGasLimit: gasLimit0.toString(), txGasPrice: gasPriceWei.toString() };
-    const ser0 = viem.serializeTransaction({
-      type: "legacy",
-      to: tokenIn,
-      data: approveData,
-      value: 0n,
-      gas: gasLimit0,
-      gasPrice: gasPriceWei,
-      nonce: currentNonce0,
-      chainId: args.chainId
-    });
-    const h0 = viem.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 ? viem.parseGwei(gweiToDecimalString(effectivePriorityFeeGwei)) : viem.parseGwei("1");
-    let maxFeePerGas = viem.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 = viem.serializeTransaction({
-      type: "eip1559",
-      to: tokenIn,
-      data: approveData,
-      value: 0n,
-      gas: gasLimit0,
-      maxFeePerGas,
-      maxPriorityFeePerGas,
-      nonce: currentNonce0,
-      chainId: args.chainId
-    });
-    const h0 = viem.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 = viem.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 = viem.parseGwei(gweiToDecimalString(Number(args.chainDetail.gasPrice)));
-        if (configured > gasPriceWeiP2) gasPriceWeiP2 = configured;
-      }
-      const serP2 = viem.serializeTransaction({
-        type: "legacy",
-        to: PERMIT2_ADDRESS,
-        data: permit2ApproveData,
-        value: 0n,
-        gas: gasLimitP2,
-        gasPrice: gasPriceWeiP2,
-        nonce: currentNonceP2,
-        chainId: args.chainId
-      });
-      const hP2 = viem.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 ? viem.parseGwei(gweiToDecimalString(effectivePriorityFeeGweiP2)) : viem.parseGwei("1");
-      let maxFeePerGasP2 = viem.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 = viem.serializeTransaction({
-        type: "eip1559",
-        to: PERMIT2_ADDRESS,
-        data: permit2ApproveData,
-        value: 0n,
-        gas: gasLimitP2,
-        maxFeePerGas: maxFeePerGasP2,
-        maxPriorityFeePerGas: maxPriorityFeePerGasP2,
-        nonce: currentNonceP2,
-        chainId: args.chainId
-      });
-      const hP2 = viem.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()
-      });
-    }
+    steps.push({ to: PERMIT2_ADDRESS, data: permit2ApproveData, value: 0n, fallbackGas: 100000n });
   }
-  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 = viem.parseGwei(gweiToDecimalString(Number(args.chainDetail.gasPrice)));
-      if (configured > gasPriceWei1) gasPriceWei1 = configured;
-    }
-    const ser1 = viem.serializeTransaction({
-      type: "legacy",
-      to: toRouter,
-      data: dataHex,
-      value: valueWei,
-      gas: gasLimit1,
-      gasPrice: gasPriceWei1,
-      nonce: currentNonce1,
-      chainId: args.chainId
-    });
-    const h1 = viem.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 ? viem.parseGwei(gweiToDecimalString(effectivePriorityFeeGwei1)) : viem.parseGwei("1");
-    let maxFeePerGas1 = viem.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 = viem.serializeTransaction({
-      type: "eip1559",
-      to: toRouter,
-      data: dataHex,
-      value: valueWei,
-      gas: gasLimit1,
-      maxFeePerGas: maxFeePerGas1,
-      maxPriorityFeePerGas: maxPriorityFeePerGas1,
-      nonce: currentNonce1,
-      chainId: args.chainId
-    });
-    const h1 = viem.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: 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: {
@@ -1676,9 +1047,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: {
@@ -1720,92 +1091,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/swap.ts
@@ -2234,357 +1611,34 @@ var curveDao = {
   loadSession: loadFullCurveSessionForRpc
 };
 
-// src/agent/commonParamDocs.ts
-var EVM_COMMON_PARAM_DOCS = {
-  keyGen: {
-    type: "object",
-    required: true,
-    description: "MPC key slice: { pubkeyhex: string (required), keylist: string[], ClientKeys?: Record<string,string> }. Used for pubKey/keyList on POST /multiSignRequest."
-  },
-  purposeText: {
-    type: "string",
-    required: true,
-    description: "Human-readable purpose for the sign request. Stored in bodyForSign.purpose (may be appended with an automatic batch suffix)."
-  },
-  useCustomGas: {
-    type: "boolean",
-    required: true,
-    description: "When true, apply chain gas settings from chainDetail / customGasChainDetails instead of raw RPC estimates only."
-  },
-  chainId: {
-    type: "number",
-    required: true,
-    description: "EVM chain id (decimal). Becomes destinationChainID on the sign request."
-  },
-  rpcUrl: {
-    type: "string",
-    required: true,
-    description: "HTTPS JSON-RPC URL for gas estimation, nonce, and allowance reads."
-  },
-  executorAddress: {
-    type: "address",
-    required: true,
-    description: "MPC wallet address (from keyGen ethereumaddress) \u2014 tx sender for estimates and approvals."
-  },
-  chainDetail: {
-    type: "object",
-    required: true,
-    description: "Optional gas config: { legacy?, gasLimit?, gasMultiplier?, gasPrice?, baseFee?, priorityFee?, baseFeeMultiplier? }."
-  },
-  customGasChainDetails: {
-    type: "object",
-    required: false,
-    description: "Snapshot written to extraJSON.customGasChainDetails when useCustomGas is true."
-  }
-};
-var MULTISIGN_OUTPUT_DOC = {
-  description: "Unsigned mpc-auth multiSignRequest payload. The caller must sign messageToSign (MetaMask personal_sign or Ed25519) and POST { ...bodyForSign, clientSig, signedMessage: messageToSign } to /multiSignRequest.",
-  fields: {
-    bodyForSign: {
-      type: "object",
-      description: "POST body fields without clientSig: keyList, pubKey, msgHash, msgRaw, destinationChainID, purpose, extraJSON, proposalTxParams (batch), messageHashes/messageRawBatch when N>1 txs."
-    },
-    messageToSign: {
-      type: "string",
-      description: "JSON.stringify(bodyForSign) \u2014 exact string to sign before adding clientSig."
-    }
-  }
-};
-var MANAGEMENT_SIG_DOC = {
-  description: "Management POST bodies embed NodeMgtKeySig: { nonce, clientSig, nodeKey }. Sign JSON with clientSig cleared; POST with clientSig set to the Ed25519 128-hex or EIP-191 signature. Legacy Nonce/Sig/sig field names are not accepted.",
-  fields: {
-    nonce: {
-      type: "number",
-      description: "From GET /getPublicMgtKeyNonce (Ed25519) or GET /getNodeMgtKeyNonce (Ethereum NodeMgtKey)."
-    },
-    clientSig: {
-      type: "string",
-      description: "Management signature; empty string in the message to sign."
-    },
-    nodeKey: {
-      type: "string",
-      description: "Required. 128-hex MPC node id from GET /getNodeKey (no 0x prefix)."
-    }
-  },
-  helpers: {
-    managementSigFields: "Base envelope with clientSig cleared.",
-    buildManagementPostBody: "Spread managementSigFields then endpoint fields.",
-    messageToSignManagementBody: "Canonical JSON string to sign.",
-    withManagementClientSig: "Attach signature to POST body.",
-    fetchNodeKey: "GET /getNodeKey via nodeFetchWithReadAuth.",
-    fetchManagementNonce: "GET nonce for Ed25519 or Ethereum management key."
-  }
-};
-
-// src/agent/mcpTools.ts
-function paramProperties(params, includeCommon = []) {
-  const out = {};
-  for (const k of includeCommon) {
-    const d = EVM_COMMON_PARAM_DOCS[k];
-    if (d) out[k] = { type: d.type, description: d.description };
-  }
-  for (const [k, d] of Object.entries(params)) {
-    out[k] = { type: d.type, description: d.description };
-  }
-  return out;
-}
-function requiredKeys(params, includeCommon = []) {
-  const req = [];
-  for (const k of includeCommon) {
-    if (EVM_COMMON_PARAM_DOCS[k]?.required) req.push(k);
-  }
-  for (const [k, d] of Object.entries(params)) {
-    if (d.required) req.push(k);
-  }
-  return req;
-}
-var multisignOutputSchema = {
-  type: "object",
-  description: MULTISIGN_OUTPUT_DOC.description,
-  properties: {
-    bodyForSign: {
-      type: "object",
-      description: MULTISIGN_OUTPUT_DOC.fields.bodyForSign.description
-    },
-    messageToSign: {
-      type: "string",
-      description: MULTISIGN_OUTPUT_DOC.fields.messageToSign.description
-    }
-  },
-  required: ["bodyForSign", "messageToSign"]
-};
-var MCP_TOOL_DEFINITIONS = [
-  {
-    name: "ctm_uniswap_v4_quote",
-    actionId: "uniswap-v4.quote",
-    protocolId: "uniswap-v4",
-    chainCategory: "evm",
-    description: "Fetch a Uniswap V4 Trade API quote (POST /v1/quote). Returns classic quote JSON including quote.input/output amounts and routing. Does NOT create a sign request \u2014 use ctm_uniswap_v4_create_swap and ctm_uniswap_v4_build_swap_multisign after quoting. Requires uniswapApiKey and swapper (MPC executor address) or keyGen + managementNodeUrl to resolve swapper.",
-    prerequisites: ["Chain must be supported by Uniswap V4 (Universal Router map)."],
-    followUp: ["ctm_uniswap_v4_create_swap", "ctm_uniswap_v4_build_swap_multisign"],
-    handler: { importPath: "protocols/evm/uniswap-v4", exportName: "uniswapTradeQuote" },
-    inputSchema: {
-      type: "object",
-      properties: paramProperties({
-        type: { type: "string", required: true, description: "EXACT_INPUT or EXACT_OUTPUT" },
-        amount: { type: "string", required: true, description: "Amount in token-in base units (wei string for ERC-20)" },
-        tokenIn: { type: "address", required: true, description: "Input token; 0x0 for native ETH" },
-        tokenOut: { type: "address", required: true, description: "Output token address" },
-        chainId: { type: "number", required: true, description: "tokenInChainId / same-chain default" },
-        uniswapApiKey: { type: "string", required: true, description: "Uniswap Trade API x-api-key" },
-        swapper: { type: "address", required: false, description: "MPC executor; omit if keyGen + managementNodeUrl provided" },
-        slippage: { type: "number", required: false, description: "Slippage percent; omit for API auto slippage" }
-      }),
-      required: requiredKeys({
-        type: { type: "string", required: true, description: "" },
-        amount: { type: "string", required: true, description: "" },
-        tokenIn: { type: "address", required: true, description: "" },
-        tokenOut: { type: "address", required: true, description: "" },
-        chainId: { type: "number", required: true, description: "" },
-        uniswapApiKey: { type: "string", required: true, description: "" }
-      })
-    },
-    outputSchema: {
-      type: "object",
-      description: "Full Uniswap POST /quote JSON (includes nested quote object with input/output amounts)."
-    }
-  },
-  {
-    name: "ctm_uniswap_v4_create_swap",
-    actionId: "uniswap-v4.create-swap",
-    protocolId: "uniswap-v4",
-    chainCategory: "evm",
-    description: "Call Uniswap Trade API POST /v1/swap to build Universal Router calldata from a prior quote. Returns { swap: { to, data, value, gasLimit? }, requestId? }. Does NOT produce a multiSignRequest \u2014 call ctm_uniswap_v4_build_swap_multisign next.",
-    prerequisites: ["ctm_uniswap_v4_quote output (fullQuoteFromPermit)"],
-    followUp: ["ctm_uniswap_v4_build_swap_multisign"],
-    handler: { importPath: "protocols/evm/uniswap-v4", exportName: "uniswapCreateSwap" },
-    inputSchema: {
-      type: "object",
-      properties: paramProperties({
-        uniswapApiKey: { type: "string", required: true, description: "Uniswap Trade API key" },
-        fullQuoteFromPermit: { type: "object", required: true, description: "Full quote JSON from ctm_uniswap_v4_quote" },
-        swapTransactionDeadlineUnix: {
-          type: "number",
-          required: false,
-          description: "On-chain deadline unix seconds; default ~30 min from now"
-        },
-        useServerProxy: {
-          type: "boolean",
-          required: false,
-          description: "Set false in Node/agents; true only in browser via Next API route"
-        }
-      }),
-      required: requiredKeys({
-        uniswapApiKey: { type: "string", required: true, description: "" },
-        fullQuoteFromPermit: { type: "object", required: true, description: "" }
-      })
-    },
-    outputSchema: {
-      type: "object",
-      description: "{ swap: TransactionRequest, requestId?, gasFee? }"
-    }
-  },
-  {
-    name: "ctm_uniswap_v4_build_swap_multisign",
-    actionId: "uniswap-v4.swap-exact-input",
-    protocolId: "uniswap-v4",
-    chainCategory: "evm",
-    description: "Build mpc-auth multiSignRequest body for a Uniswap V4 swap. May batch 1\u20133 EVM txs: ERC-20 approve(s) to Permit2/router path + Universal Router swap (or 1 tx for native-in). Estimates gas, serializes unsigned txs, sets proposalTxParams. Output must be signed and POSTed to /multiSignRequest by the caller.",
-    prerequisites: [
-      "ctm_uniswap_v4_create_swap output",
-      "keyGen with pubkeyhex",
-      "executorAddress matching MPC wallet",
-      "RPC URL and chainDetail from node chain config"
-    ],
-    followUp: ["Sign messageToSign", "POST /multiSignRequest with clientSig and signedMessage"],
-    handler: { importPath: "protocols/evm/uniswap-v4", exportName: "buildEvmMultisignBodyUniswapV4SkipPermit2Batch" },
-    inputSchema: {
-      type: "object",
-      properties: paramProperties(
-        {
-          tokenIn: { type: "address", required: true, description: "Token in; 0x0 for native ETH" },
-          swap: { type: "object", required: true, description: "swap field from create_swap response" },
-          createSwapResponse: { type: "object", required: true, description: "Full create_swap response" },
-          fullQuoteSnapshot: { type: "object", required: true, description: "Quote JSON used for the swap" },
-          swapDeadlineUnix: { type: "number", required: true, description: "Same deadline passed to create_swap" },
-          slippagePercent: { type: "number", required: false, description: "Extra approve headroom for EXACT_OUTPUT" }
-        },
-        ["keyGen", "purposeText", "useCustomGas", "chainId", "rpcUrl", "executorAddress", "chainDetail", "customGasChainDetails"]
-      ),
-      required: requiredKeys(
-        {
-          tokenIn: { type: "address", required: true, description: "" },
-          swap: { type: "object", required: true, description: "" },
-          createSwapResponse: { type: "object", required: true, description: "" },
-          fullQuoteSnapshot: { type: "object", required: true, description: "" },
-          swapDeadlineUnix: { type: "number", required: true, description: "" }
-        },
-        ["keyGen", "purposeText", "useCustomGas", "chainId", "rpcUrl", "executorAddress", "chainDetail"]
-      )
-    },
-    outputSchema: multisignOutputSchema
-  },
-  {
-    name: "ctm_curve_dao_build_swap_multisign",
-    actionId: "curve-dao.swap",
-    protocolId: "curve-dao",
-    chainCategory: "evm",
-    description: "Build mpc-auth multiSignRequest for a Curve Router NG swap via @curvefi/api populateSwap. Optionally batches ERC-20 approve txs when allowance is insufficient, then exchange. Requires JSON-RPC and Curve-supported chain.",
-    prerequisites: ["keyGen", "executorAddress", "tokenIn/tokenOut/amountHuman/slippage", "RPC URL"],
-    followUp: ["Sign messageToSign", "POST /multiSignRequest with clientSig and signedMessage"],
-    handler: { importPath: "protocols/evm/curve-dao", exportName: "buildEvmMultisignBodyCurveDaoBatch" },
-    inputSchema: {
-      type: "object",
-      properties: paramProperties(
-        {
-          tokenIn: { type: "address", required: true, description: "ERC-20 sold (native in uses WETH path in UI)" },
-          tokenOut: { type: "string", required: true, description: "Output token or 0xeeee\u2026 native placeholder" },
-          amountHuman: { type: "string", required: true, description: "Human-readable amount of tokenIn" },
-          slippagePercent: { type: "number", required: true, description: "Slippage 0\u2013100 exclusive" }
-        },
-        ["keyGen", "purposeText", "useCustomGas", "chainId", "rpcUrl", "executorAddress", "chainDetail", "customGasChainDetails"]
-      ),
-      required: requiredKeys(
-        {
-          tokenIn: { type: "address", required: true, description: "" },
-          tokenOut: { type: "string", required: true, description: "" },
-          amountHuman: { type: "string", required: true, description: "" },
-          slippagePercent: { type: "number", required: true, description: "" }
-        },
-        ["keyGen", "purposeText", "useCustomGas", "chainId", "rpcUrl", "executorAddress", "chainDetail"]
-      )
-    },
-    outputSchema: multisignOutputSchema
-  }
-];
-function getAgentCatalogForMcp() {
-  return {
-    tools: MCP_TOOL_DEFINITIONS,
-    protocols: getProtocolModules(),
-    commonParams: EVM_COMMON_PARAM_DOCS,
-    multisignOutput: MULTISIGN_OUTPUT_DOC,
-    managementSig: MANAGEMENT_SIG_DOC,
-    workflow: {
-      evmSwapTypical: [
-        "1. Quote (protocol-specific API if needed)",
-        "2. Build protocol calldata (e.g. create_swap)",
-        "3. build_*_multisign \u2192 { bodyForSign, messageToSign }",
-        "4. Sign messageToSign (MetaMask or Ed25519)",
-        "5. POST /multiSignRequest with clientSig and signedMessage"
-      ],
-      managementPostTypical: [
-        "1. GET /getNodeKey \u2192 nodeKey (128 hex)",
-        "2. GET /getPublicMgtKeyNonce or /getNodeMgtKeyNonce \u2192 nonce",
-        "3. buildManagementPostBody(nonce, nodeKey, { \u2026endpoint fields })",
-        "4. messageToSignManagementBody(body) \u2192 sign \u2192 withManagementClientSig(body, sig)",
-        "5. POST management route with signed body"
-      ]
-    }
-  };
-}
-
-// src/agent/catalog.ts
-registerProtocolModule(uniswapV4ProtocolModule);
-registerProtocolModule(curveDaoProtocolModule);
-function getAgentCatalog() {
-  return {
-    protocols: getProtocolModules(),
-    byCategory: {
-      evm: getActionsByChainCategory("evm"),
-      solana: getActionsByChainCategory("solana"),
-      near: getActionsByChainCategory("near")
-    },
-    uniswapV4: uniswapV4ProtocolModule,
-    curveDao: curveDaoProtocolModule,
-    /** Prefer getAgentCatalogForMcp() or getMcpToolDefinitions() for MCP servers. */
-    mcp: getAgentCatalogForMcp()
-  };
-}
-
 // src/index.ts
 registerProtocolModule(uniswapV4ProtocolModule);
 registerProtocolModule(curveDaoProtocolModule);
 
+Object.defineProperty(exports, "firstClientIdFromKeyGen", {
+  enumerable: true,
+  get: function () { return continuumNodeSdk.getClientIdFromKeyGenResult; }
+});
 exports.NEAR_CHAIN_CATEGORY = NEAR_CHAIN_CATEGORY;
 exports.SOLANA_CHAIN_CATEGORY = SOLANA_CHAIN_CATEGORY;
-exports.alignEip1559FeesWithLatestBase = alignEip1559FeesWithLatestBase;
 exports.buildEvmMultisignBatch = buildEvmMultisignBatch;
-exports.buildManagementPostBody = buildManagementPostBody;
-exports.chainSnapshotForCustomGasExtraJSON = chainSnapshotForCustomGasExtraJSON;
-exports.composeFeePayloadToTxParams = composeFeePayloadToTxParams;
 exports.coreChainCategoryModule = coreChainCategoryModule;
 exports.curveDao = curveDao;
 exports.curveDaoProtocolModule = curveDaoProtocolModule;
 exports.evmChainCategoryModule = evmChainCategoryModule;
-exports.fetchChainFeeParams = fetchChainFeeParams;
-exports.fetchManagementNonce = fetchManagementNonce;
-exports.fetchNodeKey = fetchNodeKey;
 exports.finalizeMultisign = finalizeMultisign;
-exports.firstClientIdFromKeyGen = firstClientIdFromKeyGen;
-exports.gasLimitFromEstimateAndChainConfig = gasLimitFromEstimateAndChainConfig;
 exports.getActionsByChainCategory = getActionsByChainCategory;
-exports.getAgentCatalog = getAgentCatalog;
 exports.getProtocolModule = getProtocolModule;
 exports.getProtocolModules = getProtocolModules;
-exports.gweiToDecimalString = gweiToDecimalString;
 exports.isEvmNativeToken = isEvmNativeToken;
-exports.keyListFromKeyGen = keyListFromKeyGen;
-exports.managementSigFields = managementSigFields;
 exports.matchEvmTokenKind = matchEvmTokenKind;
 exports.mergePurposeText = mergePurposeText;
-exports.messageToSignManagementBody = messageToSignManagementBody;
 exports.nearChainCategoryModule = nearChainCategoryModule;
-exports.nodeFetchWithReadAuth = nodeFetchWithReadAuth;
-exports.normalizeManagementNodeKey = normalizeManagementNodeKey;
 exports.parseEvmChainIdToNumber = parseEvmChainIdToNumber;
-exports.proposalTxParamsToFeeSnapshot = proposalTxParamsToFeeSnapshot;
 exports.registerProtocolModule = registerProtocolModule;
-exports.requirePubKeyHex = requirePubKeyHex;
 exports.routerSwapGasLimitFromEstimate = routerSwapGasLimitFromEstimate;
 exports.solanaChainCategoryModule = solanaChainCategoryModule;
-exports.triggerTxParamsFromComposeBody = triggerTxParamsFromComposeBody;
 exports.uniswapV4 = uniswapV4;
 exports.uniswapV4ProtocolModule = uniswapV4ProtocolModule;
-exports.withManagementClientSig = withManagementClientSig;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map