fix: wip

mgrabina · mgrabina · commit 9e11005b79c6 · 2025-06-16T18:05:46.000-07:00
diff --git a/src/components/transactions/Switch/LimitSwitch.tsx b/src/components/transactions/Switch/LimitSwitch.tsx
@@ -208,7 +208,10 @@ export const LimitSwitch = ({
         rateToUse = 1 / rate.rate;
       }
 
-      const newOutputAmount = valueToBigNumber(amountToSet).multipliedBy(rateToUse).toString();
+      const newOutputAmount = valueToBigNumber(amountToSet)
+        .multipliedBy(rateToUse)
+        .decimalPlaces(selectedOutputToken.decimals)
+        .toString();
       setOutputAmount(newOutputAmount);
       debouncedOutputChange(newOutputAmount);
     }
@@ -241,7 +244,10 @@ export const LimitSwitch = ({
         rateToUse = 1 / rate.rate;
       }
 
-      const newInputAmount = valueToBigNumber(amountToSet).multipliedBy(rateToUse).toString();
+      const newInputAmount = valueToBigNumber(amountToSet)
+        .multipliedBy(rateToUse)
+        .decimalPlaces(selectedInputToken.decimals)
+        .toString();
       setInputAmount(newInputAmount);
       debouncedInputChange(newInputAmount);
     }
@@ -402,16 +408,18 @@ export const LimitSwitch = ({
 
         if (rateFrom == selectedOutputToken) {
           rateAmount = Number(
-            normalizeBN(switchRates.srcAmount, switchRates.srcDecimals).div(
-              normalizeBN(switchRates.destAmount, switchRates.destDecimals)
-            )
+            normalizeBN(switchRates.srcAmount, switchRates.srcDecimals)
+              .div(normalizeBN(switchRates.destAmount, switchRates.destDecimals))
+              .decimalPlaces(selectedInputToken.decimals)
+              .toString()
           );
           rateUsd = rateAmount * Number(switchRates.srcTokenPriceUsd);
         } else if (rateFrom == selectedInputToken) {
           rateAmount = Number(
-            normalizeBN(switchRates.destAmount, switchRates.destDecimals).div(
-              normalizeBN(switchRates.srcAmount, switchRates.srcDecimals)
-            )
+            normalizeBN(switchRates.destAmount, switchRates.destDecimals)
+              .div(normalizeBN(switchRates.srcAmount, switchRates.srcDecimals))
+              .decimalPlaces(selectedOutputToken.decimals)
+              .toString()
           );
           rateUsd = rateAmount * Number(switchRates.destTokenPriceUsd);
         }
@@ -504,6 +512,7 @@ export const LimitSwitch = ({
   const [cowOpenOrdersTotalAmountFormatted, setCowOpenOrdersTotalAmountFormatted] = useState<
     string | undefined
   >(undefined);
+
   useEffect(() => {
     if (
       switchProvider == 'cowprotocol' &&
@@ -790,6 +799,7 @@ export const LimitSwitch = ({
                 outputToken={selectedOutputToken.address}
                 inputName={selectedInputToken.name}
                 orderKind="limit"
+                limitOrderKind={limitOrderKind}
                 outputName={selectedOutputToken.name}
                 inputSymbol={selectedInputToken.symbol}
                 outputSymbol={selectedOutputToken.symbol}
@@ -806,7 +816,7 @@ export const LimitSwitch = ({
                     ? {
                         ...switchRates,
                         srcAmount: normalizeBN(
-                          debounceInputAmount || '0',
+                          debounceInputAmount ?? '0',
                           -1 * selectedInputToken.decimals
                         ).toFixed(0),
                         destAmount: normalizeBN(
diff --git a/src/components/transactions/Switch/MarketSwitch.tsx b/src/components/transactions/Switch/MarketSwitch.tsx
@@ -1,5 +1,10 @@
 import { normalize, normalizeBN } from '@aave/math-utils';
-import { OrderStatus, SupportedChainId, WRAPPED_NATIVE_CURRENCIES } from '@cowprotocol/cow-sdk';
+import {
+  OrderKind,
+  OrderStatus,
+  SupportedChainId,
+  WRAPPED_NATIVE_CURRENCIES,
+} from '@cowprotocol/cow-sdk';
 import { SwitchVerticalIcon } from '@heroicons/react/outline';
 import { Trans } from '@lingui/macro';
 import { Box, CircularProgress, IconButton, SvgIcon, Typography } from '@mui/material';
@@ -621,6 +626,7 @@ export const MarketSwitch = ({
                 outputName={selectedOutputToken.name}
                 inputSymbol={selectedInputToken.symbol}
                 outputSymbol={selectedOutputToken.symbol}
+                limitOrderKind={OrderKind.SELL}
                 orderKind="market"
                 slippage={safeSlippage.toString()}
                 setShowGasStation={setShowGasStation}
diff --git a/src/components/transactions/Switch/SwitchActions.tsx b/src/components/transactions/Switch/SwitchActions.tsx
@@ -3,6 +3,7 @@ import { valueToBigNumber } from '@aave/math-utils';
 import {
   calculateUniqueOrderId,
   COW_PROTOCOL_VAULT_RELAYER_ADDRESS,
+  OrderKind,
   SupportedChainId,
 } from '@cowprotocol/cow-sdk';
 import { Trans } from '@lingui/macro';
@@ -33,6 +34,7 @@ import { TxActionsWrapper } from '../TxActionsWrapper';
 import { APPROVAL_GAS_LIMIT } from '../utils';
 import {
   COW_APP_DATA,
+  COW_PARTNER_FEE_IN_DECIMAL,
   getPreSignTransaction,
   getUnsignerOrder,
   isNativeToken,
@@ -54,6 +56,7 @@ interface SwitchProps {
   isWrongNetwork: boolean;
   chainId: number;
   orderKind: 'market' | 'limit';
+  limitOrderKind: OrderKind;
   switchRates?: SwitchRatesType;
   inputName: string;
   outputName: string;
@@ -79,6 +82,7 @@ export const SwitchActions = ({
   outputSymbol,
   slippage: slippageInPercent = '0',
   orderKind,
+  limitOrderKind,
   expiry,
   blocked,
   loading,
@@ -146,6 +150,8 @@ export const SwitchActions = ({
   }, [approvedAmount, inputAmount, isWrongNetwork]);
 
   const action = async () => {
+    if (!switchRates) return;
+
     setMainTxState({ ...mainTxState, loading: true });
     if (isParaswapRates(switchRates)) {
       try {
@@ -221,19 +227,59 @@ export const SwitchActions = ({
         });
       }
     } else if (isCowProtocolRates(switchRates)) {
+      const provider = await getEthersProvider(wagmiConfig, { chainId });
       const validTo = Math.floor(Date.now() / 1000) + (expiry ?? Expiry['Half hour']);
-      try {
-        const provider = await getEthersProvider(wagmiConfig, { chainId });
+      const slippageBps = Math.round(Number(slippageInPercent) * 100 * 100); // percent to bps
+
+      let srcAmount;
+      let destAmount;
+
+      if (orderKind === 'market') {
         const destAmountWithSlippage = valueToBigNumber(switchRates.destAmount)
           .multipliedBy(valueToBigNumber(1).minus(valueToBigNumber(slippageInPercent)))
           .toFixed(0);
-        const slippageBps = Math.round(Number(slippageInPercent) * 100 * 100); // percent to bps
 
+        srcAmount = isNativeToken(inputToken)
+          ? switchRates.srcAmount
+          : switchRates.amountAndCosts.afterNetworkCosts.buyAmount.toString();
+        destAmount = destAmountWithSlippage;
+      } else if (limitOrderKind === OrderKind.SELL) {
+        const partnerFee = COW_PARTNER_FEE_IN_DECIMAL(inputSymbol, outputSymbol);
+        const outputAmountBN = valueToBigNumber(switchRates.destAmount);
+        const outputPartnerFeeAmount = outputAmountBN.multipliedBy(partnerFee).toString() || '0';
+        const buyAmountWithoutPartnerFees =
+          outputAmountBN.minus(outputPartnerFeeAmount).decimalPlaces(0).toString() || '0';
+
+        console.log('sell order');
+        console.log('output amount', switchRates.destAmount);
+        console.log('output partner fee amount', outputPartnerFeeAmount.toString());
+        console.log('buy amount without partner fees', buyAmountWithoutPartnerFees.toString());
+
+        srcAmount = switchRates.srcAmount;
+        destAmount = buyAmountWithoutPartnerFees;
+      } else if (limitOrderKind === OrderKind.BUY) {
+        const partnerFee = COW_PARTNER_FEE_IN_DECIMAL(inputSymbol, outputSymbol);
+        const inputAmountBN = valueToBigNumber(switchRates.srcAmount);
+        const inputPartnerFeeAmount = inputAmountBN.multipliedBy(partnerFee).toString() || '0';
+        const sellAmountWithoutPartnerFees =
+          inputAmountBN.minus(inputPartnerFeeAmount).decimalPlaces(0).toString() || '0';
+
+        console.log('input amount', inputAmountBN.toString());
+        console.log('input partner fee amount', inputPartnerFeeAmount.toString());
+        console.log('sell amount without partner fees', sellAmountWithoutPartnerFees.toString());
+
+        srcAmount = sellAmountWithoutPartnerFees;
+        destAmount = switchRates.destAmount;
+      } else {
+        throw new Error('Invalid order kind'); // This should never happen.
+      }
+
+      try {
         // If srcToken is native, we need to use the eth-flow instead of the orderbook
         if (isNativeToken(inputToken)) {
           const ethFlowTx = await populateEthFlowTx(
-            switchRates.srcAmount,
-            destAmountWithSlippage.toString(),
+            srcAmount,
+            destAmount,
             outputToken,
             user,
             validTo,
@@ -261,14 +307,15 @@ export const SwitchActions = ({
             });
 
             const unsignerOrder = await getUnsignerOrder(
-              switchRates.srcAmount,
-              destAmountWithSlippage.toString(),
+              srcAmount,
+              destAmount,
               outputToken,
               user,
               chainId,
               inputSymbol,
               outputSymbol,
-              validTo
+              validTo,
+              limitOrderKind
             );
             const calculatedOrderId = await calculateUniqueOrderId(chainId, unsignerOrder);
 
@@ -311,17 +358,15 @@ export const SwitchActions = ({
                 tokenDest: outputToken,
                 chainId,
                 user,
-                amount: switchRates.srcAmount,
                 tokenSrc: inputToken,
                 tokenSrcDecimals: switchRates.srcDecimals,
                 tokenDestDecimals: switchRates.destDecimals,
-                afterNetworkCostsBuyAmount:
-                  orderKind === 'market'
-                    ? switchRates.amountAndCosts.afterNetworkCosts.buyAmount.toString()
-                    : switchRates.destAmount, // TODO: check with cow team
+                sellAmount: srcAmount,
+                beforePartnerFeesBuyAmount: destAmount,
                 slippageBps,
                 inputSymbol,
                 outputSymbol,
+                kind: limitOrderKind,
                 validTo,
                 quote: switchRates.order,
               });
@@ -355,18 +400,16 @@ export const SwitchActions = ({
                 tokenDest: outputToken,
                 tokenDestDecimals: switchRates.destDecimals,
                 quote: switchRates.order,
-                amount: switchRates.srcAmount,
-                afterNetworkCostsBuyAmount:
-                  orderKind === 'market'
-                    ? switchRates.amountAndCosts.afterNetworkCosts.buyAmount.toString()
-                    : switchRates.destAmount, // TODO: check with cow team
+                sellAmount: srcAmount,
+                beforePartnerFeesBuyAmount: destAmount,
                 slippageBps,
                 chainId,
                 user,
                 provider,
                 inputSymbol,
-                validTo,
                 outputSymbol,
+                validTo,
+                kind: limitOrderKind,
               });
               setMainTxState({
                 loading: false,
diff --git a/src/components/transactions/Switch/cowprotocol.helpers.ts b/src/components/transactions/Switch/cowprotocol.helpers.ts
@@ -78,6 +78,10 @@ export const COW_PARTNER_FEE = (tokenFromSymbol: string, tokenToSymbol: string)
   volumeBps: cowSymbolGroup(tokenFromSymbol) == cowSymbolGroup(tokenToSymbol) ? 15 : 25,
   recipient: COW_EVM_RECIPIENT,
 });
+export const COW_PARTNER_FEE_IN_DECIMAL = (tokenFromSymbol: string, tokenToSymbol: string) => {
+  const volumeBps = COW_PARTNER_FEE(tokenFromSymbol, tokenToSymbol).volumeBps;
+  return volumeBps / 10000;
+};
 export const COW_APP_DATA = (tokenFromSymbol: string, tokenToSymbol: string) => ({
   appCode: HEADER_WIDGET_APP_CODE, // todo: use ADAPTER_APP_CODE for contract adapters
   version: '1.4.0',
@@ -91,14 +95,15 @@ export type CowProtocolActionParams = {
   provider: JsonRpcProvider;
   chainId: number;
   user: string;
-  amount: string;
+  sellAmount: string;
   tokenDest: string;
   tokenSrc: string;
   tokenSrcDecimals: number;
   tokenDestDecimals: number;
   inputSymbol: string;
   outputSymbol: string;
-  afterNetworkCostsBuyAmount: string;
+  beforePartnerFeesBuyAmount: string;
+  kind: OrderKind;
   slippageBps: number;
   validTo: number;
 };
@@ -108,12 +113,13 @@ export const getPreSignTransaction = async ({
   tokenDest,
   chainId,
   user,
-  amount,
+  sellAmount,
   tokenSrc,
   tokenSrcDecimals,
   tokenDestDecimals,
-  afterNetworkCostsBuyAmount,
+  beforePartnerFeesBuyAmount,
   slippageBps,
+  kind,
   inputSymbol,
   outputSymbol,
   validTo,
@@ -137,9 +143,9 @@ export const getPreSignTransaction = async ({
   const orderResult = await tradingSdk.postLimitOrder(
     {
       owner: user as `0x${string}`,
-      sellAmount: amount,
-      buyAmount: afterNetworkCostsBuyAmount, // TODO: check partner fees on limit orders
-      kind: OrderKind.SELL,
+      sellAmount,
+      buyAmount: beforePartnerFeesBuyAmount,
+      kind,
       sellToken: tokenSrc,
       buyToken: tokenDest,
       slippageBps,
@@ -172,11 +178,12 @@ export const sendOrder = async ({
   tokenDest,
   chainId,
   user,
-  amount,
+  sellAmount,
   tokenSrc,
   tokenSrcDecimals,
   tokenDestDecimals,
-  afterNetworkCostsBuyAmount,
+  beforePartnerFeesBuyAmount,
+  kind,
   slippageBps,
   inputSymbol,
   outputSymbol,
@@ -198,13 +205,16 @@ export const sendOrder = async ({
     throw new Error('Smart contract wallets should use presign.');
   }
 
+  console.log('kind', kind);
+  console.log('sell amount sending to cow', sellAmount);
+  console.log('before partner fees buy amount', beforePartnerFeesBuyAmount);
   return tradingSdk
     .postLimitOrder(
       {
         owner: user as `0x${string}`,
-        sellAmount: amount,
-        buyAmount: afterNetworkCostsBuyAmount, // TODO: check with cow team, this is being modified adding partner fees
-        kind: OrderKind.SELL,
+        sellAmount,
+        buyAmount: beforePartnerFeesBuyAmount,
+        kind,
         sellToken: tokenSrc,
         slippageBps,
         buyToken: tokenDest,
@@ -268,7 +278,8 @@ export const getUnsignerOrder = async (
   chainId: number,
   tokenFromSymbol: string,
   tokenToSymbol: string,
-  validTo: number
+  validTo: number,
+  kind: OrderKind
 ): Promise<UnsignedOrder> => {
   const metadataApi = new MetadataApi();
   const { appDataHex } = await metadataApi.getAppDataInfo(
@@ -284,7 +295,7 @@ export const getUnsignerOrder = async (
     feeAmount: '0',
     validTo,
     partiallyFillable: false,
-    kind: OrderKind.SELL,
+    kind,
     sellToken: WRAPPED_NATIVE_CURRENCIES[chainId as SupportedChainId].address.toLowerCase(),
     buyTokenBalance: BuyTokenDestination.ERC20,
     sellTokenBalance: SellTokenSource.ERC20,
