@continuumdao/ctm-mpc-defi 0.2.0 → 0.2.1

package/dist/protocols/evm/maple/index.js

@@ -1,4 +1,5 @@
-import { parseAbi, getAddress, parseUnits, encodeFunctionData, parseGwei, serializeTransaction, keccak256, defineChain, createPublicClient, http, stringToBytes, toHex, formatUnits } from 'viem';
+import { parseAbi, getAddress, parseUnits, encodeFunctionData, defineChain, createPublicClient, http, stringToBytes, toHex, parseGwei, serializeTransaction, keccak256 } from 'viem';
+import { fetchChainFeeParams, gasLimitFromEstimateAndChainConfig, gweiToDecimalString, proposalTxParamsToFeeSnapshot, alignEip1559FeesWithLatestBase, getClientIdFromKeyGenResult } from '@continuumdao/continuum-node-sdk';
 
 // src/core/registry.ts
 var modules = [];
@@ -23,87 +24,234 @@ function isMapleSyrupSupportedChain(chainId) {
   return chainId === 1 || chainId === 11155111;
 }
 
-// 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 cfg = BigInt(Math.floor(chainGasLimit));
-  return cfg > estimatedGas ? cfg : estimatedGas;
+  const valueWei = first.valueWei;
+  if (valueWei != null && valueWei > 0n) {
+    bodyForSign.value = valueWei.toString();
+  }
+  if (clientId) bodyForSign.clientId = clientId;
+  return { bodyForSign, messageToSign: JSON.stringify(bodyForSign) };
 }
-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",
+function routerSwapGasLimitFromEstimate(estimatedGas, chainGasLimit) {
+  if (chainGasLimit != null && Number.isFinite(chainGasLimit) && chainGasLimit > 0) {
+    return gasLimitFromEstimateAndChainConfig(estimatedGas, chainGasLimit);
+  }
+  return (estimatedGas * 12n + 9n) / 10n;
+}
+
+// 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] } }
-  });
-  const publicClient = createPublicClient({
-    chain,
-    transport: http(url)
+    rpcUrls: { default: { http: [rpcUrl] } }
   });
-  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");
+  const extraJSON = {};
+  if (useCustomGas && customGasChainDetails && Object.keys(customGasChainDetails).length > 0) {
+    extraJSON.customGasChainDetails = customGasChainDetails;
   }
-  if (maxF < maxP) {
-    maxF = baseWei > 0n ? baseWei + maxP + parseGwei("0.001") : maxP * 2n;
+  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);
+  return result;
 }
 
 // src/protocols/evm/maple/multisign.ts
@@ -126,13 +274,6 @@ var poolV2ExitAbi = parseAbi([
   "function requestRedeem(uint256 shares, address receiver) returns (uint256)",
   "function decimals() view returns (uint8)"
 ]);
-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;
-}
 function formatBytes32DataLabel(s) {
   const b = stringToBytes(s);
   if (b.length > 32) throw new Error("Maple depositData label is too long for bytes32.");
@@ -222,10 +363,6 @@ async function buildEvmMultisignBodyMapleSyrupDeposit(args) {
   if (args.chainId !== 1 && args.chainId !== 11155111) {
     throw new Error("Maple Syrup deposit is only supported on Ethereum mainnet or Sepolia.");
   }
-  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 asset = getAddress(args.asset);
   const router = getAddress(args.syrupRouter);
   const pool = getAddress(args.pool);
@@ -281,33 +418,44 @@ async function buildEvmMultisignBodyMapleSyrupDeposit(args) {
     });
     steps.push({ kind: "deposit", to: router, data: depositCalldata, value: 0n });
   }
-  const feeParams = await fetchChainFeeParams(args.rpcUrl, args.chainId);
-  const legacy = Boolean(args.chainDetail?.legacy) || !feeParams.isEip1559;
-  const latestBaseFeeWei = !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 gasFeeMultiplier = useCustomGas && args.chainDetail?.gasMultiplier != null ? Number(args.chainDetail.gasMultiplier) : void 0;
-  const baseNonce = await publicClient.getTransactionCount({ address: executor, blockTag: "pending" });
-  const messageHashes = [];
-  const messageRawBatch = [];
-  const proposalTxParamsBatch = [];
-  const batchMeta = [];
-  let firstTxFeePayload = {};
-  let firstDataNo0x = "";
-  for (let i = 0; i < steps.length; i++) {
-    const s = steps[i];
-    const currentNonce = baseNonce + i;
-    let estimatedGas;
-    const skipFinalStakeEstimateBecausePriorApproves = (s.kind === "deposit" || s.kind === "authorizeAndDeposit") && i > 0;
-    if (skipFinalStakeEstimateBecausePriorApproves) {
-      estimatedGas = MAPLE_SYRUP_DEPOSIT_FALLBACK;
-    } else {
+  const chainIdStr = String(args.chainId);
+  const evmSteps = steps.map((s) => ({
+    to: s.to,
+    data: s.data,
+    value: s.value,
+    fallbackGas: s.kind === "approve" ? AAVE_ERC20_APPROVE_FALLBACK : MAPLE_SYRUP_DEPOSIT_FALLBACK
+  }));
+  const n = steps.length;
+  const finalVerb = stakeMethod === "authorizeAndDeposit" ? "authorizeAndDeposit (permission + deposit)" : "deposit";
+  const purposeSuffix = n === 1 ? `Maple Syrup: 1-tx \u2014 ${finalVerb} via SyrupRouter (allowance already set).` : `Maple Syrup: ${n}-tx batch \u2014 approve asset for SyrupRouter, then ${finalVerb}.`;
+  const firstDataNo0x = evmSteps[0].data.startsWith("0x") ? evmSteps[0].data.slice(2) : evmSteps[0].data;
+  return buildEvmMultisignBatch({
+    context: {
+      chainCategory: "evm",
+      keyGen: args.keyGen,
+      purposeText: args.purposeText,
+      chainId: args.chainId,
+      rpcUrl: args.rpcUrl,
+      executorAddress: executor,
+      chainDetail: args.chainDetail,
+      useCustomGas: args.useCustomGas,
+      customGasChainDetails: args.customGasChainDetails
+    },
+    steps: evmSteps,
+    purposeSuffix,
+    firstMsgRawNo0x: firstDataNo0x,
+    destinationAddress: steps[0].to,
+    estimateGasForStep: async ({ step, index, publicClient: publicClient2, executor: exec }) => {
+      const s = steps[index];
+      if ((s.kind === "deposit" || s.kind === "authorizeAndDeposit") && index > 0) {
+        return MAPLE_SYRUP_DEPOSIT_FALLBACK;
+      }
       try {
-        estimatedGas = await publicClient.estimateGas({
-          to: s.to,
-          data: s.data,
-          value: s.value,
-          account: executor
+        return await publicClient2.estimateGas({
+          to: step.to,
+          data: step.data,
+          value: step.value,
+          account: exec
         });
       } catch (e) {
         if (s.kind === "deposit" || s.kind === "authorizeAndDeposit") {
@@ -318,129 +466,43 @@ async function buildEvmMultisignBodyMapleSyrupDeposit(args) {
             );
           }
         }
-        estimatedGas = s.kind === "approve" ? AAVE_ERC20_APPROVE_FALLBACK : MAPLE_SYRUP_DEPOSIT_FALLBACK;
-      }
-    }
-    const gasLimitI = useCustomGas ? gasLimitFromEstimateAndChainConfig(estimatedGas, gasLimitConfig) : estimatedGas;
-    if (legacy) {
-      let gasPriceWei = await publicClient.getGasPrice();
-      if (useCustomGas && gasFeeMultiplier != null && gasFeeMultiplier > 0) {
-        gasPriceWei = gasPriceWei * BigInt(100 + gasFeeMultiplier) / 100n;
+        return s.kind === "approve" ? AAVE_ERC20_APPROVE_FALLBACK : MAPLE_SYRUP_DEPOSIT_FALLBACK;
       }
-      if (useCustomGas && args.chainDetail?.gasPrice != null && args.chainDetail.gasPrice > 0) {
-        const configured = parseGwei(gweiToDecimalString(Number(args.chainDetail.gasPrice)));
-        if (configured > gasPriceWei) gasPriceWei = configured;
-      }
-      const ser = serializeTransaction({
-        type: "legacy",
-        to: s.to,
-        data: s.data,
-        value: s.value,
-        gas: gasLimitI,
-        gasPrice: gasPriceWei,
-        nonce: currentNonce,
-        chainId: args.chainId
-      });
-      const h = keccak256(ser);
-      messageHashes.push(h.startsWith("0x") ? h.slice(2) : h);
-      messageRawBatch.push(ser);
-      proposalTxParamsBatch.push({
-        nonce: currentNonce,
-        gasLimit: gasLimitI.toString(),
-        txType: "legacy",
-        gasPrice: gasPriceWei.toString()
-      });
-      if (i === 0) {
-        firstTxFeePayload = { txNonce: currentNonce, txGasLimit: gasLimitI.toString(), txGasPrice: gasPriceWei.toString() };
-        firstDataNo0x = s.data.startsWith("0x") ? s.data.slice(2) : s.data;
-      }
-    } 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;
+    },
+    buildBatchMeta: ({ index, gasLimit }) => {
+      const s = steps[index];
+      if (s.kind === "approve") {
+        return {
+          signatureText: JSON.stringify({
+            kind: "MapleSyrup",
+            name: "ERC20.approve",
+            note: "Allow SyrupRouter to pull this deposit amount.",
+            spender: router,
+            asset,
+            pool,
+            amountHuman: args.amountHuman
+          }),
+          evm: { type: "maple_syrup_erc20_approve", version: 1, chainId: chainIdStr },
+          maple: { step: "approve_asset", router, pool, asset }
+        };
       }
-      ({ maxFeePerGas, maxPriorityFeePerGas } = alignEip1559FeesWithLatestBase(
-        maxFeePerGas,
-        maxPriorityFeePerGas,
-        latestBaseFeeWei
-      ));
-      const ser = serializeTransaction({
-        type: "eip1559",
-        to: s.to,
-        data: s.data,
-        value: s.value,
-        gas: gasLimitI,
-        maxFeePerGas,
-        maxPriorityFeePerGas,
-        nonce: currentNonce,
-        chainId: args.chainId
-      });
-      const h = keccak256(ser);
-      messageHashes.push(h.startsWith("0x") ? h.slice(2) : h);
-      messageRawBatch.push(ser);
-      proposalTxParamsBatch.push({
-        nonce: currentNonce,
-        gasLimit: gasLimitI.toString(),
-        txType: "eip1559",
-        maxFeePerGas: maxFeePerGas.toString(),
-        maxPriorityFeePerGas: maxPriorityFeePerGas.toString()
-      });
-      if (i === 0) {
-        firstTxFeePayload = {
-          txNonce: currentNonce,
-          txGasLimit: gasLimitI.toString(),
-          txMaxFeePerGas: maxFeePerGas.toString(),
-          txMaxPriorityFeePerGas: maxPriorityFeePerGas.toString()
+      if (s.kind === "deposit") {
+        return {
+          signatureText: JSON.stringify({
+            kind: "MapleSyrup",
+            name: "SyrupRouter.deposit",
+            function: "deposit(uint256 assets, bytes32 depositData)",
+            assets: amountWei.toString(),
+            pool,
+            router,
+            amountHuman: args.amountHuman
+          }),
+          evm: { type: "maple_syrup_router_deposit", version: 1, chainId: chainIdStr },
+          maple: { step: "deposit", router, pool, gasBuildDeposit: { baseGasUnits: gasLimit.toString() } }
         };
-        firstDataNo0x = s.data.startsWith("0x") ? s.data.slice(2) : s.data;
       }
-    }
-    const chainIdStr = String(args.chainId);
-    if (s.kind === "approve") {
-      batchMeta.push({
-        destinationAddress: asset,
-        signatureText: JSON.stringify({
-          kind: "MapleSyrup",
-          name: "ERC20.approve",
-          note: "Allow SyrupRouter to pull this deposit amount.",
-          spender: router,
-          asset,
-          pool,
-          amountHuman: args.amountHuman
-        }),
-        evm: { type: "maple_syrup_erc20_approve", version: 1, chainId: chainIdStr },
-        maple: { step: "approve_asset", router, pool, asset }
-      });
-    } else if (s.kind === "deposit") {
-      batchMeta.push({
-        destinationAddress: router,
-        signatureText: JSON.stringify({
-          kind: "MapleSyrup",
-          name: "SyrupRouter.deposit",
-          function: "deposit(uint256 assets, bytes32 depositData)",
-          assets: amountWei.toString(),
-          pool,
-          router,
-          amountHuman: args.amountHuman
-        }),
-        evm: { type: "maple_syrup_router_deposit", version: 1, chainId: chainIdStr },
-        maple: { step: "deposit", router, pool, gasBuildDeposit: { baseGasUnits: gasLimitI.toString() } }
-      });
-    } else {
       const a = args.authorizeSig;
-      batchMeta.push({
-        destinationAddress: router,
+      return {
         signatureText: JSON.stringify({
           kind: "MapleSyrup",
           name: "SyrupRouter.authorizeAndDeposit",
@@ -454,50 +516,15 @@ async function buildEvmMultisignBodyMapleSyrupDeposit(args) {
           amountHuman: args.amountHuman
         }),
         evm: { type: "maple_syrup_router_authorize_and_deposit", version: 1, chainId: chainIdStr },
-        maple: { step: "authorize_and_deposit", router, pool, gasBuildDeposit: { baseGasUnits: gasLimitI.toString() } }
-      });
+        maple: { step: "authorize_and_deposit", router, pool, gasBuildDeposit: { baseGasUnits: gasLimit.toString() } }
+      };
     }
-  }
-  const extraPayload = { batchMeta };
-  if (useCustomGas && args.customGasChainDetails && Object.keys(args.customGasChainDetails).length > 0) {
-    extraPayload.customGasChainDetails = args.customGasChainDetails;
-  }
-  const extraJSON = JSON.stringify(extraPayload);
-  const firstSigText = batchMeta[0].signatureText;
-  const n = steps.length;
-  const finalVerb = stakeMethod === "authorizeAndDeposit" ? "authorizeAndDeposit (permission + deposit)" : "deposit";
-  const purposeSuffix = n === 1 ? `Maple Syrup: 1-tx \u2014 ${finalVerb} via SyrupRouter (allowance already set).` : `Maple Syrup: ${n}-tx batch \u2014 approve asset for SyrupRouter, then ${finalVerb}.`;
-  const bodyForSign = {
-    keyList,
-    pubKey: ph,
-    msgHash: messageHashes[0],
-    msgRaw: firstDataNo0x,
-    messageHashes,
-    messageRawBatch,
-    destinationChainID: String(args.chainId),
-    destinationAddress: steps[0].to,
-    extraJSON,
-    signatureText: firstSigText,
-    purpose: (() => {
-      const t = args.purposeText.trim();
-      return (t ? `${t}
-
-` : "") + purposeSuffix;
-    })(),
-    ...firstTxFeePayload,
-    proposalTxParams: proposalTxParamsBatch
-  };
-  if (clientId) bodyForSign.clientId = clientId;
-  return { bodyForSign, messageToSign: JSON.stringify(bodyForSign) };
+  });
 }
 async function buildEvmMultisignBodyMaplePoolRequestRedeem(args) {
   if (args.chainId !== 1 && args.chainId !== 11155111) {
     throw new Error("Maple Syrup redeem request is only supported on Ethereum mainnet or Sepolia.");
   }
-  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 pool = getAddress(args.pool);
   const executor = getAddress(args.executorAddress);
   const receiver = executor;
@@ -518,113 +545,26 @@ async function buildEvmMultisignBodyMaplePoolRequestRedeem(args) {
     functionName: "requestRedeem",
     args: [exitShares, receiver]
   });
-  const feeParams = await fetchChainFeeParams(args.rpcUrl, args.chainId);
-  const legacy = Boolean(args.chainDetail?.legacy) || !feeParams.isEip1559;
-  const latestBaseFeeWei = !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 gasFeeMultiplier = useCustomGas && args.chainDetail?.gasMultiplier != null ? Number(args.chainDetail.gasMultiplier) : void 0;
-  const currentNonce = await publicClient.getTransactionCount({ address: executor, blockTag: "pending" });
-  let estimatedGas;
-  try {
-    estimatedGas = await publicClient.estimateGas({
-      to: pool,
-      data,
-      value: 0n,
-      account: executor
-    });
-  } catch {
-    estimatedGas = MAPLE_REQUEST_REDEEM_FALLBACK;
-  }
-  const gasLimitI = useCustomGas ? gasLimitFromEstimateAndChainConfig(estimatedGas, gasLimitConfig) : estimatedGas;
   const chainIdStr = String(args.chainId);
-  let firstTxFeePayload = {};
-  let ser;
-  let proposalTxParams0;
-  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;
-    }
-    ser = serializeTransaction({
-      type: "legacy",
-      to: pool,
-      data,
-      value: 0n,
-      gas: gasLimitI,
-      gasPrice: gasPriceWei,
-      nonce: currentNonce,
-      chainId: args.chainId
-    });
-    firstTxFeePayload = {
-      txNonce: currentNonce,
-      txGasLimit: gasLimitI.toString(),
-      txGasPrice: gasPriceWei.toString()
-    };
-    proposalTxParams0 = {
-      nonce: currentNonce,
-      gasLimit: gasLimitI.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,
-      latestBaseFeeWei
-    ));
-    ser = serializeTransaction({
-      type: "eip1559",
-      to: pool,
-      data,
-      value: 0n,
-      gas: gasLimitI,
-      maxFeePerGas,
-      maxPriorityFeePerGas,
-      nonce: currentNonce,
-      chainId: args.chainId
-    });
-    firstTxFeePayload = {
-      txNonce: currentNonce,
-      txGasLimit: gasLimitI.toString(),
-      txMaxFeePerGas: maxFeePerGas.toString(),
-      txMaxPriorityFeePerGas: maxPriorityFeePerGas.toString()
-    };
-    proposalTxParams0 = {
-      nonce: currentNonce,
-      gasLimit: gasLimitI.toString(),
-      txType: "eip1559",
-      maxFeePerGas: maxFeePerGas.toString(),
-      maxPriorityFeePerGas: maxPriorityFeePerGas.toString()
-    };
-  }
-  const h = keccak256(ser);
-  const messageHashes = [h.startsWith("0x") ? h.slice(2) : h];
-  const messageRawBatch = [ser];
-  const proposalTxParamsBatch = [proposalTxParams0];
   const firstDataNo0x = data.startsWith("0x") ? data.slice(2) : data;
-  const batchMeta = [
-    {
-      destinationAddress: pool,
+  const purposeSuffix = "Maple Syrup: 1-tx \u2014 request redeem (queue withdrawal of underlying from pool shares).";
+  return buildEvmMultisignBatch({
+    context: {
+      chainCategory: "evm",
+      keyGen: args.keyGen,
+      purposeText: args.purposeText,
+      chainId: args.chainId,
+      rpcUrl: args.rpcUrl,
+      executorAddress: executor,
+      chainDetail: args.chainDetail,
+      useCustomGas: args.useCustomGas,
+      customGasChainDetails: args.customGasChainDetails
+    },
+    steps: [{ to: pool, data, value: 0n, fallbackGas: MAPLE_REQUEST_REDEEM_FALLBACK }],
+    purposeSuffix,
+    firstMsgRawNo0x: firstDataNo0x,
+    destinationAddress: pool,
+    buildBatchMeta: ({ gasLimit }) => ({
       signatureText: JSON.stringify({
         kind: "MapleSyrup",
         name: "PoolV2.requestRedeem",
@@ -635,37 +575,9 @@ async function buildEvmMultisignBodyMaplePoolRequestRedeem(args) {
         pool
       }),
       evm: { type: "maple_pool_v2_request_redeem", version: 1, chainId: chainIdStr },
-      maple: { step: "request_redeem", pool, gasBuildRedeem: { baseGasUnits: gasLimitI.toString() } }
-    }
-  ];
-  const extraPayload = { batchMeta };
-  if (useCustomGas && args.customGasChainDetails && Object.keys(args.customGasChainDetails).length > 0) {
-    extraPayload.customGasChainDetails = args.customGasChainDetails;
-  }
-  const extraJSON = JSON.stringify(extraPayload);
-  const purposeSuffix = "Maple Syrup: 1-tx \u2014 request redeem (queue withdrawal of underlying from pool shares).";
-  const bodyForSign = {
-    keyList,
-    pubKey: ph,
-    msgHash: messageHashes[0],
-    msgRaw: firstDataNo0x,
-    messageHashes,
-    messageRawBatch,
-    destinationChainID: String(args.chainId),
-    destinationAddress: pool,
-    extraJSON,
-    signatureText: batchMeta[0].signatureText,
-    purpose: (() => {
-      const t = args.purposeText.trim();
-      return (t ? `${t}
-
-` : "") + purposeSuffix;
-    })(),
-    ...firstTxFeePayload,
-    proposalTxParams: proposalTxParamsBatch
-  };
-  if (clientId) bodyForSign.clientId = clientId;
-  return { bodyForSign, messageToSign: JSON.stringify(bodyForSign) };
+      maple: { step: "request_redeem", pool, gasBuildRedeem: { baseGasUnits: gasLimit.toString() } }
+    })
+  });
 }
 
 // src/protocols/evm/maple/index.ts