@continuumdao/ctm-mpc-defi 0.2.13 → 0.2.16

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

@@ -1,4 +1,4 @@
-import { parseAbiParameters, parseAbi, parseAbiItem, getAddress, zeroAddress, formatUnits, parseUnits, encodeFunctionData, erc20Abi, keccak256, encodeAbiParameters, decodeEventLog, defineChain, createPublicClient, http, decodeFunctionData, parseGwei, serializeTransaction } from 'viem';
+import { parseAbi, parseAbiParameters, parseAbiItem, getAddress, zeroAddress, formatUnits, parseUnits, createPublicClient, http, defineChain, encodeFunctionData, keccak256, encodeAbiParameters, decodeEventLog, decodeFunctionData, parseGwei, serializeTransaction, erc20Abi } from 'viem';
 import { nodeFetchWithReadAuth, fetchChainFeeParams, gasLimitFromEstimateAndChainConfig, gweiToDecimalString, proposalTxParamsToFeeSnapshot, alignEip1559FeesWithLatestBase, getClientIdFromKeyGenResult } from '@continuumdao/continuum-node-sdk';
 
 // src/core/registry.ts
@@ -498,6 +498,45 @@ function formatUniswapQuoteForDisplay(res, args) {
   if (requestId) lines.push(`Request: ${requestId}`);
   return { title: "Quote received", lines, rawJson };
 }
+var erc20AllowanceAbi = parseAbi([
+  "function allowance(address owner, address spender) view returns (uint256)",
+  "function decimals() view returns (uint8)"
+]);
+var erc20ApproveAbi = parseAbi(["function approve(address spender, uint256 amount) returns (bool)"]);
+async function buildConditionalErc20ApproveSteps(args) {
+  if (args.amountWei <= 0n) return [];
+  const token = getAddress(args.token);
+  const spender = getAddress(args.spender);
+  const owner = getAddress(args.owner);
+  const fallback = args.fallbackGas ?? 100000n;
+  const allowance = await args.publicClient.readContract({
+    address: token,
+    abi: erc20AllowanceAbi,
+    functionName: "allowance",
+    args: [owner, spender]
+  });
+  if (allowance >= args.amountWei) return [];
+  const steps = [];
+  if (allowance > 0n) {
+    steps.push({
+      to: token,
+      data: encodeFunctionData({ abi: erc20ApproveAbi, functionName: "approve", args: [spender, 0n] }),
+      value: 0n,
+      fallbackGas: fallback
+    });
+  }
+  steps.push({
+    to: token,
+    data: encodeFunctionData({
+      abi: erc20ApproveAbi,
+      functionName: "approve",
+      args: [spender, args.amountWei]
+    }),
+    value: 0n,
+    fallbackGas: fallback
+  });
+  return steps;
+}
 
 // src/core/purpose.ts
 function mergePurposeText(purposeText, purposeSuffix) {
@@ -1185,10 +1224,23 @@ async function buildEvmMultisignBodyUniswapV4SkipPermit2Batch(args) {
     if (expiration48 > MAX_UINT48) expiration48 = MAX_UINT48;
   }
   const erc20ApproveSpender = usePermit2Triple ? PERMIT2_ADDRESS : toRouter;
-  const approveData = encodeFunctionData({
-    abi: erc20Abi,
-    functionName: "approve",
-    args: [erc20ApproveSpender, approveAmountWei]
+  const executor = getAddress(args.executorAddress);
+  const publicClient = createPublicClient({
+    chain: defineChain({
+      id: args.chainId,
+      name: `uniswap-swap-${args.chainId}`,
+      nativeCurrency: { decimals: 18, name: "Ether", symbol: "ETH" },
+      rpcUrls: { default: { http: [args.rpcUrl] } }
+    }),
+    transport: http(args.rpcUrl)
+  });
+  const erc20ApproveSteps = await buildConditionalErc20ApproveSteps({
+    publicClient,
+    token: tokenIn,
+    spender: erc20ApproveSpender,
+    owner: executor,
+    amountWei: approveAmountWei,
+    fallbackGas: 100000n
   });
   const valueWei = (() => {
     const v = args.swap.value;
@@ -1200,13 +1252,16 @@ async function buildEvmMultisignBodyUniswapV4SkipPermit2Batch(args) {
     }
   })();
   const swapRecord = args.swap;
-  const swapMsgIndex = usePermit2Triple ? 2 : 1;
+  const swapMsgIndex = usePermit2Triple ? erc20ApproveSteps.length + 1 : erc20ApproveSteps.length;
   let gasBuildSource = "rpcEstimate";
   let estimateGasError;
   let swapBaseGasUnits = DEFAULT_UNIVERSAL_ROUTER_GAS_FALLBACK;
-  const steps = [
-    { to: tokenIn, data: approveData, value: 0n, fallbackGas: 100000n }
-  ];
+  const steps = erc20ApproveSteps.map((s) => ({
+    to: s.to,
+    data: s.data,
+    value: s.value,
+    fallbackGas: s.fallbackGas
+  }));
   if (usePermit2Triple) {
     const permit2ApproveData = encodeFunctionData({
       abi: permit2ApproveRouterAbi,
@@ -1223,8 +1278,9 @@ async function buildEvmMultisignBodyUniswapV4SkipPermit2Batch(args) {
     fallbackGas: DEFAULT_UNIVERSAL_ROUTER_GAS_FALLBACK
   });
   const swapStepIndex = steps.length - 1;
-  const approveMsgRawNo0x = approveData.startsWith("0x") ? approveData.slice(2) : approveData;
-  const purposeSuffix = usePermit2Triple ? "Uniswap V4: 3-tx batch (classic allowance) \u2014 (1) ERC-20 approve allowance hub, (2) hub approve(Universal Router), (3) swap (Trade /swap)." : "Uniswap V4: 2-tx batch (classic allowance, dispatcher) \u2014 (1) ERC-20 approve swap.to (dispatcher pulls tokens), (2) swap (Trade /swap).";
+  const approveMsgRawNo0x = erc20ApproveSteps.length > 0 && erc20ApproveSteps[erc20ApproveSteps.length - 1].data.startsWith("0x") ? erc20ApproveSteps[erc20ApproveSteps.length - 1].data.slice(2) : dataHex.startsWith("0x") ? dataHex.slice(2) : dataHex;
+  const approveCount = erc20ApproveSteps.length;
+  const purposeSuffix = usePermit2Triple ? `Uniswap V4: ${approveCount > 0 ? "3" : "2"}-tx batch (classic allowance) \u2014 ERC-20 approve allowance hub when needed, hub approve(Universal Router), swap.` : approveCount > 0 ? "Uniswap V4: 2-tx batch (classic allowance, dispatcher) \u2014 ERC-20 approve swap.to when needed, then swap." : "Uniswap V4: 1-tx batch \u2014 swap only (ERC-20 allowance already sufficient).";
   const buildSwapAudit = () => ({
     skipPermit2Batch: true,
     approvalPath: usePermit2Triple ? "permit2_triple" : "dispatcher",
@@ -1301,18 +1357,18 @@ async function buildEvmMultisignBodyUniswapV4SkipPermit2Batch(args) {
     firstMsgRawNo0x: approveMsgRawNo0x,
     destinationAddress: tokenIn,
     payableValueWei: valueWei > 0n ? valueWei : void 0,
-    estimateGasForStep: async ({ step, index, publicClient, executor }) => {
+    estimateGasForStep: async ({ step, index, publicClient: publicClient2, executor: executor2 }) => {
       if (index !== swapStepIndex) {
-        return publicClient.estimateGas({
+        return publicClient2.estimateGas({
           to: step.to,
           data: step.data,
           value: step.value,
-          account: executor
+          account: executor2
         });
       }
       const r = await estimateUniswapRouterSwapGas({
-        publicClient,
-        executor,
+        publicClient: publicClient2,
+        executor: executor2,
         to: toRouter,
         data: dataHex,
         value: valueWei,
@@ -2197,7 +2253,7 @@ function isNativeUniswapLpTokenAddress(token) {
 
 // src/protocols/evm/uniswap-v4/liquidityMultisign.ts
 var wethDepositAbi = parseAbi(["function deposit() payable"]);
-var erc20AllowanceAbi = parseAbi([
+var erc20AllowanceAbi2 = parseAbi([
   "function allowance(address owner, address spender) view returns (uint256)",
   "function decimals() view returns (uint8)"
 ]);
@@ -2307,7 +2363,7 @@ async function resolveApproveTargets(args) {
     }
     const allowance = await args.publicClient.readContract({
       address: row.token,
-      abi: erc20AllowanceAbi,
+      abi: erc20AllowanceAbi2,
       functionName: "allowance",
       args: [args.executor, args.spender]
     });
@@ -2349,16 +2405,32 @@ async function buildEvmMultisignBodyUniswapV4LiquidityBatchInternal(args) {
         value: target.amount,
         fallbackGas: UNISWAP_V4_LP_WETH_DEPOSIT_FALLBACK
       });
-      steps.push({
-        to: target.token,
-        data: encodeFunctionData({
-          abi: erc20Abi,
-          functionName: "approve",
-          args: [spender, target.amount]
-        }),
-        value: 0n,
-        fallbackGas: UNISWAP_V4_LP_ERC20_APPROVE_FALLBACK
+      const wethAllowance = await publicClient.readContract({
+        address: target.token,
+        abi: erc20AllowanceAbi2,
+        functionName: "allowance",
+        args: [executor, spender]
       });
+      if (wethAllowance < target.amount) {
+        if (wethAllowance > 0n) {
+          steps.push({
+            to: target.token,
+            data: encodeFunctionData({ abi: erc20Abi, functionName: "approve", args: [spender, 0n] }),
+            value: 0n,
+            fallbackGas: UNISWAP_V4_LP_ERC20_APPROVE_FALLBACK
+          });
+        }
+        steps.push({
+          to: target.token,
+          data: encodeFunctionData({
+            abi: erc20Abi,
+            functionName: "approve",
+            args: [spender, target.amount]
+          }),
+          value: 0n,
+          fallbackGas: UNISWAP_V4_LP_ERC20_APPROVE_FALLBACK
+        });
+      }
     } else {
       steps.push({
         to: target.token,