@solana/web3.js 1.31.0 → 1.32.0

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
 	   */
@@ -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.
@@ -19850,16 +19858,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 +20359,7 @@ var solanaWeb3 = (function (exports) {
 	const TokenBalanceResult = type({
 	  accountIndex: number(),
 	  mint: string(),
+	  owner: optional(string()),
 	  uiTokenAmount: TokenAmountResult
 	});
 	/**
@@ -20955,13 +20963,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);
@@ -21442,6 +21462,29 @@ 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}>}
@@ -28755,9 +28798,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
@@ -28768,25 +28812,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.
@@ -28797,7 +28839,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) {
@@ -28806,20 +28849,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
 	 *
@@ -28909,10 +28985,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;