@solana/web3.js 1.30.2 → 1.32.2

package/lib/index.esm.js

@@ -1,5 +1,4 @@
-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';
@@ -12,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)) {
@@ -1806,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
    */
@@ -1925,7 +1928,7 @@ SOLANA_SCHEMA.set(PublicKey, {
   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
 
@@ -2445,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
 
@@ -2700,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));
     });
@@ -2756,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;
         }
       }
@@ -2902,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.
@@ -2922,7 +2929,8 @@ 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;
@@ -4324,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);
     };
   }
 
@@ -4827,6 +4834,7 @@ const ParsedConfirmedTransactionResult = type({
 const TokenBalanceResult = type({
   accountIndex: number(),
   mint: string(),
+  owner: optional(string()),
   uiTokenAmount: TokenAmountResult
 });
 /**
@@ -4867,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({
@@ -4888,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(),
@@ -4899,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),
@@ -4920,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({
@@ -4928,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(),
@@ -5430,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';
 
-    const args = this._buildArgs([keys], commitment, '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, 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);
@@ -5860,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.
    */
 
 
@@ -5895,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.
    */
 
 
@@ -5917,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.
    */
 
 
@@ -5931,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
    */
@@ -5969,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);
@@ -5994,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;
@@ -6016,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.
@@ -6025,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,
@@ -6053,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) {
@@ -6062,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.
    */
 
 
@@ -6074,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);
@@ -6090,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.
    */
 
 
@@ -6115,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);
@@ -6125,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.
    */
 
 
@@ -6139,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);
@@ -6529,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;
     }
@@ -6683,7 +6904,14 @@ class Connection {
         this._rpcWebSocketIdleTimeout = setTimeout(() => {
           this._rpcWebSocketIdleTimeout = null;
 
-          this._rpcWebSocket.close();
+          try {
+            this._rpcWebSocket.close();
+          } catch (err) {
+            // swallow error if socket has already been closed.
+            if (err instanceof Error) {
+              console.log(`Error when closing socket connection: ${err.message}`);
+            }
+          }
         }, 500);
       }
 
@@ -7397,7 +7625,7 @@ class Ed25519Program {
     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,
@@ -8194,7 +8422,7 @@ class Secp256k1Program {
     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: ${error}`);
     }
@@ -8292,7 +8520,7 @@ class Secp256k1Program {
       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
@@ -8396,9 +8624,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
@@ -8409,25 +8638,23 @@ class VoteAccount {
    */
   constructor(args) {
     this.nodePubkey = void 0;
-    this.authorizedVoterPubkey = void 0;
-    this.authorizedWithdrawerPubkey = void 0;
+    this.authorizedWithdrawer = 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.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.
@@ -8438,7 +8665,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) {
@@ -8447,20 +8675,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
  *
@@ -8490,12 +8751,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/'
   }
 };
 
@@ -8524,5 +8785,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