@continuumdao/ctm-mpc-defi 0.2.0 → 0.2.2

package/dist/protocols/evm/aave-v4/index.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var viem = require('viem');
+var continuumNodeSdk = require('@continuumdao/continuum-node-sdk');
 
 // src/core/registry.ts
 var modules = [];
@@ -12,18 +13,26 @@ function registerProtocolModule(mod) {
     modules.push(mod);
   }
 }
-var AAVE_V4_GRAPHQL_URL = "https://api.v4.aave.com/graphql";
-async function aaveV4Gql(query, variables) {
-  const r = await fetch(AAVE_V4_GRAPHQL_URL, {
+async function postJsonViaOptionalProxy(args) {
+  const r = await fetch(args.directUrl, {
     method: "POST",
     headers: { "content-type": "application/json" },
-    body: JSON.stringify({ query, variables: variables ?? {} })
+    body: JSON.stringify(args.body)
   });
   if (!r.ok) {
     const t = await r.text().catch(() => "");
-    throw new Error(t ? `Aave V4 API HTTP ${r.status}: ${t.slice(0, 200)}` : `Aave V4 API HTTP ${r.status}`);
+    throw new Error(t ? `HTTP ${r.status}: ${t.slice(0, 200)}` : `HTTP ${r.status}`);
   }
-  const j = await r.json();
+  return await r.json();
+}
+
+// src/protocols/evm/aave-v4/api.ts
+var AAVE_V4_GRAPHQL_URL = "https://api.v4.aave.com/graphql";
+async function aaveV4Gql(query, variables) {
+  const body = { query, variables: variables ?? {} };
+  const j = await postJsonViaOptionalProxy({
+    directUrl: AAVE_V4_GRAPHQL_URL,
+    body});
   if (j.errors?.length) {
     const msg = j.errors.map((e) => e.message ?? "Unknown").join("; ");
     throw new Error(msg);
@@ -562,20 +571,6 @@ function buildAaveV4BorrowTableRowsFromHub(borrowable, hubReserves, debtByUnderl
     };
   });
 }
-
-// src/chains/evm/rpcUrl.ts
-function isValidRpcUrl(url) {
-  const t = url.trim();
-  if (!t) return false;
-  try {
-    const u = new URL(t);
-    return u.protocol === "http:" || u.protocol === "https:";
-  } catch {
-    return false;
-  }
-}
-
-// src/protocols/evm/aave-v4/spokeOnChain.ts
 var spokeStaticAbi = [
   {
     name: "getReserveCount",
@@ -627,7 +622,7 @@ var spokeStaticAbi = [
 ];
 async function fetchAaveV4SpokeReserveIdForUnderlying(args) {
   const url = (args.rpcUrl ?? "").trim();
-  if (!isValidRpcUrl(url)) return null;
+  if (!continuumNodeSdk.isValidRpcUrl(url)) return null;
   if (!Number.isFinite(args.chainId) || args.chainId < 0) return null;
   const spoke = viem.getAddress(args.spoke);
   const want = viem.getAddress(args.underlying).toLowerCase();
@@ -684,87 +679,234 @@ async function fetchAaveV4SpokeReserveStatusForUnderlying(args) {
   };
 }
 
-// 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();
+// 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/core/envelope.ts
+function finalizeMultisign(input) {
+  const { keyGen, destinationChainID, legs } = input;
+  if (legs.length === 0) {
+    throw new Error("finalizeMultisign requires at least one leg");
   }
-  return null;
+  const ph = (keyGen.pubkeyhex ?? "").trim();
+  if (!ph) throw new Error("keyGen pubKey (pubkeyhex) is required");
+  const keyList = keyGen.keylist ?? [];
+  const clientId = continuumNodeSdk.getClientIdFromKeyGenResult(keyGen);
+  const first = legs[0];
+  const messageHashes = legs.map((l) => l.msgHash);
+  const messageRawBatch = legs.map((l) => l.msgRaw);
+  const batchMeta = legs.map((l) => ({
+    destinationAddress: l.destinationAddress,
+    signatureText: l.signatureText,
+    ...l.audit
+  }));
+  const proposalTxParams = legs.map((l) => l.proposalTxParams).filter((p) => p != null && typeof p === "object");
+  const extraPayload = {
+    batchMeta,
+    ...input.extraJSON ?? {}
+  };
+  const extraJSON = JSON.stringify(extraPayload);
+  const bodyForSign = {
+    keyList,
+    pubKey: ph,
+    msgHash: messageHashes[0],
+    msgRaw: first.msgRaw,
+    destinationChainID,
+    destinationAddress: input.destinationAddress ?? first.destinationAddress,
+    extraJSON,
+    signatureText: first.signatureText,
+    purpose: mergePurposeText(input.purposeText, input.purposeSuffix),
+    ...first.feeSnapshot
+  };
+  if (legs.length > 1) {
+    bodyForSign.messageHashes = messageHashes;
+    bodyForSign.messageRawBatch = messageRawBatch;
+  }
+  if (proposalTxParams.length > 0) {
+    bodyForSign.proposalTxParams = proposalTxParams;
+  }
+  const valueWei = first.valueWei;
+  if (valueWei != null && valueWei > 0n) {
+    bodyForSign.value = valueWei.toString();
+  }
+  if (clientId) bodyForSign.clientId = clientId;
+  return { bodyForSign, messageToSign: JSON.stringify(bodyForSign) };
+}
+function routerSwapGasLimitFromEstimate(estimatedGas, chainGasLimit) {
+  if (chainGasLimit != null && Number.isFinite(chainGasLimit) && chainGasLimit > 0) {
+    return continuumNodeSdk.gasLimitFromEstimateAndChainConfig(estimatedGas, chainGasLimit);
+  }
+  return (estimatedGas * 12n + 9n) / 10n;
 }
 
-// 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;
-}
-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",
+// 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 = viem.defineChain({
+    id: chainId,
+    name: "Destination",
     nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
-    rpcUrls: { default: { http: [url] } }
-  });
-  const publicClient = viem.createPublicClient({
-    chain,
-    transport: viem.http(url)
+    rpcUrls: { default: { http: [rpcUrl] } }
   });
-  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 publicClient = viem.createPublicClient({ chain: ch, transport: viem.http(rpcUrl) });
+  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;
+  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 = viem.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(viem.formatUnits(baseFeePerGas, 9));
-    let priorityFeeGwei;
-    try {
-      const priorityWei = await publicClient.estimateMaxPriorityFeePerGas();
-      priorityFeeGwei = parseFloat(viem.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 ? continuumNodeSdk.gasLimitFromEstimateAndChainConfig(estimatedGas, gasLimitConfig) : estimatedGas;
     }
-    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 };
+    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 = viem.parseGwei(continuumNodeSdk.gweiToDecimalString(Number(chainDetail.gasPrice)));
+        if (configured > gasPriceWei) gasPriceWei = configured;
+      }
+      serialized = viem.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 = continuumNodeSdk.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 ? 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 } = continuumNodeSdk.alignEip1559FeesWithLatestBase(
+        maxFeePerGas,
+        maxPriorityFeePerGas,
+        latestBaseFeeWei
+      ));
+      serialized = viem.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 ? continuumNodeSdk.proposalTxParamsToFeeSnapshot(proposalTxParams) : {};
+    }
+    const h = viem.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 + viem.parseGwei("0.001");
+  const extraJSON = {};
+  if (useCustomGas && customGasChainDetails && Object.keys(customGasChainDetails).length > 0) {
+    extraJSON.customGasChainDetails = customGasChainDetails;
   }
-  if (maxF < maxP) {
-    maxF = baseWei > 0n ? baseWei + maxP + viem.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/aave-v4/multisign.ts
@@ -781,16 +923,6 @@ var AAVE_V4_SPOKE_REPAY_DEFAULT_GAS_UNITS = 1000000n;
 var AAVE_SPOKE_REPAY_ESTIMATE_FALLBACK = AAVE_V4_SPOKE_REPAY_DEFAULT_GAS_UNITS;
 var AAVE_MERKL_CLAIM_ESTIMATE_FALLBACK = 500000n;
 var EULER_REUL_UNLOCK_ESTIMATE_FALLBACK = 500000n;
-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 txToViemStep(tx) {
-  return { to: viem.getAddress(tx.to), data: tx.data, value: tx.value };
-}
 var wethDepositAbi = viem.parseAbi(["function deposit() payable"]);
 var erc20AllowanceAbi = viem.parseAbi([
   "function allowance(address owner, address spender) view returns (uint256)",
@@ -805,10 +937,6 @@ var spokeSetUsingAsCollateralAbi = viem.parseAbi([
   "function setUsingAsCollateral(uint256 reserveId, bool usingAsCollateral, address onBehalfOf)"
 ]);
 async function buildEvmMultisignBodyAaveV4DepositBatch(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 asset = viem.getAddress(args.asset);
   const spoke = viem.getAddress(args.spoke);
   const weth = viem.getAddress(args.nativeWrapped);
@@ -906,172 +1034,102 @@ async function buildEvmMultisignBodyAaveV4DepositBatch(args) {
     });
     steps.push({ kind: "set_collateral", to: spoke, data: setCollateralData, 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 = "";
   const marketLabel = String(args.market);
-  for (let i = 0; i < steps.length; i++) {
-    const s = steps[i];
-    const v = txToViemStep(s);
-    const currentNonce = baseNonce + i;
-    let estimatedGas;
-    try {
-      estimatedGas = await publicClient.estimateGas({
-        to: v.to,
-        data: v.data,
-        value: v.value,
-        account: executor
-      });
-    } catch {
-      if (s.kind === "weth_deposit") estimatedGas = AAVE_WETH_DEPOSIT_FALLBACK;
-      else if (s.kind === "approve") estimatedGas = AAVE_ERC20_APPROVE_FALLBACK;
-      else if (s.kind === "set_collateral") estimatedGas = AAVE_SPOKE_SET_USING_AS_COLLATERAL_FALLBACK;
-      else estimatedGas = AAVE_SPOKE_SUPPLY_ESTIMATE_FALLBACK;
+  const evmSteps = steps.map((s) => ({
+    to: s.to,
+    data: s.data,
+    value: s.value,
+    fallbackGas: s.kind === "weth_deposit" ? AAVE_WETH_DEPOSIT_FALLBACK : s.kind === "approve" ? AAVE_ERC20_APPROVE_FALLBACK : s.kind === "set_collateral" ? AAVE_SPOKE_SET_USING_AS_COLLATERAL_FALLBACK : AAVE_SPOKE_SUPPLY_ESTIMATE_FALLBACK
+  }));
+  const n = steps.length;
+  const hasWrap = args.isNativeIn;
+  const withCollateral = args.enableAsCollateralAfterSupply === true;
+  const purposeSuffix = (() => {
+    if (hasWrap) {
+      return withCollateral ? `Aave v4: ${n}-tx batch \u2014 wrap native to WETH (if needed), approve spoke for the exact amount, supply, then setUsingAsCollateral.` : `Aave v4: ${n}-tx batch \u2014 wrap native to WETH (if needed), approve spoke for the exact amount, then supply.`;
     }
-    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;
-      }
-      if (useCustomGas && args.chainDetail?.gasPrice != null && args.chainDetail.gasPrice > 0) {
-        const configured = viem.parseGwei(gweiToDecimalString(Number(args.chainDetail.gasPrice)));
-        if (configured > gasPriceWei) gasPriceWei = configured;
-      }
-      const ser = viem.serializeTransaction({
-        type: "legacy",
-        to: v.to,
-        data: v.data,
-        value: v.value,
-        gas: gasLimitI,
-        gasPrice: gasPriceWei,
-        nonce: currentNonce,
-        chainId: args.chainId
-      });
-      const h = viem.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 = v.data.startsWith("0x") ? v.data.slice(2) : v.data;
+    if (n === 1) {
+      return "Aave v4: 1-tx \u2014 supply (allowance already sufficient).";
+    }
+    if (withCollateral && n === 2) {
+      return "Aave v4: 2-tx batch \u2014 supply (allowance already sufficient), then setUsingAsCollateral.";
+    }
+    if (withCollateral) {
+      return `Aave v4: ${n}-tx batch \u2014 approve spoke for the exact amount, supply, then setUsingAsCollateral.`;
+    }
+    return `Aave v4: ${n}-tx batch \u2014 approve spoke for the exact amount, then supply.`;
+  })();
+  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,
+    buildBatchMeta: ({ index, gasLimit }) => {
+      const s = steps[index];
+      if (s.kind === "weth_deposit") {
+        return {
+          signatureText: JSON.stringify({
+            kind: "AaveV4",
+            name: "WETH.deposit",
+            function: "deposit()",
+            valueWei: amountWei.toString(),
+            market: marketLabel,
+            note: "Wrap native to WETH, then supply to Aave v4 (same batch)."
+          }),
+          evm: { type: "aave_v4_weth_deposit", version: 1, chainId: String(args.chainId) },
+          aaveV4: { step: "weth_deposit", market: marketLabel, amountHuman: args.amountHuman, hubAsset: asset }
+        };
       }
-    } 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;
+      if (s.kind === "approve") {
+        return {
+          signatureText: JSON.stringify({
+            kind: "AaveV4",
+            name: "ERC20.approve",
+            to: "Aave v4 spoke",
+            function: "approve(address spender, uint256 amount)",
+            spoke,
+            amountHuman: args.amountHuman,
+            note: "Allowance for this supply amount only (not unlimited)."
+          }),
+          evm: { type: "aave_v4_erc20_approve", version: 1, chainId: String(args.chainId) },
+          aaveV4: { market: marketLabel, amountHuman: args.amountHuman, spoke }
+        };
       }
-      ({ maxFeePerGas, maxPriorityFeePerGas } = alignEip1559FeesWithLatestBase(
-        maxFeePerGas,
-        maxPriorityFeePerGas,
-        latestBaseFeeWei
-      ));
-      const ser = viem.serializeTransaction({
-        type: "eip1559",
-        to: v.to,
-        data: v.data,
-        value: v.value,
-        gas: gasLimitI,
-        maxFeePerGas,
-        maxPriorityFeePerGas,
-        nonce: currentNonce,
-        chainId: args.chainId
-      });
-      const h = viem.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 === "set_collateral") {
+        return {
+          signatureText: JSON.stringify({
+            kind: "AaveV4",
+            name: "Spoke.setUsingAsCollateral",
+            function: "setUsingAsCollateral(uint256 reserveId, bool usingAsCollateral, address onBehalfOf)",
+            reserveId: reserveId.toString(),
+            usingAsCollateral: true,
+            onBehalfOf: onBehalf,
+            market: marketLabel,
+            note: "Enables this supplied reserve as collateral for borrowing (after supply in the same batch)."
+          }),
+          evm: { type: "aave_v4_spoke_set_using_as_collateral", version: 1, chainId: String(args.chainId) },
+          aaveV4: {
+            market: marketLabel,
+            asset,
+            spoke,
+            reserveId: reserveId.toString(),
+            gasBuildSetCollateral: { baseGasUnits: gasLimit.toString() }
+          }
         };
-        firstDataNo0x = v.data.startsWith("0x") ? v.data.slice(2) : v.data;
       }
-    }
-    if (s.kind === "weth_deposit") {
-      batchMeta.push({
-        destinationAddress: weth,
-        signatureText: JSON.stringify({
-          kind: "AaveV4",
-          name: "WETH.deposit",
-          function: "deposit()",
-          valueWei: amountWei.toString(),
-          market: marketLabel,
-          note: "Wrap native to WETH, then supply to Aave v4 (same batch)."
-        }),
-        evm: { type: "aave_v4_weth_deposit", version: 1, chainId: String(args.chainId) },
-        aaveV4: { step: "weth_deposit", market: marketLabel, amountHuman: args.amountHuman, hubAsset: asset }
-      });
-    } else if (s.kind === "approve") {
-      const tokenForApprove = s.to;
-      batchMeta.push({
-        destinationAddress: tokenForApprove,
-        signatureText: JSON.stringify({
-          kind: "AaveV4",
-          name: "ERC20.approve",
-          to: "Aave v4 spoke",
-          function: "approve(address spender, uint256 amount)",
-          spoke,
-          amountHuman: args.amountHuman,
-          note: "Allowance for this supply amount only (not unlimited)."
-        }),
-        evm: { type: "aave_v4_erc20_approve", version: 1, chainId: String(args.chainId) },
-        aaveV4: { market: marketLabel, amountHuman: args.amountHuman, spoke }
-      });
-    } else if (s.kind === "set_collateral") {
-      batchMeta.push({
-        destinationAddress: spoke,
-        signatureText: JSON.stringify({
-          kind: "AaveV4",
-          name: "Spoke.setUsingAsCollateral",
-          function: "setUsingAsCollateral(uint256 reserveId, bool usingAsCollateral, address onBehalfOf)",
-          reserveId: reserveId.toString(),
-          usingAsCollateral: true,
-          onBehalfOf: onBehalf,
-          market: marketLabel,
-          note: "Enables this supplied reserve as collateral for borrowing (after supply in the same batch)."
-        }),
-        evm: { type: "aave_v4_spoke_set_using_as_collateral", version: 1, chainId: String(args.chainId) },
-        aaveV4: { market: marketLabel, asset, spoke, reserveId: reserveId.toString(), gasBuildSetCollateral: { baseGasUnits: gasLimitI.toString() } }
-      });
-    } else {
-      batchMeta.push({
-        destinationAddress: spoke,
+      return {
         signatureText: JSON.stringify({
           kind: "AaveV4",
           name: "Spoke.supply",
@@ -1089,67 +1147,13 @@ async function buildEvmMultisignBodyAaveV4DepositBatch(args) {
           asset,
           spoke,
           reserveId: reserveId.toString(),
-          gasBuildSupply: { baseGasUnits: gasLimitI.toString() }
+          gasBuildSupply: { 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 hasWrap = args.isNativeIn;
-  const withCollateral = args.enableAsCollateralAfterSupply === true;
-  const purposeSuffix = (() => {
-    if (hasWrap) {
-      return withCollateral ? `Aave v4: ${n}-tx batch \u2014 wrap native to WETH (if needed), approve spoke for the exact amount, supply, then setUsingAsCollateral.` : `Aave v4: ${n}-tx batch \u2014 wrap native to WETH (if needed), approve spoke for the exact amount, then supply.`;
-    }
-    if (n === 1) {
-      return "Aave v4: 1-tx \u2014 supply (allowance already sufficient).";
+      };
     }
-    if (withCollateral && n === 2) {
-      return "Aave v4: 2-tx batch \u2014 supply (allowance already sufficient), then setUsingAsCollateral.";
-    }
-    if (withCollateral) {
-      return `Aave v4: ${n}-tx batch \u2014 approve spoke for the exact amount, supply, then setUsingAsCollateral.`;
-    }
-    return `Aave v4: ${n}-tx batch \u2014 approve spoke for the exact amount, then supply.`;
-  })();
-  const firstValue = steps[0].value;
-  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 (firstValue > 0n) {
-    bodyForSign.value = firstValue.toString();
-  }
-  if (clientId) bodyForSign.clientId = clientId;
-  return { bodyForSign, messageToSign: JSON.stringify(bodyForSign) };
+  });
 }
 async function buildEvmMultisignBodyAaveV4SpokeWithdraw(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 asset = viem.getAddress(args.underlying);
   const spoke = viem.getAddress(args.spoke);
   const onBehalf = viem.getAddress(args.onBehalfOf);
@@ -1190,9 +1194,7 @@ async function buildEvmMultisignBodyAaveV4SpokeWithdraw(args) {
   });
   const tx = { to: spoke, data, value: 0n };
   return buildEvmMultisignBodyAaveV4OneStep({
-    ph,
-    keyList,
-    clientId: clientId ?? void 0,
+    keyGen: args.keyGen,
     chainId: args.chainId,
     rpcUrl: args.rpcUrl,
     chainDetail: args.chainDetail,
@@ -1228,10 +1230,6 @@ async function buildEvmMultisignBodyAaveV4SpokeWithdraw(args) {
   });
 }
 async function buildEvmMultisignBodyAaveV4SpokeBorrow(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 asset = viem.getAddress(args.underlying);
   const spoke = viem.getAddress(args.spoke);
   const onBehalf = viem.getAddress(args.onBehalfOf);
@@ -1272,9 +1270,7 @@ async function buildEvmMultisignBodyAaveV4SpokeBorrow(args) {
   });
   const tx = { to: spoke, data, value: 0n };
   return buildEvmMultisignBodyAaveV4OneStep({
-    ph,
-    keyList,
-    clientId: clientId ?? void 0,
+    keyGen: args.keyGen,
     chainId: args.chainId,
     rpcUrl: args.rpcUrl,
     chainDetail: args.chainDetail,
@@ -1310,10 +1306,6 @@ async function buildEvmMultisignBodyAaveV4SpokeBorrow(args) {
   });
 }
 async function buildEvmMultisignBodyAaveV4SpokeRepay(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 asset = viem.getAddress(args.underlying);
   const spoke = viem.getAddress(args.spoke);
   const onBehalf = viem.getAddress(args.onBehalfOf);
@@ -1376,140 +1368,50 @@ async function buildEvmMultisignBodyAaveV4SpokeRepay(args) {
     args: [reserveId, amountWei, onBehalf]
   });
   steps.push({ kind: "repay", to: spoke, data: repayData, 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 useCustom = args.useCustomGas;
-  const gasLimitConfig = useCustom && args.chainDetail?.gasLimit != null ? Number(args.chainDetail.gasLimit) : void 0;
-  const gasFeeMultiplier = useCustom && 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 = "";
   const marketLabel = String(args.market);
-  for (let i = 0; i < steps.length; i++) {
-    const s = steps[i];
-    const v = txToViemStep(s);
-    const currentNonce = baseNonce + i;
-    let estimatedGas;
-    try {
-      estimatedGas = await publicClient.estimateGas({
-        to: v.to,
-        data: v.data,
-        value: v.value,
-        account: executor
-      });
-    } catch {
-      if (s.kind === "approve") estimatedGas = AAVE_ERC20_APPROVE_FALLBACK;
-      else estimatedGas = AAVE_SPOKE_REPAY_ESTIMATE_FALLBACK;
-    }
-    const gasLimitI = useCustom ? gasLimitFromEstimateAndChainConfig(estimatedGas, gasLimitConfig) : estimatedGas;
-    if (legacy) {
-      let gasPriceWei = await publicClient.getGasPrice();
-      if (useCustom && gasFeeMultiplier != null && gasFeeMultiplier > 0) {
-        gasPriceWei = gasPriceWei * BigInt(100 + gasFeeMultiplier) / 100n;
-      }
-      if (useCustom && args.chainDetail?.gasPrice != null && args.chainDetail.gasPrice > 0) {
-        const configured = viem.parseGwei(gweiToDecimalString(Number(args.chainDetail.gasPrice)));
-        if (configured > gasPriceWei) gasPriceWei = configured;
-      }
-      const ser = viem.serializeTransaction({
-        type: "legacy",
-        to: v.to,
-        data: v.data,
-        value: v.value,
-        gas: gasLimitI,
-        gasPrice: gasPriceWei,
-        nonce: currentNonce,
-        chainId: args.chainId
-      });
-      const h = viem.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 = v.data.startsWith("0x") ? v.data.slice(2) : v.data;
-      }
-    } else {
-      const fetchedBase = feeParams.baseFeeGwei ?? 0;
-      const fetchedPriority = feeParams.priorityFeeGwei ?? 0;
-      const configuredBase = useCustom && args.chainDetail?.baseFee != null ? Number(args.chainDetail.baseFee) : 0;
-      const configuredPriority = useCustom && args.chainDetail?.priorityFee != null ? Number(args.chainDetail.priorityFee) : 0;
-      const effectiveBaseFeeGwei = Math.max(fetchedBase, configuredBase);
-      const effectivePriorityFeeGwei = Math.max(fetchedPriority, configuredPriority);
-      const baseFeeMultiplierPct = useCustom && 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 (useCustom && gasFeeMultiplier != null && gasFeeMultiplier > 0) {
-        maxPriorityFeePerGas = maxPriorityFeePerGas * BigInt(100 + gasFeeMultiplier) / 100n;
-        maxFeePerGas = maxFeePerGas * BigInt(100 + gasFeeMultiplier) / 100n;
-      }
-      ({ maxFeePerGas, maxPriorityFeePerGas } = alignEip1559FeesWithLatestBase(
-        maxFeePerGas,
-        maxPriorityFeePerGas,
-        latestBaseFeeWei
-      ));
-      const ser = viem.serializeTransaction({
-        type: "eip1559",
-        to: v.to,
-        data: v.data,
-        value: v.value,
-        gas: gasLimitI,
-        maxFeePerGas,
-        maxPriorityFeePerGas,
-        nonce: currentNonce,
-        chainId: args.chainId
-      });
-      const h = viem.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()
+  const evmSteps = steps.map((s) => ({
+    to: s.to,
+    data: s.data,
+    value: s.value,
+    fallbackGas: s.kind === "approve" ? AAVE_ERC20_APPROVE_FALLBACK : AAVE_SPOKE_REPAY_ESTIMATE_FALLBACK
+  }));
+  const n = steps.length;
+  const purposeSuffix = `Aave v4: ${n}-tx batch \u2014 approve spoke if needed, then repay ${(args.amountHuman || "").trim() || "\u2026"} of debt.`;
+  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,
+    buildBatchMeta: ({ index, gasLimit }) => {
+      const s = steps[index];
+      if (s.kind === "approve") {
+        return {
+          signatureText: JSON.stringify({
+            kind: "AaveV4",
+            name: "ERC20.approve (repay)",
+            to: "Aave v4 spoke",
+            function: "approve(address spender, uint256 amount)",
+            spoke,
+            amountHuman: args.amountHuman,
+            note: "Allowance to repay this amount (or reset+approve to exact amount)."
+          }),
+          evm: { type: "aave_v4_erc20_approve", version: 1, chainId: String(args.chainId) },
+          aaveV4: { market: marketLabel, amountHuman: args.amountHuman, spoke, step: "repay_prepare" }
         };
-        firstDataNo0x = v.data.startsWith("0x") ? v.data.slice(2) : v.data;
       }
-    }
-    if (s.kind === "approve") {
-      const tokenForApprove = s.to;
-      batchMeta.push({
-        destinationAddress: tokenForApprove,
-        signatureText: JSON.stringify({
-          kind: "AaveV4",
-          name: "ERC20.approve (repay)",
-          to: "Aave v4 spoke",
-          function: "approve(address spender, uint256 amount)",
-          spoke,
-          amountHuman: args.amountHuman,
-          note: "Allowance to repay this amount (or reset+approve to exact amount)."
-        }),
-        evm: { type: "aave_v4_erc20_approve", version: 1, chainId: String(args.chainId) },
-        aaveV4: { market: marketLabel, amountHuman: args.amountHuman, spoke, step: "repay_prepare" }
-      });
-    } else {
-      batchMeta.push({
-        destinationAddress: spoke,
+      return {
         signatureText: JSON.stringify({
           kind: "AaveV4",
           name: "Spoke.repay",
@@ -1527,57 +1429,17 @@ async function buildEvmMultisignBodyAaveV4SpokeRepay(args) {
           asset,
           spoke,
           reserveId: reserveId.toString(),
-          gasBuildRepay: { baseGasUnits: gasLimitI.toString() }
+          gasBuildRepay: { baseGasUnits: gasLimit.toString() }
         }
-      });
+      };
     }
-  }
-  const extraPayload = { batchMeta };
-  if (useCustom && 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 purposeSuffix = `Aave v4: ${n}-tx batch \u2014 approve spoke if needed, then repay ${(args.amountHuman || "").trim() || "\u2026"} of debt.`;
-  const firstValue = steps[0].value;
-  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 (firstValue > 0n) {
-    bodyForSign.value = firstValue.toString();
-  }
-  if (clientId) bodyForSign.clientId = clientId;
-  return { bodyForSign, messageToSign: JSON.stringify(bodyForSign) };
+  });
 }
 async function buildEvmMultisignBodyAaveV4MerklClaimRewards(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 to = viem.getAddress(args.to);
   const executor = viem.getAddress(args.executorAddress);
   return buildEvmMultisignBodyAaveV4OneStep({
-    ph,
-    keyList,
-    clientId: clientId ?? void 0,
+    keyGen: args.keyGen,
     chainId: args.chainId,
     rpcUrl: args.rpcUrl,
     chainDetail: args.chainDetail,
@@ -1604,16 +1466,10 @@ async function buildEvmMultisignBodyAaveV4MerklClaimRewards(args) {
   });
 }
 async function buildEvmMultisignBodyEulerV2MerklDistributorClaim(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 to = viem.getAddress(args.to);
   const executor = viem.getAddress(args.executorAddress);
   return buildEvmMultisignBodyAaveV4OneStep({
-    ph,
-    keyList,
-    clientId: clientId ?? void 0,
+    keyGen: args.keyGen,
     chainId: args.chainId,
     rpcUrl: args.rpcUrl,
     chainDetail: args.chainDetail,
@@ -1640,17 +1496,11 @@ async function buildEvmMultisignBodyEulerV2MerklDistributorClaim(args) {
   });
 }
 async function buildEvmMultisignBodyEulerV2ReulUnlock(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 to = viem.getAddress(args.to);
   const executor = viem.getAddress(args.executorAddress);
   const lossLabel = args.allowRemainderLoss ? "early unlock (remainder to receiver)" : "vested only";
   return buildEvmMultisignBodyAaveV4OneStep({
-    ph,
-    keyList,
-    clientId: clientId ?? void 0,
+    keyGen: args.keyGen,
     chainId: args.chainId,
     rpcUrl: args.rpcUrl,
     chainDetail: args.chainDetail,
@@ -1683,151 +1533,32 @@ async function buildEvmMultisignBodyEulerV2ReulUnlock(args) {
   });
 }
 async function buildEvmMultisignBodyAaveV4OneStep(args) {
-  const ch = viem.defineChain({
-    id: args.chainId,
-    name: "Destination",
-    nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
-    rpcUrls: { default: { http: [args.rpcUrl] } }
+  const firstDataNo0x = args.v.data.startsWith("0x") ? args.v.data.slice(2) : args.v.data;
+  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: args.v.to,
+        data: args.v.data,
+        value: args.v.value,
+        fallbackGas: args.estimateGasFallback
+      }
+    ],
+    purposeSuffix: args.purposeSuffix,
+    firstMsgRawNo0x: firstDataNo0x,
+    destinationAddress: args.v.to,
+    buildBatchMeta: ({ gasLimit }) => args.buildBatchMeta({ gasLimit })
   });
-  const publicClient = viem.createPublicClient({ chain: ch, transport: viem.http(args.rpcUrl) });
-  const v = args.v;
-  const feeParams = await fetchChainFeeParams(args.rpcUrl, args.chainId);
-  const legacy = Boolean(args.chainDetail?.legacy) || !feeParams.isEip1559;
-  const latestBaseFeeWeiOneStep = !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: args.executorAddress, blockTag: "pending" });
-  const currentNonce = baseNonce;
-  let estimatedGas;
-  try {
-    estimatedGas = await publicClient.estimateGas({
-      to: v.to,
-      data: v.data,
-      value: v.value,
-      account: args.executorAddress
-    });
-  } catch {
-    estimatedGas = args.estimateGasFallback;
-  }
-  const gasLimitI = useCustomGas ? gasLimitFromEstimateAndChainConfig(estimatedGas, gasLimitConfig) : estimatedGas;
-  const batchMeta0 = args.buildBatchMeta({ gasLimit: gasLimitI });
-  let firstTxFeePayload = {};
-  let firstDataNo0x = "";
-  const messageHashes = [];
-  const messageRawBatch = [];
-  const proposalTxParamsBatch = [];
-  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;
-    }
-    const ser = viem.serializeTransaction({
-      type: "legacy",
-      to: v.to,
-      data: v.data,
-      value: v.value,
-      gas: gasLimitI,
-      gasPrice: gasPriceWei,
-      nonce: currentNonce,
-      chainId: args.chainId
-    });
-    const h = viem.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()
-    });
-    firstTxFeePayload = { txNonce: currentNonce, txGasLimit: gasLimitI.toString(), txGasPrice: gasPriceWei.toString() };
-    firstDataNo0x = v.data.startsWith("0x") ? v.data.slice(2) : v.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 ? 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,
-      latestBaseFeeWeiOneStep
-    ));
-    const ser = viem.serializeTransaction({
-      type: "eip1559",
-      to: v.to,
-      data: v.data,
-      value: v.value,
-      gas: gasLimitI,
-      maxFeePerGas,
-      maxPriorityFeePerGas,
-      nonce: currentNonce,
-      chainId: args.chainId
-    });
-    const h = viem.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()
-    });
-    firstTxFeePayload = {
-      txNonce: currentNonce,
-      txGasLimit: gasLimitI.toString(),
-      txMaxFeePerGas: maxFeePerGas.toString(),
-      txMaxPriorityFeePerGas: maxPriorityFeePerGas.toString()
-    };
-    firstDataNo0x = v.data.startsWith("0x") ? v.data.slice(2) : v.data;
-  }
-  const extraPayload = { batchMeta: [batchMeta0] };
-  if (useCustomGas && args.customGasChainDetails && Object.keys(args.customGasChainDetails).length > 0) {
-    extraPayload.customGasChainDetails = args.customGasChainDetails;
-  }
-  const extraJSON = JSON.stringify(extraPayload);
-  const firstSigText = batchMeta0.signatureText;
-  const bodyForSign = {
-    keyList: args.keyList,
-    pubKey: args.ph,
-    msgHash: messageHashes[0],
-    msgRaw: firstDataNo0x,
-    messageHashes,
-    messageRawBatch,
-    destinationChainID: String(args.chainId),
-    destinationAddress: v.to,
-    extraJSON,
-    signatureText: firstSigText,
-    purpose: (() => {
-      const t = args.purposeText.trim();
-      return (t ? `${t}
-
-` : "") + args.purposeSuffix;
-    })(),
-    ...firstTxFeePayload,
-    proposalTxParams: proposalTxParamsBatch
-  };
-  if (v.value > 0n) {
-    bodyForSign.value = v.value.toString();
-  }
-  if (args.clientId) bodyForSign.clientId = args.clientId;
-  return { bodyForSign, messageToSign: JSON.stringify(bodyForSign) };
 }
 var MIN_AAVE_V4_DEPOSIT_GAS_EXEC = 400000n;
 var AAVE_V4_EVM_TYPES = /* @__PURE__ */ new Set([
@@ -1919,6 +1650,731 @@ function resolveAaveV4DepositGasUnitsFromSignRequest(detail, batchIndex) {
   }
   return null;
 }
+var POSITIONS_LIST = `
+  query AaveUserPositions($r: UserPositionsRequest!, $currency: Currency! = USD, $w: TimeWindow! = LAST_DAY) {
+    userPositions(request: $r) {
+      id
+      user
+      createdAt
+      spoke {
+        id
+        name
+        address
+        chain {
+          chainId
+          name
+        }
+        liquidationConfig {
+          targetHealthFactor
+          healthFactorForMaxBonus
+        }
+      }
+      totalSupplied(currency: $currency) {
+        current { value name symbol }
+      }
+      totalDebt(currency: $currency) {
+        current { value name symbol }
+      }
+      netBalance(currency: $currency) {
+        current { value name symbol }
+      }
+      healthFactor {
+        current
+        change(window: $w) {
+          normalized
+          value
+        }
+      }
+      netApy {
+        normalized
+        value
+      }
+    }
+  }
+`;
+var POSITION_DETAIL = `
+  query AaveUserPosition(
+    $r: UserPositionRequest!
+    $currency: Currency! = USD
+    $w: TimeWindow! = LAST_DAY
+  ) {
+    userPosition(request: $r) {
+      id
+      user
+      createdAt
+      spoke {
+        id
+        name
+        address
+        chain {
+          chainId
+          name
+        }
+        liquidationConfig {
+          targetHealthFactor
+          healthFactorForMaxBonus
+        }
+      }
+      totalSupplied(currency: $currency) {
+        current { value name symbol }
+        change { normalized value }
+      }
+      totalCollateral(currency: $currency) {
+        current { value name symbol }
+        change { normalized value }
+      }
+      totalDebt(currency: $currency) {
+        current { value name symbol }
+        change { normalized value }
+      }
+      netBalance(currency: $currency) {
+        current { value name symbol }
+        change { normalized value }
+      }
+      netCollateral(currency: $currency) {
+        current { value name symbol }
+        change { normalized value }
+      }
+      netApy {
+        normalized
+        value
+      }
+      netSupplyApy {
+        current {
+          normalized
+        }
+      }
+      netBorrowApy {
+        current {
+          normalized
+        }
+      }
+      netAccruedInterest(currency: $currency) {
+        value
+        name
+        symbol
+      }
+      healthFactor {
+        current
+        change(window: $w) {
+          normalized
+          value
+        }
+      }
+      maxBorrowingPower(currency: $currency) {
+        value
+        name
+        symbol
+      }
+      remainingBorrowingPower(currency: $currency) {
+        value
+        name
+        symbol
+      }
+      averageCollateralFactor {
+        normalized
+      }
+      liquidationPrice(currency: $currency) {
+        value
+        name
+        symbol
+      }
+      canUpdateDynamicConfig
+      netBalancePercentChange(window: $w) {
+        normalized
+      }
+    }
+  }
+`;
+var USER_SUPPLIES = `
+  query AaveUserSupplies($r: UserSuppliesRequest!) {
+    userSupplies(request: $r) {
+      id
+      isCollateral
+      principal {
+        amount {
+          value
+        }
+        token {
+          address
+          info {
+            symbol
+            name
+            icon
+          }
+        }
+      }
+      balance {
+        amount {
+          value
+        }
+        token {
+          address
+          info {
+            symbol
+            name
+          }
+        }
+      }
+      withdrawable {
+        amount {
+          value
+        }
+        token {
+          address
+          info {
+            symbol
+          }
+        }
+      }
+      interest {
+        amount {
+          value
+        }
+        token {
+          address
+          info {
+            symbol
+          }
+        }
+      }
+      reserve {
+        id
+        onChainId
+        summary {
+          supplyApy {
+            normalized
+            value
+          }
+        }
+        asset {
+          underlying {
+            address
+            info {
+              symbol
+              name
+              icon
+            }
+          }
+        }
+      }
+    }
+  }
+`;
+var DEFAULT_CURRENCY = "USD";
+var DEFAULT_TIME_WINDOW = "LAST_DAY";
+function formatAaveV4ExchangeLabel(ex) {
+  if (ex == null) return "\u2014";
+  const sym = (ex.symbol ?? "").trim();
+  const name = (ex.name ?? "").trim();
+  if (sym === "$" && name) return name;
+  if (name && sym && name.toUpperCase() !== sym) return name;
+  return sym || name || "\u2014";
+}
+function formatAaveV4PositionPercent(normalized, value) {
+  const n = (normalized ?? "").trim();
+  const v = (value ?? "").trim();
+  if (n === "0" && (v === "0" || v === "")) return "0%";
+  const out = formatAaveV4PercentDisplay(normalized, value);
+  return out;
+}
+function formatAaveV4PositionHealthFactor(raw) {
+  if (raw == null || String(raw).trim() === "") return "\u221E";
+  return formatAaveV4HealthFactorInner(raw);
+}
+function formatAaveV4HealthFactorInner(raw) {
+  const n = Number(raw);
+  if (!Number.isFinite(n)) return String(raw);
+  if (n >= 1e12) return "\u221E";
+  return n >= 10 ? n.toFixed(1) : n.toFixed(2);
+}
+function buildUserPositionsRequest(user, filter) {
+  return {
+    user,
+    filter,
+    orderBy: { balance: "DESC" }
+  };
+}
+async function fetchAaveV4UserPositionsForChain(args) {
+  const u = (args.user ?? "").trim();
+  if (!u || !viem.isAddress(u)) return [];
+  const user = viem.getAddress(u);
+  const d = await aaveV4Gql(POSITIONS_LIST, {
+    r: buildUserPositionsRequest(user, { chainIds: [args.chainId] }),
+    currency: DEFAULT_CURRENCY,
+    w: DEFAULT_TIME_WINDOW
+  });
+  return d.userPositions ?? [];
+}
+async function fetchAaveV4UserPositionsByAssetOnChain(args) {
+  const u = (args.user ?? "").trim();
+  if (!u || !viem.isAddress(u)) {
+    return { forAsset: [], other: [], filterUnderlying: null };
+  }
+  const user = viem.getAddress(u);
+  const c = args.chainId;
+  const f = args.filterUnderlying;
+  if (f == null) {
+    const all2 = await fetchAaveV4UserPositionsForChain({ user: u, chainId: c });
+    return { forAsset: all2, other: [], filterUnderlying: null };
+  }
+  const token = viem.getAddress(f);
+  const [allRes, withTokenRes] = await Promise.all([
+    aaveV4Gql(POSITIONS_LIST, {
+      r: buildUserPositionsRequest(user, { chainIds: [c] }),
+      currency: DEFAULT_CURRENCY,
+      w: DEFAULT_TIME_WINDOW
+    }),
+    aaveV4Gql(POSITIONS_LIST, {
+      r: buildUserPositionsRequest(user, { tokens: [{ address: token, chainId: c }] }),
+      currency: DEFAULT_CURRENCY,
+      w: DEFAULT_TIME_WINDOW
+    })
+  ]);
+  const all = allRes.userPositions ?? [];
+  const forAsset = withTokenRes.userPositions ?? [];
+  const want = new Set(forAsset.map((p) => p.id));
+  const other = all.filter((p) => !want.has(p.id));
+  return { forAsset, other, filterUnderlying: token };
+}
+async function fetchAaveV4UserPositionById(positionId) {
+  const id = (positionId ?? "").trim();
+  if (!id) return null;
+  const d = await aaveV4Gql(POSITION_DETAIL, {
+    r: { id },
+    currency: DEFAULT_CURRENCY,
+    w: DEFAULT_TIME_WINDOW
+  });
+  return d.userPosition ?? null;
+}
+async function fetchAaveV4UserSuppliesForPosition(userPositionId) {
+  const pid = (userPositionId ?? "").trim();
+  if (!pid) return [];
+  const d = await aaveV4Gql(USER_SUPPLIES, {
+    r: {
+      query: { userPositionId: pid },
+      orderBy: { amount: "DESC" },
+      includeZeroBalances: false
+    }
+  });
+  return d.userSupplies ?? [];
+}
+async function aaveV4UserHasAvailableBorrowCollateralForContextOnSpoke(args) {
+  let wantSpoke;
+  try {
+    wantSpoke = viem.getAddress(args.spokeAddress).toLowerCase();
+  } catch {
+    return false;
+  }
+  const u0 = viem.getAddress(args.contextUnderlying).toLowerCase();
+  const positions = await fetchAaveV4UserPositionsForChain({ user: args.user, chainId: args.chainId });
+  const pos = positions.find((p) => {
+    const a = (p.spoke?.address ?? "").trim();
+    if (!a) return false;
+    try {
+      return viem.getAddress(a).toLowerCase() === wantSpoke;
+    } catch {
+      return false;
+    }
+  });
+  if (!pos) return false;
+  const supplies = await fetchAaveV4UserSuppliesForPosition(pos.id);
+  const row = supplies.find((s) => {
+    const a = (s.reserve?.asset?.underlying?.address ?? "").trim();
+    if (!a) return false;
+    try {
+      return viem.getAddress(a).toLowerCase() === u0;
+    } catch {
+      return false;
+    }
+  });
+  if (!row) return false;
+  const bal = parseFloat((row.balance?.amount?.value ?? "").trim());
+  if (!Number.isFinite(bal) || bal <= 0) return false;
+  return row.isCollateral === true;
+}
+function formatAaveV4DecimalString(raw, maxFractionDigits = 6) {
+  const s = (raw ?? "").trim();
+  if (!s) return "\u2014";
+  const n = Number(s);
+  if (!Number.isFinite(n)) return s;
+  if (Math.abs(n) >= 1e9) return n.toExponential(2);
+  return n.toLocaleString(void 0, { maximumFractionDigits: maxFractionDigits });
+}
+function formatAaveV4RiskNotionalString(raw) {
+  const s = (raw ?? "").trim();
+  if (!s) return "\u2014";
+  const n = Number(s);
+  if (!Number.isFinite(n)) return s;
+  if (n === 0) return "0";
+  if (Math.abs(n) >= 1e9) return n.toExponential(2);
+  if (n > 0 && n < 0.5) {
+    return n.toLocaleString(void 0, { maximumSignificantDigits: 4, maximumFractionDigits: 8 });
+  }
+  return n.toLocaleString(void 0, { maximumFractionDigits: 6 });
+}
+function formatAaveV4HealthFactor(raw) {
+  if (raw == null || String(raw).trim() === "") return "\u2014";
+  return formatAaveV4HealthFactorInner(String(raw).trim());
+}
+var HF_EPS = 1e-9;
+function aaveV4WithdrawHealthGate(args) {
+  const { hasBorrowDebt, liquidationConfig: liq } = args;
+  const r0 = args.resultingHealthFactor;
+  if (!hasBorrowDebt) {
+    return { outcome: "allow" };
+  }
+  if (r0 == null || !Number.isFinite(r0)) {
+    return { outcome: "block", reason: "Could not determine health factor after withdrawal." };
+  }
+  const r = r0;
+  const t = liq == null ? NaN : Number(liq.targetHealthFactor);
+  const m = liq == null ? NaN : Number(liq.healthFactorForMaxBonus);
+  if (r <= 1 + HF_EPS) {
+    return {
+      outcome: "block",
+      reason: "This withdrawal would leave health factor at or below 1.0 (liquidation range)."
+    };
+  }
+  if (Number.isFinite(m) && m > 1 + HF_EPS && r <= m + HF_EPS) {
+    return {
+      outcome: "block",
+      reason: `This withdrawal would put health factor at or below the spoke\u2019s max-liquidation-bonus threshold (${m}).`
+    };
+  }
+  if (Number.isFinite(t) && r < t - HF_EPS) {
+    return {
+      outcome: "confirm",
+      reason: `The resulting health factor would be below this market\u2019s target (${t.toFixed(4)}).`,
+      targetHealthFactor: t,
+      healthFactorForMaxBonus: Number.isFinite(m) ? m : 0
+    };
+  }
+  return { outcome: "allow" };
+}
+function aaveV4BorrowHealthGate(args) {
+  return aaveV4WithdrawHealthGate({
+    resultingHealthFactor: args.resultingHealthFactor,
+    hasBorrowDebt: true,
+    liquidationConfig: args.liquidationConfig
+  });
+}
+function aaveV4RepayHealthGate(args) {
+  if (!args.strict) {
+    return { outcome: "allow" };
+  }
+  return aaveV4WithdrawHealthGate({
+    resultingHealthFactor: args.resultingHealthFactor,
+    hasBorrowDebt: true,
+    liquidationConfig: args.liquidationConfig
+  });
+}
+
+// src/protocols/evm/aave-v4/positionActionsApi.ts
+var PREVIEW_WITHDRAW = `
+  query AaveV4PreviewWithdraw($req: PreviewRequest!) {
+    preview(request: $req) {
+      __typename
+      ... on PreviewUserPosition {
+        id
+        healthFactor {
+          __typename
+          ... on HealthFactorVariation {
+            current
+            after
+          }
+          ... on HealthFactorError {
+            reason
+            current
+            after
+          }
+        }
+      }
+    }
+  }
+`;
+var USER_CLAIMABLE = `
+  query AaveV4UserClaimableRewards($req: UserClaimableRewardsRequest!) {
+    userClaimableRewards(request: $req) {
+      __typename
+      ... on UserMerklClaimableReward {
+        id
+        claimable {
+          amount { value }
+          exchange { value name symbol }
+          token {
+            address
+            info { symbol name }
+          }
+        }
+      }
+    }
+  }
+`;
+var CLAIM_REWARDS = `
+  query AaveV4ClaimRewards($req: ClaimRewardsRequest!) {
+    claimRewards(request: $req) {
+      to
+      from
+      data
+      value
+      chainId
+    }
+  }
+`;
+function parseBigDecimalHf(s) {
+  if (s == null || !String(s).trim()) return null;
+  const n = Number(String(s).trim());
+  return Number.isFinite(n) ? n : null;
+}
+async function previewAaveV4WithdrawResultingHf(args) {
+  const req = {
+    action: {
+      withdraw: {
+        sender: args.user,
+        reserve: args.reserveId,
+        amount: { erc20: { exact: args.amountExactHuman } }
+      }
+    }
+  };
+  const d = await aaveV4Gql(PREVIEW_WITHDRAW, { req });
+  const p = d.preview;
+  if (p?.__typename !== "PreviewUserPosition") {
+    return { resultingHf: null, error: "Withdraw preview is not available for this request." };
+  }
+  const hf = p.healthFactor;
+  if (hf?.__typename === "HealthFactorError") {
+    return { resultingHf: null, error: hf.reason ?? "Invalid withdrawal for this position." };
+  }
+  if (hf?.__typename === "HealthFactorVariation") {
+    return { resultingHf: parseBigDecimalHf(hf.after), error: null };
+  }
+  return { resultingHf: null, error: "Could not read health factor from preview." };
+}
+async function previewAaveV4BorrowResultingHf(args) {
+  const req = {
+    action: {
+      borrow: {
+        sender: args.user,
+        reserve: args.reserveGraphqlId,
+        amount: { erc20: { value: args.amountExactHuman } }
+      }
+    }
+  };
+  const d = await aaveV4Gql(PREVIEW_WITHDRAW, { req });
+  const p = d.preview;
+  if (p?.__typename !== "PreviewUserPosition") {
+    return { resultingHf: null, error: "Borrow preview is not available for this request." };
+  }
+  const hf = p.healthFactor;
+  if (hf?.__typename === "HealthFactorError") {
+    return { resultingHf: null, error: hf.reason ?? "Invalid borrow for this position." };
+  }
+  if (hf?.__typename === "HealthFactorVariation") {
+    return { resultingHf: parseBigDecimalHf(hf.after), error: null };
+  }
+  return { resultingHf: null, error: "Could not read health factor from borrow preview." };
+}
+var PREVIEW_REPAY = `
+  query AaveV4PreviewRepay($req: PreviewRequest!) {
+    preview(request: $req) {
+      __typename
+      ... on PreviewUserPosition {
+        id
+        healthFactor {
+          __typename
+          ... on HealthFactorVariation {
+            current
+            after
+          }
+          ... on HealthFactorError {
+            reason
+            current
+            after
+          }
+        }
+      }
+    }
+  }
+`;
+async function previewAaveV4RepayResultingHf(args) {
+  const req = {
+    action: {
+      repay: {
+        sender: args.user,
+        reserve: args.reserveGraphqlId,
+        amount: { erc20: { value: { exact: args.amountExactHuman } } }
+      }
+    }
+  };
+  const d = await aaveV4Gql(PREVIEW_REPAY, { req });
+  const p = d.preview;
+  if (p?.__typename !== "PreviewUserPosition") {
+    return { resultingHf: null, error: "Repay preview is not available for this request." };
+  }
+  const hf = p.healthFactor;
+  if (hf?.__typename === "HealthFactorError") {
+    return { resultingHf: null, error: hf.reason ?? "Invalid repay for this position." };
+  }
+  if (hf?.__typename === "HealthFactorVariation") {
+    return { resultingHf: parseBigDecimalHf(hf.after), error: null };
+  }
+  return { resultingHf: null, error: "Could not read health factor from repay preview." };
+}
+async function fetchAaveV4MerklClaimableRewardsForChain(args) {
+  const d = await aaveV4Gql(USER_CLAIMABLE, { req: { user: args.user, chainId: args.chainId } });
+  const out = [];
+  for (const r of d.userClaimableRewards ?? []) {
+    if (r.__typename !== "UserMerklClaimableReward" || !("claimable" in r)) continue;
+    const id = (r.id ?? "").trim();
+    if (!id) continue;
+    const c = r.claimable;
+    const sym = (c?.token?.info?.symbol ?? "").trim() || "\u2014";
+    const name = (c?.token?.info?.name ?? "").trim() || sym;
+    const addr = (c?.token?.address ?? "").trim();
+    const amt = (c?.amount?.value ?? "").trim();
+    const exV = (c?.exchange?.value ?? "").trim();
+    const exName = (c?.exchange?.name ?? "").trim();
+    const exSym = (c?.exchange?.symbol ?? "").trim();
+    const exchangeLabel = exName && exSym && exName.toUpperCase() !== exSym.toUpperCase() ? exName : exSym || exName || "\u2014";
+    let exchangeValue = null;
+    if (exV) {
+      const n = parseFloat(exV);
+      exchangeValue = Number.isFinite(n) ? exV : null;
+    }
+    out.push({
+      id,
+      tokenSymbol: sym,
+      tokenName: name,
+      tokenAddress: addr,
+      amountValue: amt,
+      exchangeValue,
+      exchangeLabel
+    });
+  }
+  return out;
+}
+async function fetchAaveV4MerklClaimRewardIdsForChain(args) {
+  const rows = await fetchAaveV4MerklClaimableRewardsForChain(args);
+  return rows.map((r) => r.id);
+}
+async function fetchAaveV4ClaimRewardsCalldata(args) {
+  if (args.rewardIds.length === 0) return null;
+  const d = await aaveV4Gql(CLAIM_REWARDS, { req: { user: args.user, chainId: args.chainId, ids: args.rewardIds } });
+  const c = d.claimRewards;
+  if (!c) return null;
+  return {
+    to: c.to,
+    from: c.from,
+    data: c.data,
+    value: c.value,
+    chainId: c.chainId
+  };
+}
+
+// src/protocols/evm/aave-v4/loadSupportedChainIds.ts
+var cached = null;
+var inflight = null;
+function loadAaveV4SupportedChainIds() {
+  if (cached) return Promise.resolve(cached);
+  if (inflight) return inflight;
+  inflight = (async () => {
+    try {
+      const s = await loadAaveV4SupportedChainIdsFromV4Api();
+      cached = s;
+      return s;
+    } finally {
+      inflight = null;
+    }
+  })();
+  return inflight;
+}
+
+// src/chains/evm/chainIdParse.ts
+function parseEvmChainIdToNumber(chainId) {
+  if (chainId == null) return Number.NaN;
+  if (typeof chainId === "bigint") {
+    const n = Number(chainId);
+    return Number.isSafeInteger(n) && n >= 0 ? n : Number.NaN;
+  }
+  if (typeof chainId === "number") {
+    return Number.isInteger(chainId) && chainId >= 0 ? chainId : Number.NaN;
+  }
+  const t = String(chainId).trim();
+  if (!t) return Number.NaN;
+  const low = t.toLowerCase();
+  if (low.startsWith("eip155:")) {
+    const rest = t.slice("eip155:".length).trim();
+    const n = Number.parseInt(rest, 10);
+    return Number.isNaN(n) || n < 0 ? Number.NaN : n;
+  }
+  if (low.startsWith("0x")) {
+    return Number.parseInt(t, 16);
+  }
+  return Number.parseInt(t, 10);
+}
+
+// src/protocols/evm/aave-v4/reserveDisplay.ts
+function formatAavePercentDisplay(p) {
+  if (!p) return "\u2014";
+  const t = (p.formatted ?? "").trim();
+  if (t) return t.includes("%") ? t : `${t}%`;
+  const v = (p.value ?? "").trim();
+  if (!v) return "\u2014";
+  const n = Number(v) * 100;
+  if (!Number.isFinite(n)) return "\u2014";
+  if (n >= 0.01) return `${n.toFixed(2)}%`;
+  if (n > 0) return `${n.toFixed(4)}%`;
+  return "0%";
+}
+function aaveAvailableLiquidityDisplay(supplyInfo, borrowInfo) {
+  const sTotal = supplyInfo?.total;
+  const bAmt = borrowInfo?.total?.amount;
+  if (!sTotal?.raw || sTotal.decimals == null) return "\u2014";
+  if (!bAmt?.raw || bAmt.decimals == null) return "\u2014";
+  try {
+    if (sTotal.decimals !== bAmt.decimals) return "\u2014";
+    const a = BigInt(sTotal.raw) - BigInt(bAmt.raw);
+    if (a < 0n) return "0";
+    return viem.formatUnits(a, sTotal.decimals);
+  } catch {
+    return "\u2014";
+  }
+}
+function aaveUnderlyingAddressForContext(args) {
+  const raw = (args.contextContract ?? "").trim();
+  try {
+    const a = viem.getAddress(raw);
+    if (a.toLowerCase() === viem.zeroAddress.toLowerCase() && args.chainNativeWrapped) {
+      return viem.getAddress(args.chainNativeWrapped.trim());
+    }
+    return a;
+  } catch {
+    return viem.getAddress(viem.zeroAddress);
+  }
+}
+function isValidAaveChainId(assetsChainId) {
+  if (assetsChainId == null) return false;
+  const n = parseEvmChainIdToNumber(assetsChainId);
+  return !Number.isNaN(n) && n >= 0;
+}
+function aaveReadSupplyMetrics(reserve, symbolForDisplay) {
+  if (!reserve || typeof reserve !== "object") {
+    return { depositedAmount: "\u2014", apy: "\u2014", totalDeposits: "\u2014", availableLiquidity: "\u2014" };
+  }
+  const r = reserve;
+  const apy = formatAavePercentDisplay(r.supplyInfo?.apy);
+  const tot = r.supplyInfo?.total?.value ?? "\u2014";
+  const liq = aaveAvailableLiquidityDisplay(r.supplyInfo, r.borrowInfo);
+  const dep = r.userState?.balance?.amount?.value ?? "\u2014";
+  const sym = (symbolForDisplay ?? "").trim();
+  return {
+    depositedAmount: dep === "\u2014" ? "\u2014" : sym ? `${dep} ${sym}` : dep,
+    apy,
+    totalDeposits: tot === "\u2014" ? "\u2014" : sym ? `${tot} ${sym}` : tot,
+    availableLiquidity: liq === "\u2014" ? "\u2014" : sym ? `${liq} ${sym}` : liq
+  };
+}
 
 // src/protocols/evm/aave-v4/index.ts
 var AAVE_V4_PROTOCOL_ID = "aave-v4";
@@ -1947,10 +2403,17 @@ exports.AAVE_V4_SPOKE_REPAY_DEFAULT_GAS_UNITS = AAVE_V4_SPOKE_REPAY_DEFAULT_GAS_
 exports.AAVE_V4_SPOKE_SUPPLY_DEFAULT_GAS_UNITS = AAVE_V4_SPOKE_SUPPLY_DEFAULT_GAS_UNITS;
 exports.AAVE_V4_SPOKE_WITHDRAW_DEFAULT_GAS_UNITS = AAVE_V4_SPOKE_WITHDRAW_DEFAULT_GAS_UNITS;
 exports.MIN_AAVE_V4_DEPOSIT_GAS_EXEC = MIN_AAVE_V4_DEPOSIT_GAS_EXEC;
+exports.aaveAvailableLiquidityDisplay = aaveAvailableLiquidityDisplay;
+exports.aaveReadSupplyMetrics = aaveReadSupplyMetrics;
+exports.aaveUnderlyingAddressForContext = aaveUnderlyingAddressForContext;
+exports.aaveV4BorrowHealthGate = aaveV4BorrowHealthGate;
 exports.aaveV4Gql = aaveV4Gql;
 exports.aaveV4KeyForNodeAssetRow = aaveV4KeyForNodeAssetRow;
 exports.aaveV4ProtocolModule = aaveV4ProtocolModule;
+exports.aaveV4RepayHealthGate = aaveV4RepayHealthGate;
 exports.aaveV4UiMarketIdForHubName = aaveV4UiMarketIdForHubName;
+exports.aaveV4UserHasAvailableBorrowCollateralForContextOnSpoke = aaveV4UserHasAvailableBorrowCollateralForContextOnSpoke;
+exports.aaveV4WithdrawHealthGate = aaveV4WithdrawHealthGate;
 exports.aggregateV4SupplyDisplay = aggregateV4SupplyDisplay;
 exports.borrowableAssetsFromHubReserves = borrowableAssetsFromHubReserves;
 exports.buildAaveV4BorrowTableRowsFromHub = buildAaveV4BorrowTableRowsFromHub;
@@ -1963,24 +2426,44 @@ exports.buildEvmMultisignBodyEulerV2MerklDistributorClaim = buildEvmMultisignBod
 exports.buildEvmMultisignBodyEulerV2ReulUnlock = buildEvmMultisignBodyEulerV2ReulUnlock;
 exports.ensureAaveV4ChainTokenCache = ensureAaveV4ChainTokenCache;
 exports.fetchAaveV4Chains = fetchAaveV4Chains;
+exports.fetchAaveV4ClaimRewardsCalldata = fetchAaveV4ClaimRewardsCalldata;
 exports.fetchAaveV4HubReserves = fetchAaveV4HubReserves;
 exports.fetchAaveV4HubsForChain = fetchAaveV4HubsForChain;
+exports.fetchAaveV4MerklClaimRewardIdsForChain = fetchAaveV4MerklClaimRewardIdsForChain;
+exports.fetchAaveV4MerklClaimableRewardsForChain = fetchAaveV4MerklClaimableRewardsForChain;
 exports.fetchAaveV4NativeWrappedToken = fetchAaveV4NativeWrappedToken;
 exports.fetchAaveV4ReservesForUnderlying = fetchAaveV4ReservesForUnderlying;
 exports.fetchAaveV4SpokeReserveIdForUnderlying = fetchAaveV4SpokeReserveIdForUnderlying;
 exports.fetchAaveV4SpokeReserveStatusForUnderlying = fetchAaveV4SpokeReserveStatusForUnderlying;
 exports.fetchAaveV4SupportedUnderlyingAddressSet = fetchAaveV4SupportedUnderlyingAddressSet;
 exports.fetchAaveV4UserBorrowsDebtByUnderlyingForHub = fetchAaveV4UserBorrowsDebtByUnderlyingForHub;
+exports.fetchAaveV4UserPositionById = fetchAaveV4UserPositionById;
+exports.fetchAaveV4UserPositionsByAssetOnChain = fetchAaveV4UserPositionsByAssetOnChain;
+exports.fetchAaveV4UserPositionsForChain = fetchAaveV4UserPositionsForChain;
+exports.fetchAaveV4UserSuppliesForPosition = fetchAaveV4UserSuppliesForPosition;
 exports.findAaveV4HubReserveForChainUnderlying = findAaveV4HubReserveForChainUnderlying;
 exports.findHubReserveForUnderlying = findHubReserveForUnderlying;
+exports.formatAavePercentDisplay = formatAavePercentDisplay;
 exports.formatAaveV4AmountHumanFromApiString = formatAaveV4AmountHumanFromApiString;
+exports.formatAaveV4DecimalString = formatAaveV4DecimalString;
+exports.formatAaveV4ExchangeLabel = formatAaveV4ExchangeLabel;
+exports.formatAaveV4HealthFactor = formatAaveV4HealthFactor;
 exports.formatAaveV4PercentDisplay = formatAaveV4PercentDisplay;
+exports.formatAaveV4PositionHealthFactor = formatAaveV4PositionHealthFactor;
+exports.formatAaveV4PositionPercent = formatAaveV4PositionPercent;
 exports.formatAaveV4ReserveLiquidityFromSummary = formatAaveV4ReserveLiquidityFromSummary;
 exports.formatAaveV4RiskDisplay = formatAaveV4RiskDisplay;
+exports.formatAaveV4RiskNotionalString = formatAaveV4RiskNotionalString;
 exports.formatAaveV4TokenAmount = formatAaveV4TokenAmount;
 exports.isAaveV4DepositEvmSignRequest = isAaveV4DepositEvmSignRequest;
+exports.isValidAaveChainId = isValidAaveChainId;
+exports.loadAaveV4SupportedChainIds = loadAaveV4SupportedChainIds;
 exports.loadAaveV4SupportedChainIdsFromV4Api = loadAaveV4SupportedChainIdsFromV4Api;
+exports.parseBigDecimalHf = parseBigDecimalHf;
 exports.pickAaveV4ReserveRowForSpoke = pickAaveV4ReserveRowForSpoke;
+exports.previewAaveV4BorrowResultingHf = previewAaveV4BorrowResultingHf;
+exports.previewAaveV4RepayResultingHf = previewAaveV4RepayResultingHf;
+exports.previewAaveV4WithdrawResultingHf = previewAaveV4WithdrawResultingHf;
 exports.resolveAaveV4DepositGasUnitsFromSignRequest = resolveAaveV4DepositGasUnitsFromSignRequest;
 exports.resolveAaveV4HubForUiMarket = resolveAaveV4HubForUiMarket;
 //# sourceMappingURL=index.cjs.map