Help swaps flakiness

e2e/helpers.ts

@@ -7,6 +7,7 @@ import * as fs from 'node:fs';
 
 import { Contract } from '@ethersproject/contracts';
 import { getDefaultProvider } from '@ethersproject/providers';
+import { providers } from 'ethers';
 import {
   Builder,
   By,
@@ -172,9 +173,9 @@ const addPermissionForAllWebsites = async (driver: WebDriver) => {
     id: 'details-deck-button-permissions',
     driver,
   });
-  await driver.executeScript(
-    `document.querySelectorAll('[class="permission-info"]')[0].children[0].click();`,
-  );
+  // await driver.executeScript(
+  //   `document.querySelectorAll('[class="permission-info"]')[0].children[0].click();`,
+  // );
 };
 
 export async function getExtensionIdByName(
@@ -776,6 +777,90 @@ export async function transactionStatus() {
   return txnStatus;
 }
 
+export async function waitForAndCheckTransaction(
+  provider: providers.Provider,
+  txHash: string,
+  maxAttempts = 20,
+): Promise<{
+  status: 'success' | 'failure' | 'timeout';
+  receipt: providers.TransactionReceipt | null;
+}> {
+  let attempts = 0;
+  while (attempts < maxAttempts) {
+    try {
+      console.log(`Checking transaction status, attempt ${attempts + 1}`);
+      const txnReceipt = await provider.getTransactionReceipt(txHash);
+
+      if (txnReceipt) {
+        const txnStatus = txnReceipt.status === 1 ? 'success' : 'failure';
+        console.log('Transaction receipt:', txnReceipt);
+
+        if (txnStatus === 'success') {
+          console.log(
+            'Transaction successful, waiting for 30 seconds to give balances time to update ...',
+          );
+          await new Promise((resolve) => setTimeout(resolve, 30000));
+        } else {
+          throw new Error(`Swap transaction failed. Status: ${txnStatus}`);
+        }
+
+        return { status: txnStatus, receipt: txnReceipt };
+      }
+    } catch (error) {
+      console.error('Error checking transaction:', error);
+      throw error; // Re-throw the error to be caught by the caller
+    }
+
+    attempts++;
+    await new Promise((resolve) => setTimeout(resolve, 10_000));
+  }
+
+  throw new Error('Swap transaction timed out');
+}
+
+export async function getLatestTransactionHash(
+  provider: providers.Provider,
+  address: string,
+  maxAttempts = 10,
+  delayMs = 10_000,
+): Promise<string | null> {
+  for (let attempt = 0; attempt < maxAttempts; attempt++) {
+    console.log(`Searching for transaction, attempt ${attempt + 1}`);
+    const currentBlock = await provider.getBlockNumber();
+
+    for (let i = 0; i < 3; i++) {
+      // Check last 3 blocks
+      const block = await provider.getBlockWithTransactions(currentBlock - i);
+
+      for (const tx of block.transactions) {
+        if (tx.from.toLowerCase() === address.toLowerCase()) {
+          return tx.hash;
+        }
+      }
+    }
+
+    // If not found, wait before next attempt
+    await new Promise((resolve) => setTimeout(resolve, delayMs));
+  }
+
+  return null;
+}
+
+export async function getPendingTransactionHash(
+  provider: providers.JsonRpcProvider,
+  address: string,
+): Promise<string | null> {
+  const pendingTransactions = await provider.send(
+    'eth_pendingTransactions',
+    [],
+  );
+  const transaction = pendingTransactions.find(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (tx: any) => tx.from.toLowerCase() === address.toLowerCase(),
+  );
+  return transaction ? transaction.hash : null;
+}
+
 export const fillSeedPhrase = async (driver: WebDriver, seedPhrase: string) => {
   const words = seedPhrase.split(' ');
   for (let i = 0; i < 12; i++) {