@solana/web3.js 1.30.1 → 1.30.3

package/lib/index.cjs.js

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var nacl = require('tweetnacl');
 var buffer = require('buffer');
 var BN = require('bn.js');
@@ -38,7 +37,6 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 var nacl__default = /*#__PURE__*/_interopDefaultLegacy(nacl);
 var nacl__namespace = /*#__PURE__*/_interopNamespace(nacl);
 var BN__default = /*#__PURE__*/_interopDefaultLegacy(BN);
@@ -1760,8 +1758,7 @@ class Struct {
 class Enum extends Struct {
   constructor(properties) {
     super(properties);
-
-    _defineProperty__default["default"](this, "enum", '');
+    this.enum = '';
 
     if (Object.keys(properties).length !== 1) {
       throw new Error('Enum can only take single value');
@@ -1801,8 +1798,7 @@ class PublicKey extends Struct {
    */
   constructor(value) {
     super({});
-
-    _defineProperty__default["default"](this, "_bn", void 0);
+    this._bn = void 0;
 
     if (isPublicKeyData(value)) {
       this._bn = value._bn;
@@ -1812,7 +1808,7 @@ class PublicKey extends Struct {
         const decoded = bs58__default["default"].decode(value);
 
         if (decoded.length != 32) {
-          throw new Error("Invalid public key input");
+          throw new Error(`Invalid public key input`);
         }
 
         this._bn = new BN__default["default"](decoded);
@@ -1821,7 +1817,7 @@ class PublicKey extends Struct {
       }
 
       if (this._bn.byteLength() > 32) {
-        throw new Error("Invalid public key input");
+        throw new Error(`Invalid public key input`);
       }
     }
   }
@@ -1901,7 +1897,7 @@ class PublicKey extends Struct {
     let buffer$1 = buffer.Buffer.alloc(0);
     seeds.forEach(function (seed) {
       if (seed.length > MAX_SEED_LENGTH) {
-        throw new TypeError("Max seed length exceeded");
+        throw new TypeError(`Max seed length exceeded`);
       }
 
       buffer$1 = buffer.Buffer.concat([buffer$1, toBuffer(seed)]);
@@ -1911,7 +1907,7 @@ class PublicKey extends Struct {
     let publicKeyBytes = new BN__default["default"](hash, 16).toArray(undefined, 32);
 
     if (is_on_curve(publicKeyBytes)) {
-      throw new Error("Invalid seeds, address must fall off the curve");
+      throw new Error(`Invalid seeds, address must fall off the curve`);
     }
 
     return new PublicKey(publicKeyBytes);
@@ -1945,7 +1941,7 @@ class PublicKey extends Struct {
       return [address, nonce];
     }
 
-    throw new Error("Unable to find a viable program address nonce");
+    throw new Error(`Unable to find a viable program address nonce`);
   }
   /**
    * Check that a pubkey is on the ed25519 curve.
@@ -1957,9 +1953,7 @@ class PublicKey extends Struct {
   }
 
 }
-
-_defineProperty__default["default"](PublicKey, "default", new PublicKey('11111111111111111111111111111111'));
-
+PublicKey.default = new PublicKey('11111111111111111111111111111111');
 SOLANA_SCHEMA.set(PublicKey, {
   kind: 'struct',
   fields: [['_bn', 'u256']]
@@ -2032,7 +2026,7 @@ class Account {
    * @param secretKey Secret key for the account
    */
   constructor(secretKey) {
-    _defineProperty__default["default"](this, "_keypair", void 0);
+    this._keypair = void 0;
 
     if (secretKey) {
       this._keypair = nacl__namespace.sign.keyPair.fromSecretKey(toBuffer(secretKey));
@@ -2157,27 +2151,52 @@ function encodeLength(bytes, len) {
   }
 }
 
+const END_OF_BUFFER_ERROR_MESSAGE = 'Reached end of buffer unexpectedly';
 /**
- * The message header, identifying signed and read-only account
+ * Delegates to `Array#shift`, but throws if the array is zero-length.
  */
 
-const PUBKEY_LENGTH = 32;
+function guardedShift(byteArray) {
+  if (byteArray.length === 0) {
+    throw new Error(END_OF_BUFFER_ERROR_MESSAGE);
+  }
+
+  return byteArray.shift();
+}
 /**
- * List of instructions to be processed atomically
+ * Delegates to `Array#splice`, but throws if the section being spliced out extends past the end of
+ * the array.
  */
 
-class Message {
-  constructor(args) {
-    _defineProperty__default["default"](this, "header", void 0);
+function guardedSplice(byteArray, ...args) {
+  var _args$;
+
+  const [start] = args;
 
-    _defineProperty__default["default"](this, "accountKeys", void 0);
+  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);
+  }
 
-    _defineProperty__default["default"](this, "recentBlockhash", void 0);
+  return byteArray.splice(...args);
+}
 
-    _defineProperty__default["default"](this, "instructions", void 0);
+/**
+ * The message header, identifying signed and read-only account
+ */
 
-    _defineProperty__default["default"](this, "indexToProgramIds", new Map());
+const PUBKEY_LENGTH = 32;
+/**
+ * List of instructions to be processed atomically
+ */
 
+class Message {
+  constructor(args) {
+    this.header = void 0;
+    this.accountKeys = void 0;
+    this.recentBlockhash = void 0;
+    this.instructions = void 0;
+    this.indexToProgramIds = new Map();
     this.header = args.header;
     this.accountKeys = args.accountKeys.map(account => new PublicKey(account));
     this.recentBlockhash = args.recentBlockhash;
@@ -2260,32 +2279,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,
@@ -2314,6 +2329,10 @@ function assert (condition, message) {
   }
 }
 
+/**
+ * Transaction signature as base-58 encoded string
+ */
+
 /**
  * Default (empty) signature
  *
@@ -2351,12 +2370,9 @@ class TransactionInstruction {
    * Program input
    */
   constructor(opts) {
-    _defineProperty__default["default"](this, "keys", void 0);
-
-    _defineProperty__default["default"](this, "programId", void 0);
-
-    _defineProperty__default["default"](this, "data", buffer.Buffer.alloc(0));
-
+    this.keys = void 0;
+    this.programId = void 0;
+    this.data = buffer.Buffer.alloc(0);
     this.programId = opts.programId;
     this.keys = opts.keys;
 
@@ -2398,16 +2414,11 @@ class Transaction {
    * Construct an empty Transaction
    */
   constructor(opts) {
-    _defineProperty__default["default"](this, "signatures", []);
-
-    _defineProperty__default["default"](this, "feePayer", void 0);
-
-    _defineProperty__default["default"](this, "instructions", []);
-
-    _defineProperty__default["default"](this, "recentBlockhash", void 0);
-
-    _defineProperty__default["default"](this, "nonceInfo", void 0);
-
+    this.signatures = [];
+    this.feePayer = void 0;
+    this.instructions = [];
+    this.recentBlockhash = void 0;
+    this.nonceInfo = void 0;
     opts && Object.assign(this, opts);
   }
   /**
@@ -2471,7 +2482,7 @@ class Transaction {
 
     for (let i = 0; i < this.instructions.length; i++) {
       if (this.instructions[i].programId === undefined) {
-        throw new Error("Transaction instruction index ".concat(i, " has undefined program id"));
+        throw new Error(`Transaction instruction index ${i} has undefined program id`);
       }
     }
 
@@ -2546,7 +2557,7 @@ class Transaction {
           console.warn('Transaction references a signature that is unnecessary, ' + 'only the fee payer and instruction signer accounts should sign a transaction. ' + 'This behavior is deprecated and will throw an error in the next major version release.');
         }
       } else {
-        throw new Error("unknown signer: ".concat(signature.publicKey.toString()));
+        throw new Error(`unknown signer: ${signature.publicKey.toString()}`);
       }
     }
 
@@ -2781,7 +2792,7 @@ class Transaction {
     const index = this.signatures.findIndex(sigpair => pubkey.equals(sigpair.publicKey));
 
     if (index < 0) {
-      throw new Error("unknown signer: ".concat(pubkey.toString()));
+      throw new Error(`unknown signer: ${pubkey.toString()}`);
     }
 
     this.signatures[index].signature = buffer.Buffer.from(signature);
@@ -2857,12 +2868,12 @@ class Transaction {
       signature
     }, index) => {
       if (signature !== null) {
-        assert(signature.length === 64, "signature has invalid length");
+        assert(signature.length === 64, `signature has invalid length`);
         buffer.Buffer.from(signature).copy(wireTransaction, signatureCount.length + index * 64);
       }
     });
     signData.copy(wireTransaction, signatureCount.length + signatures.length * 64);
-    assert(wireTransaction.length <= PACKET_DATA_SIZE, "Transaction too large: ".concat(wireTransaction.length, " > ").concat(PACKET_DATA_SIZE));
+    assert(wireTransaction.length <= PACKET_DATA_SIZE, `Transaction too large: ${wireTransaction.length} > ${PACKET_DATA_SIZE}`);
     return wireTransaction;
   }
   /**
@@ -2907,8 +2918,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)));
     }
 
@@ -2981,7 +2991,7 @@ async function sendAndConfirmTransaction(connection, transaction, signers, optio
   const status = (await connection.confirmTransaction(signature, options && options.commitment)).value;
 
   if (status.err) {
-    throw new Error("Transaction ".concat(signature, " failed (").concat(JSON.stringify(status), ")"));
+    throw new Error(`Transaction ${signature} failed (${JSON.stringify(status)})`);
   }
 
   return signature;
@@ -3024,7 +3034,7 @@ function decodeData(type, buffer) {
   }
 
   if (data.instruction !== type.index) {
-    throw new Error("invalid instruction; instruction index mismatch ".concat(data.instruction, " != ").concat(type.index));
+    throw new Error(`invalid instruction; instruction index mismatch ${data.instruction} != ${type.index}`);
   }
 
   return data;
@@ -3058,12 +3068,9 @@ class NonceAccount {
    * @internal
    */
   constructor(args) {
-    _defineProperty__default["default"](this, "authorizedPubkey", void 0);
-
-    _defineProperty__default["default"](this, "nonce", void 0);
-
-    _defineProperty__default["default"](this, "feeCalculator", void 0);
-
+    this.authorizedPubkey = void 0;
+    this.nonce = void 0;
+    this.feeCalculator = void 0;
     this.authorizedPubkey = args.authorizedPubkey;
     this.nonce = args.nonce;
     this.feeCalculator = args.feeCalculator;
@@ -3364,7 +3371,7 @@ class SystemInstruction {
 
   static checkKeyLength(keys, expectedLength) {
     if (keys.length < expectedLength) {
-      throw new Error("invalid instruction; found ".concat(keys.length, " keys, expected at least ").concat(expectedLength));
+      throw new Error(`invalid instruction; found ${keys.length} keys, expected at least ${expectedLength}`);
     }
   }
 
@@ -3796,8 +3803,7 @@ class SystemProgram {
   }
 
 }
-
-_defineProperty__default["default"](SystemProgram, "programId", new PublicKey('11111111111111111111111111111111'));
+SystemProgram.programId = new PublicKey('11111111111111111111111111111111');
 
 // rest of the Transaction fields
 //
@@ -3966,8 +3972,7 @@ class Loader {
   }
 
 }
-
-_defineProperty__default["default"](Loader, "chunkSize", CHUNK_SIZE);
+Loader.chunkSize = CHUNK_SIZE;
 
 const BPF_LOADER_PROGRAM_ID = new PublicKey('BPFLoader2111111111111111111111111111111111');
 /**
@@ -4018,14 +4023,10 @@ class AgentManager {
   }
 
   constructor(useHttps) {
-    _defineProperty__default["default"](this, "_agent", void 0);
-
-    _defineProperty__default["default"](this, "_activeRequests", 0);
-
-    _defineProperty__default["default"](this, "_destroyTimeout", null);
-
-    _defineProperty__default["default"](this, "_useHttps", void 0);
-
+    this._agent = void 0;
+    this._activeRequests = 0;
+    this._destroyTimeout = null;
+    this._useHttps = void 0;
     this._useHttps = useHttps === true;
     this._agent = AgentManager._newAgent(this._useHttps);
   }
@@ -4098,16 +4099,11 @@ class EpochSchedule {
 
   /** The first slot of `firstNormalEpoch` */
   constructor(slotsPerEpoch, leaderScheduleSlotOffset, warmup, firstNormalEpoch, firstNormalSlot) {
-    _defineProperty__default["default"](this, "slotsPerEpoch", void 0);
-
-    _defineProperty__default["default"](this, "leaderScheduleSlotOffset", void 0);
-
-    _defineProperty__default["default"](this, "warmup", void 0);
-
-    _defineProperty__default["default"](this, "firstNormalEpoch", void 0);
-
-    _defineProperty__default["default"](this, "firstNormalSlot", void 0);
-
+    this.slotsPerEpoch = void 0;
+    this.leaderScheduleSlotOffset = void 0;
+    this.warmup = void 0;
+    this.firstNormalEpoch = void 0;
+    this.firstNormalSlot = void 0;
     this.slotsPerEpoch = slotsPerEpoch;
     this.leaderScheduleSlotOffset = leaderScheduleSlotOffset;
     this.warmup = warmup;
@@ -4159,9 +4155,7 @@ class EpochSchedule {
 class SendTransactionError extends Error {
   constructor(message, logs) {
     super(message);
-
-    _defineProperty__default["default"](this, "logs", void 0);
-
+    this.logs = void 0;
     this.logs = logs;
   }
 
@@ -4445,7 +4439,7 @@ function createRpcClient(url, useHttps, httpHeaders, fetchMiddleware, disableRet
           break;
         }
 
-        console.log("Server responded with ".concat(res.status, " ").concat(res.statusText, ".  Retrying after ").concat(waitTime, "ms delay..."));
+        console.log(`Server responded with ${res.status} ${res.statusText}.  Retrying after ${waitTime}ms delay...`);
         await sleep(waitTime);
         waitTime *= 2;
       }
@@ -4455,7 +4449,7 @@ function createRpcClient(url, useHttps, httpHeaders, fetchMiddleware, disableRet
       if (res.ok) {
         callback(null, text);
       } else {
-        callback(new Error("".concat(res.status, " ").concat(res.statusText, ": ").concat(text)));
+        callback(new Error(`${res.status} ${res.statusText}: ${text}`));
       }
     } catch (err) {
       if (err instanceof Error) callback(err);
@@ -5121,67 +5115,39 @@ class Connection {
    * @param commitmentOrConfig optional default commitment level or optional ConnectionConfig configuration object
    */
   constructor(endpoint, commitmentOrConfig) {
-    _defineProperty__default["default"](this, "_commitment", void 0);
-
-    _defineProperty__default["default"](this, "_confirmTransactionInitialTimeout", void 0);
-
-    _defineProperty__default["default"](this, "_rpcEndpoint", void 0);
-
-    _defineProperty__default["default"](this, "_rpcWsEndpoint", void 0);
-
-    _defineProperty__default["default"](this, "_rpcClient", void 0);
-
-    _defineProperty__default["default"](this, "_rpcRequest", void 0);
-
-    _defineProperty__default["default"](this, "_rpcBatchRequest", void 0);
-
-    _defineProperty__default["default"](this, "_rpcWebSocket", void 0);
-
-    _defineProperty__default["default"](this, "_rpcWebSocketConnected", false);
-
-    _defineProperty__default["default"](this, "_rpcWebSocketHeartbeat", null);
-
-    _defineProperty__default["default"](this, "_rpcWebSocketIdleTimeout", null);
-
-    _defineProperty__default["default"](this, "_disableBlockhashCaching", false);
-
-    _defineProperty__default["default"](this, "_pollingBlockhash", false);
-
-    _defineProperty__default["default"](this, "_blockhashInfo", {
+    this._commitment = void 0;
+    this._confirmTransactionInitialTimeout = void 0;
+    this._rpcEndpoint = void 0;
+    this._rpcWsEndpoint = void 0;
+    this._rpcClient = void 0;
+    this._rpcRequest = void 0;
+    this._rpcBatchRequest = void 0;
+    this._rpcWebSocket = void 0;
+    this._rpcWebSocketConnected = false;
+    this._rpcWebSocketHeartbeat = null;
+    this._rpcWebSocketIdleTimeout = null;
+    this._disableBlockhashCaching = false;
+    this._pollingBlockhash = false;
+    this._blockhashInfo = {
       recentBlockhash: null,
       lastFetch: 0,
       transactionSignatures: [],
       simulatedSignatures: []
-    });
-
-    _defineProperty__default["default"](this, "_accountChangeSubscriptionCounter", 0);
-
-    _defineProperty__default["default"](this, "_accountChangeSubscriptions", {});
-
-    _defineProperty__default["default"](this, "_programAccountChangeSubscriptionCounter", 0);
-
-    _defineProperty__default["default"](this, "_programAccountChangeSubscriptions", {});
-
-    _defineProperty__default["default"](this, "_rootSubscriptionCounter", 0);
-
-    _defineProperty__default["default"](this, "_rootSubscriptions", {});
-
-    _defineProperty__default["default"](this, "_signatureSubscriptionCounter", 0);
-
-    _defineProperty__default["default"](this, "_signatureSubscriptions", {});
-
-    _defineProperty__default["default"](this, "_slotSubscriptionCounter", 0);
-
-    _defineProperty__default["default"](this, "_slotSubscriptions", {});
-
-    _defineProperty__default["default"](this, "_logsSubscriptionCounter", 0);
-
-    _defineProperty__default["default"](this, "_logsSubscriptions", {});
-
-    _defineProperty__default["default"](this, "_slotUpdateSubscriptionCounter", 0);
-
-    _defineProperty__default["default"](this, "_slotUpdateSubscriptions", {});
-
+    };
+    this._accountChangeSubscriptionCounter = 0;
+    this._accountChangeSubscriptions = {};
+    this._programAccountChangeSubscriptionCounter = 0;
+    this._programAccountChangeSubscriptions = {};
+    this._rootSubscriptionCounter = 0;
+    this._rootSubscriptions = {};
+    this._signatureSubscriptionCounter = 0;
+    this._signatureSubscriptions = {};
+    this._slotSubscriptionCounter = 0;
+    this._slotSubscriptions = {};
+    this._logsSubscriptionCounter = 0;
+    this._logsSubscriptions = {};
+    this._slotUpdateSubscriptionCounter = 0;
+    this._slotUpdateSubscriptions = {};
     let url = new URL(endpoint);
     const useHttps = url.protocol === 'https:';
     let wsEndpoint;
@@ -5555,7 +5521,7 @@ class Connection {
     const res = superstruct.create(unsafeRes, jsonRpcResult(StakeActivationResult));
 
     if ('error' in res) {
-      throw new Error("failed to get Stake Activation ".concat(publicKey.toBase58(), ": ").concat(res.error.message));
+      throw new Error(`failed to get Stake Activation ${publicKey.toBase58()}: ${res.error.message}`);
     }
 
     return res.result;
@@ -5691,7 +5657,7 @@ class Connection {
 
     if (response === null) {
       const duration = (Date.now() - start) / 1000;
-      throw new Error("Transaction was not confirmed in ".concat(duration.toFixed(2), " seconds. It is unknown if it succeeded or failed. Check signature ").concat(signature, " using the Solana Explorer or CLI tools."));
+      throw new Error(`Transaction was not confirmed in ${duration.toFixed(2)} seconds. It is unknown if it succeeded or failed. Check signature ${signature} using the Solana Explorer or CLI tools.`);
     }
 
     return response;
@@ -6465,7 +6431,7 @@ class Connection {
         await sleep(MS_PER_SLOT / 2);
       }
 
-      throw new Error("Unable to obtain a new blockhash after ".concat(Date.now() - startTime, "ms"));
+      throw new Error(`Unable to obtain a new blockhash after ${Date.now() - startTime}ms`);
     } finally {
       this._pollingBlockhash = false;
     }
@@ -6722,7 +6688,7 @@ class Connection {
         }
 
         if (err instanceof Error) {
-          console.error("".concat(rpcMethod, " error for argument"), rpcArgs, err.message);
+          console.error(`${rpcMethod} error for argument`, rpcArgs, err.message);
         }
       }
     }
@@ -6742,7 +6708,7 @@ class Connection {
         await this._rpcWebSocket.call(rpcMethod, [unsubscribeId]);
       } catch (err) {
         if (err instanceof Error) {
-          console.error("".concat(rpcMethod, " error:"), err.message);
+          console.error(`${rpcMethod} error:`, err.message);
         }
       }
     }
@@ -6907,7 +6873,7 @@ class Connection {
 
       this._updateSubscriptions();
     } else {
-      throw new Error("Unknown account change id: ".concat(id));
+      throw new Error(`Unknown account change id: ${id}`);
     }
   }
   /**
@@ -6973,7 +6939,7 @@ class Connection {
 
       this._updateSubscriptions();
     } else {
-      throw new Error("Unknown program account change id: ".concat(id));
+      throw new Error(`Unknown program account change id: ${id}`);
     }
   }
   /**
@@ -7003,7 +6969,7 @@ class Connection {
 
   async removeOnLogsListener(id) {
     if (!this._logsSubscriptions[id]) {
-      throw new Error("Unknown logs id: ".concat(id));
+      throw new Error(`Unknown logs id: ${id}`);
     }
 
     const subInfo = this._logsSubscriptions[id];
@@ -7079,7 +7045,7 @@ class Connection {
 
       this._updateSubscriptions();
     } else {
-      throw new Error("Unknown slot change id: ".concat(id));
+      throw new Error(`Unknown slot change id: ${id}`);
     }
   }
   /**
@@ -7132,7 +7098,7 @@ class Connection {
 
       this._updateSubscriptions();
     } else {
-      throw new Error("Unknown slot update id: ".concat(id));
+      throw new Error(`Unknown slot update id: ${id}`);
     }
   }
 
@@ -7273,7 +7239,7 @@ class Connection {
 
       this._updateSubscriptions();
     } else {
-      throw new Error("Unknown signature result id: ".concat(id));
+      throw new Error(`Unknown signature result id: ${id}`);
     }
   }
   /**
@@ -7325,7 +7291,7 @@ class Connection {
 
       this._updateSubscriptions();
     } else {
-      throw new Error("Unknown root change id: ".concat(id));
+      throw new Error(`Unknown root change id: ${id}`);
     }
   }
 
@@ -7346,7 +7312,7 @@ class Keypair {
    * @param keypair ed25519 keypair
    */
   constructor(keypair) {
-    _defineProperty__default["default"](this, "_keypair", void 0);
+    this._keypair = void 0;
 
     if (keypair) {
       this._keypair = keypair;
@@ -7450,8 +7416,8 @@ class Ed25519Program {
       signature,
       instructionIndex
     } = params;
-    assert(publicKey.length === PUBLIC_KEY_BYTES$1, "Public Key must be ".concat(PUBLIC_KEY_BYTES$1, " bytes but received ").concat(publicKey.length, " bytes"));
-    assert(signature.length === SIGNATURE_BYTES, "Signature must be ".concat(SIGNATURE_BYTES, " bytes but received ").concat(signature.length, " bytes"));
+    assert(publicKey.length === PUBLIC_KEY_BYTES$1, `Public Key must be ${PUBLIC_KEY_BYTES$1} bytes but received ${publicKey.length} bytes`);
+    assert(signature.length === SIGNATURE_BYTES, `Signature must be ${SIGNATURE_BYTES} bytes but received ${signature.length} bytes`);
     const publicKeyOffset = ED25519_INSTRUCTION_LAYOUT.span;
     const signatureOffset = publicKeyOffset + publicKey.length;
     const messageDataOffset = signatureOffset + signature.length;
@@ -7489,7 +7455,7 @@ class Ed25519Program {
       message,
       instructionIndex
     } = params;
-    assert(privateKey.length === PRIVATE_KEY_BYTES$1, "Private key must be ".concat(PRIVATE_KEY_BYTES$1, " bytes but received ").concat(privateKey.length, " bytes"));
+    assert(privateKey.length === PRIVATE_KEY_BYTES$1, `Private key must be ${PRIVATE_KEY_BYTES$1} bytes but received ${privateKey.length} bytes`);
 
     try {
       const keypair = Keypair.fromSecretKey(privateKey);
@@ -7502,13 +7468,12 @@ class Ed25519Program {
         instructionIndex
       });
     } catch (error) {
-      throw new Error("Error creating instruction; ".concat(error));
+      throw new Error(`Error creating instruction; ${error}`);
     }
   }
 
 }
-
-_defineProperty__default["default"](Ed25519Program, "programId", new PublicKey('Ed25519SigVerify111111111111111111111111111'));
+Ed25519Program.programId = new PublicKey('Ed25519SigVerify111111111111111111111111111');
 
 /**
  * Address of the stake config account which configures the rate
@@ -7531,10 +7496,8 @@ class Authorized {
    * @param withdrawer the withdraw authority
    */
   constructor(staker, withdrawer) {
-    _defineProperty__default["default"](this, "staker", void 0);
-
-    _defineProperty__default["default"](this, "withdrawer", void 0);
-
+    this.staker = void 0;
+    this.withdrawer = void 0;
     this.staker = staker;
     this.withdrawer = withdrawer;
   }
@@ -7555,12 +7518,9 @@ class Lockup {
    * Create a new Lockup object
    */
   constructor(unixTimestamp, epoch, custodian) {
-    _defineProperty__default["default"](this, "unixTimestamp", void 0);
-
-    _defineProperty__default["default"](this, "epoch", void 0);
-
-    _defineProperty__default["default"](this, "custodian", void 0);
-
+    this.unixTimestamp = void 0;
+    this.epoch = void 0;
+    this.custodian = void 0;
     this.unixTimestamp = unixTimestamp;
     this.epoch = epoch;
     this.custodian = custodian;
@@ -7575,7 +7535,7 @@ class Lockup {
  * Create stake account transaction params
  */
 
-_defineProperty__default["default"](Lockup, "default", new Lockup(0, 0, PublicKey.default));
+Lockup.default = new Lockup(0, 0, PublicKey.default);
 
 /**
  * Stake Instruction class
@@ -7788,7 +7748,7 @@ class StakeInstruction {
 
   static checkKeyLength(keys, expectedLength) {
     if (keys.length < expectedLength) {
-      throw new Error("invalid instruction; found ".concat(keys.length, " keys, expected at least ").concat(expectedLength));
+      throw new Error(`invalid instruction; found ${keys.length} keys, expected at least ${expectedLength}`);
     }
   }
 
@@ -8263,10 +8223,8 @@ class StakeProgram {
   }
 
 }
-
-_defineProperty__default["default"](StakeProgram, "programId", new PublicKey('Stake11111111111111111111111111111111111111'));
-
-_defineProperty__default["default"](StakeProgram, "space", 200);
+StakeProgram.programId = new PublicKey('Stake11111111111111111111111111111111111111');
+StakeProgram.space = 200;
 
 const {
   publicKeyCreate,
@@ -8296,12 +8254,12 @@ class Secp256k1Program {
    * @param {Buffer} publicKey a 64 byte secp256k1 public key buffer
    */
   static publicKeyToEthAddress(publicKey) {
-    assert(publicKey.length === PUBLIC_KEY_BYTES, "Public key must be ".concat(PUBLIC_KEY_BYTES, " bytes but received ").concat(publicKey.length, " bytes"));
+    assert(publicKey.length === PUBLIC_KEY_BYTES, `Public key must be ${PUBLIC_KEY_BYTES} bytes but received ${publicKey.length} bytes`);
 
     try {
       return buffer.Buffer.from(jsSha3.keccak_256.update(toBuffer(publicKey)).digest()).slice(-ETHEREUM_ADDRESS_BYTES);
     } catch (error) {
-      throw new Error("Error constructing Ethereum address: ".concat(error));
+      throw new Error(`Error constructing Ethereum address: ${error}`);
     }
   }
   /**
@@ -8352,7 +8310,7 @@ class Secp256k1Program {
       ethAddress = rawAddress;
     }
 
-    assert(ethAddress.length === ETHEREUM_ADDRESS_BYTES, "Address must be ".concat(ETHEREUM_ADDRESS_BYTES, " bytes but received ").concat(ethAddress.length, " bytes"));
+    assert(ethAddress.length === ETHEREUM_ADDRESS_BYTES, `Address must be ${ETHEREUM_ADDRESS_BYTES} bytes but received ${ethAddress.length} bytes`);
     const dataStart = 1 + SIGNATURE_OFFSETS_SERIALIZED_SIZE;
     const ethAddressOffset = dataStart;
     const signatureOffset = dataStart + ethAddress.length;
@@ -8391,7 +8349,7 @@ class Secp256k1Program {
       message,
       instructionIndex
     } = params;
-    assert(pkey.length === PRIVATE_KEY_BYTES, "Private key must be ".concat(PRIVATE_KEY_BYTES, " bytes but received ").concat(pkey.length, " bytes"));
+    assert(pkey.length === PRIVATE_KEY_BYTES, `Private key must be ${PRIVATE_KEY_BYTES} bytes but received ${pkey.length} bytes`);
 
     try {
       const privateKey = toBuffer(pkey);
@@ -8410,13 +8368,12 @@ class Secp256k1Program {
         instructionIndex
       });
     } catch (error) {
-      throw new Error("Error creating instruction; ".concat(error));
+      throw new Error(`Error creating instruction; ${error}`);
     }
   }
 
 }
-
-_defineProperty__default["default"](Secp256k1Program, "programId", new PublicKey('KeccakSecp256k11111111111111111111111111111'));
+Secp256k1Program.programId = new PublicKey('KeccakSecp256k11111111111111111111111111111');
 
 const VALIDATOR_INFO_KEY = new PublicKey('Va1idator1nfo111111111111111111111111111111');
 /**
@@ -8449,10 +8406,8 @@ class ValidatorInfo {
    * @param info validator information
    */
   constructor(key, info) {
-    _defineProperty__default["default"](this, "key", void 0);
-
-    _defineProperty__default["default"](this, "info", void 0);
-
+    this.key = void 0;
+    this.info = void 0;
     this.key = key;
     this.info = info;
   }
@@ -8473,10 +8428,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
@@ -8516,26 +8469,16 @@ class VoteAccount {
    * @internal
    */
   constructor(args) {
-    _defineProperty__default["default"](this, "nodePubkey", void 0);
-
-    _defineProperty__default["default"](this, "authorizedVoterPubkey", void 0);
-
-    _defineProperty__default["default"](this, "authorizedWithdrawerPubkey", void 0);
-
-    _defineProperty__default["default"](this, "commission", void 0);
-
-    _defineProperty__default["default"](this, "votes", void 0);
-
-    _defineProperty__default["default"](this, "rootSlot", void 0);
-
-    _defineProperty__default["default"](this, "epoch", void 0);
-
-    _defineProperty__default["default"](this, "credits", void 0);
-
-    _defineProperty__default["default"](this, "lastEpochCredits", void 0);
-
-    _defineProperty__default["default"](this, "epochCredits", void 0);
-
+    this.nodePubkey = void 0;
+    this.authorizedVoterPubkey = void 0;
+    this.authorizedWithdrawerPubkey = void 0;
+    this.commission = void 0;
+    this.votes = void 0;
+    this.rootSlot = void 0;
+    this.epoch = void 0;
+    this.credits = void 0;
+    this.lastEpochCredits = void 0;
+    this.epochCredits = void 0;
     this.nodePubkey = args.nodePubkey;
     this.authorizedVoterPubkey = args.authorizedVoterPubkey;
     this.authorizedWithdrawerPubkey = args.authorizedWithdrawerPubkey;
@@ -8598,7 +8541,7 @@ async function sendAndConfirmRawTransaction(connection, rawTransaction, options)
   const status = (await connection.confirmTransaction(signature, options && options.commitment)).value;
 
   if (status.err) {
-    throw new Error("Raw transaction ".concat(signature, " failed (").concat(JSON.stringify(status), ")"));
+    throw new Error(`Raw transaction ${signature} failed (${JSON.stringify(status)})`);
   }
 
   return signature;
@@ -8630,7 +8573,7 @@ function clusterApiUrl(cluster, tls) {
   const url = endpoint[key][cluster];
 
   if (!url) {
-    throw new Error("Unknown ".concat(key, " cluster: ").concat(cluster));
+    throw new Error(`Unknown ${key} cluster: ${cluster}`);
   }
 
   return url;