src/connection.ts

@@ -3051,15 +3051,6 @@ export class Connection {
       }
     });
 
-    const checkBlockHeight = async () => {
-      try {
-        const blockHeight = await this.getBlockHeight(commitment);
-        return blockHeight;
-      } catch (_e) {
-        return -1;
-      }
-    };
-
     const expiryPromise = new Promise<
       | {__type: TransactionStatus.BLOCKHEIGHT_EXCEEDED}
       | {__type: TransactionStatus.TIMED_OUT; timeoutMs: number}
@@ -3088,6 +3079,14 @@ export class Connection {
       } else {
         let config =
           strategy as BlockheightBasedTransactionConfirmationStrategy;
+        const checkBlockHeight = async () => {
+          try {
+            const blockHeight = await this.getBlockHeight(commitment);
+            return blockHeight;
+          } catch (_e) {
+            return -1;
+          }
+        };
         (async () => {
           let currentBlockHeight = await checkBlockHeight();
           if (done) return;

src/transaction.ts

@@ -258,17 +258,25 @@ export class Transaction {
   ) {
     if (!opts) {
       return;
-    } else if (
-      Object.prototype.hasOwnProperty.call(opts, 'lastValidBlockHeight')
-    ) {
-      const newOpts = opts as TransactionBlockhashCtor;
-      Object.assign(this, newOpts);
-      this.recentBlockhash = newOpts.blockhash;
-      this.lastValidBlockHeight = newOpts.lastValidBlockHeight;
+    }
+    if (opts.feePayer) {
+      this.feePayer = opts.feePayer;
+    }
+    if (opts.signatures) {
+      this.signatures = opts.signatures;
+    }
+    if (Object.prototype.hasOwnProperty.call(opts, 'lastValidBlockHeight')) {
+      const {blockhash, lastValidBlockHeight} =
+        opts as TransactionBlockhashCtor;
+      this.recentBlockhash = blockhash;
+      this.lastValidBlockHeight = lastValidBlockHeight;
     } else {
-      const oldOpts = opts as TransactionCtorFields_DEPRECATED;
-      Object.assign(this, oldOpts);
-      this.recentBlockhash = oldOpts.recentBlockhash;
+      const {recentBlockhash, nonceInfo} =
+        opts as TransactionCtorFields_DEPRECATED;
+      if (nonceInfo) {
+        this.nonceInfo = nonceInfo;
+      }
+      this.recentBlockhash = recentBlockhash;
     }
   }