@solana/web3.js 1.47.2 → 1.47.3

package/lib/index.iife.js

@@ -14138,15 +14138,34 @@ var solanaWeb3 = (function (exports) {
 
 	    if (!opts) {
 	      return;
-	    } else if (Object.prototype.hasOwnProperty.call(opts, 'lastValidBlockHeight')) {
-	      const newOpts = opts;
-	      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;
+	      this.recentBlockhash = blockhash;
+	      this.lastValidBlockHeight = lastValidBlockHeight;
 	    } else {
-	      const oldOpts = opts;
-	      Object.assign(this, oldOpts);
-	      this.recentBlockhash = oldOpts.recentBlockhash;
+	      const {
+	        recentBlockhash,
+	        nonceInfo
+	      } = opts;
+
+	      if (nonceInfo) {
+	        this.nonceInfo = nonceInfo;
+	      }
+
+	      this.recentBlockhash = recentBlockhash;
 	    }
 	  }
 	  /**
@@ -20988,16 +21007,6 @@ var solanaWeb3 = (function (exports) {
 	        reject(err);
 	      }
 	    });
-
-	    const checkBlockHeight = async () => {
-	      try {
-	        const blockHeight = await this.getBlockHeight(commitment);
-	        return blockHeight;
-	      } catch (_e) {
-	        return -1;
-	      }
-	    };
-
 	    const expiryPromise = new Promise(resolve => {
 	      if (typeof strategy === 'string') {
 	        let timeoutMs = this._confirmTransactionInitialTimeout || 60 * 1000;
@@ -21021,6 +21030,15 @@ var solanaWeb3 = (function (exports) {
 	      } else {
 	        let config = strategy;
 
+	        const checkBlockHeight = async () => {
+	          try {
+	            const blockHeight = await this.getBlockHeight(commitment);
+	            return blockHeight;
+	          } catch (_e) {
+	            return -1;
+	          }
+	        };
+
 	        (async () => {
 	          let currentBlockHeight = await checkBlockHeight();
 	          if (done) return;