@solana/web3.js 1.41.11 → 1.42.1

package/lib/index.iife.js

@@ -26002,7 +26002,7 @@ var solanaWeb3 = (function (exports) {
 	    this._disableBlockhashCaching = false;
 	    this._pollingBlockhash = false;
 	    this._blockhashInfo = {
-	      recentBlockhash: null,
+	      latestBlockhash: null,
 	      lastFetch: 0,
 	      transactionSignatures: [],
 	      simulatedSignatures: []
@@ -26965,7 +26965,7 @@ var solanaWeb3 = (function (exports) {
 	  }
 	  /**
 	   * Fetch the latest blockhash from the cluster
-	   * @return {Promise<{blockhash: Blockhash, lastValidBlockHeight: number}>}
+	   * @return {Promise<BlockhashWithExpiryBlockHeight>}
 	   */
 
 
@@ -26979,7 +26979,7 @@ var solanaWeb3 = (function (exports) {
 	  }
 	  /**
 	   * Fetch the latest blockhash from the cluster
-	   * @return {Promise<{blockhash: Blockhash, lastValidBlockHeight: number}>}
+	   * @return {Promise<BlockhashWithExpiryBlockHeight>}
 	   */
 
 
@@ -27562,7 +27562,7 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async _recentBlockhash(disableCache) {
+	  async _blockhashWithExpiryBlockHeight(disableCache) {
 	    if (!disableCache) {
 	      // Wait for polling to finish
 	      while (this._pollingBlockhash) {
@@ -27573,8 +27573,8 @@ var solanaWeb3 = (function (exports) {
 
 	      const expired = timeSinceFetch >= BLOCKHASH_CACHE_TIMEOUT_MS;
 
-	      if (this._blockhashInfo.recentBlockhash !== null && !expired) {
-	        return this._blockhashInfo.recentBlockhash;
+	      if (this._blockhashInfo.latestBlockhash !== null && !expired) {
+	        return this._blockhashInfo.latestBlockhash;
 	      }
 	    }
 
@@ -27590,20 +27590,20 @@ var solanaWeb3 = (function (exports) {
 
 	    try {
 	      const startTime = Date.now();
+	      const cachedLatestBlockhash = this._blockhashInfo.latestBlockhash;
+	      const cachedBlockhash = cachedLatestBlockhash ? cachedLatestBlockhash.blockhash : null;
 
 	      for (let i = 0; i < 50; i++) {
-	        const {
-	          blockhash
-	        } = await this.getRecentBlockhash('finalized');
+	        const latestBlockhash = await this.getLatestBlockhash('finalized');
 
-	        if (this._blockhashInfo.recentBlockhash != blockhash) {
+	        if (cachedBlockhash !== latestBlockhash.blockhash) {
 	          this._blockhashInfo = {
-	            recentBlockhash: blockhash,
+	            latestBlockhash,
 	            lastFetch: Date.now(),
 	            transactionSignatures: [],
 	            simulatedSignatures: []
 	          };
-	          return blockhash;
+	          return latestBlockhash;
 	        } // Sleep for approximately half a slot
 
 
@@ -27625,13 +27625,11 @@ var solanaWeb3 = (function (exports) {
 
 	    if (transactionOrMessage instanceof Transaction) {
 	      let originalTx = transactionOrMessage;
-	      transaction = new Transaction({
-	        recentBlockhash: originalTx.recentBlockhash,
-	        nonceInfo: originalTx.nonceInfo,
-	        feePayer: originalTx.feePayer,
-	        signatures: [...originalTx.signatures]
-	      });
+	      transaction = new Transaction();
+	      transaction.feePayer = originalTx.feePayer;
 	      transaction.instructions = transactionOrMessage.instructions;
+	      transaction.nonceInfo = originalTx.nonceInfo;
+	      transaction.signatures = originalTx.signatures;
 	    } else {
 	      transaction = Transaction.populate(transactionOrMessage); // HACK: this function relies on mutating the populated transaction
 
@@ -27644,7 +27642,9 @@ var solanaWeb3 = (function (exports) {
 	      let disableCache = this._disableBlockhashCaching;
 
 	      for (;;) {
-	        transaction.recentBlockhash = await this._recentBlockhash(disableCache);
+	        const latestBlockhash = await this._blockhashWithExpiryBlockHeight(disableCache);
+	        transaction.lastValidBlockHeight = latestBlockhash.lastValidBlockHeight;
+	        transaction.recentBlockhash = latestBlockhash.blockhash;
 	        if (!signers) break;
 	        transaction.sign(...signers);
 
@@ -27728,7 +27728,9 @@ var solanaWeb3 = (function (exports) {
 	      let disableCache = this._disableBlockhashCaching;
 
 	      for (;;) {
-	        transaction.recentBlockhash = await this._recentBlockhash(disableCache);
+	        const latestBlockhash = await this._blockhashWithExpiryBlockHeight(disableCache);
+	        transaction.lastValidBlockHeight = latestBlockhash.lastValidBlockHeight;
+	        transaction.recentBlockhash = latestBlockhash.blockhash;
 	        transaction.sign(...signers);
 
 	        if (!transaction.signature) {
@@ -30167,16 +30169,36 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @param {Connection} connection
 	 * @param {Buffer} rawTransaction
+	 * @param {BlockheightBasedTransactionConfimationStrategy} confirmationStrategy
 	 * @param {ConfirmOptions} [options]
 	 * @returns {Promise<TransactionSignature>}
 	 */
-	async function sendAndConfirmRawTransaction(connection, rawTransaction, options) {
+
+	/**
+	 * @deprecated Calling `sendAndConfirmRawTransaction()` without a `confirmationStrategy`
+	 * is no longer supported and will be removed in a future version.
+	 */
+	// eslint-disable-next-line no-redeclare
+	// eslint-disable-next-line no-redeclare
+	async function sendAndConfirmRawTransaction(connection, rawTransaction, confirmationStrategyOrConfirmOptions, maybeConfirmOptions) {
+	  let confirmationStrategy;
+	  let options;
+
+	  if (confirmationStrategyOrConfirmOptions && Object.prototype.hasOwnProperty.call(confirmationStrategyOrConfirmOptions, 'lastValidBlockHeight')) {
+	    confirmationStrategy = confirmationStrategyOrConfirmOptions;
+	    options = maybeConfirmOptions;
+	  } else {
+	    options = confirmationStrategyOrConfirmOptions;
+	  }
+
 	  const sendOptions = options && {
 	    skipPreflight: options.skipPreflight,
 	    preflightCommitment: options.preflightCommitment || options.commitment
 	  };
 	  const signature = await connection.sendRawTransaction(rawTransaction, sendOptions);
-	  const status = (await connection.confirmTransaction(signature, options && options.commitment)).value;
+	  const commitment = options && options.commitment;
+	  const confirmationPromise = confirmationStrategy ? connection.confirmTransaction(confirmationStrategy, commitment) : connection.confirmTransaction(signature, commitment);
+	  const status = (await confirmationPromise).value;
 
 	  if (status.err) {
 	    throw new Error(`Raw transaction ${signature} failed (${JSON.stringify(status)})`);