Merge pull request #397 from multiversx/development

Development

Author: arhtudormorar

package.json

@@ -40,7 +40,8 @@
     "copy-mainnet-config": "cp ./src/config/config.mainnet.ts ./src/config/index.ts",
     "test": "jest",
     "run-playwright-test": "playwright test",
-    "run-playwright-test-ui": "playwright test --ui"
+    "run-playwright-test-ui": "playwright test --ui",
+    "run-playwright-test-grep": "playwright test --grep \"$npm_config_grep\""
   },
   "browserslist": [
     ">0.2%",

playwright.config.ts

@@ -1,5 +1,4 @@
 import { defineConfig, devices } from '@playwright/test';
-
 import { TEST_CONFIG } from './tests/config';
 
 /**

src/hooks/transactions/useSendPingPongTransaction.ts

@@ -1,5 +1,5 @@
+import { ProxyNetworkProvider } from '@multiversx/sdk-core/out';
 import axios from 'axios';
-
 import { contractAddress } from 'config';
 import { signAndSendTransactions } from 'helpers';
 import {
@@ -51,9 +51,17 @@ export const useSendPingPongTransaction = () => {
       gasPrice: BigInt(GAS_PRICE),
       chainID: network.chainId,
       sender: new Address(address),
-      version: 1
+      version: 2
     });
 
+    const networkProvider = new ProxyNetworkProvider(network.apiAddress);
+    const account = await networkProvider.getAccount(new Address(address));
+    pingTransaction.nonce = account.nonce;
+
+    const transactionCost =
+      await networkProvider.estimateTransactionCost(pingTransaction);
+    pingTransaction.gasLimit = BigInt(transactionCost.gasLimit); // overwrite default gas limit with estimation
+
     const sessionId = await signAndSendTransactions({
       transactions: [pingTransaction],
       transactionsDisplayInfo: PING_TRANSACTION_INFO
@@ -102,9 +110,17 @@ export const useSendPingPongTransaction = () => {
       gasPrice: BigInt(GAS_PRICE),
       chainID: network.chainId,
       sender: new Address(address),
-      version: 1
+      version: 2
     });
 
+    const networkProvider = new ProxyNetworkProvider(network.apiAddress);
+    const account = await networkProvider.getAccount(new Address(address));
+    pongTransaction.nonce = account.nonce;
+
+    const transactionCost =
+      await networkProvider.estimateTransactionCost(pongTransaction);
+    pongTransaction.gasLimit = BigInt(transactionCost.gasLimit); // overwrite default gas limit with estimation
+
     const sessionId = await signAndSendTransactions({
       transactions: [pongTransaction],
       transactionsDisplayInfo: PONG_TRANSACTION_INFO

src/initConfig.ts

@@ -2,9 +2,6 @@ import './styles/tailwind.css';
 import './styles/style.css';
 
 import { walletConnectV2ProjectId } from 'config';
-
-// Enable this block to showcase a custom provider implementation
-
 import { EnvironmentsEnum, ICustomProvider, InitAppType } from './lib';
 import { InMemoryProvider } from './provider/inMemoryProvider';
 

tests/ConnectWallet/webWallet.spec.ts

@@ -1,20 +1,18 @@
-import { test, expect } from '@playwright/test';
-
+import { expect, test } from '@playwright/test';
 import * as TestActions from '../support';
-import { TestDataEnums, SelectorsEnum } from '../support/testdata';
+import { SelectorsEnum, TestDataEnums } from '../support/testdata';
 
 const keystoreConfig = {
-  keystore: TestDataEnums.keystoreFilePath,
-  password: TestDataEnums.keystoreFilePassword
+  keystore: TestDataEnums.keystoreFilePath1,
+  password: TestDataEnums.keystorePassword
 };
 
 const pemConfig = {
-  pem: TestDataEnums.pemFilePath
+  pem: TestDataEnums.pemFilePath1
 };
 
 test.describe('Connect a wallet', () => {
   // Connect wallet tests verify wallet connection functionality
-  // Each test focuses on a specific aspect of the wallet connection process
 
   test.beforeEach(async ({ page }) => {
     await TestActions.navigateToConnectWallet(page);
@@ -26,7 +24,7 @@ test.describe('Connect a wallet', () => {
 
       await TestActions.checkConnectionToWallet(
         page,
-        TestDataEnums.keystoreWalletAddress
+        TestDataEnums.keystoreWalletAddress1
       );
     });
   });
@@ -37,7 +35,7 @@ test.describe('Connect a wallet', () => {
 
       await TestActions.checkConnectionToWallet(
         page,
-        TestDataEnums.pemWalletAddress
+        TestDataEnums.pemWalletAddress1
       );
     });
   });
@@ -46,7 +44,7 @@ test.describe('Connect a wallet', () => {
     test('should handle missing password for keystore', async ({ page }) => {
       // Test with keystore but no password
       const invalidKeystoreConfig = {
-        keystore: TestDataEnums.keystoreFilePath,
+        keystore: TestDataEnums.keystoreFilePath1,
         password: undefined
       };
 
@@ -66,7 +64,10 @@ test.describe('Connect a wallet', () => {
     }) => {
       // Connect with keystore
       await TestActions.navigateToConnectWallet(page);
-      await TestActions.connectWebWallet({ page, loginMethod: keystoreConfig });
+      await TestActions.connectWebWallet({
+        page,
+        loginMethod: keystoreConfig
+      });
 
       // Verify the topInfo container is visible
       const topInfoContainer = page.getByTestId(SelectorsEnum.topInfoContainer);
@@ -78,7 +79,7 @@ test.describe('Connect a wallet', () => {
       );
       await expect(addressElement).toBeVisible();
       await expect(addressElement).toContainText(
-        TestDataEnums.keystoreWalletAddress
+        TestDataEnums.keystoreWalletAddress1
       );
 
       // Verify herotag section is present and should be N/A

tests/TemplateActions/nativeAuth.spec.ts

@@ -1,12 +1,11 @@
-import { test, expect } from '@playwright/test';
-
+import { expect, test } from '@playwright/test';
 import * as TestActions from '../support';
-import { TestDataEnums, SelectorsEnum } from '../support/testdata';
 import { extractBalanceFromContainer } from '../support';
+import { SelectorsEnum, TestDataEnums } from '../support/testdata';
 
 const keystoreConfig = {
-  keystore: TestDataEnums.keystoreFilePath,
-  password: TestDataEnums.keystoreFilePassword
+  keystore: TestDataEnums.keystoreFilePath1,
+  password: TestDataEnums.keystorePassword
 };
 
 test.describe('Native auth', () => {
@@ -15,7 +14,7 @@ test.describe('Native auth', () => {
     await TestActions.connectWebWallet({ page, loginMethod: keystoreConfig });
     await TestActions.checkConnectionToWallet(
       page,
-      TestDataEnums.keystoreWalletAddress
+      TestDataEnums.keystoreWalletAddress1
     );
   });
 
@@ -63,7 +62,7 @@ test.describe('Native auth', () => {
       .getByTestId(SelectorsEnum.trimFullAddress);
 
     await expect(nativeAuthAddress).toHaveText(
-      TestDataEnums.keystoreWalletAddress
+      TestDataEnums.keystoreWalletAddress1
     );
 
     // Check that the balance is displayed and matches the account balance

tests/TemplateActions/pingAndPongAbi.spec.ts

@@ -1,28 +1,26 @@
-import { test, expect } from '@playwright/test';
-
+import { expect, test } from '@playwright/test';
 import * as TestActions from '../support';
+import { TEST_CONSTANTS } from '../support/constants';
 import {
-  TestDataEnums,
-  PingPongEnum,
   OriginPageEnum,
-  SelectorsEnum
+  PingPongEnum,
+  SelectorsEnum,
+  TestDataEnums
 } from '../support/testdata';
-import { TEST_CONSTANTS } from '../support/constants';
 
-const keystoreConfig = {
-  keystore: TestDataEnums.keystoreFilePath,
-  password: TestDataEnums.keystoreFilePassword
+const pemConfig = {
+  pem: TestDataEnums.pemFilePath1
 };
 
 test.describe('Ping & Pong (ABI)', () => {
   // Note: Ping/Pong buttons have a 3-minute cooldown period after being clicked
 
   test.beforeEach(async ({ page }) => {
     await TestActions.navigateToConnectWallet(page);
-    await TestActions.connectWebWallet({ page, loginMethod: keystoreConfig });
+    await TestActions.connectWebWallet({ page, loginMethod: pemConfig });
     await TestActions.checkConnectionToWallet(
       page,
-      TestDataEnums.keystoreWalletAddress
+      TestDataEnums.pemWalletAddress1
     );
   });
 
@@ -106,8 +104,8 @@ test.describe('Ping & Pong (ABI)', () => {
     // Verify wallet page opened
     await expect(walletPage).toHaveURL(/devnet-wallet\.multiversx\.com/);
 
-    // Sign transaction by confirming with keystore or pem
-    await TestActions.confirmWalletTransaction(walletPage, keystoreConfig);
+    // Sign transaction by confirming with pem
+    await TestActions.confirmWalletTransaction(walletPage, pemConfig);
 
     // Click on Sign button to confirm the transaction in the web wallet
     await walletPage.getByTestId(SelectorsEnum.signButton).click();
@@ -121,9 +119,6 @@ test.describe('Ping & Pong (ABI)', () => {
     // Wait for transaction toast to be displayed
     await TestActions.waitForToastToBeDisplayed(templatePage);
 
-    // Wait for the transaction toast to be closed (indicates transaction completed)
-    await TestActions.waitForToastToBeClosed(templatePage);
-
     // Check balance change based on the clicked button
     await TestActions.checkPingPongBalanceUpdate({
       page: templatePage,

tests/TemplateActions/signAndSendBatch.spec.ts

@@ -1,16 +1,15 @@
-import { test, expect } from '@playwright/test';
-
+import { expect, test } from '@playwright/test';
 import * as TestActions from '../support';
+import { TEST_CONSTANTS } from '../support/constants';
 import {
-  TestDataEnums,
+  OriginPageEnum,
   SelectorsEnum,
-  OriginPageEnum
+  TestDataEnums
 } from '../support/testdata';
-import { TEST_CONSTANTS } from '../support/constants';
 
 const keystoreConfig = {
-  keystore: TestDataEnums.keystoreFilePath,
-  password: TestDataEnums.keystoreFilePassword
+  keystore: TestDataEnums.keystoreFilePath2,
+  password: TestDataEnums.keystorePassword
 };
 
 test.describe('Sign & send batch', () => {
@@ -19,7 +18,7 @@ test.describe('Sign & send batch', () => {
     await TestActions.connectWebWallet({ page, loginMethod: keystoreConfig });
     await TestActions.checkConnectionToWallet(
       page,
-      TestDataEnums.keystoreWalletAddress
+      TestDataEnums.keystoreWalletAddress2
     );
   });
 
@@ -96,7 +95,7 @@ test.describe('Sign & send batch', () => {
     // Check that the transaction toast shows that all transactions are signed
     await TestActions.waitForTransactionToastToContain({
       page: templatePage,
-      toastContent: '5 / 5 transactions processed'
+      toastStatus: '5 / 5 transactions processed'
     });
 
     // Wait for the transaction toast to be closed

tests/TemplateActions/signMessage.spec.ts

@@ -1,15 +1,14 @@
-import { test, expect } from '@playwright/test';
-
+import { expect, test } from '@playwright/test';
 import * as TestActions from '../support';
 import {
-  TestDataEnums,
+  OriginPageEnum,
   SelectorsEnum,
-  OriginPageEnum
+  TestDataEnums
 } from '../support/testdata';
 
 const keystoreConfig = {
-  keystore: TestDataEnums.keystoreFilePath,
-  password: TestDataEnums.keystoreFilePassword
+  keystore: TestDataEnums.keystoreFilePath1,
+  password: TestDataEnums.keystorePassword
 };
 
 test.describe('Sign Message', () => {
@@ -18,7 +17,7 @@ test.describe('Sign Message', () => {
     await TestActions.connectWebWallet({ page, loginMethod: keystoreConfig });
     await TestActions.checkConnectionToWallet(
       page,
-      TestDataEnums.keystoreWalletAddress
+      TestDataEnums.keystoreWalletAddress1
     );
   });
 

tests/TemplateActions/swapAndLock.ts

@@ -1,16 +1,15 @@
-import { test, expect } from '@playwright/test';
-
+import { expect, test } from '@playwright/test';
 import * as TestActions from '../support';
+import { TEST_CONSTANTS } from '../support/constants';
 import {
-  TestDataEnums,
+  OriginPageEnum,
   SelectorsEnum,
-  OriginPageEnum
+  TestDataEnums
 } from '../support/testdata';
-import { TEST_CONSTANTS } from '../support/constants';
 
 const keystoreConfig = {
-  keystore: TestDataEnums.keystoreFilePath,
-  password: TestDataEnums.keystoreFilePassword
+  keystore: TestDataEnums.keystoreFilePath3,
+  password: TestDataEnums.keystorePassword
 };
 
 test.describe('Swap & Lock', () => {
@@ -19,7 +18,7 @@ test.describe('Swap & Lock', () => {
     await TestActions.connectWebWallet({ page, loginMethod: keystoreConfig });
     await TestActions.checkConnectionToWallet(
       page,
-      TestDataEnums.keystoreWalletAddress
+      TestDataEnums.keystoreWalletAddress3
     );
   });
 
@@ -100,7 +99,10 @@ test.describe('Swap & Lock', () => {
     // Check that the transaction toast shows that all transactions were signed
     await TestActions.waitForTransactionToastToContain({
       page: templatePage,
-      toastContent: '0 / 4 transactions processed'
+      toastStatus: '4 / 4 transactions processed'
     });
+
+    // Wait for the transaction toast to be closed
+    await TestActions.waitForToastToBeClosed(templatePage);
   });
 });