Gui replacement

.github/workflows/e2e.yml

@@ -69,8 +69,6 @@ jobs:
           WITH_ANVIL: true
           URL: https://${{ steps.preview.outputs.preview_url }}
           RPC_URL: ${{ secrets.RPC_URL }}
-          GUARDIAN_UI_INFURA_API_KEY: ${{ secrets.GUARDIAN_UI_INFURA_API_KEY }}
-          GUARDIAN_UI_ALCHEMY_API_KEY: ${{ secrets.GUARDIAN_UI_ALCHEMY_API_KEY }}
           VERCEL_AUTOMATION_BYPASS_SECRET: ${{ secrets.VERCEL_AUTOMATION_BYPASS_SECRET }}
         run: pnpm run e2e
 

e2e/extendTest.ts

@@ -1,4 +1,4 @@
-import { test as base } from '@guardianui/test'
+import { test as base } from '@playwright/test'
 
 import {
   api,
@@ -7,16 +7,15 @@ import {
   swap,
   vault,
   queue,
-  anvil,
   wallet,
   osToken,
   graphql,
   element,
   helpers,
   settings,
-  guardian,
   transactions,
 } from './fixtures'
+import { resetAllChains } from './fixtures/wallet/helpers'
 
 
 const baseTest = base.extend<E2E.ExtendedTest>({
@@ -26,14 +25,12 @@ const baseTest = base.extend<E2E.ExtendedTest>({
   swap,
   queue,
   vault,
-  anvil,
   wallet,
   osToken,
   graphql,
   element,
   helpers,
   settings,
-  guardian,
   transactions,
 })
 
@@ -55,6 +52,10 @@ const log = {
 
 const getFileName = (value: string) => value.replace(/^.*\/(.*)\//gm, '$1/')
 
+baseTest.beforeAll(async () => {
+  await resetAllChains()
+})
+
 baseTest.afterEach(async ({}, testInfo) => {
   const { title, error, duration, file, retry } = testInfo
 

e2e/fixtures/element/checkLink.ts

@@ -33,7 +33,6 @@ export const createCheckLink: Wrapper = ({ page }) => (
       await expect(page).toHaveURL(expectedURL)
 
       if (!skipPageHeadingCheck) {
-        await page.waitForLoadState('networkidle')
         await expect(page.getByTestId('page-heading')).toBeVisible()
       }
     }

e2e/fixtures/index.ts

@@ -4,14 +4,12 @@ export { default as user } from './user'
 export { default as swap } from './swap'
 export { default as vault } from './vault'
 export { default as queue } from './queue'
-export { default as anvil } from './anvil'
 export { default as wallet } from './wallet'
 export { default as osToken } from './osToken'
 export { default as graphql } from './graphql'
 export { default as element } from './element'
 export { default as helpers } from './helpers'
 export { default as settings } from './settings'
-export { default as guardian } from './guardian'
 export { default as transactions } from './transactions'
 
 
@@ -21,12 +19,10 @@ export type { UserFixture } from './user'
 export type { SwapFixture } from './swap'
 export type { VaultFixture } from './vault'
 export type { QueueFixture } from './queue'
-export type { AnvilFixture } from './anvil'
 export type { WalletFixture } from './wallet'
 export type { OsTokenFixture } from './osToken'
 export type { ElementFixture } from './element'
 export type { HelpersFixture } from './helpers'
 export type { GraphqlFixture } from './graphql'
 export type { SettingsFixture } from './settings'
-export type { GuardianFixture } from './guardian'
 export type { TransactionsFixture } from './transactions'

e2e/fixtures/sdk/deposit.ts

@@ -1,7 +1,7 @@
 import { parseEther } from 'ethers'
 
 
-type Wrapper = E2E.FixtureMethod<Deposit, 'page'>
+type Wrapper = E2E.FixtureMethod<Deposit, 'page' | 'wallet'>
 
 export type Deposit = (values: Input) => Promise<void>
 
@@ -10,12 +10,13 @@ export type Input = {
   assets: string
 }
 
-export const createDeposit: Wrapper = ({ page }) => (
+// Pull the address from the wallet fixture rather than reading
+// `window.ethereum.signer.address` in-page - keeps the SDK call typed and
+// removes a compat-shim dependency from the browser evaluate body.
+export const createDeposit: Wrapper = ({ page, wallet }) => (
   async ({ vaultAddress, assets }: Input) => (
-    page.evaluate(async ({ vaultAddress, depositAssets }) => {
+    page.evaluate(async ({ vaultAddress, depositAssets, userAddress }) => {
       const sdk = window.e2e.sdk
-      // @ts-ignore
-      const userAddress = window.ethereum.signer.address
       const assets = BigInt(depositAssets)
 
       const depositHash = await sdk.vault.deposit({
@@ -28,6 +29,7 @@ export const createDeposit: Wrapper = ({ page }) => (
     }, {
       vaultAddress,
       depositAssets: parseEther(assets).toString(),
+      userAddress: wallet.getAddress(),
     })
   )
 )

e2e/fixtures/sdk/index.ts

@@ -7,10 +7,10 @@ export type SDKFixture = {
   deposit: Deposit
 }
 
-const sdk: E2E.Fixture<SDKFixture> = async ({ page }, use) => {
+const sdk: E2E.Fixture<SDKFixture> = async ({ page, wallet }, use) => {
   await use({
-    mint: createMint({ page }),
-    deposit: createDeposit({ page }),
+    mint: createMint({ page, wallet }),
+    deposit: createDeposit({ page, wallet }),
   })
 }