permit on classic swaps and some fixes

Author: mgrabina

src/components/transactions/Swap/actions/CollateralSwap/CollateralSwapActionsViaCoWAdapters.tsx

@@ -1,10 +1,5 @@
 import { normalize } from '@aave/math-utils';
-import {
-  enableLogging,
-  getOrderToSign,
-  LimitTradeParameters,
-  OrderKind,
-} from '@cowprotocol/cow-sdk';
+import { getOrderToSign, LimitTradeParameters, OrderKind } from '@cowprotocol/cow-sdk';
 import { AaveFlashLoanType, HASH_ZERO } from '@cowprotocol/sdk-flash-loans';
 import { Trans } from '@lingui/macro';
 import { Dispatch, useEffect, useMemo, useState } from 'react';
@@ -192,7 +187,6 @@ export const CollateralSwapActionsViaCowAdapters = ({
 
       console.log('POST LIMIT ORDER', limitOrder, orderPostParams);
 
-      enableLogging(true);
       const result = await tradingSdk.postLimitOrder(limitOrder, orderPostParams.swapSettings);
 
       trackingHandlers.trackSwap();

src/components/transactions/Swap/actions/DebtSwap/DebtSwapActionsViaCoW.tsx

@@ -1,10 +1,5 @@
 import { normalize } from '@aave/math-utils';
-import {
-  enableLogging,
-  getOrderToSign,
-  LimitTradeParameters,
-  OrderKind,
-} from '@cowprotocol/cow-sdk';
+import { getOrderToSign, LimitTradeParameters, OrderKind } from '@cowprotocol/cow-sdk';
 import { AaveFlashLoanType, HASH_ZERO } from '@cowprotocol/sdk-flash-loans';
 import { Trans } from '@lingui/macro';
 import { Dispatch, useEffect, useMemo, useState } from 'react';
@@ -180,7 +175,6 @@ export const DebtSwapActionsViaCoW = ({
         HASH_ZERO
       );
 
-      enableLogging(true); //  todo remove
       const orderPostParams = await flashLoanSdk.getOrderPostingSettings(
         AaveFlashLoanType.DebtSwap,
         {

src/components/transactions/Swap/actions/SwapActions/SwapActionsViaCoW.tsx

@@ -7,7 +7,7 @@ import {
 import { Trans } from '@lingui/macro';
 import { BigNumber } from 'ethers';
 import stringify from 'json-stringify-deterministic';
-import { Dispatch, useEffect } from 'react';
+import { Dispatch } from 'react';
 import { TxActionsWrapper } from 'src/components/transactions/TxActionsWrapper';
 import { isSmartContractWallet } from 'src/helpers/provider';
 import { useModalContext } from 'src/hooks/useModal';
@@ -51,18 +51,19 @@ export const SwapActionsViaCoW = ({
   const { mainTxState, loadingTxns, setMainTxState, setTxError, approvalTxState } =
     useModalContext();
 
-  const { requiresApproval, requiresApprovalReset, approval, tryPermit } = useSwapTokenApproval({
-    chainId: state.chainId,
-    token: state.sourceToken.addressToSwap,
-    symbol: state.sourceToken.symbol,
-    amount: state.sellAmountFormatted ?? '0',
-    decimals: state.sourceToken.decimals,
-    spender: isCowProtocolRates(state.swapRate)
-      ? COW_PROTOCOL_VAULT_RELAYER_ADDRESS[state.chainId as SupportedChainId]
-      : undefined,
-    setState,
-    allowPermit: false, // CoW does not support permit
-  });
+  const { requiresApproval, requiresApprovalReset, approval, tryPermit, signatureParams } =
+    useSwapTokenApproval({
+      chainId: state.chainId,
+      token: state.sourceToken.addressToSwap,
+      symbol: state.sourceToken.symbol,
+      amount: state.sellAmountFormatted ?? '0',
+      decimals: state.sourceToken.decimals,
+      spender: isCowProtocolRates(state.swapRate)
+        ? COW_PROTOCOL_VAULT_RELAYER_ADDRESS[state.chainId as SupportedChainId]
+        : undefined,
+      setState,
+      allowPermit: true,
+    });
 
   // Use centralized gas estimation
   useSwapGasEstimation({
@@ -232,6 +233,8 @@ export const SwapActionsViaCoW = ({
                     : state.side === 'buy'
                     ? OrderKind.BUY
                     : OrderKind.SELL,
+                signatureParams, // TODO: Test permit for smart contract wallets?
+                estimateGasLimit,
               });
 
               const response = await sendTx({
@@ -281,6 +284,8 @@ export const SwapActionsViaCoW = ({
                 outputSymbol: state.destinationToken.symbol,
                 appCode,
                 orderBookQuote: state.swapRate.orderBookQuote,
+                signatureParams,
+                estimateGasLimit,
               });
               setMainTxState({
                 loading: false,
@@ -327,12 +332,6 @@ export const SwapActionsViaCoW = ({
     params.invalidateAppState();
   };
 
-  // Track execution state to pause rate updates during actions
-  useEffect(() => {
-    const isExecuting = mainTxState.loading || approvalTxState.loading;
-    setState({ actionsLoading: isExecuting });
-  }, [mainTxState.loading, approvalTxState.loading, setState, state.actionsLoading]);
-
   return (
     <TxActionsWrapper
       sx={{

src/components/transactions/Swap/constants/cow.constants.ts

@@ -84,7 +84,8 @@ export const COW_APP_DATA = (
   slippageBips: number,
   smartSlippage: boolean,
   orderType: OrderType,
-  appCode: string
+  appCode: string,
+  hooks?: Record<string, unknown>
 ) => ({
   appCode: appCode,
   version: '1.4.0',
@@ -97,6 +98,7 @@ export const COW_APP_DATA = (
       smartSlippage,
     },
     partnerFee: COW_PARTNER_FEE(tokenFromSymbol, tokenToSymbol),
+    hooks,
   },
 });
 

src/components/transactions/Swap/details/CowCostsDetails.tsx

@@ -43,6 +43,8 @@ export const CowCostsDetails = ({ state }: { state: SwapState }) => {
   const flashloanFeeUsd = Number(flashloanFeeFormatted) * state.swapRate.srcTokenPriceUsd;
   const flashloanFeeToken = state.sourceToken;
 
+  if (!state.buyAmountToken || !state.sellAmountToken) return null;
+
   // Partner fee is applied to the surplus token:
   // - For sell orders: fee in buy token (destinationToken), deducted from buy amount
   // - For buy orders: fee in sell token (sourceToken), added to sell amount
@@ -59,18 +61,19 @@ export const CowCostsDetails = ({ state }: { state: SwapState }) => {
     // Fee in destination token (buy token)
     partnerFeeFormatted = normalize(
       state.swapRate.amountAndCosts.costs.partnerFee.amount.toString(),
-      state.destinationToken.decimals
+      state.buyAmountToken?.decimals ?? 18
     );
     partnerFeeUsd = Number(partnerFeeFormatted) * state.swapRate.destTokenPriceUsd;
     partnerFeeToken = state.destinationToken;
   } else {
     // Fee in source token (sell token)
     partnerFeeFormatted = normalize(
       state.swapRate.amountAndCosts.costs.partnerFee.amount.toString(),
-      state.sourceToken.decimals
+      state.buyAmountToken?.decimals ?? 18
     );
+
     partnerFeeUsd = Number(partnerFeeFormatted) * state.swapRate.srcTokenPriceUsd;
-    partnerFeeToken = state.sourceToken;
+    partnerFeeToken = state.buyAmountToken;
   }
 
   const totalCostsInUsd = networkFeeUsd + partnerFeeUsd + (flashloanFeeUsd ?? 0); // + costs.slippageInUsd;