Close position UI, fix for NotEnoughAllowance (#57)

* Adjust allowance to be at least $1 and 150% * Wait a bit * Fetch fresh debt when closing position to get accurate allowance * No need to wait * Bump timeouts * Dont auto-close transaction errors * Record test videos * Lint harder
Synthetixio · Nov 8, 2024 · 427848a · 427848a
1 parent 95e5973
commit 427848a
Show file tree

Hide file tree

Showing 14 changed files with 84 additions and 20 deletions.
diff --git a/liquidity/components/BorrowModal/BorrowModal.tsx b/liquidity/components/BorrowModal/BorrowModal.tsx
@@ -157,6 +157,7 @@ export const BorrowModal: React.FC<{
         ),
         status: 'error',
         variant: 'left-accent',
+        duration: 3_600_000,
       });
       throw Error('Borrow failed', { cause: error });
     }

diff --git a/liquidity/components/ClaimModal/ClaimModal.tsx b/liquidity/components/ClaimModal/ClaimModal.tsx
@@ -179,6 +179,7 @@ export const ClaimModal: React.FC<{
         ),
         status: 'error',
         variant: 'left-accent',
+        duration: 3_600_000,
       });
       throw Error(isBorrow ? 'Borrow' : 'Claim' + ' failed', { cause: error });
     }

diff --git a/liquidity/components/DepositModal/DepositModal.tsx b/liquidity/components/DepositModal/DepositModal.tsx
@@ -345,6 +345,7 @@ export const DepositModal: DepositModalProps = ({ onClose, isOpen, title, liquid
             ),
             status: 'error',
             variant: 'left-accent',
+            duration: 3_600_000,
           });
           throw Error('Wrapping failed', { cause: error });
         }
@@ -376,6 +377,7 @@ export const DepositModal: DepositModalProps = ({ onClose, isOpen, title, liquid
             ),
             status: 'error',
             variant: 'left-accent',
+            duration: 3_600_000,
           });
           throw Error('Approve failed', { cause: error });
         }
@@ -454,6 +456,7 @@ export const DepositModal: DepositModalProps = ({ onClose, isOpen, title, liquid
             ),
             status: 'error',
             variant: 'left-accent',
+            duration: 3_600_000,
           });
           throw Error('Lock collateral failed', { cause: error });
         }

diff --git a/liquidity/components/RepayModal/RepayModal.tsx b/liquidity/components/RepayModal/RepayModal.tsx
@@ -210,6 +210,7 @@ export const RepayModal: React.FC<{
             ),
             status: 'error',
             variant: 'left-accent',
+            duration: 3_600_000,
           });
           throw Error('Approve failed', { cause: error });
         }
@@ -262,6 +263,7 @@ export const RepayModal: React.FC<{
             ),
             status: 'error',
             variant: 'left-accent',
+            duration: 3_600_000,
           });
           throw Error('Repay failed', { cause: error });
         }

diff --git a/liquidity/components/UndelegateModal/UndelegateModal.tsx b/liquidity/components/UndelegateModal/UndelegateModal.tsx
@@ -205,6 +205,7 @@ export const UndelegateModal: UndelegateModalProps = ({ onClose, isOpen, liquidi
             ),
             status: 'error',
             variant: 'left-accent',
+            duration: 3_600_000,
           });
           throw Error('Unlock collateral failed', { cause: error });
         }

diff --git a/liquidity/components/WithdrawModal/WithdrawModal.tsx b/liquidity/components/WithdrawModal/WithdrawModal.tsx
@@ -219,6 +219,7 @@ export function WithdrawModal({
         ),
         status: 'error',
         variant: 'left-accent',
+        duration: 3_600_000,
       });
       throw Error('Withdraw failed', { cause: error });
     }

diff --git a/liquidity/cypress/cypress.config.js b/liquidity/cypress/cypress.config.js
@@ -51,13 +51,15 @@ module.exports = defineConfig({
       });
       return config;
     },
+    video: true,
 
     retries: {
       runMode: 1,
       openMode: 0,
     },
-    defaultCommandTimeout: 60_000,
-    execTimeout: 60_000,
-    taskTimeout: 60_000,
+
+    defaultCommandTimeout: 120_000,
+    execTimeout: 120_000,
+    taskTimeout: 120_000,
   },
 });
diff --git a/liquidity/cypress/cypress/support/e2e.js b/liquidity/cypress/cypress/support/e2e.js
@@ -15,8 +15,9 @@ beforeEach(() => {
 
   cy.on('log:added', onLogAdded);
 
-  cy.intercept('https://analytics.synthetix.io/matomo.js', { statusCode: 204 }).as('matomo');
-  cy.intercept('https://analytics.synthetix.io/matomo.js', { log: false });
+  cy.intercept('https://analytics.synthetix.io/matomo.js', { statusCode: 204, log: false }).as(
+    'matomo'
+  );
   cy.intercept('https://cloudflare-eth.com/**', { statusCode: 400, log: false }).as(
     'cloudflare-eth'
   );

diff --git a/liquidity/lib/useClaimAllRewards/useClaimAllRewards.tsx b/liquidity/lib/useClaimAllRewards/useClaimAllRewards.tsx
@@ -167,6 +167,7 @@ export function useClaimAllRewards(
           ),
           status: 'error',
           variant: 'left-accent',
+          duration: 3_600_000,
         });
       }
     },

diff --git a/liquidity/ui/src/components/ClosePosition/ClosePositionOneStep.tsx b/liquidity/ui/src/components/ClosePosition/ClosePositionOneStep.tsx
@@ -27,6 +27,9 @@ import debug from 'debug';
 import { ethers } from 'ethers';
 import React from 'react';
 import { LiquidityPositionUpdated } from '../Manage/LiquidityPositionUpdated';
+import { fetchPositionDebt } from './fetchPositionDebt';
+import { fetchPositionDebtWithPriceUpdate } from './fetchPositionDebtWithPriceUpdate';
+import { fetchPriceUpdateTxn } from './fetchPriceUpdateTxn';
 import { useAccountCollateral } from './useAccountCollateral';
 import { usePositionDebt } from './usePositionDebt';
 
@@ -123,11 +126,33 @@ export function ClosePositionOneStep({
         signer
       );
 
-      const adjustedAllowance = positionDebt.lt(0)
+      const freshPriceUpdateTxn = await fetchPriceUpdateTxn({ PythVerfier, pythFeeds });
+      log('freshPriceUpdateTxn: %O', freshPriceUpdateTxn);
+
+      const freshPositionDebt = freshPriceUpdateTxn.value
+        ? await fetchPositionDebtWithPriceUpdate({
+            provider,
+            CoreProxy,
+            Multicall3,
+            accountId: params.accountId,
+            poolId: params.poolId,
+            collateralTypeTokenAddress: collateralType.tokenAddress,
+            priceUpdateTxn: freshPriceUpdateTxn,
+          })
+        : await fetchPositionDebt({
+            provider,
+            CoreProxy,
+            accountId: params.accountId,
+            poolId: params.poolId,
+            collateralTypeTokenAddress: collateralType.tokenAddress,
+          });
+      log('freshPositionDebt: %O', freshPositionDebt);
+
+      const adjustedAllowance = freshPositionDebt.lt(1)
         ? // For the case when debt fluctuates from negative/zero to slightly positive
           ethers.utils.parseEther('1.00')
         : // Add extra buffer for debt fluctuations
-          positionDebt.mul(110).div(100);
+          freshPositionDebt.mul(120).div(100);
       log('adjustedAllowance: %O', adjustedAllowance);
 
       // "function approve(address to, uint256 tokenId)",
@@ -198,6 +223,19 @@ export function ClosePositionOneStep({
         queryKey: [`${network?.id}-${network?.preset}`, 'AccountCollateralUnlockDate'],
       });
 
+      queryClient.invalidateQueries({
+        queryKey: [network?.id, network?.preset, 'PriceUpdateTxn'],
+      });
+      queryClient.invalidateQueries({
+        queryKey: [network?.id, network?.preset, 'PositionDebt'],
+      });
+      queryClient.invalidateQueries({
+        queryKey: [network?.id, network?.preset, 'AccountCollateral'],
+      });
+      queryClient.invalidateQueries({
+        queryKey: [network?.id, network?.preset, 'AccountAvailableCollateral'],
+      });
+
       // After mutation withERC7412, we guaranteed to have updated all the prices, dont care about await
       refetchPriceUpdateTx();
     },

diff --git a/liquidity/ui/src/components/ClosePosition/ClosePositionTransactions.tsx b/liquidity/ui/src/components/ClosePosition/ClosePositionTransactions.tsx
@@ -306,6 +306,7 @@ export const ClosePositionTransactions: FC<{
           'Please try again.'
         ),
         status: 'error',
+        duration: 3_600_000,
       });
       throw Error('Transaction failed', { cause: error });
     }

diff --git a/liquidity/ui/src/components/ClosePosition/fetchPriceUpdateTxn.ts b/liquidity/ui/src/components/ClosePosition/fetchPriceUpdateTxn.ts
@@ -0,0 +1,22 @@
+import { EvmPriceServiceConnection } from '@pythnetwork/pyth-evm-js';
+import { ethers } from 'ethers';
+import { offchainMainnetEndpoint } from '@snx-v3/constants';
+
+export async function fetchPriceUpdateTxn({
+  PythVerfier,
+  pythFeeds,
+}: {
+  PythVerfier: { address: string; abi: string[] };
+  pythFeeds: string[];
+}) {
+  const PythVerifierInterface = new ethers.utils.Interface(PythVerfier.abi);
+  const priceService = new EvmPriceServiceConnection(offchainMainnetEndpoint);
+  const signedOffchainData = await priceService.getPriceFeedsUpdateData(pythFeeds);
+  const priceUpdateTxn = {
+    target: PythVerfier.address,
+    callData: PythVerifierInterface.encodeFunctionData('updatePriceFeeds', [signedOffchainData]),
+    value: ethers.BigNumber.from(pythFeeds.length),
+    requireSuccess: false,
+  };
+  return priceUpdateTxn;
+}
diff --git a/liquidity/ui/src/components/ClosePosition/usePriceUpdateTxn.ts b/liquidity/ui/src/components/ClosePosition/usePriceUpdateTxn.ts
@@ -1,11 +1,10 @@
-import { EvmPriceServiceConnection } from '@pythnetwork/pyth-evm-js';
-import { offchainMainnetEndpoint } from '@snx-v3/constants';
 import { useProvider } from '@snx-v3/useBlockchain';
 import { usePythFeeds } from '@snx-v3/usePythFeeds';
 import { usePythVerifier } from '@snx-v3/usePythVerifier';
 import { useQuery } from '@tanstack/react-query';
 import debug from 'debug';
 import { ethers } from 'ethers';
+import { fetchPriceUpdateTxn } from './fetchPriceUpdateTxn';
 import { useErrorParser } from './useErrorParser';
 import { useSynthetix } from './useSynthetix';
 
@@ -31,17 +30,7 @@ export function usePriceUpdateTxn() {
         throw 'OMFG';
       }
       log({ chainId, preset, priceIds: pythFeeds, PythVerfier });
-      const PythVerifierInterface = new ethers.utils.Interface(PythVerfier.abi);
-      const priceService = new EvmPriceServiceConnection(offchainMainnetEndpoint);
-      const signedOffchainData = await priceService.getPriceFeedsUpdateData(pythFeeds);
-      const priceUpdateTxn = {
-        target: PythVerfier.address,
-        callData: PythVerifierInterface.encodeFunctionData('updatePriceFeeds', [
-          signedOffchainData,
-        ]),
-        value: ethers.BigNumber.from(pythFeeds.length),
-        requireSuccess: false,
-      };
+      const priceUpdateTxn = await fetchPriceUpdateTxn({ pythFeeds, PythVerfier });
       log('priceUpdateTxn: %O', priceUpdateTxn);
       return priceUpdateTxn;
     },

diff --git a/liquidity/ui/src/components/MigrateUSD/MigrateUSDTransaction.tsx b/liquidity/ui/src/components/MigrateUSD/MigrateUSDTransaction.tsx
@@ -118,6 +118,7 @@ export function MigrateUSDTransaction({
         ),
         status: 'error',
         variant: 'left-accent',
+        duration: 3_600_000,
       });
     }
   }, [
-Original file line number
+Diff line change
@@ Expand Up / @@ -167,6 +167,7 @@ export function useClaimAllRewards( @@
               ),
               status: 'error',
               variant: 'left-accent',
+              duration: 3_600_000,
             });
           }
         },
@@ Expand Down @@