Replace confirmTx function

common/js/tx-sender.ts

@@ -9,6 +9,7 @@ import {
   PublicKey,
   Transaction,
   Connection,
+  SignatureStatus,
 } from "@solana/web3.js";
 
 import { interpretTxErr, InterpretedTxErrType } from "./tx-error";
@@ -147,11 +148,53 @@ async function createOptimizedV0Tx(
   return { v0Tx, lastValidBlockHeight };
 }
 
+// Replacement for Agave 2.0
+async function confirmTx(
+  connection: Connection,
+  sig: string
+): Promise<SignatureStatus> {
+  return new Promise((resolve, reject) => {
+    // eslint-disable-next-line prefer-const
+    let intervalId: NodeJS.Timeout | undefined;
+    // eslint-disable-next-line prefer-const
+    let timeoutId: NodeJS.Timeout | undefined;
+
+    const checkStatus = async (): Promise<void> => {
+      try {
+        const status = (await connection.getSignatureStatuses([sig])).value[0];
+
+        if (
+          status !== null &&
+          (status.confirmationStatus === "confirmed" ||
+            status.confirmationStatus === "finalized" ||
+            status.err !== null)
+        ) {
+          clearInterval(intervalId);
+          clearTimeout(timeoutId);
+          resolve(status);
+        }
+      } catch (err) {
+        clearInterval(intervalId);
+        clearTimeout(timeoutId);
+        console.error("Error confirming transaction", err);
+        reject(err);
+      }
+    };
+
+    checkStatus();
+
+    intervalId = setInterval(checkStatus, 400);
+
+    timeoutId = setTimeout(() => {
+      clearInterval(intervalId);
+      reject(new TypeError("Confirm transaction timed out"));
+    }, 2 * 60 * 1000); // 2 minutes
+  });
+}
+
 async function broadcastAndConf(
   connection: Connection,
-  rawTx: Uint8Array,
-  blockhash: string,
-  lastValidBlockHeight: number
+  rawTx: Uint8Array
 ): Promise<string> {
   // Send transaction
   let intervalId: NodeJS.Timeout | undefined;
@@ -174,13 +217,9 @@ async function broadcastAndConf(
 
     // Confirm transaction
     console.log("Confirming...");
-    const confirmation = await connection.confirmTransaction({
-      signature: sig,
-      blockhash,
-      lastValidBlockHeight,
-    });
-    if (confirmation.value.err) {
-      throw new Error(`${confirmation.value.err.toString()}`);
+    const res = await confirmTx(connection, sig);
+    if (res.err) {
+      throw new Error(`${res.err.toString()}`);
     }
 
     console.log(`Transaction confirmed: https://explorer.solana.com/tx/${sig}`);
@@ -218,12 +257,7 @@ async function simSignSignAndConf(
   const rawTx = signedTx.serialize();
 
   console.log("Sending...");
-  const sig = await broadcastAndConf(
-    connection,
-    rawTx,
-    signedTx.message.recentBlockhash,
-    lastValidBlockHeight
-  );
+  const sig = await broadcastAndConf(connection, rawTx);
   return sig;
 }