From bde1e3d00409f8ff31d5ef609981dd7802d1a102 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 16 Nov 2020 09:15:51 -0800
Subject: [PATCH] fix: default preflight commitment to confirmation commitment

---
 web3.js/src/connection.js                            | 9 ++-------
 web3.js/src/util/send-and-confirm-raw-transaction.js | 7 ++++++-
 web3.js/src/util/send-and-confirm-transaction.js     | 7 ++++++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/web3.js/src/connection.js b/web3.js/src/connection.js
index 47d9f024db..e4800f3b7c 100644
--- a/web3.js/src/connection.js
+++ b/web3.js/src/connection.js
@@ -2933,15 +2933,10 @@ export class Connection {
     const skipPreflight = options && options.skipPreflight;
     const preflightCommitment = options && options.preflightCommitment;
 
-    if (skipPreflight && preflightCommitment) {
-      throw new Error(
-        'cannot set preflightCommitment when skipPreflight is enabled',
-      );
-    }
-
     if (skipPreflight) {
       config.skipPreflight = skipPreflight;
-    } else if (preflightCommitment) {
+    }
+    if (preflightCommitment) {
       config.preflightCommitment = preflightCommitment;
     }
 
diff --git a/web3.js/src/util/send-and-confirm-raw-transaction.js b/web3.js/src/util/send-and-confirm-raw-transaction.js
index 29b1000922..3e231e481e 100644
--- a/web3.js/src/util/send-and-confirm-raw-transaction.js
+++ b/web3.js/src/util/send-and-confirm-raw-transaction.js
@@ -19,9 +19,14 @@ export async function sendAndConfirmRawTransaction(
   rawTransaction: Buffer,
   options?: ConfirmOptions,
 ): Promise<TransactionSignature> {
+  const sendOptions = options && {
+    skipPreflight: options.skipPreflight,
+    preflightCommitment: options.preflightCommitment || options.commitment,
+  };
+
   const signature = await connection.sendRawTransaction(
     rawTransaction,
-    options,
+    sendOptions,
   );
 
   const status = (
diff --git a/web3.js/src/util/send-and-confirm-transaction.js b/web3.js/src/util/send-and-confirm-transaction.js
index f60ffc06a3..4f0477a1f3 100644
--- a/web3.js/src/util/send-and-confirm-transaction.js
+++ b/web3.js/src/util/send-and-confirm-transaction.js
@@ -23,10 +23,15 @@ export async function sendAndConfirmTransaction(
   signers: Array<Account>,
   options?: ConfirmOptions,
 ): Promise<TransactionSignature> {
+  const sendOptions = options && {
+    skipPreflight: options.skipPreflight,
+    preflightCommitment: options.preflightCommitment || options.commitment,
+  };
+
   const signature = await connection.sendTransaction(
     transaction,
     signers,
-    options,
+    sendOptions,
   );
 
   const status = (