fixes

Author: mgrabina

.npmrc

@@ -1,4 +1,4 @@
-@cowprotocol:registry=https://npm.pkg.github.com
-always-auth=true
-# registry=https://registry.npmjs.org/
-//npm.pkg.github.com/:_authToken=${GITHUB_TOKEN}
+# @cowprotocol:registry=https://npm.pkg.github.com
+# always-auth=true
+# # registry=https://registry.npmjs.org/
+# //npm.pkg.github.com/:_authToken=${GITHUB_TOKEN}

package.json

@@ -36,10 +36,10 @@
     "@aave/react": "0.6.1",
     "@amplitude/analytics-browser": "^2.13.0",
     "@bgd-labs/aave-address-book": "^4.31.0",
-    "@cowprotocol/sdk-app-data": "4.1.3-pr-614-5b1d24e9.0",
-    "@cowprotocol/cow-sdk": "7.0.10-pr-614-5b1d24e9.0",
-    "@cowprotocol/sdk-flash-loans": "0.0.1-pr-614-5b1d24e9.0",
-    "@cowprotocol/sdk-viem-adapter": "0.1.2-pr-614-5b1d24e9.0",
+    "@cowprotocol/sdk-app-data": "4.1.4",
+    "@cowprotocol/cow-sdk": "7.0.11",
+    "@cowprotocol/sdk-flash-loans": "1.1.0",
+    "@cowprotocol/sdk-viem-adapter": "0.1.3",
     "@emotion/cache": "11.10.3",
     "@emotion/react": "11.10.4",
     "@emotion/server": "latest",

src/components/transactions/Repay/CollateralRepayActions.tsx

@@ -64,6 +64,26 @@ export const CollateralRepayActions = ({
       protocolAction: ProtocolAction.repayCollateral,
       handleGetTxns: async (signature, deadline) => {
         const route = await buildTxFn();
+
+        console.log('paraswapRepayWithCollateral', {
+          repayAllDebt,
+          repayAmount,
+          rateMode,
+          repayWithAmount,
+
+          fromAssetData,
+          poolReserve,
+          symbol,
+          isWrongNetwork,
+          useFlashLoan,
+          blocked,
+          swapCallData: route.swapCallData,
+          augustus: route.augustus,
+          signature,
+          deadline,
+          signedAmount: calculateSignedAmount(repayWithAmount, fromAssetData.decimals),
+        });
+
         return paraswapRepayWithCollateral({
           repayAllDebt,
           repayAmount,
@@ -83,6 +103,25 @@ export const CollateralRepayActions = ({
         });
       },
       handleGetApprovalTxns: async () => {
+        console.log('paraswapRepayWithCollateral', {
+          repayAllDebt,
+          repayAmount,
+          rateMode,
+          repayWithAmount,
+
+          fromAssetData,
+          poolReserve,
+          symbol,
+          isWrongNetwork,
+          useFlashLoan,
+          blocked,
+          swapCallData: '0x',
+          augustus: API_ETH_MOCK_ADDRESS,
+          signature: '0x',
+          deadline: '0',
+          signedAmount: calculateSignedAmount(repayWithAmount, fromAssetData.decimals),
+        });
+
         return paraswapRepayWithCollateral({
           repayAllDebt,
           repayAmount,

src/components/transactions/Repay/CollateralRepayModalContent.tsx

@@ -257,6 +257,13 @@ export function CollateralRepayModalContent({
       />
     );
 
+  console.log('poolReserve', poolReserve.symbol, poolReserve.underlyingAsset);
+  console.log(
+    'collateralReserveData',
+    collateralReserveData.symbol,
+    collateralReserveData.underlyingAsset
+  );
+
   return (
     <>
       <AssetInput

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

@@ -1,6 +1,6 @@
 import { normalize } from '@aave/math-utils';
-import { getOrderToSign, LimitTradeParameters, OrderKind, TradingSdk } from '@cowprotocol/cow-sdk';
-import { AaveCollateralSwapSdk, HASH_ZERO } from '@cowprotocol/sdk-flash-loans';
+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, useState } from 'react';
 import { TxActionsWrapper } from 'src/components/transactions/TxActionsWrapper';
@@ -12,7 +12,7 @@ import { useShallow } from 'zustand/react/shallow';
 import { TrackAnalyticsHandlers } from '../../analytics/useTrackAnalytics';
 import { COW_PARTNER_FEE, FLASH_LOAN_FEE_BPS } from '../../constants/cow.constants';
 import { APP_CODE_PER_SWAP_TYPE } from '../../constants/shared.constants';
-import { getCowAdapter } from '../../helpers/cow';
+import { getCowFlashLoanSdk, getCowTradingSdkByChainIdAndAppCode } from '../../helpers/cow';
 import { calculateInstanceAddress } from '../../helpers/cow/adapters.helpers';
 import { useSwapGasEstimation } from '../../hooks/useSwapGasEstimation';
 import { OrderType, SwapParams, SwapState } from '../../types';
@@ -45,7 +45,7 @@ export const CollateralSwapActionsViaCowAdapters = ({
   // Pre-compute instance address
   useEffect(() => {
     if (state.chainId !== 100) return; // TODO: remove this once we have a supported chainId
-    calculateInstanceAddress(state, user, validTo)
+    calculateInstanceAddress(state, user, validTo, AaveFlashLoanType.CollateralSwap)
       .catch((error) => {
         console.error('calculateInstanceAddress error', error);
         setTxError(getErrorTextFromError(error, TxAction.MAIN_ACTION, true));
@@ -106,18 +106,13 @@ export const CollateralSwapActionsViaCowAdapters = ({
       const sellAmount = normalize(state.inputAmount, -state.sourceToken.decimals);
       const buyAmount = normalize(state.minimumReceived, -state.destinationToken.decimals);
 
-      const adapter = await getCowAdapter(state.chainId);
-      const tradingSdk = new TradingSdk(
-        {
-          chainId: state.chainId,
-          appCode: APP_CODE_PER_SWAP_TYPE[state.swapType],
-          env: 'staging',
-          signer: adapter.signer,
-        },
-        {},
-        adapter
+      const tradingSdk = await getCowTradingSdkByChainIdAndAppCode(
+        state.chainId,
+        APP_CODE_PER_SWAP_TYPE[state.swapType],
+        'staging'
       );
-      const flashLoanSdk = new AaveCollateralSwapSdk();
+      const flashLoanSdk = await getCowFlashLoanSdk(state.chainId);
+
       const collateralPermit = signatureParams
         ? {
             amount: signatureParams?.amount,
@@ -155,6 +150,7 @@ export const CollateralSwapActionsViaCowAdapters = ({
       );
 
       const orderPostParams = await flashLoanSdk.getOrderPostingSettings(
+        AaveFlashLoanType.CollateralSwap,
         {
           chainId: state.chainId,
           validTo,

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

@@ -59,6 +59,10 @@ export const CollateralSwapActionsViaParaswapAdapters = ({
     if (!state.swapRate || !isParaswapRates(state.swapRate))
       throw new Error('Route required to build transaction');
 
+    setMainTxState({
+      txHash: undefined,
+      loading: true,
+    });
     const isMaxSelected = state.isMaxSelected;
     const optimalRateData = state.swapRate.optimalRateData;
 
@@ -186,7 +190,8 @@ export const CollateralSwapActionsViaParaswapAdapters = ({
           chainId: state.chainId,
         }
       );
-      // TODO: fix success
+      trackingHandlers.trackSwap(); // TODO: check this happening in all actions
+      params.invalidateAppState(); // TODO: check this happening in all actions
       setMainTxState({
         txHash: response.hash,
         loading: false,