feat: added WalletConnect integration for improve tests speed

package.json

@@ -41,9 +41,9 @@
     "branches": [
       "main",
       {
-        "name": "develop",
-        "channel": "alpha",
-        "prerelease": "alpha"
+        "name": "feat/add-wc-wallet-without-wait",
+        "channel": "alpha-add-wc-wallet-without-wait",
+        "prerelease": "alpha-add-wc-wallet-without-wait"
       }
     ]
   },

packages/browser-service/package.json

@@ -36,4 +36,4 @@
   "peerDependencies": {
     "@playwright/test": "^1.51.1"
   }
-}
+}

packages/browser-service/src/browser.constants.ts

@@ -10,6 +10,7 @@ import {
   SafeIframePage,
   SafeWcPage,
   TrustWalletPage,
+  WCWallet,
 } from '@lidofinance/wallets-testing-wallets';
 
 export const WALLET_PAGES = {
@@ -24,6 +25,7 @@ export const WALLET_PAGES = {
   bitget: BitgetPage,
   safeWc: SafeWcPage,
   safeIframe: SafeIframePage,
+  walletconnect: WCWallet,
 };
 
 export const DEFAULT_BROWSER_CONTEXT_DIR_NAME = '.browser_context';

packages/browser-service/src/browser.context.service.ts

@@ -29,7 +29,7 @@ export type BrowserOptions = {
 type OptionsBrowserContext = {
   // If contextDataDir is undefined - will be created temp dir for context data.
   // Else contextDataDir is not undefined - will be created user dir for context data in current folder.
-  contextDataDir: string;
+  contextDataDir?: string;
   browserOptions?: BrowserOptions;
 };
 
@@ -41,7 +41,7 @@ export class BrowserContextService {
   private readonly logger = new ConsoleLogger(BrowserContextService.name);
 
   constructor(
-    public walletExtensionStartPath: string,
+    public walletExtensionStartPath: string | null,
     public options: OptionsBrowserContext,
   ) {
     this.defaultBrowserOptions = {
@@ -50,7 +50,9 @@ export class BrowserContextService {
       args: [
         '--lang=en-US',
         '--disable-dev-shm-usage',
-        `--disable-extensions-except=${this.walletExtensionStartPath}`,
+        this.walletExtensionStartPath
+          ? `--disable-extensions-except=${this.walletExtensionStartPath}`
+          : '',
         '--js-flags="--max-old-space-size=2048"',
       ],
       permissions: ['clipboard-read', 'clipboard-write'],
@@ -63,10 +65,6 @@ export class BrowserContextService {
   }
 
   async initBrowserContext() {
-    this.logger.debug(
-      `Starting a new browser context (temp context: ${!this.options
-        .contextDataDir})`,
-    );
     let browserContextPath = '';
 
     if (this.options.contextDataDir) {
@@ -80,21 +78,33 @@ export class BrowserContextService {
       });
     }
 
+    this.logger.debug(
+      `Starting a new browser context (temp context: ${browserContextPath})`,
+    );
+
     let attemptsLeft = 3;
     while (attemptsLeft > 0) {
       try {
-        this.browserContext = await chromium.launchPersistentContext(
-          browserContextPath,
-          {
-            ...this.options.browserOptions,
-            timeout: 5000,
-          },
-        );
-        break;
+        if (this.walletExtensionStartPath) {
+          this.browserContext = await chromium.launchPersistentContext(
+            browserContextPath,
+            {
+              ...this.options.browserOptions,
+              timeout: 5000,
+            },
+          );
+          break;
+        } else {
+          const browser = await chromium.launch(this.options.browserOptions);
+          this.browserContext = await browser.newContext();
+          break;
+        }
       } catch (er) {
         attemptsLeft--;
         if (attemptsLeft == 0)
-          throw new Error(`Failed to launch persistent context: ${er}`);
+          throw new Error(
+            `Failed to launch browser with persistent context or new context: ${er}`,
+          );
       }
     }
 
@@ -111,10 +121,12 @@ export class BrowserContextService {
       await this.browserContext.addCookies(this.options.browserOptions.cookies);
     }
 
-    let [background] = this.browserContext.serviceWorkers();
-    if (!background)
-      background = await this.browserContext.waitForEvent('serviceworker');
-    this.extensionId = background.url().split('/')[2];
+    if (this.walletExtensionStartPath) {
+      let [background] = this.browserContext.serviceWorkers();
+      if (!background)
+        background = await this.browserContext.waitForEvent('serviceworker');
+      this.extensionId = background.url().split('/')[2];
+    }
   }
 
   async closePages() {

packages/browser-service/src/browser.service.ts

@@ -116,23 +116,30 @@ export class BrowserService {
   }
 
   async setup() {
-    const extensionService = new ExtensionService();
+    let extensionPath, extensionService, contextDataDir;
 
-    const extensionPath = await extensionService.getExtensionDirFromId(
-      this.options.walletConfig.STORE_EXTENSION_ID,
-      this.options.walletConfig.LATEST_STABLE_DOWNLOAD_LINK,
-    );
+    if (this.options.walletConfig?.STORE_EXTENSION_ID) {
+      extensionService = new ExtensionService();
+
+      extensionPath = await extensionService.getExtensionDirFromId(
+        this.options.walletConfig.STORE_EXTENSION_ID,
+        this.options.walletConfig.LATEST_STABLE_DOWNLOAD_LINK,
+      );
+
+      contextDataDir = `${DEFAULT_BROWSER_CONTEXT_DIR_NAME}_${
+        mnemonicToAccount(this.options.accountConfig.SECRET_PHRASE).address
+      }_isFork-${this.isFork}_${this.options.walletConfig.WALLET_NAME}`;
+    }
 
-    const contextDataDir = `${DEFAULT_BROWSER_CONTEXT_DIR_NAME}_${
-      mnemonicToAccount(this.options.accountConfig.SECRET_PHRASE).address
-    }_isFork-${this.isFork}_${this.options.walletConfig.WALLET_NAME}`;
     this.browserContextService = new BrowserContextService(extensionPath, {
       contextDataDir,
       browserOptions: this.options.browserOptions,
     });
 
     await this.browserContextService.initBrowserContext();
-    await this.annotateExtensionWalletVersion(extensionService);
+    if (this.options.walletConfig?.STORE_EXTENSION_ID) {
+      await this.annotateExtensionWalletVersion(extensionService);
+    }
     this.setWalletPage();
     await this.walletPage.setup();
   }
@@ -146,15 +153,16 @@ export class BrowserService {
   }
 
   private setWalletPage() {
-    const extension = new Extension(this.browserContextService.extensionId);
-    const extensionWalletPage = new WALLET_PAGES[
-      this.options.walletConfig.EXTENSION_WALLET_NAME
-    ]({
-      browserContext: this.browserContextService.browserContext,
-      extensionUrl: extension.url,
-      accountConfig: this.options.accountConfig,
-      walletConfig: this.options.walletConfig,
-    });
+    const buildExtensionWalletPage = () => {
+      const extension = new Extension(this.browserContextService.extensionId);
+
+      return new WALLET_PAGES[this.options.walletConfig.EXTENSION_WALLET_NAME]({
+        browserContext: this.browserContextService.browserContext,
+        extensionUrl: extension.url,
+        accountConfig: this.options.accountConfig,
+        walletConfig: this.options.walletConfig,
+      });
+    };
 
     switch (this.options.walletConfig.WALLET_TYPE) {
       case WalletConnectTypes.WC:
@@ -163,8 +171,24 @@ export class BrowserService {
           this.options.walletConfig.WALLET_NAME
         ]({
           browserContext: this.browserContextService.browserContext,
-          extensionPage: extensionWalletPage,
+          extensionPage: buildExtensionWalletPage(),
+          walletConfig: this.options.walletConfig,
+          standConfig: {
+            chainId: this.options.networkConfig.chainId,
+            standUrl: this.options.standUrl,
+            rpcUrl:
+              this.ethereumNodeService?.state.nodeUrl ||
+              this.options.networkConfig.rpcUrl,
+          },
+        });
+        break;
+      case WalletConnectTypes.WC_SDK:
+        this.walletPage = new WALLET_PAGES[
+          this.options.walletConfig.WALLET_NAME
+        ]({
+          browserContext: this.browserContextService.browserContext,
           walletConfig: this.options.walletConfig,
+          accountConfig: this.options.accountConfig,
           standConfig: {
             chainId: this.options.networkConfig.chainId,
             standUrl: this.options.standUrl,
@@ -175,7 +199,7 @@ export class BrowserService {
         });
         break;
       default:
-        this.walletPage = extensionWalletPage;
+        this.walletPage = buildExtensionWalletPage();
     }
   }
 

packages/pg-reporter/src/reportRuntime.ts

@@ -251,7 +251,7 @@ export class ReporterRuntime {
         });
       }
 
-      const suite = suiteStats.get(suiteKey)!;
+      const suite = suiteStats.get(suiteKey);
       suite.total++;
 
       if (testCase.status === 'passed') suite.passed++;

packages/wallets/package.json

@@ -29,6 +29,7 @@
     "access": "public"
   },
   "dependencies": {
+    "@walletconnect/sign-client": "2.23.4",
     "big.js": "^6.2.1",
     "expect": "^28.1.3",
     "reflect-metadata": "^0.1.13",

packages/wallets/src/index.ts

@@ -11,6 +11,7 @@ export * from './exodus';
 export * from './okx';
 export * from './bitget';
 export * from './ctrl';
+export * from './walletConnect';
 
 // export WC and IFRAME WalletConnectTypes
 export * from './safe';

packages/wallets/src/walletConnect/components/accounts.ts

@@ -0,0 +1,47 @@
+import { ConsoleLogger } from '@nestjs/common';
+import { Account } from 'viem';
+
+const logger = new ConsoleLogger('WCWallet.Accounts');
+
+export class Accounts {
+  private activeAccount: Account;
+  private accountsStore: Map<string, Account> = new Map();
+
+  async isWalletAddressExist(address: string): Promise<boolean> {
+    return this.accountsStore.has(address.toLowerCase());
+  }
+
+  setActiveAccount(account: Account) {
+    if (!this.accountsStore.has(account.address.toLowerCase())) {
+      logger.warn(
+        `Account ${account.address} not found in accounts list while setting active account, adding it to accounts list`,
+      );
+      this.storeAccount(account);
+    }
+    this.activeAccount = account;
+  }
+
+  getActiveAccount() {
+    if (!this.activeAccount) {
+      throw new Error('Active account is not set');
+    }
+    return this.activeAccount;
+  }
+
+  getEip115Account(chainId: number, address: string): string {
+    return `eip155:${chainId}:${address}`;
+  }
+
+  storeAccount(account: Account) {
+    if (!this.accountsStore.has(account.address.toLowerCase())) {
+      this.accountsStore.set(account.address.toLowerCase(), account);
+    }
+  }
+
+  getAccountByAddress(address: string) {
+    const account = this.accountsStore.get(address.toLowerCase());
+
+    if (!account) throw new Error(`Account with address ${address} not found`);
+    return account;
+  }
+}

packages/wallets/src/walletConnect/components/index.ts

@@ -0,0 +1,3 @@
+export * from './network';
+export * from './requestManager';
+export * from './accounts';