@solana/web3.js 1.13.1 → 1.14.1

package/lib/index.cjs.js

@@ -2974,10 +2974,6 @@ const GetSignatureStatusesRpcResult = jsonRpcResultAndContext(superstruct.array(
  */
 
 const GetMinimumBalanceForRentExemptionRpcResult = jsonRpcResult(superstruct.number());
-/**
- * @internal
- */
-
 const ConfirmedTransactionResult = superstruct.type({
   signatures: superstruct.array(superstruct.string()),
   message: superstruct.type({
@@ -2995,13 +2991,6 @@ const ConfirmedTransactionResult = superstruct.type({
     recentBlockhash: superstruct.string()
   })
 });
-const TransactionFromConfirmed = superstruct.coerce(superstruct.instance(Transaction), ConfirmedTransactionResult, result => {
-  const {
-    message,
-    signatures
-  } = result;
-  return Transaction.populate(new Message(message), signatures);
-});
 const ParsedInstructionResult = superstruct.type({
   parsed: superstruct.unknown(),
   program: superstruct.string(),
@@ -3097,7 +3086,7 @@ const GetConfirmedBlockRpcResult = jsonRpcResult(superstruct.nullable(superstruc
   previousBlockhash: superstruct.string(),
   parentSlot: superstruct.number(),
   transactions: superstruct.array(superstruct.type({
-    transaction: TransactionFromConfirmed,
+    transaction: ConfirmedTransactionResult,
     meta: superstruct.nullable(ConfirmedTransactionMetaResult)
   })),
   rewards: superstruct.optional(superstruct.array(superstruct.type({
@@ -3125,9 +3114,9 @@ const GetConfirmedBlockSignaturesRpcResult = jsonRpcResult(superstruct.nullable(
 
 const GetConfirmedTransactionRpcResult = jsonRpcResult(superstruct.nullable(superstruct.type({
   slot: superstruct.number(),
-  transaction: TransactionFromConfirmed,
   meta: ConfirmedTransactionMetaResult,
-  blockTime: superstruct.optional(superstruct.nullable(superstruct.number()))
+  blockTime: superstruct.optional(superstruct.nullable(superstruct.number())),
+  transaction: ConfirmedTransactionResult
 })));
 /**
  * Expected JSON RPC response for the "getConfirmedTransaction" message
@@ -3940,7 +3929,8 @@ class Connection {
   }
   /**
    * Fetch the current total currency supply of the cluster in lamports
-   * @deprecated Deprecated since v1.2.8. Use `Connection.getSupply()` instead.
+   *
+   * @deprecated Deprecated since v1.2.8. Please use {@link getSupply} instead.
    */
 
 
@@ -4149,13 +4139,12 @@ class Connection {
     return res.result;
   }
   /**
-   * Fetch a list of Transactions and transaction statuses from the cluster
-   * for a confirmed block
+   * Fetch a processed block from the cluster.
    */
 
 
-  async getConfirmedBlock(slot, commitment) {
-    const args = this._buildArgsAtLeastConfirmed([slot], commitment);
+  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);
@@ -4165,12 +4154,73 @@ class Connection {
     }
 
     const result = res.result;
+    if (!result) return result;
+    return { ...result,
+      transactions: result.transactions.map(({
+        transaction,
+        meta
+      }) => {
+        const message = new Message(transaction.message);
+        return {
+          meta,
+          transaction: { ...transaction,
+            message
+          }
+        };
+      })
+    };
+  }
+  /**
+   * Fetch a processed 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);
+
+    if ('error' in res) {
+      throw new Error('failed to get confirmed transaction: ' + res.error.message);
+    }
+
+    const result = res.result;
+    if (!result) return result;
+    return { ...result,
+      transaction: { ...result.transaction,
+        message: new Message(result.transaction.message)
+      }
+    };
+  }
+  /**
+   * Fetch a list of Transactions and transaction statuses from the cluster
+   * for a confirmed block.
+   *
+   * @deprecated Deprecated since v1.13.0. Please use {@link getBlock} instead.
+   */
+
+
+  async getConfirmedBlock(slot, commitment) {
+    const result = await this.getBlock(slot, {
+      commitment
+    });
 
     if (!result) {
       throw new Error('Confirmed block ' + slot + ' not found');
     }
 
-    return result;
+    return { ...result,
+      transactions: result.transactions.map(({
+        transaction,
+        meta
+      }) => {
+        return {
+          meta,
+          transaction: Transaction.populate(transaction.message, transaction.signatures)
+        };
+      })
+    };
   }
   /**
    * Fetch a list of Signatures from the cluster for a confirmed block, excluding rewards
@@ -4204,16 +4254,17 @@ class Connection {
 
 
   async getConfirmedTransaction(signature, commitment) {
-    const args = this._buildArgsAtLeastConfirmed([signature], commitment);
-
-    const unsafeRes = await this._rpcRequest('getConfirmedTransaction', args);
-    const res = superstruct.create(unsafeRes, GetConfirmedTransactionRpcResult);
-
-    if ('error' in res) {
-      throw new Error('failed to get confirmed transaction: ' + res.error.message);
-    }
-
-    return res.result;
+    const result = await this.getTransaction(signature, {
+      commitment
+    });
+    if (!result) return result;
+    const {
+      message,
+      signatures
+    } = result.transaction;
+    return { ...result,
+      transaction: Transaction.populate(message, signatures)
+    };
   }
   /**
    * Fetch parsed transaction details for a confirmed transaction
@@ -4261,7 +4312,8 @@ class Connection {
   /**
    * Fetch a list of all the confirmed signatures for transactions involving an address
    * within a specified slot range. Max range allowed is 10,000 slots.
-   * @deprecated Deprecated since v1.3. Use `Connection.getConfirmedSignaturesForAddress2()` instead.
+   *
+   * @deprecated Deprecated since v1.3. Please use {@link getConfirmedSignaturesForAddress2} instead.
    *
    * @param address queried address
    * @param startSlot start slot, inclusive