Close Position and Debt repayment on Base (#68)

* Run e2e tests in parallel * Close Position and debt repayment on Base * New block, longer timeouts, fix Deposit * Use Amount with suffix * Add clearDebt and use it before delegating collateral * Split USDC_Unlock_negative_debt and USDC_Unlock_positive_debt, rename tests * remove extra deposit to a position with debt. * XL * Unlock actually works well on this block * Limit anvil memory --------- Co-authored-by: Noisekit <[email protected]>
Synthetixio · Nov 28, 2024 · f7baf82 · f7baf82
1 parent deaac78
commit f7baf82
Show file tree

Hide file tree

Showing 44 changed files with 372 additions and 233 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -142,6 +142,7 @@ jobs:
     docker:
       - image: cimg/node:<< pipeline.parameters.node-version >>
     resource_class: xlarge
+    parallelism: 3
     steps:
       - checkout
       - install-foundry
@@ -171,7 +172,7 @@ jobs:
             echo "0" > /tmp/cypress_exit_code
             export NODE_ENV=test
             export CYPRESS_INFURA_KEY=$INFURA_KEY
-            yarn cypress run --e2e || echo $? > /tmp/cypress_exit_code
+            circleci tests glob 'cypress/e2e/**/*.e2e.js' | circleci tests run --verbose --split-by=timings --command="xargs yarn cypress run --e2e --spec" || echo $? > /tmp/cypress_exit_code
 
       - save_cache:
           key: *anvil-fork-cache

diff --git a/README.md b/README.md
@@ -62,7 +62,7 @@ and all transactions will be automatically signed, without any popups
     ```sh
     # Mainnets
     anvil --auto-impersonate --chain-id 1 --fork-url wss://mainnet.infura.io/ws/v3/$INFURA_KEY --no-rate-limit --steps-tracing --fork-block-number 21233424
-    anvil --auto-impersonate --chain-id 8453 --fork-url wss://base-mainnet.infura.io/ws/v3/$INFURA_KEY --no-rate-limit --steps-tracing --fork-block-number 22683522
+    anvil --auto-impersonate --chain-id 8453 --fork-url wss://base-mainnet.infura.io/ws/v3/$INFURA_KEY --no-rate-limit --steps-tracing --fork-block-number 22946353
     anvil --auto-impersonate --chain-id 42161 --fork-url wss://arbitrum-mainnet.infura.io/ws/v3/$INFURA_KEY --no-rate-limit --steps-tracing --fork-block-number 271813668
 
     # Testnets

diff --git a/liquidity/components/UndelegateModal/UndelegateModal.tsx b/liquidity/components/UndelegateModal/UndelegateModal.tsx
@@ -3,17 +3,20 @@ import { Button, Divider, Link, Text, useToast } from '@chakra-ui/react';
 import { Amount } from '@snx-v3/Amount';
 import { ZEROWEI } from '@snx-v3/constants';
 import { ContractError } from '@snx-v3/ContractError';
-import { currency } from '@snx-v3/format';
+import { currency, parseUnits } from '@snx-v3/format';
 import { isBaseAndromeda } from '@snx-v3/isBaseAndromeda';
 import { ManagePositionContext } from '@snx-v3/ManagePositionContext';
 import { Multistep } from '@snx-v3/Multistep';
+import { useApprove } from '@snx-v3/useApprove';
 import { useNetwork } from '@snx-v3/useBlockchain';
 import { CollateralType, useCollateralType } from '@snx-v3/useCollateralTypes';
 import { useContractErrorParser } from '@snx-v3/useContractErrorParser';
+import { useDebtRepayer } from '@snx-v3/useDebtRepayer';
 import { LiquidityPosition } from '@snx-v3/useLiquidityPosition';
 import { useParams } from '@snx-v3/useParams';
 import { useUndelegate } from '@snx-v3/useUndelegate';
 import { useUndelegateBaseAndromeda } from '@snx-v3/useUndelegateBaseAndromeda';
+import { useUSDC } from '@snx-v3/useUSDC';
 import { Wei, wei } from '@synthetixio/wei';
 import { useQueryClient } from '@tanstack/react-query';
 import { useMachine } from '@xstate/react';
@@ -143,6 +146,19 @@ export const UndelegateModal: UndelegateModalProps = ({ onClose, isOpen, liquidi
     collateralChange,
     currentCollateral: currentCollateral,
   });
+
+  const debtExists = liquidityPosition?.debt.gt(0);
+  const currentDebt = debtExists && liquidityPosition ? liquidityPosition.debt : wei(0);
+  const { data: USDC } = useUSDC();
+  const { data: DebtRepayer } = useDebtRepayer();
+
+  const { approve, requireApproval } = useApprove({
+    contractAddress: USDC?.address,
+    //slippage for approval
+    amount: debtExists ? parseUnits(currentDebt.toString(), 6).mul(120).div(100) : 0,
+    spender: DebtRepayer?.address,
+  });
+
   const { exec: undelegateBaseAndromeda } = useUndelegateBaseAndromeda({
     accountId: params.accountId,
     poolId: params.poolId,
@@ -169,6 +185,9 @@ export const UndelegateModal: UndelegateModalProps = ({ onClose, isOpen, liquidi
           });
 
           if (isBase) {
+            if (requireApproval) {
+              await approve(false);
+            }
             await undelegateBaseAndromeda();
           } else {
             await execUndelegate();

diff --git a/liquidity/components/UndelegateModal/package.json b/liquidity/components/UndelegateModal/package.json
@@ -13,11 +13,14 @@
     "@snx-v3/constants": "workspace:*",
     "@snx-v3/format": "workspace:*",
     "@snx-v3/isBaseAndromeda": "workspace:*",
+    "@snx-v3/useApprove": "workspace:*",
     "@snx-v3/useBlockchain": "workspace:*",
     "@snx-v3/useCollateralTypes": "workspace:*",
     "@snx-v3/useContractErrorParser": "workspace:*",
+    "@snx-v3/useDebtRepayer": "workspace:*",
     "@snx-v3/useLiquidityPosition": "workspace:*",
     "@snx-v3/useParams": "workspace:*",
+    "@snx-v3/useUSDC": "workspace:*",
     "@snx-v3/useUndelegate": "workspace:*",
     "@snx-v3/useUndelegateBaseAndromeda": "workspace:*",
     "@synthetixio/wei": "^2.74.4",

diff --git a/liquidity/components/WithdrawModal/WithdrawModal.tsx b/liquidity/components/WithdrawModal/WithdrawModal.tsx
@@ -71,12 +71,7 @@ export const WithdrawModalUi: FC<{
         <Multistep
           step={1}
           title="Withdraw"
-          subtitle={
-            <Text as="div">
-              <Amount value={amount} />
-              &nbsp;{symbol} will be withdrawn
-            </Text>
-          }
+          subtitle={<Amount value={amount} suffix={` ${symbol} will be withdrawn`} />}
           status={{
             failed: state.step === 1 && state.status === 'error',
             success: state.step > 1,

diff --git a/liquidity/cypress/cypress.d.ts b/liquidity/cypress/cypress.d.ts
@@ -33,6 +33,18 @@ declare global {
         poolId: number;
       }) => Promise<void>;
 
+      clearDebt: ({
+        address,
+        accountId,
+        symbol,
+        poolId,
+      }: {
+        address?: string;
+        accountId?: string;
+        symbol: string;
+        poolId: number;
+      }) => Promise<void>;
+
       delegateCollateral: ({
         address,
         accountId,

diff --git a/liquidity/cypress/cypress/e2e/1-main/Create_Account.e2e.js b/liquidity/cypress/cypress/e2e/1-main/Create_Account.e2e.js
@@ -1,4 +1,4 @@
-describe('Create Account', () => {
+describe(__filename, () => {
   Cypress.env('chainId', '1');
   Cypress.env('preset', 'main');
   Cypress.env('walletAddress', '0xc3Cf311e04c1f8C74eCF6a795Ae760dc6312F345');
@@ -21,7 +21,7 @@ describe('Create Account', () => {
   });
   afterEach(() => cy.task('stopAnvil').then(() => cy.log('Anvil stopped')));
 
-  it('works', () => {
+  it(__filename, () => {
     cy.setEthBalance({ balance: 100 });
 
     cy.visit('/#/dashboard');

diff --git a/liquidity/cypress/cypress/e2e/1-main/Dashboard_Connected.e2e.js b/liquidity/cypress/cypress/e2e/1-main/Dashboard_Connected.e2e.js
@@ -1,4 +1,4 @@
-describe('Dashboard - Connected', () => {
+describe(__filename, () => {
   Cypress.env('chainId', '1');
   Cypress.env('preset', 'main');
   Cypress.env('walletAddress', '0xc3Cf311e04c1f8C74eCF6a795Ae760dc6312F345');
@@ -21,7 +21,7 @@ describe('Dashboard - Connected', () => {
   });
   afterEach(() => cy.task('stopAnvil').then(() => cy.log('Anvil stopped')));
 
-  it('works', () => {
+  it(__filename, () => {
     cy.setEthBalance({ balance: 100 });
 
     cy.visit('/#/dashboard');

diff --git a/liquidity/cypress/cypress/e2e/1-main/Dashboard_Not_Connected.e2e.js b/liquidity/cypress/cypress/e2e/1-main/Dashboard_Not_Connected.e2e.js
@@ -1,4 +1,4 @@
-describe('Dashboard - Not Connected', () => {
+describe(__filename, () => {
   Cypress.env('chainId', '1');
   Cypress.env('preset', 'main');
   Cypress.env('walletAddress', '0xc3Cf311e04c1f8C74eCF6a795Ae760dc6312F345');
@@ -13,7 +13,7 @@ describe('Dashboard - Not Connected', () => {
     });
   });
 
-  it('works', () => {
+  it(__filename, () => {
     cy.visit('/#/dashboard');
 
     cy.contains('h2', 'Dashboard').should('exist');

diff --git a/.../1-main/Manage_SNX_Position_Borrow.e2e.js → ...ress/cypress/e2e/1-main/SNX_Borrow.e2e.js b/.../1-main/Manage_SNX_Position_Borrow.e2e.js → ...ress/cypress/e2e/1-main/SNX_Borrow.e2e.js
@@ -1,4 +1,4 @@
-describe('Manage SNX Position - Borrow', () => {
+describe(__filename, () => {
   Cypress.env('chainId', '1');
   Cypress.env('preset', 'main');
   Cypress.env('walletAddress', '0xc3Cf311e04c1f8C74eCF6a795Ae760dc6312F345');
@@ -21,7 +21,7 @@ describe('Manage SNX Position - Borrow', () => {
   });
   afterEach(() => cy.task('stopAnvil').then(() => cy.log('Anvil stopped')));
 
-  it('works', () => {
+  it(__filename, () => {
     cy.setEthBalance({ balance: 100 });
     cy.approveCollateral({ symbol: 'SNX', spender: 'CoreProxy' });
     cy.getSNX({ amount: 2000 });
@@ -30,7 +30,7 @@ describe('Manage SNX Position - Borrow', () => {
 
     cy.visit(`/#/positions/SNX/1?manageAction=claim&accountId=${Cypress.env('accountId')}`);
 
-    cy.get('[data-cy="claim form"]').should('exist');
+    cy.get('[data-cy="claim form"]', { timeout: 180_000 }).should('exist');
     cy.contains('[data-status="info"]', 'You can take an interest-free loan up to').should('exist');
 
     cy.get('[data-cy="claim amount input"]').should('exist');

diff --git a/...1-main/Manage_SNX_Position_Deposit.e2e.js → ...ess/cypress/e2e/1-main/SNX_Deposit.e2e.js b/...1-main/Manage_SNX_Position_Deposit.e2e.js → ...ess/cypress/e2e/1-main/SNX_Deposit.e2e.js
@@ -1,4 +1,4 @@
-describe('Manage SNX Position - Deposit', () => {
+describe(__filename, () => {
   Cypress.env('chainId', '1');
   Cypress.env('preset', 'main');
   Cypress.env('walletAddress', '0xc3Cf311e04c1f8C74eCF6a795Ae760dc6312F345');
@@ -21,13 +21,13 @@ describe('Manage SNX Position - Deposit', () => {
   });
   afterEach(() => cy.task('stopAnvil').then(() => cy.log('Anvil stopped')));
 
-  it('works', () => {
+  it(__filename, () => {
     cy.setEthBalance({ balance: 100 });
     cy.getSNX({ amount: 500 });
 
     cy.visit(`/#/positions/SNX/1?manageAction=deposit&accountId=${Cypress.env('accountId')}`);
 
-    cy.get('[data-cy="deposit and lock collateral form"]').should('exist');
+    cy.get('[data-cy="deposit and lock collateral form"]', { timeout: 180_000 }).should('exist');
     cy.get('[data-cy="balance amount"]').should('exist').and('include.text', 'Max');
 
     cy.get('[data-cy="deposit amount input"]').type('101');

diff --git a/.../1-main/Manage_SNX_Position_Unlock.e2e.js → ...ress/cypress/e2e/1-main/SNX_Unlock.e2e.js b/.../1-main/Manage_SNX_Position_Unlock.e2e.js → ...ress/cypress/e2e/1-main/SNX_Unlock.e2e.js
@@ -1,4 +1,4 @@
-describe('Manage SNX Position - Unlock', () => {
+describe(__filename, () => {
   Cypress.env('chainId', '1');
   Cypress.env('preset', 'main');
   Cypress.env('walletAddress', '0xc3Cf311e04c1f8C74eCF6a795Ae760dc6312F345');
@@ -21,7 +21,7 @@ describe('Manage SNX Position - Unlock', () => {
   });
   afterEach(() => cy.task('stopAnvil').then(() => cy.log('Anvil stopped')));
 
-  it('works', () => {
+  it(__filename, () => {
     cy.setEthBalance({ balance: 100 });
     cy.getSNX({ amount: 2000 });
     cy.approveCollateral({ symbol: 'SNX', spender: 'CoreProxy' });
@@ -30,7 +30,7 @@ describe('Manage SNX Position - Unlock', () => {
 
     cy.visit(`/#/positions/SNX/1?manageAction=undelegate&accountId=${Cypress.env('accountId')}`);
 
-    cy.get('[data-cy="unlock collateral form"]').should('exist');
+    cy.get('[data-cy="unlock collateral form"]', { timeout: 180_000 }).should('exist');
     cy.get('[data-cy="locked amount"]').should('exist').and('include.text', 'Max');
 
     cy.get('[data-cy="undelegate amount input"]').should('exist');

diff --git a/liquidity/cypress/cypress/e2e/42161-main/Create_Account.e2e.js b/liquidity/cypress/cypress/e2e/42161-main/Create_Account.e2e.js
@@ -1,4 +1,4 @@
-describe('Create Account', () => {
+describe(__filename, () => {
   Cypress.env('chainId', '42161');
   Cypress.env('preset', 'main');
   Cypress.env('walletAddress', '0xc3Cf311e04c1f8C74eCF6a795Ae760dc6312F345');
@@ -21,7 +21,7 @@ describe('Create Account', () => {
   });
   afterEach(() => cy.task('stopAnvil').then(() => cy.log('Anvil stopped')));
 
-  it('works', () => {
+  it(__filename, () => {
     cy.setEthBalance({ balance: 100 });
 
     cy.visit('/#/dashboard');

diff --git a/liquidity/cypress/cypress/e2e/42161-main/Dashboard_Connected.e2e.js b/liquidity/cypress/cypress/e2e/42161-main/Dashboard_Connected.e2e.js
@@ -1,4 +1,4 @@
-describe('Dashboard - Connected', () => {
+describe(__filename, () => {
   Cypress.env('chainId', '42161');
   Cypress.env('preset', 'main');
   Cypress.env('walletAddress', '0xc3Cf311e04c1f8C74eCF6a795Ae760dc6312F345');
@@ -21,7 +21,7 @@ describe('Dashboard - Connected', () => {
   });
   afterEach(() => cy.task('stopAnvil').then(() => cy.log('Anvil stopped')));
 
-  it('works', () => {
+  it(__filename, () => {
     cy.setEthBalance({ balance: 100 });
 
     cy.visit('/#/dashboard');

diff --git a/liquidity/cypress/cypress/e2e/42161-main/Dashboard_Not_Connected.e2e.js b/liquidity/cypress/cypress/e2e/42161-main/Dashboard_Not_Connected.e2e.js
@@ -1,4 +1,4 @@
-describe('Dashboard - Not Connected', () => {
+describe(__filename, () => {
   Cypress.env('chainId', '42161');
   Cypress.env('preset', 'main');
   Cypress.env('walletAddress', '0xc3Cf311e04c1f8C74eCF6a795Ae760dc6312F345');
@@ -13,7 +13,7 @@ describe('Dashboard - Not Connected', () => {
     });
   });
 
-  it('works', () => {
+  it(__filename, () => {
     cy.visit('/#/dashboard');
 
     cy.contains('h2', 'Dashboard').should('exist');

diff --git a/...1-main/Manage_WETH_Position_Borrow.e2e.js → ...cypress/e2e/42161-main/WETH_Borrow.e2e.js b/...1-main/Manage_WETH_Position_Borrow.e2e.js → ...cypress/e2e/42161-main/WETH_Borrow.e2e.js
@@ -1,4 +1,4 @@
-describe('Manage WETH Position - Borrow', () => {
+describe(__filename, () => {
   Cypress.env('chainId', '42161');
   Cypress.env('preset', 'main');
   Cypress.env('walletAddress', '0xc3Cf311e04c1f8C74eCF6a795Ae760dc6312F345');
@@ -23,7 +23,7 @@ describe('Manage WETH Position - Borrow', () => {
   });
   afterEach(() => cy.task('stopAnvil').then(() => cy.log('Anvil stopped')));
 
-  it('works', () => {
+  it(__filename, () => {
     cy.setEthBalance({ balance: 100 });
     cy.approveCollateral({ symbol: 'WETH', spender: 'CoreProxy' });
     cy.wrapEth({ amount: 20 });
@@ -32,7 +32,7 @@ describe('Manage WETH Position - Borrow', () => {
 
     cy.visit(`/#/positions/WETH/1?manageAction=claim&accountId=${Cypress.env('accountId')}`);
 
-    cy.get('[data-cy="claim form"]').should('exist');
+    cy.get('[data-cy="claim form"]', { timeout: 180_000 }).should('exist');
     cy.contains('[data-status="info"]', 'You can take an interest-free loan up to').should('exist');
 
     cy.get('[data-cy="claim amount input"]').type('100');

diff --git a/...-main/Manage_WETH_Position_Deposit.e2e.js → ...ypress/e2e/42161-main/WETH_Deposit.e2e.js b/...-main/Manage_WETH_Position_Deposit.e2e.js → ...ypress/e2e/42161-main/WETH_Deposit.e2e.js
@@ -1,4 +1,4 @@
-describe('Manage WETH Position - Deposit', () => {
+describe(__filename, () => {
   Cypress.env('chainId', '42161');
   Cypress.env('preset', 'main');
   Cypress.env('walletAddress', '0xc3Cf311e04c1f8C74eCF6a795Ae760dc6312F345');
@@ -21,7 +21,7 @@ describe('Manage WETH Position - Deposit', () => {
   });
   afterEach(() => cy.task('stopAnvil').then(() => cy.log('Anvil stopped')));
 
-  it('works', () => {
+  it(__filename, () => {
     cy.setEthBalance({ balance: 100 });
 
     // Make initial delegation
@@ -32,7 +32,7 @@ describe('Manage WETH Position - Deposit', () => {
 
     cy.visit(`/#/positions/WETH/1?manageAction=deposit&accountId=${Cypress.env('accountId')}`);
 
-    cy.get('[data-cy="deposit and lock collateral form"]').should('exist');
+    cy.get('[data-cy="deposit and lock collateral form"]', { timeout: 180_000 }).should('exist');
     cy.get('[data-cy="balance amount"]').should('exist').and('include.text', 'Max');
 
     cy.get('[data-cy="deposit amount input"]').type('1');

diff --git a/...61-main/Manage_WETH_Position_Repay.e2e.js → .../cypress/e2e/42161-main/WETH_Repay.e2e.js b/...61-main/Manage_WETH_Position_Repay.e2e.js → .../cypress/e2e/42161-main/WETH_Repay.e2e.js
@@ -1,4 +1,4 @@
-describe('Manage WETH Position - Repay', () => {
+describe(__filename, () => {
   Cypress.env('chainId', '42161');
   Cypress.env('preset', 'main');
   Cypress.env('walletAddress', '0xc3Cf311e04c1f8C74eCF6a795Ae760dc6312F345');
@@ -21,7 +21,7 @@ describe('Manage WETH Position - Repay', () => {
   });
   afterEach(() => cy.task('stopAnvil').then(() => cy.log('Anvil stopped')));
 
-  it('works', () => {
+  it(__filename, () => {
     cy.setEthBalance({ balance: 100 });
     cy.approveCollateral({ symbol: 'WETH', spender: 'CoreProxy' });
     cy.wrapEth({ amount: 20 });
@@ -31,7 +31,7 @@ describe('Manage WETH Position - Repay', () => {
 
     cy.visit(`/#/positions/WETH/1?manageAction=repay&accountId=${Cypress.env('accountId')}`);
 
-    cy.get('[data-cy="repay debt form"]').should('exist');
+    cy.get('[data-cy="repay debt form"]', { timeout: 180_000 }).should('exist');
     cy.get('[data-cy="current debt amount"]').should('exist').and('include.text', 'Max');
 
     cy.get('[data-cy="repay amount input"]').type('5');

diff --git a/liquidity/cypress/cypress/e2e/8453-andromeda/Create_Account.e2e.js b/liquidity/cypress/cypress/e2e/8453-andromeda/Create_Account.e2e.js
@@ -1,4 +1,4 @@
-describe('Create Account', () => {
+describe(__filename, () => {
   Cypress.env('chainId', '8453');
   Cypress.env('preset', 'andromeda');
   Cypress.env('walletAddress', '0xc3Cf311e04c1f8C74eCF6a795Ae760dc6312F345');
@@ -8,7 +8,7 @@ describe('Create Account', () => {
     cy.task('startAnvil', {
       chainId: Cypress.env('chainId'),
       forkUrl: `wss://base-mainnet.infura.io/ws/v3/${Cypress.env('INFURA_KEY')}`,
-      block: '22683522',
+      block: '22946353',
     }).then(() => cy.log('Anvil started'));
 
     cy.on('window:before:load', (win) => {
@@ -21,7 +21,7 @@ describe('Create Account', () => {
   });
   afterEach(() => cy.task('stopAnvil').then(() => cy.log('Anvil stopped')));
 
-  it('works', () => {
+  it(__filename, () => {
     cy.setEthBalance({ balance: 100 });
 
     cy.visit('/#/dashboard');