@solana/web3.js 1.32.0 → 1.32.1

package/lib/index.cjs.js

@@ -2964,7 +2964,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;
@@ -4909,8 +4910,31 @@ const ParsedConfirmedTransactionMetaResult = superstruct.type({
   preTokenBalances: superstruct.optional(superstruct.nullable(superstruct.array(TokenBalanceResult))),
   postTokenBalances: superstruct.optional(superstruct.nullable(superstruct.array(TokenBalanceResult)))
 });
+/**
+ * Expected JSON RPC response for the "getBlock" message
+ */
+
+const GetBlockRpcResult = jsonRpcResult(superstruct.nullable(superstruct.type({
+  blockhash: superstruct.string(),
+  previousBlockhash: superstruct.string(),
+  parentSlot: superstruct.number(),
+  transactions: superstruct.array(superstruct.type({
+    transaction: ConfirmedTransactionResult,
+    meta: superstruct.nullable(ConfirmedTransactionMetaResult)
+  })),
+  rewards: superstruct.optional(superstruct.array(superstruct.type({
+    pubkey: superstruct.string(),
+    lamports: superstruct.number(),
+    postBalance: superstruct.nullable(superstruct.number()),
+    rewardType: superstruct.nullable(superstruct.string())
+  }))),
+  blockTime: superstruct.nullable(superstruct.number()),
+  blockHeight: superstruct.nullable(superstruct.number())
+})));
 /**
  * Expected JSON RPC response for the "getConfirmedBlock" message
+ *
+ * @deprecated Deprecated since Solana v1.8.0. Please use {@link GetBlockRpcResult} instead.
  */
 
 const GetConfirmedBlockRpcResult = jsonRpcResult(superstruct.nullable(superstruct.type({
@@ -4930,10 +4954,10 @@ const GetConfirmedBlockRpcResult = jsonRpcResult(superstruct.nullable(superstruc
   blockTime: superstruct.nullable(superstruct.number())
 })));
 /**
- * Expected JSON RPC response for the "getConfirmedBlockSignatures" message
+ * Expected JSON RPC response for the "getBlock" message
  */
 
-const GetConfirmedBlockSignaturesRpcResult = jsonRpcResult(superstruct.nullable(superstruct.type({
+const GetBlockSignaturesRpcResult = jsonRpcResult(superstruct.nullable(superstruct.type({
   blockhash: superstruct.string(),
   previousBlockhash: superstruct.string(),
   parentSlot: superstruct.number(),
@@ -4941,20 +4965,20 @@ const GetConfirmedBlockSignaturesRpcResult = jsonRpcResult(superstruct.nullable(
   blockTime: superstruct.nullable(superstruct.number())
 })));
 /**
- * Expected JSON RPC response for the "getConfirmedTransaction" message
+ * Expected JSON RPC response for the "getTransaction" message
  */
 
-const GetConfirmedTransactionRpcResult = jsonRpcResult(superstruct.nullable(superstruct.type({
+const GetTransactionRpcResult = jsonRpcResult(superstruct.nullable(superstruct.type({
   slot: superstruct.number(),
   meta: ConfirmedTransactionMetaResult,
   blockTime: superstruct.optional(superstruct.nullable(superstruct.number())),
   transaction: ConfirmedTransactionResult
 })));
 /**
- * Expected JSON RPC response for the "getConfirmedTransaction" message
+ * Expected parsed JSON RPC response for the "getTransaction" message
  */
 
-const GetParsedConfirmedTransactionRpcResult = jsonRpcResult(superstruct.nullable(superstruct.type({
+const GetParsedTransactionRpcResult = jsonRpcResult(superstruct.nullable(superstruct.type({
   slot: superstruct.number(),
   transaction: ParsedConfirmedTransactionResult,
   meta: superstruct.nullable(ParsedConfirmedTransactionMetaResult),
@@ -4962,6 +4986,8 @@ const GetParsedConfirmedTransactionRpcResult = jsonRpcResult(superstruct.nullabl
 })));
 /**
  * Expected JSON RPC response for the "getRecentBlockhash" message
+ *
+ * @deprecated Deprecated since Solana v1.8.0. Please use {@link GetLatestBlockhashRpcResult} instead.
  */
 
 const GetRecentBlockhashAndContextRpcResult = jsonRpcResultAndContext(superstruct.type({
@@ -4970,6 +4996,14 @@ const GetRecentBlockhashAndContextRpcResult = jsonRpcResultAndContext(superstruc
     lamportsPerSignature: superstruct.number()
   })
 }));
+/**
+ * Expected JSON RPC response for the "getLatestBlockhash" message
+ */
+
+const GetLatestBlockhashRpcResult = jsonRpcResultAndContext(superstruct.type({
+  blockhash: superstruct.string(),
+  lastValidBlockHeight: superstruct.number()
+}));
 const PerfSampleResult = superstruct.type({
   slot: superstruct.number(),
   numTransactions: superstruct.number(),
@@ -5914,6 +5948,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.
    */
 
 
@@ -5949,6 +5985,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.
    */
 
 
@@ -5997,6 +6035,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.
    */
 
 
@@ -6008,6 +6048,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 = superstruct.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
    */
@@ -6046,8 +6118,8 @@ class Connection {
   async getBlock(slot, opts) {
     const args = this._buildArgsAtLeastConfirmed([slot], opts && opts.commitment);
 
-    const unsafeRes = await this._rpcRequest('getConfirmedBlock', args);
-    const res = superstruct.create(unsafeRes, GetConfirmedBlockRpcResult);
+    const unsafeRes = await this._rpcRequest('getBlock', args);
+    const res = superstruct.create(unsafeRes, GetBlockRpcResult);
 
     if ('error' in res) {
       throw new Error('failed to get confirmed block: ' + res.error.message);
@@ -6071,18 +6143,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 = superstruct.create(unsafeRes, GetConfirmedTransactionRpcResult);
+    const unsafeRes = await this._rpcRequest('getTransaction', args);
+    const res = superstruct.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;
@@ -6093,6 +6165,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 = superstruct.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 = superstruct.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.
@@ -6102,18 +6217,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 = superstruct.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,
@@ -6130,7 +6266,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 = superstruct.create(unsafeRes, jsonRpcResult(superstruct.array(superstruct.number())));
 
     if ('error' in res) {
@@ -6139,8 +6275,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 = superstruct.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.
    */
 
 
@@ -6151,7 +6315,7 @@ class Connection {
     });
 
     const unsafeRes = await this._rpcRequest('getConfirmedBlock', args);
-    const res = superstruct.create(unsafeRes, GetConfirmedBlockSignaturesRpcResult);
+    const res = superstruct.create(unsafeRes, GetBlockSignaturesRpcResult);
 
     if ('error' in res) {
       throw new Error('failed to get confirmed block: ' + res.error.message);
@@ -6167,24 +6331,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 = superstruct.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.
    */
 
 
@@ -6192,7 +6365,7 @@ class Connection {
     const args = this._buildArgsAtLeastConfirmed([signature], commitment, 'jsonParsed');
 
     const unsafeRes = await this._rpcRequest('getConfirmedTransaction', args);
-    const res = superstruct.create(unsafeRes, GetParsedConfirmedTransactionRpcResult);
+    const res = superstruct.create(unsafeRes, GetParsedTransactionRpcResult);
 
     if ('error' in res) {
       throw new Error('failed to get confirmed transaction: ' + res.error.message);
@@ -6202,6 +6375,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.
    */
 
 
@@ -6216,7 +6391,7 @@ class Connection {
     });
     const unsafeRes = await this._rpcBatchRequest(batch);
     const res = unsafeRes.map(unsafeRes => {
-      const res = superstruct.create(unsafeRes, GetParsedConfirmedTransactionRpcResult);
+      const res = superstruct.create(unsafeRes, GetParsedTransactionRpcResult);
 
       if ('error' in res) {
         throw new Error('failed to get confirmed transactions: ' + res.error.message);
@@ -6606,6 +6781,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;
     }
@@ -8600,12 +8779,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/'
   }
 };