@solana/web3.js 1.59.0 → 1.59.2

package/lib/index.cjs.js

@@ -770,6 +770,36 @@ class CompiledKeys {
 
 }
 
+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);
+}
+
 /**
  * An instruction to execute by a program
  *
@@ -911,37 +941,33 @@ class Message {
   static from(buffer$1) {
     // Slice up wire data
     let byteArray = [...buffer$1];
-    const numRequiredSignatures = byteArray.shift();
+    const numRequiredSignatures = guardedShift(byteArray);
 
     if (numRequiredSignatures !== (numRequiredSignatures & VERSION_PREFIX_MASK)) {
       throw new Error('Versioned messages must be deserialized with VersionedMessage.deserialize()');
     }
 
-    const numReadonlySignedAccounts = byteArray.shift();
-    const numReadonlyUnsignedAccounts = byteArray.shift();
+    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, PUBLIC_KEY_LENGTH);
-      byteArray = byteArray.slice(PUBLIC_KEY_LENGTH);
+      const account = guardedSplice(byteArray, 0, PUBLIC_KEY_LENGTH);
       accountKeys.push(new PublicKey(buffer.Buffer.from(account)));
     }
 
-    const recentBlockhash = byteArray.slice(0, PUBLIC_KEY_LENGTH);
-    byteArray = byteArray.slice(PUBLIC_KEY_LENGTH);
+    const recentBlockhash = guardedSplice(byteArray, 0, PUBLIC_KEY_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,
@@ -1154,33 +1180,33 @@ class MessageV0 {
 
   static deserialize(serializedMessage) {
     let byteArray = [...serializedMessage];
-    const prefix = byteArray.shift();
+    const prefix = guardedShift(byteArray);
     const maskedPrefix = prefix & VERSION_PREFIX_MASK;
     assert(prefix !== maskedPrefix, `Expected versioned message but received legacy message`);
     const version = maskedPrefix;
     assert(version === 0, `Expected versioned message with version 0 but found version ${version}`);
     const header = {
-      numRequiredSignatures: byteArray.shift(),
-      numReadonlySignedAccounts: byteArray.shift(),
-      numReadonlyUnsignedAccounts: byteArray.shift()
+      numRequiredSignatures: guardedShift(byteArray),
+      numReadonlySignedAccounts: guardedShift(byteArray),
+      numReadonlyUnsignedAccounts: guardedShift(byteArray)
     };
     const staticAccountKeys = [];
     const staticAccountKeysLength = decodeLength(byteArray);
 
     for (let i = 0; i < staticAccountKeysLength; i++) {
-      staticAccountKeys.push(new PublicKey(byteArray.splice(0, PUBLIC_KEY_LENGTH)));
+      staticAccountKeys.push(new PublicKey(guardedSplice(byteArray, 0, PUBLIC_KEY_LENGTH)));
     }
 
-    const recentBlockhash = bs58__default["default"].encode(byteArray.splice(0, PUBLIC_KEY_LENGTH));
+    const recentBlockhash = bs58__default["default"].encode(guardedSplice(byteArray, 0, PUBLIC_KEY_LENGTH));
     const instructionCount = decodeLength(byteArray);
     const compiledInstructions = [];
 
     for (let i = 0; i < instructionCount; i++) {
-      const programIdIndex = byteArray.shift();
+      const programIdIndex = guardedShift(byteArray);
       const accountKeyIndexesLength = decodeLength(byteArray);
-      const accountKeyIndexes = byteArray.splice(0, accountKeyIndexesLength);
+      const accountKeyIndexes = guardedSplice(byteArray, 0, accountKeyIndexesLength);
       const dataLength = decodeLength(byteArray);
-      const data = new Uint8Array(byteArray.splice(0, dataLength));
+      const data = new Uint8Array(guardedSplice(byteArray, 0, dataLength));
       compiledInstructions.push({
         programIdIndex,
         accountKeyIndexes,
@@ -1192,11 +1218,11 @@ class MessageV0 {
     const addressTableLookups = [];
 
     for (let i = 0; i < addressTableLookupsCount; i++) {
-      const accountKey = new PublicKey(byteArray.splice(0, PUBLIC_KEY_LENGTH));
+      const accountKey = new PublicKey(guardedSplice(byteArray, 0, PUBLIC_KEY_LENGTH));
       const writableIndexesLength = decodeLength(byteArray);
-      const writableIndexes = byteArray.splice(0, writableIndexesLength);
+      const writableIndexes = guardedSplice(byteArray, 0, writableIndexesLength);
       const readonlyIndexesLength = decodeLength(byteArray);
-      const readonlyIndexes = byteArray.splice(0, readonlyIndexesLength);
+      const readonlyIndexes = guardedSplice(byteArray, 0, readonlyIndexesLength);
       addressTableLookups.push({
         accountKey,
         writableIndexes,
@@ -1927,8 +1953,7 @@ class Transaction {
     let signatures = [];
 
     for (let i = 0; i < signatureCount; i++) {
-      const signature = byteArray.slice(0, SIGNATURE_LENGTH_IN_BYTES);
-      byteArray = byteArray.slice(SIGNATURE_LENGTH_IN_BYTES);
+      const signature = guardedSplice(byteArray, 0, SIGNATURE_LENGTH_IN_BYTES);
       signatures.push(bs58__default["default"].encode(buffer.Buffer.from(signature)));
     }
 
@@ -1978,10 +2003,10 @@ class Transaction {
 
 class TransactionMessage {
   constructor(args) {
-    this.accountKeys = void 0;
+    this.payerKey = void 0;
     this.instructions = void 0;
     this.recentBlockhash = void 0;
-    this.accountKeys = args.accountKeys;
+    this.payerKey = args.payerKey;
     this.instructions = args.instructions;
     this.recentBlockhash = args.recentBlockhash;
   }
@@ -2002,6 +2027,12 @@ class TransactionMessage {
     const numWritableUnsignedAccounts = message.staticAccountKeys.length - numReadonlyUnsignedAccounts;
     assert(numWritableUnsignedAccounts >= 0, 'Message header is invalid');
     const accountKeys = message.getAccountKeys(args);
+    const payerKey = accountKeys.get(0);
+
+    if (payerKey === undefined) {
+      throw new Error('Failed to decompile message because no account keys were found');
+    }
+
     const instructions = [];
 
     for (const compiledIx of compiledInstructions) {
@@ -2047,35 +2078,23 @@ class TransactionMessage {
     }
 
     return new TransactionMessage({
-      accountKeys,
+      payerKey,
       instructions,
       recentBlockhash
     });
   }
 
   compileToLegacyMessage() {
-    const payerKey = this.accountKeys.get(0);
-
-    if (payerKey === undefined) {
-      throw new Error('Failed to compile message because no account keys were found');
-    }
-
     return Message.compile({
-      payerKey,
+      payerKey: this.payerKey,
       recentBlockhash: this.recentBlockhash,
       instructions: this.instructions
     });
   }
 
   compileToV0Message(addressLookupTableAccounts) {
-    const payerKey = this.accountKeys.get(0);
-
-    if (payerKey === undefined) {
-      throw new Error('Failed to compile message because no account keys were found');
-    }
-
     return MessageV0.compile({
-      payerKey,
+      payerKey: this.payerKey,
       recentBlockhash: this.recentBlockhash,
       instructions: this.instructions,
       addressLookupTableAccounts
@@ -2128,7 +2147,7 @@ class VersionedTransaction {
     const signaturesLength = decodeLength(byteArray);
 
     for (let i = 0; i < signaturesLength; i++) {
-      signatures.push(new Uint8Array(byteArray.splice(0, SIGNATURE_LENGTH_IN_BYTES)));
+      signatures.push(new Uint8Array(guardedSplice(byteArray, 0, SIGNATURE_LENGTH_IN_BYTES)));
     }
 
     const message = VersionedMessage.deserialize(new Uint8Array(byteArray));
@@ -4587,7 +4606,7 @@ const LogsNotificationResult = superstruct.type({
 
 /** @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'}`
+  'solana-client': `js/${(_process$env$npm_pack = "1.59.2") !== null && _process$env$npm_pack !== void 0 ? _process$env$npm_pack : 'UNKNOWN'}`
 };
 /**
  * A connection to a fullnode JSON RPC endpoint
@@ -9501,10 +9520,8 @@ class ValidatorInfo {
     const configKeys = [];
 
     for (let i = 0; i < 2; i++) {
-      const publicKey = new PublicKey(byteArray.slice(0, PUBLIC_KEY_LENGTH));
-      byteArray = byteArray.slice(PUBLIC_KEY_LENGTH);
-      const isSigner = byteArray.slice(0, 1)[0] === 1;
-      byteArray = byteArray.slice(1);
+      const publicKey = new PublicKey(guardedSplice(byteArray, 0, PUBLIC_KEY_LENGTH));
+      const isSigner = guardedShift(byteArray) === 1;
       configKeys.push({
         publicKey,
         isSigner