feat: use pubsub to confirm transactions (#12095)

web3.js/src/util/promise-timeout.js

@@ -0,0 +1,16 @@
+// @flow
+
+export function promiseTimeout<T>(
+  promise: Promise<T>,
+  timeoutMs: number,
+): Promise<T | null> {
+  let timeoutId: TimeoutID;
+  const timeoutPromise = new Promise(resolve => {
+    timeoutId = setTimeout(() => resolve(null), timeoutMs);
+  });
+
+  return Promise.race([promise, timeoutPromise]).then(result => {
+    clearTimeout(timeoutId);
+    return result;
+  });
+}

web3.js/src/util/send-and-confirm-raw-transaction.js

@@ -7,7 +7,7 @@ import type {ConfirmOptions} from '../connection';
 /**
  * Send and confirm a raw transaction
  *
- * If `confirmations` count is not specified, wait for transaction to be finalized.
+ * If `commitment` option is not specified, defaults to 'max' commitment.
  *
  * @param {Connection} connection
  * @param {Buffer} rawTransaction
@@ -19,31 +19,23 @@ export async function sendAndConfirmRawTransaction(
   rawTransaction: Buffer,
   options?: ConfirmOptions,
 ): Promise<TransactionSignature> {
-  const start = Date.now();
   const signature = await connection.sendRawTransaction(
     rawTransaction,
     options,
   );
+
   const status = (
     await connection.confirmTransaction(
       signature,
-      options && options.confirmations,
+      options && options.commitment,
     )
   ).value;
 
-  if (status) {
-    if (status.err) {
-      throw new Error(
-        `Raw transaction ${signature} failed (${JSON.stringify(status)})`,
-      );
-    }
-    return signature;
+  if (status.err) {
+    throw new Error(
+      `Raw transaction ${signature} failed (${JSON.stringify(status)})`,
+    );
   }
 
-  const duration = (Date.now() - start) / 1000;
-  throw new Error(
-    `Raw transaction '${signature}' was not confirmed in ${duration.toFixed(
-      2,
-    )} seconds`,
-  );
+  return signature;
 }

web3.js/src/util/send-and-confirm-transaction.js

@@ -9,7 +9,7 @@ import type {TransactionSignature} from '../transaction';
 /**
  * Sign, send and confirm a transaction.
  *
- * If `confirmations` count is not specified, wait for transaction to be finalized.
+ * If `commitment` option is not specified, defaults to 'max' commitment.
  *
  * @param {Connection} connection
  * @param {Transaction} transaction
@@ -23,32 +23,24 @@ export async function sendAndConfirmTransaction(
   signers: Array<Account>,
   options?: ConfirmOptions,
 ): Promise<TransactionSignature> {
-  const start = Date.now();
   const signature = await connection.sendTransaction(
     transaction,
     signers,
     options,
   );
+
   const status = (
     await connection.confirmTransaction(
       signature,
-      options && options.confirmations,
+      options && options.commitment,
     )
   ).value;
 
-  if (status) {
-    if (status.err) {
-      throw new Error(
-        `Transaction ${signature} failed (${JSON.stringify(status)})`,
-      );
-    }
-    return signature;
+  if (status.err) {
+    throw new Error(
+      `Transaction ${signature} failed (${JSON.stringify(status)})`,
+    );
   }
 
-  const duration = (Date.now() - start) / 1000;
-  throw new Error(
-    `Transaction was not confirmed in ${duration.toFixed(
-      2,
-    )} seconds (${JSON.stringify(status)})`,
-  );
+  return signature;
 }