@solana/web3.js 1.44.1 → 1.45.0

package/lib/index.browser.cjs.js

@@ -2541,24 +2541,27 @@ class Transaction {
       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');
     }
 
@@ -2573,15 +2576,15 @@ class Transaction {
       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
         });
@@ -2691,7 +2694,7 @@ class Transaction {
       }
     });
     const accountKeys = signedKeys.concat(unsignedKeys);
-    const instructions = this.instructions.map(instruction => {
+    const compiledInstructions = instructions.map(instruction => {
       const {
         data,
         programId
@@ -2702,7 +2705,7 @@ class Transaction {
         data: bs58__default["default"].encode(data)
       };
     });
-    instructions.forEach(instruction => {
+    compiledInstructions.forEach(instruction => {
       assert(instruction.programIdIndex >= 0);
       instruction.accounts.forEach(keyIndex => assert(keyIndex >= 0));
     });
@@ -2714,7 +2717,7 @@ class Transaction {
       },
       accountKeys,
       recentBlockhash,
-      instructions
+      instructions: compiledInstructions
     });
   }
   /**
@@ -4596,6 +4599,7 @@ function makeWebsocketUrl(endpoint) {
   return url.toString();
 }
 
+var _process$env$npm_pack;
 const PublicKeyFromString = superstruct.coerce(superstruct.instance(PublicKey), superstruct.string(), value => new PublicKey(value));
 const RawAccountDataResult = superstruct.tuple([superstruct.string(), superstruct.literal('base64')]);
 const BufferFromRawAccountData = superstruct.coerce(superstruct.instance(buffer.Buffer), RawAccountDataResult, value => buffer.Buffer.from(value[0], 'base64'));
@@ -4806,7 +4810,7 @@ function createRpcClient(url, useHttps, httpHeaders, customFetch, fetchMiddlewar
       agent,
       headers: Object.assign({
         'Content-Type': 'application/json'
-      }, httpHeaders || {})
+      }, httpHeaders || {}, COMMON_HTTP_HEADERS)
     };
 
     try {
@@ -5479,9 +5483,14 @@ const LogsNotificationResult = superstruct.type({
  * 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 */
 
@@ -6757,7 +6766,13 @@ class Connection {
         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;
   }