@solana/web3.js 1.44.1 → 1.45.0

package/lib/index.iife.js

@@ -14201,24 +14201,27 @@ var solanaWeb3 = (function (exports) {
 	      return this._message;
 	    }
 
-	    const {
-	      nonceInfo
-	    } = this;
+	    let recentBlockhash;
+	    let instructions;
 
-	    if (nonceInfo && this.instructions[0] != nonceInfo.nonceInstruction) {
-	      this.recentBlockhash = nonceInfo.nonce;
-	      this.instructions.unshift(nonceInfo.nonceInstruction);
-	    }
+	    if (this.nonceInfo) {
+	      recentBlockhash = this.nonceInfo.nonce;
 
-	    const {
-	      recentBlockhash
-	    } = this;
+	      if (this.instructions[0] != this.nonceInfo.nonceInstruction) {
+	        instructions = [this.nonceInfo.nonceInstruction, ...this.instructions];
+	      } else {
+	        instructions = this.instructions;
+	      }
+	    } else {
+	      recentBlockhash = this.recentBlockhash;
+	      instructions = this.instructions;
+	    }
 
 	    if (!recentBlockhash) {
 	      throw new Error('Transaction recentBlockhash required');
 	    }
 
-	    if (this.instructions.length < 1) {
+	    if (instructions.length < 1) {
 	      console.warn('No instructions provided');
 	    }
 
@@ -14233,15 +14236,15 @@ var solanaWeb3 = (function (exports) {
 	      throw new Error('Transaction fee payer required');
 	    }
 
-	    for (let i = 0; i < this.instructions.length; i++) {
-	      if (this.instructions[i].programId === undefined) {
+	    for (let i = 0; i < instructions.length; i++) {
+	      if (instructions[i].programId === undefined) {
 	        throw new Error(`Transaction instruction index ${i} has undefined program id`);
 	      }
 	    }
 
 	    const programIds = [];
 	    const accountMetas = [];
-	    this.instructions.forEach(instruction => {
+	    instructions.forEach(instruction => {
 	      instruction.keys.forEach(accountMeta => {
 	        accountMetas.push({ ...accountMeta
 	        });
@@ -14351,7 +14354,7 @@ var solanaWeb3 = (function (exports) {
 	      }
 	    });
 	    const accountKeys = signedKeys.concat(unsignedKeys);
-	    const instructions = this.instructions.map(instruction => {
+	    const compiledInstructions = instructions.map(instruction => {
 	      const {
 	        data,
 	        programId
@@ -14362,7 +14365,7 @@ var solanaWeb3 = (function (exports) {
 	        data: bs58$1.encode(data)
 	      };
 	    });
-	    instructions.forEach(instruction => {
+	    compiledInstructions.forEach(instruction => {
 	      assert$c(instruction.programIdIndex >= 0);
 	      instruction.accounts.forEach(keyIndex => assert$c(keyIndex >= 0));
 	    });
@@ -14374,7 +14377,7 @@ var solanaWeb3 = (function (exports) {
 	      },
 	      accountKeys,
 	      recentBlockhash,
-	      instructions
+	      instructions: compiledInstructions
 	    });
 	  }
 	  /**
@@ -19421,6 +19424,7 @@ var solanaWeb3 = (function (exports) {
 	  return url.toString();
 	}
 
+	var _process$env$npm_pack;
 	const PublicKeyFromString = coerce(instance(PublicKey), string(), value => new PublicKey(value));
 	const RawAccountDataResult = tuple([string(), literal('base64')]);
 	const BufferFromRawAccountData = coerce(instance(buffer.Buffer), RawAccountDataResult, value => buffer.Buffer.from(value[0], 'base64'));
@@ -19631,7 +19635,7 @@ var solanaWeb3 = (function (exports) {
 	      agent,
 	      headers: Object.assign({
 	        'Content-Type': 'application/json'
-	      }, httpHeaders || {})
+	      }, httpHeaders || {}, COMMON_HTTP_HEADERS)
 	    };
 
 	    try {
@@ -20304,9 +20308,14 @@ var solanaWeb3 = (function (exports) {
 	 * Filter for log subscriptions.
 	 */
 
+	/** @internal */
+	const COMMON_HTTP_HEADERS = {
+	  'solana-client': `js/${(_process$env$npm_pack = "0.0.0-development") !== null && _process$env$npm_pack !== void 0 ? _process$env$npm_pack : 'UNKNOWN'}`
+	};
 	/**
 	 * A connection to a fullnode JSON RPC endpoint
 	 */
+
 	class Connection {
 	  /** @internal */
 
@@ -21582,7 +21591,13 @@ var solanaWeb3 = (function (exports) {
 	        throw new Error('failed to get transactions: ' + res.error.message);
 	      }
 
-	      return res.result;
+	      const result = res.result;
+	      if (!result) return result;
+	      return { ...result,
+	        transaction: { ...result.transaction,
+	          message: new Message(result.transaction.message)
+	        }
+	      };
 	    });
 	    return res;
 	  }