@solana/web3.js 1.31.0 → 1.32.0

package/lib/index.d.ts

@@ -53,6 +53,7 @@ declare module '@solana/web3.js' {
      * Return the base-58 representation of the public key
      */
     toBase58(): string;
+    toJSON(): string;
     /**
      * Return the byte array representation of the public key
      */
@@ -759,6 +760,7 @@ declare module '@solana/web3.js' {
   export type TokenBalance = {
     accountIndex: number;
     mint: string;
+    owner?: string;
     uiTokenAmount: TokenAmount;
   };
   /**
@@ -1188,6 +1190,15 @@ declare module '@solana/web3.js' {
     /** Optional array of filters to apply to accounts */
     filters?: GetProgramAccountsFilter[];
   };
+  /**
+   * Configuration object for getMultipleAccounts
+   */
+  export type GetMultipleAccountsConfig = {
+    /** Optional commitment level */
+    commitment?: Commitment;
+    /** Optional encoding for account data (default base64) */
+    encoding?: 'base64' | 'jsonParsed';
+  };
   /**
    * Information describing an account
    */
@@ -1200,7 +1211,7 @@ declare module '@solana/web3.js' {
     lamports: number;
     /** Optional data assigned to the account */
     data: T;
-    /** Optional rent epoch infor for account */
+    /** Optional rent epoch info for account */
     rentEpoch?: number;
   };
   /**
@@ -1348,7 +1359,7 @@ declare module '@solana/web3.js' {
   export type FetchMiddleware = (
     url: string,
     options: any,
-    fetch: Function,
+    fetch: (modifiedUrl: string, modifiedOptions: any) => void,
   ) => void;
   /**
    * Configuration for instantiating a Connection
@@ -1505,8 +1516,8 @@ declare module '@solana/web3.js' {
      */
     getMultipleAccountsInfo(
       publicKeys: PublicKey[],
-      commitment?: Commitment,
-    ): Promise<(AccountInfo<Buffer> | null)[]>;
+      configOrCommitment?: GetMultipleAccountsConfig | Commitment,
+    ): Promise<(AccountInfo<Buffer | ParsedAccountData> | null)[]>;
     /**
      * Returns epoch activation information for a stake account that has been delegated
      */
@@ -1652,6 +1663,13 @@ declare module '@solana/web3.js' {
       blockhash: Blockhash,
       commitment?: Commitment,
     ): Promise<RpcResponseAndContext<FeeCalculator | null>>;
+    /**
+     * Fetch the fee for a message from the cluster, return with context
+     */
+    getFeeForMessage(
+      message: Message,
+      commitment?: Commitment,
+    ): Promise<RpcResponseAndContext<number>>;
     /**
      * Fetch a recent blockhash from the cluster
      * @return {Promise<{blockhash: Blockhash, feeCalculator: FeeCalculator}>}
@@ -2824,20 +2842,32 @@ declare module '@solana/web3.js' {
     credits: number;
     prevCredits: number;
   };
+  export type AuthorizedVoter = {
+    epoch: number;
+    authorizedVoter: PublicKey;
+  };
+  export type PriorVoter = {
+    authorizedPubkey: PublicKey;
+    epochOfLastAuthorizedSwitch: number;
+    targetEpoch: number;
+  };
+  export type BlockTimestamp = {
+    slot: number;
+    timetamp: number;
+  };
   /**
    * VoteAccount class
    */
   export class VoteAccount {
     nodePubkey: PublicKey;
-    authorizedVoterPubkey: PublicKey;
-    authorizedWithdrawerPubkey: PublicKey;
+    authorizedWithdrawer: PublicKey;
     commission: number;
-    votes: Array<Lockout>;
     rootSlot: number | null;
-    epoch: number;
-    credits: number;
-    lastEpochCredits: number;
-    epochCredits: Array<EpochCredits>;
+    votes: Lockout[];
+    authorizedVoters: AuthorizedVoter[];
+    priorVoters: PriorVoter[];
+    epochCredits: EpochCredits[];
+    lastTimestamp: BlockTimestamp;
     /**
      * Deserialize VoteAccount from the account data.
      *
@@ -2850,11 +2880,14 @@ declare module '@solana/web3.js' {
   }
 
   export const SYSVAR_CLOCK_PUBKEY: PublicKey;
+  export const SYSVAR_EPOCH_SCHEDULE_PUBKEY: PublicKey;
+  export const SYSVAR_INSTRUCTIONS_PUBKEY: PublicKey;
   export const SYSVAR_RECENT_BLOCKHASHES_PUBKEY: PublicKey;
   export const SYSVAR_RENT_PUBKEY: PublicKey;
   export const SYSVAR_REWARDS_PUBKEY: PublicKey;
+  export const SYSVAR_SLOT_HASHES_PUBKEY: PublicKey;
+  export const SYSVAR_SLOT_HISTORY_PUBKEY: PublicKey;
   export const SYSVAR_STAKE_HISTORY_PUBKEY: PublicKey;
-  export const SYSVAR_INSTRUCTIONS_PUBKEY: PublicKey;
 
   export class SendTransactionError extends Error {
     logs: string[] | undefined;

package/lib/index.esm.js

@@ -1805,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
    */
@@ -2444,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
 
@@ -2901,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.
@@ -4323,16 +4331,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);
     };
   }
 
@@ -4826,6 +4833,7 @@ const ParsedConfirmedTransactionResult = type({
 const TokenBalanceResult = type({
   accountIndex: number(),
   mint: string(),
+  owner: optional(string()),
   uiTokenAmount: TokenAmountResult
 });
 /**
@@ -5429,13 +5437,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);
@@ -5916,6 +5936,29 @@ 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}>}
@@ -8395,9 +8438,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
@@ -8408,25 +8452,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.
@@ -8437,7 +8479,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) {
@@ -8446,20 +8489,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
  *
@@ -8523,5 +8599,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