@solana/web3.js 1.39.0 → 1.39.2

package/lib/index.cjs.js

@@ -2204,6 +2204,36 @@ function encodeLength(bytes, len) {
   }
 }
 
+const END_OF_BUFFER_ERROR_MESSAGE = 'Reached end of buffer unexpectedly';
+/**
+ * Delegates to `Array#shift`, but throws if the array is zero-length.
+ */
+
+function guardedShift(byteArray) {
+  if (byteArray.length === 0) {
+    throw new Error(END_OF_BUFFER_ERROR_MESSAGE);
+  }
+
+  return byteArray.shift();
+}
+/**
+ * Delegates to `Array#splice`, but throws if the section being spliced out extends past the end of
+ * the array.
+ */
+
+function guardedSplice(byteArray, ...args) {
+  var _args$;
+
+  const [start] = args;
+
+  if (args.length === 2 // Implies that `deleteCount` was supplied
+  ? start + ((_args$ = args[1]) !== null && _args$ !== void 0 ? _args$ : 0) > byteArray.length : start >= byteArray.length) {
+    throw new Error(END_OF_BUFFER_ERROR_MESSAGE);
+  }
+
+  return byteArray.splice(...args);
+}
+
 /**
  * The message header, identifying signed and read-only account
  */
@@ -2302,32 +2332,28 @@ class Message {
   static from(buffer$1) {
     // Slice up wire data
     let byteArray = [...buffer$1];
-    const numRequiredSignatures = byteArray.shift();
-    const numReadonlySignedAccounts = byteArray.shift();
-    const numReadonlyUnsignedAccounts = byteArray.shift();
+    const numRequiredSignatures = guardedShift(byteArray);
+    const numReadonlySignedAccounts = guardedShift(byteArray);
+    const numReadonlyUnsignedAccounts = guardedShift(byteArray);
     const accountCount = decodeLength(byteArray);
     let accountKeys = [];
 
     for (let i = 0; i < accountCount; i++) {
-      const account = byteArray.slice(0, PUBKEY_LENGTH);
-      byteArray = byteArray.slice(PUBKEY_LENGTH);
+      const account = guardedSplice(byteArray, 0, PUBKEY_LENGTH);
       accountKeys.push(bs58__default["default"].encode(buffer.Buffer.from(account)));
     }
 
-    const recentBlockhash = byteArray.slice(0, PUBKEY_LENGTH);
-    byteArray = byteArray.slice(PUBKEY_LENGTH);
+    const recentBlockhash = guardedSplice(byteArray, 0, PUBKEY_LENGTH);
     const instructionCount = decodeLength(byteArray);
     let instructions = [];
 
     for (let i = 0; i < instructionCount; i++) {
-      const programIdIndex = byteArray.shift();
+      const programIdIndex = guardedShift(byteArray);
       const accountCount = decodeLength(byteArray);
-      const accounts = byteArray.slice(0, accountCount);
-      byteArray = byteArray.slice(accountCount);
+      const accounts = guardedSplice(byteArray, 0, accountCount);
       const dataLength = decodeLength(byteArray);
-      const dataSlice = byteArray.slice(0, dataLength);
+      const dataSlice = guardedSplice(byteArray, 0, dataLength);
       const data = bs58__default["default"].encode(buffer.Buffer.from(dataSlice));
-      byteArray = byteArray.slice(dataLength);
       instructions.push({
         programIdIndex,
         accounts,
@@ -2356,6 +2382,10 @@ function assert (condition, message) {
   }
 }
 
+/**
+ * Transaction signature as base-58 encoded string
+ */
+
 /**
  * Default (empty) signature
  *
@@ -2403,6 +2433,26 @@ class TransactionInstruction {
       this.data = opts.data;
     }
   }
+  /**
+   * @internal
+   */
+
+
+  toJSON() {
+    return {
+      keys: this.keys.map(({
+        pubkey,
+        isSigner,
+        isWritable
+      }) => ({
+        pubkey: pubkey.toJSON(),
+        isSigner,
+        isWritable
+      })),
+      programId: this.programId.toJSON(),
+      data: [...this.data]
+    };
+  }
 
 }
 /**
@@ -2442,8 +2492,33 @@ class Transaction {
     this.instructions = [];
     this.recentBlockhash = void 0;
     this.nonceInfo = void 0;
+    this._message = void 0;
+    this._json = void 0;
     opts && Object.assign(this, opts);
   }
+  /**
+   * @internal
+   */
+
+
+  toJSON() {
+    return {
+      recentBlockhash: this.recentBlockhash || null,
+      feePayer: this.feePayer ? this.feePayer.toJSON() : null,
+      nonceInfo: this.nonceInfo ? {
+        nonce: this.nonceInfo.nonce,
+        nonceInstruction: this.nonceInfo.nonceInstruction.toJSON()
+      } : null,
+      instructions: this.instructions.map(instruction => instruction.toJSON()),
+      signatures: this.signatures.map(({
+        publicKey,
+        signature
+      }) => ({
+        publicKey: publicKey.toJSON(),
+        signature: signature ? [...signature] : null
+      }))
+    };
+  }
   /**
    * Add one or more instructions to this Transaction
    */
@@ -2471,6 +2546,14 @@ class Transaction {
 
 
   compileMessage() {
+    if (this._message) {
+      if (JSON.stringify(this.toJSON()) !== JSON.stringify(this._json)) {
+        throw new Error('Transaction mutated after being populated from Message');
+      }
+
+      return this._message;
+    }
+
     const {
       nonceInfo
     } = this;
@@ -2950,8 +3033,7 @@ class Transaction {
     let signatures = [];
 
     for (let i = 0; i < signatureCount; i++) {
-      const signature = byteArray.slice(0, SIGNATURE_LENGTH);
-      byteArray = byteArray.slice(SIGNATURE_LENGTH);
+      const signature = guardedSplice(byteArray, 0, SIGNATURE_LENGTH);
       signatures.push(bs58__default["default"].encode(buffer.Buffer.from(signature)));
     }
 
@@ -2992,6 +3074,8 @@ class Transaction {
         data: bs58__default["default"].decode(instruction.data)
       }));
     });
+    transaction._message = message;
+    transaction._json = transaction.toJSON();
     return transaction;
   }
 
@@ -6768,7 +6852,9 @@ class Connection {
       });
       transaction.instructions = transactionOrMessage.instructions;
     } else {
-      transaction = Transaction.populate(transactionOrMessage);
+      transaction = Transaction.populate(transactionOrMessage); // HACK: this function relies on mutating the populated transaction
+
+      transaction._message = transaction._json = undefined;
     }
 
     if (transaction.nonceInfo && signers) {
@@ -8791,10 +8877,8 @@ class ValidatorInfo {
     const configKeys = [];
 
     for (let i = 0; i < 2; i++) {
-      const publicKey = new PublicKey(byteArray.slice(0, PUBKEY_LENGTH));
-      byteArray = byteArray.slice(PUBKEY_LENGTH);
-      const isSigner = byteArray.slice(0, 1)[0] === 1;
-      byteArray = byteArray.slice(1);
+      const publicKey = new PublicKey(guardedSplice(byteArray, 0, PUBKEY_LENGTH));
+      const isSigner = guardedShift(byteArray) === 1;
       configKeys.push({
         publicKey,
         isSigner