@solana/web3.js 1.30.1 → 1.32.1

package/lib/index.esm.js

@@ -1,6 +1,4 @@
-import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import * as nacl from 'tweetnacl';
-import nacl__default from 'tweetnacl';
+import nacl from 'tweetnacl';
 import { Buffer } from 'buffer';
 import BN from 'bn.js';
 import bs58 from 'bs58';
@@ -13,7 +11,7 @@ import RpcClient from 'jayson/lib/client/browser';
 import http from 'http';
 import https from 'https';
 import secp256k1 from 'secp256k1';
-import { keccak_256 } from 'js-sha3';
+import sha3 from 'js-sha3';
 
 const toBuffer = arr => {
   if (Buffer.isBuffer(arr)) {
@@ -1725,8 +1723,7 @@ class Struct {
 class Enum extends Struct {
   constructor(properties) {
     super(properties);
-
-    _defineProperty(this, "enum", '');
+    this.enum = '';
 
     if (Object.keys(properties).length !== 1) {
       throw new Error('Enum can only take single value');
@@ -1766,8 +1763,7 @@ class PublicKey extends Struct {
    */
   constructor(value) {
     super({});
-
-    _defineProperty(this, "_bn", void 0);
+    this._bn = void 0;
 
     if (isPublicKeyData(value)) {
       this._bn = value._bn;
@@ -1777,7 +1773,7 @@ class PublicKey extends Struct {
         const decoded = bs58.decode(value);
 
         if (decoded.length != 32) {
-          throw new Error("Invalid public key input");
+          throw new Error(`Invalid public key input`);
         }
 
         this._bn = new BN(decoded);
@@ -1786,7 +1782,7 @@ class PublicKey extends Struct {
       }
 
       if (this._bn.byteLength() > 32) {
-        throw new Error("Invalid public key input");
+        throw new Error(`Invalid public key input`);
       }
     }
   }
@@ -1809,6 +1805,10 @@ class PublicKey extends Struct {
   toBase58() {
     return bs58.encode(this.toBytes());
   }
+
+  toJSON() {
+    return this.toBase58();
+  }
   /**
    * Return the byte array representation of the public key
    */
@@ -1866,7 +1866,7 @@ class PublicKey extends Struct {
     let 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 = Buffer.concat([buffer, toBuffer(seed)]);
@@ -1876,7 +1876,7 @@ class PublicKey extends Struct {
     let publicKeyBytes = new BN(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);
@@ -1910,7 +1910,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.
@@ -1922,15 +1922,13 @@ class PublicKey extends Struct {
   }
 
 }
-
-_defineProperty(PublicKey, "default", new PublicKey('11111111111111111111111111111111'));
-
+PublicKey.default = new PublicKey('11111111111111111111111111111111');
 SOLANA_SCHEMA.set(PublicKey, {
   kind: 'struct',
   fields: [['_bn', 'u256']]
 }); // @ts-ignore
 
-let naclLowLevel = nacl__default.lowlevel; // Check that a pubkey is on the curve.
+let naclLowLevel = nacl.lowlevel; // Check that a pubkey is on the curve.
 // This function and its dependents were sourced from:
 // https://github.com/dchest/tweetnacl-js/blob/f1ec050ceae0861f34280e62498b1d3ed9c350c6/nacl.js#L792
 
@@ -1997,7 +1995,7 @@ class Account {
    * @param secretKey Secret key for the account
    */
   constructor(secretKey) {
-    _defineProperty(this, "_keypair", void 0);
+    this._keypair = void 0;
 
     if (secretKey) {
       this._keypair = nacl.sign.keyPair.fromSecretKey(toBuffer(secretKey));
@@ -2133,16 +2131,11 @@ const PUBKEY_LENGTH = 32;
 
 class Message {
   constructor(args) {
-    _defineProperty(this, "header", void 0);
-
-    _defineProperty(this, "accountKeys", void 0);
-
-    _defineProperty(this, "recentBlockhash", void 0);
-
-    _defineProperty(this, "instructions", void 0);
-
-    _defineProperty(this, "indexToProgramIds", new Map());
-
+    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;
@@ -2316,12 +2309,9 @@ class TransactionInstruction {
    * Program input
    */
   constructor(opts) {
-    _defineProperty(this, "keys", void 0);
-
-    _defineProperty(this, "programId", void 0);
-
-    _defineProperty(this, "data", Buffer.alloc(0));
-
+    this.keys = void 0;
+    this.programId = void 0;
+    this.data = Buffer.alloc(0);
     this.programId = opts.programId;
     this.keys = opts.keys;
 
@@ -2363,16 +2353,11 @@ class Transaction {
    * Construct an empty Transaction
    */
   constructor(opts) {
-    _defineProperty(this, "signatures", []);
-
-    _defineProperty(this, "feePayer", void 0);
-
-    _defineProperty(this, "instructions", []);
-
-    _defineProperty(this, "recentBlockhash", void 0);
-
-    _defineProperty(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);
   }
   /**
@@ -2436,7 +2421,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`);
       }
     }
 
@@ -2463,8 +2448,9 @@ class Transaction {
     }); // Sort. Prioritizing first by signer, then by writable
 
     accountMetas.sort(function (x, y) {
+      const pubkeySorting = x.pubkey.toBase58().localeCompare(y.pubkey.toBase58());
       const checkSigner = x.isSigner === y.isSigner ? 0 : x.isSigner ? -1 : 1;
-      const checkWritable = x.isWritable === y.isWritable ? 0 : x.isWritable ? -1 : 1;
+      const checkWritable = x.isWritable === y.isWritable ? pubkeySorting : x.isWritable ? -1 : 1;
       return checkSigner || checkWritable;
     }); // Cull duplicate account metas
 
@@ -2511,7 +2497,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()}`);
       }
     }
 
@@ -2718,7 +2704,7 @@ class Transaction {
   _partialSign(message, ...signers) {
     const signData = message.serialize();
     signers.forEach(signer => {
-      const signature = nacl__default.sign.detached(signData, signer.secretKey);
+      const signature = nacl.sign.detached(signData, signer.secretKey);
 
       this._addSignature(signer.publicKey, toBuffer(signature));
     });
@@ -2746,7 +2732,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.from(signature);
@@ -2774,7 +2760,7 @@ class Transaction {
           return false;
         }
       } else {
-        if (!nacl__default.sign.detached.verify(signData, signature, publicKey.toBuffer())) {
+        if (!nacl.sign.detached.verify(signData, signature, publicKey.toBuffer())) {
           return false;
         }
       }
@@ -2822,12 +2808,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.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;
   }
   /**
@@ -2920,11 +2906,14 @@ class Transaction {
 }
 
 const SYSVAR_CLOCK_PUBKEY = new PublicKey('SysvarC1ock11111111111111111111111111111111');
+const SYSVAR_EPOCH_SCHEDULE_PUBKEY = new PublicKey('SysvarEpochSchedu1e111111111111111111111111');
+const SYSVAR_INSTRUCTIONS_PUBKEY = new PublicKey('Sysvar1nstructions1111111111111111111111111');
 const SYSVAR_RECENT_BLOCKHASHES_PUBKEY = new PublicKey('SysvarRecentB1ockHashes11111111111111111111');
 const SYSVAR_RENT_PUBKEY = new PublicKey('SysvarRent111111111111111111111111111111111');
 const SYSVAR_REWARDS_PUBKEY = new PublicKey('SysvarRewards111111111111111111111111111111');
+const SYSVAR_SLOT_HASHES_PUBKEY = new PublicKey('SysvarS1otHashes111111111111111111111111111');
+const SYSVAR_SLOT_HISTORY_PUBKEY = new PublicKey('SysvarS1otHistory11111111111111111111111111');
 const SYSVAR_STAKE_HISTORY_PUBKEY = new PublicKey('SysvarStakeHistory1111111111111111111111111');
-const SYSVAR_INSTRUCTIONS_PUBKEY = new PublicKey('Sysvar1nstructions1111111111111111111111111');
 
 /**
  * Sign, send and confirm a transaction.
@@ -2940,13 +2929,14 @@ const SYSVAR_INSTRUCTIONS_PUBKEY = new PublicKey('Sysvar1nstructions111111111111
 async function sendAndConfirmTransaction(connection, transaction, signers, options) {
   const sendOptions = options && {
     skipPreflight: options.skipPreflight,
-    preflightCommitment: options.preflightCommitment || options.commitment
+    preflightCommitment: options.preflightCommitment || options.commitment,
+    maxRetries: options.maxRetries
   };
   const signature = await connection.sendTransaction(transaction, signers, sendOptions);
   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;
@@ -2989,7 +2979,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;
@@ -3023,12 +3013,9 @@ class NonceAccount {
    * @internal
    */
   constructor(args) {
-    _defineProperty(this, "authorizedPubkey", void 0);
-
-    _defineProperty(this, "nonce", void 0);
-
-    _defineProperty(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;
@@ -3329,7 +3316,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}`);
     }
   }
 
@@ -3761,8 +3748,7 @@ class SystemProgram {
   }
 
 }
-
-_defineProperty(SystemProgram, "programId", new PublicKey('11111111111111111111111111111111'));
+SystemProgram.programId = new PublicKey('11111111111111111111111111111111');
 
 // rest of the Transaction fields
 //
@@ -3931,8 +3917,7 @@ class Loader {
   }
 
 }
-
-_defineProperty(Loader, "chunkSize", CHUNK_SIZE);
+Loader.chunkSize = CHUNK_SIZE;
 
 const BPF_LOADER_PROGRAM_ID = new PublicKey('BPFLoader2111111111111111111111111111111111');
 /**
@@ -3983,14 +3968,10 @@ class AgentManager {
   }
 
   constructor(useHttps) {
-    _defineProperty(this, "_agent", void 0);
-
-    _defineProperty(this, "_activeRequests", 0);
-
-    _defineProperty(this, "_destroyTimeout", null);
-
-    _defineProperty(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);
   }
@@ -4063,16 +4044,11 @@ class EpochSchedule {
 
   /** The first slot of `firstNormalEpoch` */
   constructor(slotsPerEpoch, leaderScheduleSlotOffset, warmup, firstNormalEpoch, firstNormalSlot) {
-    _defineProperty(this, "slotsPerEpoch", void 0);
-
-    _defineProperty(this, "leaderScheduleSlotOffset", void 0);
-
-    _defineProperty(this, "warmup", void 0);
-
-    _defineProperty(this, "firstNormalEpoch", void 0);
-
-    _defineProperty(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;
@@ -4124,9 +4100,7 @@ class EpochSchedule {
 class SendTransactionError extends Error {
   constructor(message, logs) {
     super(message);
-
-    _defineProperty(this, "logs", void 0);
-
+    this.logs = void 0;
     this.logs = logs;
   }
 
@@ -4358,16 +4332,15 @@ function createRpcClient(url, useHttps, httpHeaders, fetchMiddleware, disableRet
   let fetchWithMiddleware;
 
   if (fetchMiddleware) {
-    fetchWithMiddleware = (url, options) => {
-      return new Promise((resolve, reject) => {
-        fetchMiddleware(url, options, async (url, options) => {
-          try {
-            resolve(await fetch(url, options));
-          } catch (error) {
-            reject(error);
-          }
-        });
+    fetchWithMiddleware = async (url, options) => {
+      const modifiedFetchArgs = await new Promise((resolve, reject) => {
+        try {
+          fetchMiddleware(url, options, (modifiedUrl, modifiedOptions) => resolve([modifiedUrl, modifiedOptions]));
+        } catch (error) {
+          reject(error);
+        }
       });
+      return await fetch(...modifiedFetchArgs);
     };
   }
 
@@ -4410,7 +4383,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;
       }
@@ -4420,7 +4393,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);
@@ -4861,6 +4834,7 @@ const ParsedConfirmedTransactionResult = type({
 const TokenBalanceResult = type({
   accountIndex: number(),
   mint: string(),
+  owner: optional(string()),
   uiTokenAmount: TokenAmountResult
 });
 /**
@@ -4901,8 +4875,31 @@ const ParsedConfirmedTransactionMetaResult = type({
   preTokenBalances: optional(nullable(array(TokenBalanceResult))),
   postTokenBalances: optional(nullable(array(TokenBalanceResult)))
 });
+/**
+ * Expected JSON RPC response for the "getBlock" message
+ */
+
+const GetBlockRpcResult = jsonRpcResult(nullable(type({
+  blockhash: string(),
+  previousBlockhash: string(),
+  parentSlot: number(),
+  transactions: array(type({
+    transaction: ConfirmedTransactionResult,
+    meta: nullable(ConfirmedTransactionMetaResult)
+  })),
+  rewards: optional(array(type({
+    pubkey: string(),
+    lamports: number(),
+    postBalance: nullable(number()),
+    rewardType: nullable(string())
+  }))),
+  blockTime: nullable(number()),
+  blockHeight: nullable(number())
+})));
 /**
  * Expected JSON RPC response for the "getConfirmedBlock" message
+ *
+ * @deprecated Deprecated since Solana v1.8.0. Please use {@link GetBlockRpcResult} instead.
  */
 
 const GetConfirmedBlockRpcResult = jsonRpcResult(nullable(type({
@@ -4922,10 +4919,10 @@ const GetConfirmedBlockRpcResult = jsonRpcResult(nullable(type({
   blockTime: nullable(number())
 })));
 /**
- * Expected JSON RPC response for the "getConfirmedBlockSignatures" message
+ * Expected JSON RPC response for the "getBlock" message
  */
 
-const GetConfirmedBlockSignaturesRpcResult = jsonRpcResult(nullable(type({
+const GetBlockSignaturesRpcResult = jsonRpcResult(nullable(type({
   blockhash: string(),
   previousBlockhash: string(),
   parentSlot: number(),
@@ -4933,20 +4930,20 @@ const GetConfirmedBlockSignaturesRpcResult = jsonRpcResult(nullable(type({
   blockTime: nullable(number())
 })));
 /**
- * Expected JSON RPC response for the "getConfirmedTransaction" message
+ * Expected JSON RPC response for the "getTransaction" message
  */
 
-const GetConfirmedTransactionRpcResult = jsonRpcResult(nullable(type({
+const GetTransactionRpcResult = jsonRpcResult(nullable(type({
   slot: number(),
   meta: ConfirmedTransactionMetaResult,
   blockTime: optional(nullable(number())),
   transaction: ConfirmedTransactionResult
 })));
 /**
- * Expected JSON RPC response for the "getConfirmedTransaction" message
+ * Expected parsed JSON RPC response for the "getTransaction" message
  */
 
-const GetParsedConfirmedTransactionRpcResult = jsonRpcResult(nullable(type({
+const GetParsedTransactionRpcResult = jsonRpcResult(nullable(type({
   slot: number(),
   transaction: ParsedConfirmedTransactionResult,
   meta: nullable(ParsedConfirmedTransactionMetaResult),
@@ -4954,6 +4951,8 @@ const GetParsedConfirmedTransactionRpcResult = jsonRpcResult(nullable(type({
 })));
 /**
  * Expected JSON RPC response for the "getRecentBlockhash" message
+ *
+ * @deprecated Deprecated since Solana v1.8.0. Please use {@link GetLatestBlockhashRpcResult} instead.
  */
 
 const GetRecentBlockhashAndContextRpcResult = jsonRpcResultAndContext(type({
@@ -4962,6 +4961,14 @@ const GetRecentBlockhashAndContextRpcResult = jsonRpcResultAndContext(type({
     lamportsPerSignature: number()
   })
 }));
+/**
+ * Expected JSON RPC response for the "getLatestBlockhash" message
+ */
+
+const GetLatestBlockhashRpcResult = jsonRpcResultAndContext(type({
+  blockhash: string(),
+  lastValidBlockHeight: number()
+}));
 const PerfSampleResult = type({
   slot: number(),
   numTransactions: number(),
@@ -5086,67 +5093,39 @@ class Connection {
    * @param commitmentOrConfig optional default commitment level or optional ConnectionConfig configuration object
    */
   constructor(endpoint, commitmentOrConfig) {
-    _defineProperty(this, "_commitment", void 0);
-
-    _defineProperty(this, "_confirmTransactionInitialTimeout", void 0);
-
-    _defineProperty(this, "_rpcEndpoint", void 0);
-
-    _defineProperty(this, "_rpcWsEndpoint", void 0);
-
-    _defineProperty(this, "_rpcClient", void 0);
-
-    _defineProperty(this, "_rpcRequest", void 0);
-
-    _defineProperty(this, "_rpcBatchRequest", void 0);
-
-    _defineProperty(this, "_rpcWebSocket", void 0);
-
-    _defineProperty(this, "_rpcWebSocketConnected", false);
-
-    _defineProperty(this, "_rpcWebSocketHeartbeat", null);
-
-    _defineProperty(this, "_rpcWebSocketIdleTimeout", null);
-
-    _defineProperty(this, "_disableBlockhashCaching", false);
-
-    _defineProperty(this, "_pollingBlockhash", false);
-
-    _defineProperty(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(this, "_accountChangeSubscriptionCounter", 0);
-
-    _defineProperty(this, "_accountChangeSubscriptions", {});
-
-    _defineProperty(this, "_programAccountChangeSubscriptionCounter", 0);
-
-    _defineProperty(this, "_programAccountChangeSubscriptions", {});
-
-    _defineProperty(this, "_rootSubscriptionCounter", 0);
-
-    _defineProperty(this, "_rootSubscriptions", {});
-
-    _defineProperty(this, "_signatureSubscriptionCounter", 0);
-
-    _defineProperty(this, "_signatureSubscriptions", {});
-
-    _defineProperty(this, "_slotSubscriptionCounter", 0);
-
-    _defineProperty(this, "_slotSubscriptions", {});
-
-    _defineProperty(this, "_logsSubscriptionCounter", 0);
-
-    _defineProperty(this, "_logsSubscriptions", {});
-
-    _defineProperty(this, "_slotUpdateSubscriptionCounter", 0);
-
-    _defineProperty(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;
@@ -5492,13 +5471,25 @@ class Connection {
    */
 
 
-  async getMultipleAccountsInfo(publicKeys, commitment) {
+  async getMultipleAccountsInfo(publicKeys, configOrCommitment) {
     const keys = publicKeys.map(key => key.toBase58());
+    let commitment;
+    let encoding = 'base64';
+
+    if (configOrCommitment) {
+      if (typeof configOrCommitment === 'string') {
+        commitment = configOrCommitment;
+        encoding = 'base64';
+      } else {
+        commitment = configOrCommitment.commitment;
+        encoding = configOrCommitment.encoding || 'base64';
+      }
+    }
 
-    const args = this._buildArgs([keys], commitment, 'base64');
+    const args = this._buildArgs([keys], commitment, encoding);
 
     const unsafeRes = await this._rpcRequest('getMultipleAccounts', args);
-    const res = create(unsafeRes, jsonRpcResultAndContext(array(nullable(AccountInfoResult))));
+    const res = create(unsafeRes, jsonRpcResultAndContext(array(nullable(ParsedAccountInfoResult))));
 
     if ('error' in res) {
       throw new Error('failed to get info for accounts ' + keys + ': ' + res.error.message);
@@ -5520,7 +5511,7 @@ class Connection {
     const res = 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;
@@ -5656,7 +5647,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;
@@ -5922,6 +5913,8 @@ class Connection {
   /**
    * Fetch a recent blockhash from the cluster, return with context
    * @return {Promise<RpcResponseAndContext<{blockhash: Blockhash, feeCalculator: FeeCalculator}>>}
+   *
+   * @deprecated Deprecated since Solana v1.8.0. Please use {@link getLatestBlockhash} instead.
    */
 
 
@@ -5957,6 +5950,8 @@ class Connection {
   }
   /**
    * Fetch the fee calculator for a recent blockhash from the cluster, return with context
+   *
+   * @deprecated Deprecated since Solana v1.8.0. Please use {@link getFeeForMessage} instead.
    */
 
 
@@ -5979,9 +5974,34 @@ class Connection {
       value: value !== null ? value.feeCalculator : null
     };
   }
+  /**
+   * Fetch the fee for a message from the cluster, return with context
+   */
+
+
+  async getFeeForMessage(message, commitment) {
+    const wireMessage = message.serialize().toString('base64');
+
+    const args = this._buildArgs([wireMessage], commitment);
+
+    const unsafeRes = await this._rpcRequest('getFeeForMessage', args);
+    const res = create(unsafeRes, jsonRpcResultAndContext(nullable(number())));
+
+    if ('error' in res) {
+      throw new Error('failed to get slot: ' + res.error.message);
+    }
+
+    if (res.result === null) {
+      throw new Error('invalid blockhash');
+    }
+
+    return res.result;
+  }
   /**
    * Fetch a recent blockhash from the cluster
    * @return {Promise<{blockhash: Blockhash, feeCalculator: FeeCalculator}>}
+   *
+   * @deprecated Deprecated since Solana v1.8.0. Please use {@link getLatestBlockhash} instead.
    */
 
 
@@ -5993,6 +6013,38 @@ class Connection {
       throw new Error('failed to get recent blockhash: ' + e);
     }
   }
+  /**
+   * Fetch the latest blockhash from the cluster
+   * @return {Promise<{blockhash: Blockhash, lastValidBlockHeight: number}>}
+   */
+
+
+  async getLatestBlockhash(commitment) {
+    try {
+      const res = await this.getLatestBlockhashAndContext(commitment);
+      return res.value;
+    } catch (e) {
+      throw new Error('failed to get recent blockhash: ' + e);
+    }
+  }
+  /**
+   * Fetch the latest blockhash from the cluster
+   * @return {Promise<{blockhash: Blockhash, lastValidBlockHeight: number}>}
+   */
+
+
+  async getLatestBlockhashAndContext(commitment) {
+    const args = this._buildArgs([], commitment);
+
+    const unsafeRes = await this._rpcRequest('getLatestBlockhash', args);
+    const res = create(unsafeRes, GetLatestBlockhashRpcResult);
+
+    if ('error' in res) {
+      throw new Error('failed to get latest blockhash: ' + res.error.message);
+    }
+
+    return res.result;
+  }
   /**
    * Fetch the node version
    */
@@ -6031,8 +6083,8 @@ class Connection {
   async getBlock(slot, opts) {
     const args = this._buildArgsAtLeastConfirmed([slot], opts && opts.commitment);
 
-    const unsafeRes = await this._rpcRequest('getConfirmedBlock', args);
-    const res = create(unsafeRes, GetConfirmedBlockRpcResult);
+    const unsafeRes = await this._rpcRequest('getBlock', args);
+    const res = create(unsafeRes, GetBlockRpcResult);
 
     if ('error' in res) {
       throw new Error('failed to get confirmed block: ' + res.error.message);
@@ -6056,18 +6108,18 @@ class Connection {
     };
   }
   /**
-   * Fetch a processed transaction from the cluster.
+   * Fetch a confirmed or finalized transaction from the cluster.
    */
 
 
   async getTransaction(signature, opts) {
     const args = this._buildArgsAtLeastConfirmed([signature], opts && opts.commitment);
 
-    const unsafeRes = await this._rpcRequest('getConfirmedTransaction', args);
-    const res = create(unsafeRes, GetConfirmedTransactionRpcResult);
+    const unsafeRes = await this._rpcRequest('getTransaction', args);
+    const res = create(unsafeRes, GetTransactionRpcResult);
 
     if ('error' in res) {
-      throw new Error('failed to get confirmed transaction: ' + res.error.message);
+      throw new Error('failed to get transaction: ' + res.error.message);
     }
 
     const result = res.result;
@@ -6078,6 +6130,49 @@ class Connection {
       }
     };
   }
+  /**
+   * Fetch parsed transaction details for a confirmed or finalized transaction
+   */
+
+
+  async getParsedTransaction(signature, commitment) {
+    const args = this._buildArgsAtLeastConfirmed([signature], commitment, 'jsonParsed');
+
+    const unsafeRes = await this._rpcRequest('getTransaction', args);
+    const res = create(unsafeRes, GetParsedTransactionRpcResult);
+
+    if ('error' in res) {
+      throw new Error('failed to get transaction: ' + res.error.message);
+    }
+
+    return res.result;
+  }
+  /**
+   * Fetch parsed transaction details for a batch of confirmed transactions
+   */
+
+
+  async getParsedTransactions(signatures, commitment) {
+    const batch = signatures.map(signature => {
+      const args = this._buildArgsAtLeastConfirmed([signature], commitment, 'jsonParsed');
+
+      return {
+        methodName: 'getTransaction',
+        args
+      };
+    });
+    const unsafeRes = await this._rpcBatchRequest(batch);
+    const res = unsafeRes.map(unsafeRes => {
+      const res = create(unsafeRes, GetParsedTransactionRpcResult);
+
+      if ('error' in res) {
+        throw new Error('failed to get transactions: ' + res.error.message);
+      }
+
+      return res.result;
+    });
+    return res;
+  }
   /**
    * Fetch a list of Transactions and transaction statuses from the cluster
    * for a confirmed block.
@@ -6087,18 +6182,39 @@ class Connection {
 
 
   async getConfirmedBlock(slot, commitment) {
-    const result = await this.getBlock(slot, {
-      commitment
-    });
+    const args = this._buildArgsAtLeastConfirmed([slot], commitment);
+
+    const unsafeRes = await this._rpcRequest('getConfirmedBlock', args);
+    const res = create(unsafeRes, GetConfirmedBlockRpcResult);
+
+    if ('error' in res) {
+      throw new Error('failed to get confirmed block: ' + res.error.message);
+    }
+
+    const result = res.result;
 
     if (!result) {
       throw new Error('Confirmed block ' + slot + ' not found');
     }
 
-    return { ...result,
+    const block = { ...result,
       transactions: result.transactions.map(({
         transaction,
         meta
+      }) => {
+        const message = new Message(transaction.message);
+        return {
+          meta,
+          transaction: { ...transaction,
+            message
+          }
+        };
+      })
+    };
+    return { ...block,
+      transactions: block.transactions.map(({
+        transaction,
+        meta
       }) => {
         return {
           meta,
@@ -6115,7 +6231,7 @@ class Connection {
   async getBlocks(startSlot, endSlot, commitment) {
     const args = this._buildArgsAtLeastConfirmed(endSlot !== undefined ? [startSlot, endSlot] : [startSlot], commitment);
 
-    const unsafeRes = await this._rpcRequest('getConfirmedBlocks', args);
+    const unsafeRes = await this._rpcRequest('getBlocks', args);
     const res = create(unsafeRes, jsonRpcResult(array(number())));
 
     if ('error' in res) {
@@ -6124,8 +6240,36 @@ class Connection {
 
     return res.result;
   }
+  /**
+   * Fetch a list of Signatures from the cluster for a block, excluding rewards
+   */
+
+
+  async getBlockSignatures(slot, commitment) {
+    const args = this._buildArgsAtLeastConfirmed([slot], commitment, undefined, {
+      transactionDetails: 'signatures',
+      rewards: false
+    });
+
+    const unsafeRes = await this._rpcRequest('getBlock', args);
+    const res = create(unsafeRes, GetBlockSignaturesRpcResult);
+
+    if ('error' in res) {
+      throw new Error('failed to get block: ' + res.error.message);
+    }
+
+    const result = res.result;
+
+    if (!result) {
+      throw new Error('Block ' + slot + ' not found');
+    }
+
+    return result;
+  }
   /**
    * Fetch a list of Signatures from the cluster for a confirmed block, excluding rewards
+   *
+   * @deprecated Deprecated since Solana v1.8.0. Please use {@link getBlockSignatures} instead.
    */
 
 
@@ -6136,7 +6280,7 @@ class Connection {
     });
 
     const unsafeRes = await this._rpcRequest('getConfirmedBlock', args);
-    const res = create(unsafeRes, GetConfirmedBlockSignaturesRpcResult);
+    const res = create(unsafeRes, GetBlockSignaturesRpcResult);
 
     if ('error' in res) {
       throw new Error('failed to get confirmed block: ' + res.error.message);
@@ -6152,24 +6296,33 @@ class Connection {
   }
   /**
    * Fetch a transaction details for a confirmed transaction
+   *
+   * @deprecated Deprecated since Solana v1.8.0. Please use {@link getTransaction} instead.
    */
 
 
   async getConfirmedTransaction(signature, commitment) {
-    const result = await this.getTransaction(signature, {
-      commitment
-    });
+    const args = this._buildArgsAtLeastConfirmed([signature], commitment);
+
+    const unsafeRes = await this._rpcRequest('getConfirmedTransaction', args);
+    const res = create(unsafeRes, GetTransactionRpcResult);
+
+    if ('error' in res) {
+      throw new Error('failed to get transaction: ' + res.error.message);
+    }
+
+    const result = res.result;
     if (!result) return result;
-    const {
-      message,
-      signatures
-    } = result.transaction;
+    const message = new Message(result.transaction.message);
+    const signatures = result.transaction.signatures;
     return { ...result,
       transaction: Transaction.populate(message, signatures)
     };
   }
   /**
    * Fetch parsed transaction details for a confirmed transaction
+   *
+   * @deprecated Deprecated since Solana v1.8.0. Please use {@link getParsedTransaction} instead.
    */
 
 
@@ -6177,7 +6330,7 @@ class Connection {
     const args = this._buildArgsAtLeastConfirmed([signature], commitment, 'jsonParsed');
 
     const unsafeRes = await this._rpcRequest('getConfirmedTransaction', args);
-    const res = create(unsafeRes, GetParsedConfirmedTransactionRpcResult);
+    const res = create(unsafeRes, GetParsedTransactionRpcResult);
 
     if ('error' in res) {
       throw new Error('failed to get confirmed transaction: ' + res.error.message);
@@ -6187,6 +6340,8 @@ class Connection {
   }
   /**
    * Fetch parsed transaction details for a batch of confirmed transactions
+   *
+   * @deprecated Deprecated since Solana v1.8.0. Please use {@link getParsedTransactions} instead.
    */
 
 
@@ -6201,7 +6356,7 @@ class Connection {
     });
     const unsafeRes = await this._rpcBatchRequest(batch);
     const res = unsafeRes.map(unsafeRes => {
-      const res = create(unsafeRes, GetParsedConfirmedTransactionRpcResult);
+      const res = create(unsafeRes, GetParsedTransactionRpcResult);
 
       if ('error' in res) {
         throw new Error('failed to get confirmed transactions: ' + res.error.message);
@@ -6430,7 +6585,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;
     }
@@ -6591,6 +6746,10 @@ class Connection {
     const skipPreflight = options && options.skipPreflight;
     const preflightCommitment = options && options.preflightCommitment || this.commitment;
 
+    if (options && options.maxRetries) {
+      config.maxRetries = options.maxRetries;
+    }
+
     if (skipPreflight) {
       config.skipPreflight = skipPreflight;
     }
@@ -6687,7 +6846,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);
         }
       }
     }
@@ -6707,7 +6866,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);
         }
       }
     }
@@ -6872,7 +7031,7 @@ class Connection {
 
       this._updateSubscriptions();
     } else {
-      throw new Error("Unknown account change id: ".concat(id));
+      throw new Error(`Unknown account change id: ${id}`);
     }
   }
   /**
@@ -6938,7 +7097,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}`);
     }
   }
   /**
@@ -6968,7 +7127,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];
@@ -7044,7 +7203,7 @@ class Connection {
 
       this._updateSubscriptions();
     } else {
-      throw new Error("Unknown slot change id: ".concat(id));
+      throw new Error(`Unknown slot change id: ${id}`);
     }
   }
   /**
@@ -7097,7 +7256,7 @@ class Connection {
 
       this._updateSubscriptions();
     } else {
-      throw new Error("Unknown slot update id: ".concat(id));
+      throw new Error(`Unknown slot update id: ${id}`);
     }
   }
 
@@ -7238,7 +7397,7 @@ class Connection {
 
       this._updateSubscriptions();
     } else {
-      throw new Error("Unknown signature result id: ".concat(id));
+      throw new Error(`Unknown signature result id: ${id}`);
     }
   }
   /**
@@ -7290,7 +7449,7 @@ class Connection {
 
       this._updateSubscriptions();
     } else {
-      throw new Error("Unknown root change id: ".concat(id));
+      throw new Error(`Unknown root change id: ${id}`);
     }
   }
 
@@ -7311,7 +7470,7 @@ class Keypair {
    * @param keypair ed25519 keypair
    */
   constructor(keypair) {
-    _defineProperty(this, "_keypair", void 0);
+    this._keypair = void 0;
 
     if (keypair) {
       this._keypair = keypair;
@@ -7415,8 +7574,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;
@@ -7454,12 +7613,12 @@ 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);
       const publicKey = keypair.publicKey.toBytes();
-      const signature = nacl__default.sign.detached(message, keypair.secretKey);
+      const signature = nacl.sign.detached(message, keypair.secretKey);
       return this.createInstructionWithPublicKey({
         publicKey,
         message,
@@ -7467,13 +7626,12 @@ class Ed25519Program {
         instructionIndex
       });
     } catch (error) {
-      throw new Error("Error creating instruction; ".concat(error));
+      throw new Error(`Error creating instruction; ${error}`);
     }
   }
 
 }
-
-_defineProperty(Ed25519Program, "programId", new PublicKey('Ed25519SigVerify111111111111111111111111111'));
+Ed25519Program.programId = new PublicKey('Ed25519SigVerify111111111111111111111111111');
 
 /**
  * Address of the stake config account which configures the rate
@@ -7496,10 +7654,8 @@ class Authorized {
    * @param withdrawer the withdraw authority
    */
   constructor(staker, withdrawer) {
-    _defineProperty(this, "staker", void 0);
-
-    _defineProperty(this, "withdrawer", void 0);
-
+    this.staker = void 0;
+    this.withdrawer = void 0;
     this.staker = staker;
     this.withdrawer = withdrawer;
   }
@@ -7520,12 +7676,9 @@ class Lockup {
    * Create a new Lockup object
    */
   constructor(unixTimestamp, epoch, custodian) {
-    _defineProperty(this, "unixTimestamp", void 0);
-
-    _defineProperty(this, "epoch", void 0);
-
-    _defineProperty(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;
@@ -7540,7 +7693,7 @@ class Lockup {
  * Create stake account transaction params
  */
 
-_defineProperty(Lockup, "default", new Lockup(0, 0, PublicKey.default));
+Lockup.default = new Lockup(0, 0, PublicKey.default);
 
 /**
  * Stake Instruction class
@@ -7753,7 +7906,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}`);
     }
   }
 
@@ -8228,10 +8381,8 @@ class StakeProgram {
   }
 
 }
-
-_defineProperty(StakeProgram, "programId", new PublicKey('Stake11111111111111111111111111111111111111'));
-
-_defineProperty(StakeProgram, "space", 200);
+StakeProgram.programId = new PublicKey('Stake11111111111111111111111111111111111111');
+StakeProgram.space = 200;
 
 const {
   publicKeyCreate,
@@ -8261,12 +8412,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.from(keccak_256.update(toBuffer(publicKey)).digest()).slice(-ETHEREUM_ADDRESS_BYTES);
+      return Buffer.from(sha3.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}`);
     }
   }
   /**
@@ -8317,7 +8468,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;
@@ -8356,13 +8507,13 @@ 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);
       const publicKey = publicKeyCreate(privateKey, false).slice(1); // throw away leading byte
 
-      const messageHash = Buffer.from(keccak_256.update(toBuffer(message)).digest());
+      const messageHash = Buffer.from(sha3.keccak_256.update(toBuffer(message)).digest());
       const {
         signature,
         recid: recoveryId
@@ -8375,13 +8526,12 @@ class Secp256k1Program {
         instructionIndex
       });
     } catch (error) {
-      throw new Error("Error creating instruction; ".concat(error));
+      throw new Error(`Error creating instruction; ${error}`);
     }
   }
 
 }
-
-_defineProperty(Secp256k1Program, "programId", new PublicKey('KeccakSecp256k11111111111111111111111111111'));
+Secp256k1Program.programId = new PublicKey('KeccakSecp256k11111111111111111111111111111');
 
 const VALIDATOR_INFO_KEY = new PublicKey('Va1idator1nfo111111111111111111111111111111');
 /**
@@ -8414,10 +8564,8 @@ class ValidatorInfo {
    * @param info validator information
    */
   constructor(key, info) {
-    _defineProperty(this, "key", void 0);
-
-    _defineProperty(this, "info", void 0);
-
+    this.key = void 0;
+    this.info = void 0;
     this.key = key;
     this.info = info;
   }
@@ -8469,9 +8617,10 @@ const VOTE_PROGRAM_ID = new PublicKey('Vote1111111111111111111111111111111111111
  *
  * @internal
  */
-const VoteAccountLayout = BufferLayout.struct([publicKey('nodePubkey'), publicKey('authorizedVoterPubkey'), publicKey('authorizedWithdrawerPubkey'), BufferLayout.u8('commission'), BufferLayout.nu64(), // votes.length
-BufferLayout.seq(BufferLayout.struct([BufferLayout.nu64('slot'), BufferLayout.u32('confirmationCount')]), BufferLayout.offset(BufferLayout.u32(), -8), 'votes'), BufferLayout.u8('rootSlotValid'), BufferLayout.nu64('rootSlot'), BufferLayout.nu64('epoch'), BufferLayout.nu64('credits'), BufferLayout.nu64('lastEpochCredits'), BufferLayout.nu64(), // epochCredits.length
-BufferLayout.seq(BufferLayout.struct([BufferLayout.nu64('epoch'), BufferLayout.nu64('credits'), BufferLayout.nu64('prevCredits')]), BufferLayout.offset(BufferLayout.u32(), -8), 'epochCredits')]);
+const VoteAccountLayout = BufferLayout.struct([publicKey('nodePubkey'), publicKey('authorizedWithdrawer'), BufferLayout.u8('commission'), BufferLayout.nu64(), // votes.length
+BufferLayout.seq(BufferLayout.struct([BufferLayout.nu64('slot'), BufferLayout.u32('confirmationCount')]), BufferLayout.offset(BufferLayout.u32(), -8), 'votes'), BufferLayout.u8('rootSlotValid'), BufferLayout.nu64('rootSlot'), BufferLayout.nu64(), // authorizedVoters.length
+BufferLayout.seq(BufferLayout.struct([BufferLayout.nu64('epoch'), publicKey('authorizedVoter')]), BufferLayout.offset(BufferLayout.u32(), -8), 'authorizedVoters'), BufferLayout.struct([BufferLayout.seq(BufferLayout.struct([publicKey('authorizedPubkey'), BufferLayout.nu64('epochOfLastAuthorizedSwitch'), BufferLayout.nu64('targetEpoch')]), 32, 'buf'), BufferLayout.nu64('idx'), BufferLayout.u8('isEmpty')], 'priorVoters'), BufferLayout.nu64(), // epochCredits.length
+BufferLayout.seq(BufferLayout.struct([BufferLayout.nu64('epoch'), BufferLayout.nu64('credits'), BufferLayout.nu64('prevCredits')]), BufferLayout.offset(BufferLayout.u32(), -8), 'epochCredits'), BufferLayout.struct([BufferLayout.nu64('slot'), BufferLayout.nu64('timestamp')], 'lastTimestamp')]);
 
 /**
  * VoteAccount class
@@ -8481,36 +8630,24 @@ class VoteAccount {
    * @internal
    */
   constructor(args) {
-    _defineProperty(this, "nodePubkey", void 0);
-
-    _defineProperty(this, "authorizedVoterPubkey", void 0);
-
-    _defineProperty(this, "authorizedWithdrawerPubkey", void 0);
-
-    _defineProperty(this, "commission", void 0);
-
-    _defineProperty(this, "votes", void 0);
-
-    _defineProperty(this, "rootSlot", void 0);
-
-    _defineProperty(this, "epoch", void 0);
-
-    _defineProperty(this, "credits", void 0);
-
-    _defineProperty(this, "lastEpochCredits", void 0);
-
-    _defineProperty(this, "epochCredits", void 0);
-
+    this.nodePubkey = void 0;
+    this.authorizedWithdrawer = void 0;
+    this.commission = void 0;
+    this.rootSlot = void 0;
+    this.votes = void 0;
+    this.authorizedVoters = void 0;
+    this.priorVoters = void 0;
+    this.epochCredits = void 0;
+    this.lastTimestamp = void 0;
     this.nodePubkey = args.nodePubkey;
-    this.authorizedVoterPubkey = args.authorizedVoterPubkey;
-    this.authorizedWithdrawerPubkey = args.authorizedWithdrawerPubkey;
+    this.authorizedWithdrawer = args.authorizedWithdrawer;
     this.commission = args.commission;
-    this.votes = args.votes;
     this.rootSlot = args.rootSlot;
-    this.epoch = args.epoch;
-    this.credits = args.credits;
-    this.lastEpochCredits = args.lastEpochCredits;
+    this.votes = args.votes;
+    this.authorizedVoters = args.authorizedVoters;
+    this.priorVoters = args.priorVoters;
     this.epochCredits = args.epochCredits;
+    this.lastTimestamp = args.lastTimestamp;
   }
   /**
    * Deserialize VoteAccount from the account data.
@@ -8521,7 +8658,8 @@ class VoteAccount {
 
 
   static fromAccountData(buffer) {
-    const va = VoteAccountLayout.decode(toBuffer(buffer), 0);
+    const versionOffset = 4;
+    const va = VoteAccountLayout.decode(toBuffer(buffer), versionOffset);
     let rootSlot = va.rootSlot;
 
     if (!va.rootSlotValid) {
@@ -8530,20 +8668,53 @@ class VoteAccount {
 
     return new VoteAccount({
       nodePubkey: new PublicKey(va.nodePubkey),
-      authorizedVoterPubkey: new PublicKey(va.authorizedVoterPubkey),
-      authorizedWithdrawerPubkey: new PublicKey(va.authorizedWithdrawerPubkey),
+      authorizedWithdrawer: new PublicKey(va.authorizedWithdrawer),
       commission: va.commission,
       votes: va.votes,
       rootSlot,
-      epoch: va.epoch,
-      credits: va.credits,
-      lastEpochCredits: va.lastEpochCredits,
-      epochCredits: va.epochCredits
+      authorizedVoters: va.authorizedVoters.map(parseAuthorizedVoter),
+      priorVoters: getPriorVoters(va.priorVoters),
+      epochCredits: va.epochCredits,
+      lastTimestamp: va.lastTimestamp
     });
   }
 
 }
 
+function parseAuthorizedVoter({
+  epoch,
+  authorizedVoter
+}) {
+  return {
+    epoch,
+    authorizedVoter: new PublicKey(authorizedVoter)
+  };
+}
+
+function parsePriorVoters({
+  authorizedPubkey,
+  epochOfLastAuthorizedSwitch,
+  targetEpoch
+}) {
+  return {
+    authorizedPubkey: new PublicKey(authorizedPubkey),
+    epochOfLastAuthorizedSwitch,
+    targetEpoch
+  };
+}
+
+function getPriorVoters({
+  buf,
+  idx,
+  isEmpty
+}) {
+  if (isEmpty) {
+    return [];
+  }
+
+  return [...buf.slice(idx + 1).map(parsePriorVoters), ...buf.slice(0, idx)];
+}
+
 /**
  * Send and confirm a raw transaction
  *
@@ -8563,7 +8734,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;
@@ -8573,12 +8744,12 @@ const endpoint = {
   http: {
     devnet: 'http://api.devnet.solana.com',
     testnet: 'http://api.testnet.solana.com',
-    'mainnet-beta': 'http://api.mainnet-beta.solana.com'
+    'mainnet-beta': 'http://api.mainnet-beta.solana.com/'
   },
   https: {
     devnet: 'https://api.devnet.solana.com',
     testnet: 'https://api.testnet.solana.com',
-    'mainnet-beta': 'https://api.mainnet-beta.solana.com'
+    'mainnet-beta': 'https://api.mainnet-beta.solana.com/'
   }
 };
 
@@ -8595,7 +8766,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;
@@ -8607,5 +8778,5 @@ function clusterApiUrl(cluster, tls) {
 
 const LAMPORTS_PER_SOL = 1000000000;
 
-export { Account, Authorized, BLOCKHASH_CACHE_TIMEOUT_MS, BPF_LOADER_DEPRECATED_PROGRAM_ID, BPF_LOADER_PROGRAM_ID, BpfLoader, Connection, Ed25519Program, Enum, EpochSchedule, FeeCalculatorLayout, Keypair, LAMPORTS_PER_SOL, Loader, Lockup, MAX_SEED_LENGTH, Message, NONCE_ACCOUNT_LENGTH, NonceAccount, PACKET_DATA_SIZE, PublicKey, SOLANA_SCHEMA, STAKE_CONFIG_ID, STAKE_INSTRUCTION_LAYOUTS, SYSTEM_INSTRUCTION_LAYOUTS, SYSVAR_CLOCK_PUBKEY, SYSVAR_INSTRUCTIONS_PUBKEY, SYSVAR_RECENT_BLOCKHASHES_PUBKEY, SYSVAR_RENT_PUBKEY, SYSVAR_REWARDS_PUBKEY, SYSVAR_STAKE_HISTORY_PUBKEY, Secp256k1Program, SendTransactionError, StakeAuthorizationLayout, StakeInstruction, StakeProgram, Struct, SystemInstruction, SystemProgram, Transaction, TransactionInstruction, VALIDATOR_INFO_KEY, VOTE_PROGRAM_ID, ValidatorInfo, VoteAccount, clusterApiUrl, sendAndConfirmRawTransaction, sendAndConfirmTransaction };
+export { Account, Authorized, BLOCKHASH_CACHE_TIMEOUT_MS, BPF_LOADER_DEPRECATED_PROGRAM_ID, BPF_LOADER_PROGRAM_ID, BpfLoader, Connection, Ed25519Program, Enum, EpochSchedule, FeeCalculatorLayout, Keypair, LAMPORTS_PER_SOL, Loader, Lockup, MAX_SEED_LENGTH, Message, NONCE_ACCOUNT_LENGTH, NonceAccount, PACKET_DATA_SIZE, PublicKey, SOLANA_SCHEMA, STAKE_CONFIG_ID, STAKE_INSTRUCTION_LAYOUTS, SYSTEM_INSTRUCTION_LAYOUTS, SYSVAR_CLOCK_PUBKEY, SYSVAR_EPOCH_SCHEDULE_PUBKEY, SYSVAR_INSTRUCTIONS_PUBKEY, SYSVAR_RECENT_BLOCKHASHES_PUBKEY, SYSVAR_RENT_PUBKEY, SYSVAR_REWARDS_PUBKEY, SYSVAR_SLOT_HASHES_PUBKEY, SYSVAR_SLOT_HISTORY_PUBKEY, SYSVAR_STAKE_HISTORY_PUBKEY, Secp256k1Program, SendTransactionError, StakeAuthorizationLayout, StakeInstruction, StakeProgram, Struct, SystemInstruction, SystemProgram, Transaction, TransactionInstruction, VALIDATOR_INFO_KEY, VOTE_PROGRAM_ID, ValidatorInfo, VoteAccount, clusterApiUrl, sendAndConfirmRawTransaction, sendAndConfirmTransaction };
 //# sourceMappingURL=index.esm.js.map