Merge pull request #610 from bobanetwork/fix/crashes-and-anchorage-wi…

…thdrawal Fix/crashes and anchorage withdrawal
bobanetwork · Aug 30, 2024 · fc75fec · fc75fec
2 parents 372d4e3 + a7a920e
commit fc75fec
Show file tree

Hide file tree

Showing 59 changed files with 3,459 additions and 790 deletions.
diff --git a/.env.example b/.env.example
@@ -6,6 +6,7 @@ REACT_APP_GA4_MEASUREMENT_ID=
 REACT_APP_SENTRY_DSN=
 REACT_APP_WC_PROJECT_ID=
 REACT_APP_GATEWAY_DATA_BRANCH=
+REACT_APP_THE_GRAPH_API_KEY=
 #####################
 ##### WebWallet #####
 #####################

diff --git a/.github/workflows/end2end-test.yml b/.github/workflows/end2end-test.yml
@@ -1,10 +1,10 @@
 name: Integration Test
 
 on: 
-  # push: 
-  #   branches: ['main', 'master']
-  # pull_request:
-  workflow_dispatch
+  push: 
+    branches: ['main', 'master']
+  pull_request:
+  workflow_dispatch:
 
 jobs:
   e2e-test:

diff --git a/e2e-tests/lib/gatewayAction.ts b/e2e-tests/lib/gatewayAction.ts
@@ -2,41 +2,6 @@ import { Page } from '@playwright/test'
 import { BasePage } from '../pages/basePage'
 import { BridgePage } from '../pages/bridgePage'
 
-const networkConfig = {
-  L1: {
-    token: 'ETH',
-    chainId: '11155111',
-    name: 'Sepolia',
-  },
-  L2: {
-    token: 'ETH',
-    chainId: '28882',
-    name: 'Boba Sepolia',
-  },
-}
-
-const networkNames = {
-  eth: {
-    fromNetwork: 'Ethereum (Sepolia)',
-    toNetwork: 'Boba (Sepolia)',
-  },
-  bnb: {
-    fromNetwork: 'BNB Testnet',
-    toNetwork: 'Boba BNB Testnet',
-  },
-}
-
-const withDrawalNetworkNames = {
-  eth: {
-    toNetwork: 'Ethereum (Sepolia)',
-    fromNetwork: 'Boba (Sepolia)',
-  },
-  bnb: {
-    toNetwork: 'BNB Testnet',
-    fromNetwork: 'Boba BNB Testnet',
-  },
-}
-
 export class GatewayAction {
   basePage: BasePage
   bridgePage: BridgePage
@@ -46,53 +11,14 @@ export class GatewayAction {
     this.bridgePage = new BridgePage(page)
   }
 
-  async classicBridgeDeposit({
-    amountToBridge,
-    tokenSymbol,
-    successWaitTime = 1000,
-    approveAllowance = false,
-    networkKey = 'eth',
-  }: {
-    amountToBridge: string
-    tokenSymbol: string
-    successWaitTime?: number
-    approveAllowance?: boolean
-    networkKey?: 'bnb' | 'eth'
-  }) {
-    await this.bridgePage.openTokenPickerAndSelect(tokenSymbol)
-    await this.bridgePage.bridgeButtonToBeDisable()
-    await this.bridgePage.fillBridgingAmount(amountToBridge)
-    await this.bridgePage.bridgeButtonToBeEnable()
-    await this.bridgePage.validateBridgingFee({
-      amount: amountToBridge,
-      token: tokenSymbol,
-      estimatedTime: '13 ~ 14mins.',
-    })
-    await this.bridgePage.clickToBridge()
-    await this.bridgePage.validateAndConfirmBridging({
-      amount: amountToBridge,
-      token: tokenSymbol,
-      ...networkNames[networkKey],
-      estimatedTime: '13 ~ 14mins.',
-    })
-    if (approveAllowance) {
-      await this.bridgePage.approveAndConfirmMetaMaskSuccess(amountToBridge)
-    } else {
-      await this.bridgePage.confirmMetaMaskModalToBridge(amountToBridge)
-    }
-    await this.bridgePage.wait(successWaitTime) // have to wait for success modal
-    await this.bridgePage.validateBridgeSuccess()
-    await this.bridgePage.toHistoryPage()
-  }
-
-  async classicBridgeWithdrawal({
+  async classicBridge({
     amountToBridge,
     tokenSymbol,
-    networkKey = 'eth',
+    estimatedTime = '',
   }: {
     amountToBridge: string
     tokenSymbol: string
-    networkKey?: 'bnb' | 'eth'
+    estimatedTime?: string
   }) {
     await this.bridgePage.openTokenPickerAndSelect(tokenSymbol)
     await this.bridgePage.bridgeButtonToBeDisable()
@@ -101,68 +27,51 @@ export class GatewayAction {
     await this.bridgePage.validateBridgingFee({
       amount: amountToBridge,
       token: tokenSymbol,
-      estimatedTime: '7 days',
+      estimatedTime,
     })
     await this.bridgePage.clickToBridge()
     await this.bridgePage.validateAndConfirmBridging({
       amount: amountToBridge,
       token: tokenSymbol,
-      ...withDrawalNetworkNames[networkKey],
-      estimatedTime: '7 days',
+      estimatedTime,
     })
-    await this.bridgePage.reviewAndInitiateWithdrawal()
-    // TODO :
-    // await this.bridgePage.switchNetworkProovWithdrawal()
-    // NOTE: Discuss and implement the proove validation.
   }
 
-  async lightBridgeDeposit({
+  async doDepositClassicBridge({
     amountToBridge,
-    tokenSymbol,
-    successWaitTime = 1000,
     approveAllowance = false,
   }: {
     amountToBridge: string
-    tokenSymbol: string
-    successWaitTime?: number
     approveAllowance?: boolean
   }) {
-    await this.bridgePage.switchToLightBridge()
-    await this.bridgePage.openTokenPickerAndSelect(tokenSymbol)
-    await this.bridgePage.bridgeButtonToBeDisable()
-    await this.bridgePage.fillBridgingAmount(amountToBridge)
-    await this.bridgePage.bridgeButtonToBeEnable()
-    await this.bridgePage.validateBridgingFee({
-      amount: amountToBridge,
-      token: tokenSymbol,
-      estimatedTime: '~1min.',
-    })
-    await this.bridgePage.clickToBridge()
-    await this.bridgePage.validateAndConfirmBridging({
-      amount: amountToBridge,
-      token: tokenSymbol,
-      fromNetwork: 'Ethereum (Sepolia)',
-      toNetwork: 'Boba (Sepolia)',
-      estimatedTime: '~1min.',
-    })
     if (approveAllowance) {
       await this.bridgePage.approveAndConfirmMetaMaskSuccess(amountToBridge)
     } else {
       await this.bridgePage.confirmMetaMaskModalToBridge(amountToBridge)
     }
-    await this.bridgePage.wait(successWaitTime) // have to wait for success modal
+    await this.bridgePage.wait(1000)
     await this.bridgePage.validateBridgeSuccess()
     await this.bridgePage.toHistoryPage()
   }
 
-  async lightBridgeWithdraw({
+  async doWithdrawClassicBridge() {
+    await this.bridgePage.reviewAndWithdraw()
+  }
+
+  async doWithdrawClassicBridgeBnb(amount) {
+    await this.bridgePage.reviewAproveAndWithdraw(amount)
+  }
+
+  async lightBridge({
     amountToBridge,
     tokenSymbol,
     successWaitTime = 1000,
     approveAllowance = false,
+    receivableAmt,
   }: {
     amountToBridge: string
     tokenSymbol: string
+    receivableAmt?: string
     successWaitTime?: number
     approveAllowance?: boolean
   }) {
@@ -171,27 +80,22 @@ export class GatewayAction {
     await this.bridgePage.bridgeButtonToBeDisable()
     await this.bridgePage.fillBridgingAmount(amountToBridge)
     await this.bridgePage.bridgeButtonToBeEnable()
-    const receivableAmt = Number(amountToBridge) * ((100 - 1) / 100)
     await this.bridgePage.validateBridgingFee({
-      amount: receivableAmt.toFixed(4),
+      amount: receivableAmt ? Number(receivableAmt).toFixed(4) : amountToBridge,
       token: tokenSymbol,
       estimatedTime: '~1min.',
     })
     await this.bridgePage.clickToBridge()
     await this.bridgePage.validateAndConfirmBridging({
       amount: amountToBridge,
       token: tokenSymbol,
-      fromNetwork: 'Boba (Sepolia)',
-      toNetwork: 'Ethereum (Sepolia)',
       estimatedTime: '~1min.',
     })
-
     if (approveAllowance) {
       await this.bridgePage.approveAndConfirmMetaMaskSuccess(amountToBridge)
     } else {
       await this.bridgePage.confirmMetaMaskModalToBridge(amountToBridge)
     }
-
     await this.bridgePage.wait(successWaitTime) // have to wait for success modal
     await this.bridgePage.validateBridgeSuccess()
     await this.bridgePage.toHistoryPage()
@@ -204,8 +108,14 @@ export class GatewayAction {
     await this.basePage.wait(1000)
   }
 
-  async switchL2Network() {
+  async connect() {
+    await this.basePage.connectToMetamask(true)
+  }
+
+  async switchToL2AndReset() {
     await this.basePage.clickToSwitchNetwork()
+    await this.basePage.disconnectMetamask()
+    await this.basePage.connectToMetamask(true)
   }
 
   async addAndConnectBNBTestnet() {

diff --git a/e2e-tests/pages/bridgePage.ts b/e2e-tests/pages/bridgePage.ts
@@ -71,34 +71,21 @@ export class BridgePage extends BasePage {
   async validateAndConfirmBridging({
     amount,
     token,
-    fromNetwork,
-    toNetwork,
     estimatedTime,
   }: {
-    amount: string
     token: string
-    fromNetwork: string
-    toNetwork: string
+    amount: string
     estimatedTime: string
   }) {
     await expect(
       this.page.getByRole('heading', { name: 'Bridge Confirmation' })
     ).toBeVisible()
 
-    // label can change base on networkType.
-    await expect(this.page.getByTestId('fromNetwork')).toContainText(
-      fromNetwork //'Ethereum (Sepolia)'
-    )
-
-    await expect(this.page.getByTestId('toNetwork')).toContainText(
-      toNetwork //'Boba (Sepolia)'
-    )
-
     const amountToBridge = await this.page
       .locator(':text("Amount to bridge") + p')
       .textContent()
 
-    await expect(amountToBridge).toContain(`${amount} ${token}`)
+    expect(amountToBridge).toContain(`${amount} ${token}`)
 
     const time = await this.page
       .locator('[data-testid="bridge-confirmation"] :text("Time") + p')
@@ -128,7 +115,7 @@ export class BridgePage extends BasePage {
 
     await metamask.confirmPermissionToSpend(amount, true)
 
-    this.page.waitForTimeout(3000) // wait for 3 secs.
+    this.page.waitForTimeout(6000) // wait for 3 secs.
 
     await metamask.confirmTransaction({ shouldWaitForPopupClosure: true })
 
@@ -151,23 +138,29 @@ export class BridgePage extends BasePage {
     )
   }
 
-  async reviewAndInitiateWithdrawal() {
+  async reviewAndWithdraw() {
     await expect(
       this.page.getByRole('heading', { name: 'Withdrawal' })
     ).toBeVisible()
-
-    const initBtn = this.page.getByRole('button', {
-      name: 'Initiate Withdrawal',
-    })
-
-    await expect(initBtn).toBeEnabled()
-
-    await initBtn.click()
-
+    await expect(
+      this.page.getByRole('button', { name: 'Initiate Withdrawal' })
+    ).toBeEnabled()
+    await this.page.getByRole('button', { name: 'Initiate Withdrawal' }).click()
     await metamask.confirmTransaction()
-
     await this.wait(2000)
+    await this.page.getByRole('button', { name: 'Close' }).click()
+  }
 
+  async reviewAproveAndWithdraw(amount) {
+    await expect(
+      this.page.getByRole('heading', { name: 'Withdrawal' })
+    ).toBeVisible()
+    await expect(
+      this.page.getByRole('button', { name: 'Initiate Withdrawal' })
+    ).toBeEnabled()
+    await this.page.getByRole('button', { name: 'Initiate Withdrawal' }).click()
+    await metamask.confirmPermissionToSpend(amount)
+    await this.wait(2000)
     await this.page.getByRole('button', { name: 'Close' }).click()
   }