@solana/web3.js 1.44.0 → 1.44.3

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
     });
   }
   /**
@@ -6757,7 +6760,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;
   }
@@ -9857,6 +9866,8 @@ exports.Struct = Struct;
 exports.SystemInstruction = SystemInstruction;
 exports.SystemProgram = SystemProgram;
 exports.Transaction = Transaction;
+exports.TransactionExpiredBlockheightExceededError = TransactionExpiredBlockheightExceededError;
+exports.TransactionExpiredTimeoutError = TransactionExpiredTimeoutError;
 exports.TransactionInstruction = TransactionInstruction;
 exports.VALIDATOR_INFO_KEY = VALIDATOR_INFO_KEY;
 exports.VOTE_PROGRAM_ID = VOTE_PROGRAM_ID;