swap with aave collateral approval not using eip712 domain (#2549)

Co-authored-by: Mark Grothe <[email protected]>

Author: mgrabina

package.json

@@ -31,8 +31,8 @@
     "test:coverage": "jest --coverage"
   },
   "dependencies": {
-    "@aave/contract-helpers": "1.36.0",
-    "@aave/math-utils": "1.36.0",
+    "@aave/contract-helpers": "1.36.1",
+    "@aave/math-utils": "1.36.1",
     "@amplitude/analytics-browser": "^2.13.0",
     "@bgd-labs/aave-address-book": "^4.25.1",
     "@cowprotocol/app-data": "^3.1.0",

src/helpers/useGovernanceDelegate.tsx

@@ -252,13 +252,8 @@ export const useGovernanceDelegate = (
 
       const unsignedPayloads: string[] = [];
       for (const tx of delegationParameters) {
-        if (delegationType !== DelegationType.ALL) {
-          const payload = await delegationTokenService.prepareV3DelegateByTypeSignature(tx);
-          unsignedPayloads.push(payload);
-        } else {
-          const payload = await delegationTokenService.prepareV3DelegateByTypeSignature(tx);
-          unsignedPayloads.push(payload);
-        }
+        const payload = await delegationTokenService.prepareV3DelegateByTypeSignature(tx);
+        unsignedPayloads.push(payload);
       }
       try {
         const signedPayload: SignatureLike[] = [];
@@ -303,7 +298,6 @@ export const useGovernanceDelegate = (
       } else {
         let txs: EthereumTransactionTypeExtended[] = [];
         if (delegationType === DelegationType.ALL) {
-          // TODO check if this is working as normal
           txs = await delegate({
             delegatee,
             governanceToken:
@@ -312,13 +306,8 @@ export const useGovernanceDelegate = (
                 : delegationTokenType === DelegationTokenType.STKAAVE
                 ? governanceV3Config.votingAssets.stkAaveTokenAddress
                 : governanceV3Config.votingAssets.aAaveTokenAddress,
-            // delegationTokenType === DelegationTokenType.AAVE
-            //   ? governanceConfig.aaveTokenAddress
-            //   : governanceConfig.stkAaveTokenAddress,
           });
         } else {
-          // TODO check if this is working as normal
-
           txs = await delegateByType({
             delegatee,
             delegationType: delegationType.toString(),
@@ -328,9 +317,6 @@ export const useGovernanceDelegate = (
                 : delegationTokenType === DelegationTokenType.STKAAVE
                 ? governanceV3Config.votingAssets.stkAaveTokenAddress
                 : governanceV3Config.votingAssets.aAaveTokenAddress,
-            // delegationTokenType === DelegationTokenType.AAVE
-            //   ? governanceConfig.aaveTokenAddress
-            //   : governanceConfig.stkAaveTokenAddress,
           });
         }
         setActionTx(txs[0]);

src/hooks/paraswap/useCollateralRepaySwap.tsx

@@ -127,8 +127,7 @@ export const useCollateralRepaySwap = ({
       } catch (e) {
         console.error(e);
         const message =
-          convertParaswapErrorMessage(e.message) ||
-          'There was an issue fetching data from Velora';
+          convertParaswapErrorMessage(e.message) || 'There was an issue fetching data from Velora';
         setError(message);
       } finally {
         setLoading(false);

src/hooks/paraswap/useCollateralSwap.tsx

@@ -108,8 +108,7 @@ export const useCollateralSwap = ({
       } catch (e) {
         console.error(e);
         const message =
-          convertParaswapErrorMessage(e.message) ||
-          'There was an issue fetching data from Velora';
+          convertParaswapErrorMessage(e.message) || 'There was an issue fetching data from Velora';
         setError(message);
       } finally {
         setLoading(false);

src/hooks/paraswap/useDebtSwitch.tsx

@@ -111,8 +111,7 @@ export const useDebtSwitch = ({
       } catch (e) {
         console.error(e);
         const message =
-          convertParaswapErrorMessage(e.message) ||
-          'There was an issue fetching data from Velora';
+          convertParaswapErrorMessage(e.message) || 'There was an issue fetching data from Velora';
         setError(message);
       } finally {
         setLoading(false);

src/store/poolSlice.ts

@@ -713,17 +713,16 @@ export const createPoolSlice: StateCreator<
       },
     },
     generateSignatureRequest: async ({ token, amount, deadline, spender }, opts = {}) => {
-      const v3Tokens = [
+      const v3TokensWithEip712DomainSupport = [
         AaveV3Ethereum.ASSETS.AAVE.UNDERLYING.toLowerCase(),
-        AaveV3Ethereum.ASSETS.AAVE.A_TOKEN.toLowerCase(),
         AaveSafetyModule.STK_AAVE.toLowerCase(),
       ];
 
       const provider = get().jsonRpcProvider(opts.chainId);
 
       let name = '';
       let version = '1';
-      if (v3Tokens.includes(token.toLowerCase())) {
+      if (v3TokensWithEip712DomainSupport.includes(token.toLowerCase())) {
         const aaveV3TokenService = new AaveTokenV3Service(token, provider);
         const domain = await aaveV3TokenService.getEip712Domain();
         name = domain.name;

yarn.lock

@@ -2,17 +2,17 @@
 # yarn lockfile v1
 
 
-"@aave/[email protected].0":
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/@aave/contract-helpers/-/contract-helpers-1.36.0.tgz#0041fe515436cce982d8ea26e3bd1393032dee9a"
-  integrity sha512-3Wb3O2Oc/AKd3/CEp8x4vpkRnXHF9tilLVx5fPkLIcuIpHlHSnWQalci9UZsOun9fIy5a1Dm+CsLNO++onWYAg==
+"@aave/[email protected].1":
+  version "1.36.1"
+  resolved "https://registry.yarnpkg.com/@aave/contract-helpers/-/contract-helpers-1.36.1.tgz#729735e6be4f8a1872e1e3400591485fc2198b76"
+  integrity sha512-Ppoz11WRA3bjkZqnRA0a/txjfb67fVWh+ucgtN/RR45WI9oDsEmtYsqAwiNR3egvigSeyJASFeei0ijGGoFifw==
   dependencies:
     isomorphic-unfetch "^3.1.0"
 
-"@aave/[email protected].0":
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/@aave/math-utils/-/math-utils-1.36.0.tgz#485d2f6d9858648049bdb25c14e515486749b006"
-  integrity sha512-fVmHyFVMzFTU1+pxGCwr8egR7xDTLDwG1RoB3q9OCCROLf4sPl+vRFd1tejoJSsKQ+IJK7QG1mk0ygdjujl2JA==
+"@aave/[email protected].1":
+  version "1.36.1"
+  resolved "https://registry.yarnpkg.com/@aave/math-utils/-/math-utils-1.36.1.tgz#3e501962de3700250c213c981ea47b36a8e37a54"
+  integrity sha512-rR1sbDX1IFb1B1TLdi8hZANvtviPeU8hfpLuHC9cwlXluujCdHttnNVODwco1J5d2k6KxnNnc0DZJj2yV7nLTQ==
 
 "@adobe/css-tools@^4.0.1":
   version "4.4.1"