@solana/web3.js 1.32.0 → 1.32.1

package/lib/index.d.ts

@@ -535,6 +535,8 @@ declare module '@solana/web3.js' {
     skipPreflight?: boolean;
     /** preflight commitment level */
     preflightCommitment?: Commitment;
+    /** Maximum number of times for the RPC node to retry sending the transaction to the leader. */
+    maxRetries?: number;
   };
   /**
    * Options for confirming transactions
@@ -546,6 +548,8 @@ declare module '@solana/web3.js' {
     commitment?: Commitment;
     /** preflight commitment level */
     preflightCommitment?: Commitment;
+    /** Maximum number of times for the RPC node to retry sending the transaction to the leader. */
+    maxRetries?: number;
   };
   /**
    * Options for getConfirmedSignaturesForAddress2
@@ -765,8 +769,14 @@ declare module '@solana/web3.js' {
   };
   /**
    * Metadata for a parsed confirmed transaction on the ledger
+   *
+   * @deprecated Deprecated since Solana v1.8.0. Please use {@link ParsedTransactionMeta} instead.
+   */
+  export type ParsedConfirmedTransactionMeta = ParsedTransactionMeta;
+  /**
+   * Metadata for a parsed transaction on the ledger
    */
-  export type ParsedConfirmedTransactionMeta = {
+  export type ParsedTransactionMeta = {
     /** The fee charged for processing the transaction */
     fee: number;
     /** An array of cross program invoked parsed instructions */
@@ -895,14 +905,20 @@ declare module '@solana/web3.js' {
   };
   /**
    * A parsed and confirmed transaction on the ledger
+   *
+   * @deprecated Deprecated since Solana v1.8.0. Please use {@link ParsedTransactionWithMeta} instead.
+   */
+  export type ParsedConfirmedTransaction = ParsedTransactionWithMeta;
+  /**
+   * A parsed transaction on the ledger with meta
    */
-  export type ParsedConfirmedTransaction = {
+  export type ParsedTransactionWithMeta = {
     /** The slot during which the transaction was processed */
     slot: number;
     /** The details of the transaction */
     transaction: ParsedTransaction;
     /** Metadata produced from the transaction */
-    meta: ParsedConfirmedTransactionMeta | null;
+    meta: ParsedTransactionMeta | null;
     /** The unix timestamp of when the transaction was processed */
     blockTime?: number | null;
   };
@@ -968,9 +984,9 @@ declare module '@solana/web3.js' {
     blockTime: number | null;
   };
   /**
-   * A ConfirmedBlock on the ledger with signatures only
+   * A Block on the ledger with signatures only
    */
-  export type ConfirmedBlockSignatures = {
+  export type BlockSignatures = {
     /** Blockhash of this block */
     blockhash: Blockhash;
     /** Blockhash of this block's parent */
@@ -1644,6 +1660,8 @@ declare module '@solana/web3.js' {
     /**
      * 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.
      */
     getRecentBlockhashAndContext(commitment?: Commitment): Promise<
       RpcResponseAndContext<{
@@ -1658,6 +1676,8 @@ declare module '@solana/web3.js' {
     getRecentPerformanceSamples(limit?: number): Promise<Array<PerfSample>>;
     /**
      * 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.
      */
     getFeeCalculatorForBlockhash(
       blockhash: Blockhash,
@@ -1673,11 +1693,31 @@ declare module '@solana/web3.js' {
     /**
      * 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.
      */
     getRecentBlockhash(commitment?: Commitment): Promise<{
       blockhash: Blockhash;
       feeCalculator: FeeCalculator;
     }>;
+    /**
+     * Fetch the latest blockhash from the cluster
+     * @return {Promise<{blockhash: Blockhash, lastValidBlockHeight: number}>}
+     */
+    getLatestBlockhash(commitment?: Commitment): Promise<{
+      blockhash: Blockhash;
+      lastValidBlockHeight: number;
+    }>;
+    /**
+     * Fetch the latest blockhash from the cluster
+     * @return {Promise<{blockhash: Blockhash, lastValidBlockHeight: number}>}
+     */
+    getLatestBlockhashAndContext(commitment?: Commitment): Promise<
+      RpcResponseAndContext<{
+        blockhash: Blockhash;
+        lastValidBlockHeight: number;
+      }>
+    >;
     /**
      * Fetch the node version
      */
@@ -1696,7 +1736,7 @@ declare module '@solana/web3.js' {
       },
     ): Promise<BlockResponse | null>;
     /**
-     * Fetch a processed transaction from the cluster.
+     * Fetch a confirmed or finalized transaction from the cluster.
      */
     getTransaction(
       signature: string,
@@ -1704,6 +1744,20 @@ declare module '@solana/web3.js' {
         commitment?: Finality;
       },
     ): Promise<TransactionResponse | null>;
+    /**
+     * Fetch parsed transaction details for a confirmed or finalized transaction
+     */
+    getParsedTransaction(
+      signature: TransactionSignature,
+      commitment?: Finality,
+    ): Promise<ParsedConfirmedTransaction | null>;
+    /**
+     * Fetch parsed transaction details for a batch of confirmed transactions
+     */
+    getParsedTransactions(
+      signatures: TransactionSignature[],
+      commitment?: Finality,
+    ): Promise<(ParsedConfirmedTransaction | null)[]>;
     /**
      * Fetch a list of Transactions and transaction statuses from the cluster
      * for a confirmed block.
@@ -1722,15 +1776,26 @@ declare module '@solana/web3.js' {
       endSlot?: number,
       commitment?: Finality,
     ): Promise<Array<number>>;
+    /**
+     * Fetch a list of Signatures from the cluster for a block, excluding rewards
+     */
+    getBlockSignatures(
+      slot: number,
+      commitment?: Finality,
+    ): Promise<BlockSignatures>;
     /**
      * 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.
      */
     getConfirmedBlockSignatures(
       slot: number,
       commitment?: Finality,
-    ): Promise<ConfirmedBlockSignatures>;
+    ): Promise<BlockSignatures>;
     /**
      * Fetch a transaction details for a confirmed transaction
+     *
+     * @deprecated Deprecated since Solana v1.8.0. Please use {@link getTransaction} instead.
      */
     getConfirmedTransaction(
       signature: TransactionSignature,
@@ -1738,6 +1803,8 @@ declare module '@solana/web3.js' {
     ): Promise<ConfirmedTransaction | null>;
     /**
      * Fetch parsed transaction details for a confirmed transaction
+     *
+     * @deprecated Deprecated since Solana v1.8.0. Please use {@link getParsedTransaction} instead.
      */
     getParsedConfirmedTransaction(
       signature: TransactionSignature,
@@ -1745,6 +1812,8 @@ declare module '@solana/web3.js' {
     ): Promise<ParsedConfirmedTransaction | null>;
     /**
      * Fetch parsed transaction details for a batch of confirmed transactions
+     *
+     * @deprecated Deprecated since Solana v1.8.0. Please use {@link getParsedTransactions} instead.
      */
     getParsedConfirmedTransactions(
       signatures: TransactionSignature[],

package/lib/index.esm.js

@@ -2929,7 +2929,8 @@ const SYSVAR_STAKE_HISTORY_PUBKEY = new PublicKey('SysvarStakeHistory11111111111
 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;
@@ -4874,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({
@@ -4895,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(),
@@ -4906,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),
@@ -4927,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({
@@ -4935,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(),
@@ -5879,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.
    */
 
 
@@ -5914,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.
    */
 
 
@@ -5962,6 +6000,8 @@ class Connection {
   /**
    * 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.
    */
 
 
@@ -5973,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
    */
@@ -6011,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);
@@ -6036,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;
@@ -6058,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.
@@ -6067,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,
@@ -6095,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) {
@@ -6104,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.
    */
 
 
@@ -6116,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);
@@ -6132,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.
    */
 
 
@@ -6157,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);
@@ -6167,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.
    */
 
 
@@ -6181,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);
@@ -6571,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;
     }
@@ -8565,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/'
   }
 };