@solana/web3.js 1.30.2 → 1.32.2

package/lib/index.iife.js

@@ -11124,6 +11124,10 @@ var solanaWeb3 = (function (exports) {
 	  toBase58() {
 	    return bs58$1.encode(this.toBytes());
 	  }
+
+	  toJSON() {
+	    return this.toBase58();
+	  }
 	  /**
 	   * Return the byte array representation of the public key
 	   */
@@ -11313,9 +11317,9 @@ var solanaWeb3 = (function (exports) {
 	    this._keypair = void 0;
 
 	    if (secretKey) {
-	      this._keypair = naclFast.exports.sign.keyPair.fromSecretKey(toBuffer(secretKey));
+	      this._keypair = nacl.sign.keyPair.fromSecretKey(toBuffer(secretKey));
 	    } else {
-	      this._keypair = naclFast.exports.sign.keyPair();
+	      this._keypair = nacl.sign.keyPair();
 	    }
 	  }
 	  /**
@@ -14347,8 +14351,9 @@ var solanaWeb3 = (function (exports) {
 	    }); // 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
 
@@ -14804,11 +14809,14 @@ var solanaWeb3 = (function (exports) {
 	}
 
 	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.
@@ -14824,7 +14832,8 @@ var solanaWeb3 = (function (exports) {
 	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;
@@ -19850,16 +19859,15 @@ var solanaWeb3 = (function (exports) {
 	  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);
 	    };
 	  }
 
@@ -20352,6 +20360,7 @@ var solanaWeb3 = (function (exports) {
 	const TokenBalanceResult = type({
 	  accountIndex: number(),
 	  mint: string(),
+	  owner: optional(string()),
 	  uiTokenAmount: TokenAmountResult
 	});
 	/**
@@ -20392,8 +20401,31 @@ var solanaWeb3 = (function (exports) {
 	  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({
@@ -20413,10 +20445,10 @@ var solanaWeb3 = (function (exports) {
 	  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(),
@@ -20424,20 +20456,20 @@ var solanaWeb3 = (function (exports) {
 	  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),
@@ -20445,6 +20477,8 @@ var solanaWeb3 = (function (exports) {
 	})));
 	/**
 	 * Expected JSON RPC response for the "getRecentBlockhash" message
+	 *
+	 * @deprecated Deprecated since Solana v1.8.0. Please use {@link GetLatestBlockhashRpcResult} instead.
 	 */
 
 	const GetRecentBlockhashAndContextRpcResult = jsonRpcResultAndContext(type({
@@ -20453,6 +20487,14 @@ var solanaWeb3 = (function (exports) {
 	    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(),
@@ -20955,13 +20997,25 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  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);
@@ -21385,6 +21439,8 @@ var solanaWeb3 = (function (exports) {
 	  /**
 	   * 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.
 	   */
 
 
@@ -21420,6 +21476,8 @@ var solanaWeb3 = (function (exports) {
 	  }
 	  /**
 	   * 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.
 	   */
 
 
@@ -21442,9 +21500,34 @@ var solanaWeb3 = (function (exports) {
 	      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.
 	   */
 
 
@@ -21456,6 +21539,38 @@ var solanaWeb3 = (function (exports) {
 	      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
 	   */
@@ -21494,8 +21609,8 @@ var solanaWeb3 = (function (exports) {
 	  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);
@@ -21519,18 +21634,18 @@ var solanaWeb3 = (function (exports) {
 	    };
 	  }
 	  /**
-	   * 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;
@@ -21541,6 +21656,49 @@ var solanaWeb3 = (function (exports) {
 	      }
 	    };
 	  }
+	  /**
+	   * 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.
@@ -21550,18 +21708,39 @@ var solanaWeb3 = (function (exports) {
 
 
 	  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,
@@ -21578,7 +21757,7 @@ var solanaWeb3 = (function (exports) {
 	  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) {
@@ -21587,8 +21766,36 @@ var solanaWeb3 = (function (exports) {
 
 	    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.
 	   */
 
 
@@ -21599,7 +21806,7 @@ var solanaWeb3 = (function (exports) {
 	    });
 
 	    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);
@@ -21615,24 +21822,33 @@ var solanaWeb3 = (function (exports) {
 	  }
 	  /**
 	   * 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.
 	   */
 
 
@@ -21640,7 +21856,7 @@ var solanaWeb3 = (function (exports) {
 	    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);
@@ -21650,6 +21866,8 @@ var solanaWeb3 = (function (exports) {
 	  }
 	  /**
 	   * Fetch parsed transaction details for a batch of confirmed transactions
+	   *
+	   * @deprecated Deprecated since Solana v1.8.0. Please use {@link getParsedTransactions} instead.
 	   */
 
 
@@ -21664,7 +21882,7 @@ var solanaWeb3 = (function (exports) {
 	    });
 	    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);
@@ -22054,6 +22272,10 @@ var solanaWeb3 = (function (exports) {
 	    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;
 	    }
@@ -22208,7 +22430,14 @@ var solanaWeb3 = (function (exports) {
 	        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);
 	      }
 
@@ -22779,7 +23008,7 @@ var solanaWeb3 = (function (exports) {
 	    if (keypair) {
 	      this._keypair = keypair;
 	    } else {
-	      this._keypair = naclFast.exports.sign.keyPair();
+	      this._keypair = nacl.sign.keyPair();
 	    }
 	  }
 	  /**
@@ -22788,7 +23017,7 @@ var solanaWeb3 = (function (exports) {
 
 
 	  static generate() {
-	    return new Keypair(naclFast.exports.sign.keyPair());
+	    return new Keypair(nacl.sign.keyPair());
 	  }
 	  /**
 	   * Create a keypair from a raw secret key byte array.
@@ -22805,14 +23034,14 @@ var solanaWeb3 = (function (exports) {
 
 
 	  static fromSecretKey(secretKey, options) {
-	    const keypair = naclFast.exports.sign.keyPair.fromSecretKey(secretKey);
+	    const keypair = nacl.sign.keyPair.fromSecretKey(secretKey);
 
 	    if (!options || !options.skipValidation) {
 	      const encoder = new TextEncoder();
 	      const signData = encoder.encode('@solana/web3.js-validation-v1');
-	      const signature = naclFast.exports.sign.detached(signData, keypair.secretKey);
+	      const signature = nacl.sign.detached(signData, keypair.secretKey);
 
-	      if (!naclFast.exports.sign.detached.verify(signData, signature, keypair.publicKey)) {
+	      if (!nacl.sign.detached.verify(signData, signature, keypair.publicKey)) {
 	        throw new Error('provided secretKey is invalid');
 	      }
 	    }
@@ -22827,7 +23056,7 @@ var solanaWeb3 = (function (exports) {
 
 
 	  static fromSeed(seed) {
-	    return new Keypair(naclFast.exports.sign.keyPair.fromSeed(seed));
+	    return new Keypair(nacl.sign.keyPair.fromSeed(seed));
 	  }
 	  /**
 	   * The public key for this keypair
@@ -27865,7 +28094,7 @@ var solanaWeb3 = (function (exports) {
 
 	var secp256k1 = elliptic;
 
-	var sha3 = {exports: {}};
+	var sha3$1 = {exports: {}};
 
 	/**
 	 * [js-sha3]{@link https://github.com/emn178/js-sha3}
@@ -28518,7 +28747,9 @@ var solanaWeb3 = (function (exports) {
 	    }
 	  }
 	})();
-	}(sha3));
+	}(sha3$1));
+
+	var sha3 = sha3$1.exports;
 
 	const {
 	  publicKeyCreate,
@@ -28551,7 +28782,7 @@ var solanaWeb3 = (function (exports) {
 	    assert$c(publicKey.length === PUBLIC_KEY_BYTES, `Public key must be ${PUBLIC_KEY_BYTES} bytes but received ${publicKey.length} bytes`);
 
 	    try {
-	      return buffer.Buffer.from(sha3.exports.keccak_256.update(toBuffer(publicKey)).digest()).slice(-ETHEREUM_ADDRESS_BYTES);
+	      return buffer.Buffer.from(sha3.keccak_256.update(toBuffer(publicKey)).digest()).slice(-ETHEREUM_ADDRESS_BYTES);
 	    } catch (error) {
 	      throw new Error(`Error constructing Ethereum address: ${error}`);
 	    }
@@ -28649,7 +28880,7 @@ var solanaWeb3 = (function (exports) {
 	      const privateKey = toBuffer(pkey);
 	      const publicKey = publicKeyCreate(privateKey, false).slice(1); // throw away leading byte
 
-	      const messageHash = buffer.Buffer.from(sha3.exports.keccak_256.update(toBuffer(message)).digest());
+	      const messageHash = buffer.Buffer.from(sha3.keccak_256.update(toBuffer(message)).digest());
 	      const {
 	        signature,
 	        recid: recoveryId
@@ -28753,9 +28984,10 @@ var solanaWeb3 = (function (exports) {
 	 *
 	 * @internal
 	 */
-	const VoteAccountLayout = struct([publicKey('nodePubkey'), publicKey('authorizedVoterPubkey'), publicKey('authorizedWithdrawerPubkey'), u8('commission'), nu64(), // votes.length
-	seq(struct([nu64('slot'), u32('confirmationCount')]), offset(u32(), -8), 'votes'), u8('rootSlotValid'), nu64('rootSlot'), nu64('epoch'), nu64('credits'), nu64('lastEpochCredits'), nu64(), // epochCredits.length
-	seq(struct([nu64('epoch'), nu64('credits'), nu64('prevCredits')]), offset(u32(), -8), 'epochCredits')]);
+	const VoteAccountLayout = struct([publicKey('nodePubkey'), publicKey('authorizedWithdrawer'), u8('commission'), nu64(), // votes.length
+	seq(struct([nu64('slot'), u32('confirmationCount')]), offset(u32(), -8), 'votes'), u8('rootSlotValid'), nu64('rootSlot'), nu64(), // authorizedVoters.length
+	seq(struct([nu64('epoch'), publicKey('authorizedVoter')]), offset(u32(), -8), 'authorizedVoters'), struct([seq(struct([publicKey('authorizedPubkey'), nu64('epochOfLastAuthorizedSwitch'), nu64('targetEpoch')]), 32, 'buf'), nu64('idx'), u8('isEmpty')], 'priorVoters'), nu64(), // epochCredits.length
+	seq(struct([nu64('epoch'), nu64('credits'), nu64('prevCredits')]), offset(u32(), -8), 'epochCredits'), struct([nu64('slot'), nu64('timestamp')], 'lastTimestamp')]);
 
 	/**
 	 * VoteAccount class
@@ -28766,25 +28998,23 @@ var solanaWeb3 = (function (exports) {
 	   */
 	  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.
@@ -28795,7 +29025,8 @@ var solanaWeb3 = (function (exports) {
 
 
 	  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) {
@@ -28804,20 +29035,53 @@ var solanaWeb3 = (function (exports) {
 
 	    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
 	 *
@@ -28847,12 +29111,12 @@ var solanaWeb3 = (function (exports) {
 	  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/'
 	  }
 	};
 
@@ -28907,10 +29171,13 @@ var solanaWeb3 = (function (exports) {
 	exports.STAKE_INSTRUCTION_LAYOUTS = STAKE_INSTRUCTION_LAYOUTS;
 	exports.SYSTEM_INSTRUCTION_LAYOUTS = SYSTEM_INSTRUCTION_LAYOUTS;
 	exports.SYSVAR_CLOCK_PUBKEY = SYSVAR_CLOCK_PUBKEY;
+	exports.SYSVAR_EPOCH_SCHEDULE_PUBKEY = SYSVAR_EPOCH_SCHEDULE_PUBKEY;
 	exports.SYSVAR_INSTRUCTIONS_PUBKEY = SYSVAR_INSTRUCTIONS_PUBKEY;
 	exports.SYSVAR_RECENT_BLOCKHASHES_PUBKEY = SYSVAR_RECENT_BLOCKHASHES_PUBKEY;
 	exports.SYSVAR_RENT_PUBKEY = SYSVAR_RENT_PUBKEY;
 	exports.SYSVAR_REWARDS_PUBKEY = SYSVAR_REWARDS_PUBKEY;
+	exports.SYSVAR_SLOT_HASHES_PUBKEY = SYSVAR_SLOT_HASHES_PUBKEY;
+	exports.SYSVAR_SLOT_HISTORY_PUBKEY = SYSVAR_SLOT_HISTORY_PUBKEY;
 	exports.SYSVAR_STAKE_HISTORY_PUBKEY = SYSVAR_STAKE_HISTORY_PUBKEY;
 	exports.Secp256k1Program = Secp256k1Program;
 	exports.SendTransactionError = SendTransactionError;