@solana/web3.js 1.96.0 → 1.98.0

package/lib/index.native.js

@@ -5005,18 +5005,6 @@ const GetParsedTransactionRpcResult = jsonRpcResult(superstruct.nullable(superst
   version: superstruct.optional(TransactionVersionStruct)
 })));
 
-/**
- * Expected JSON RPC response for the "getRecentBlockhash" message
- *
- * @deprecated Deprecated since RPC v1.8.0. Please use {@link GetLatestBlockhashRpcResult} instead.
- */
-const GetRecentBlockhashAndContextRpcResult = jsonRpcResultAndContext(superstruct.type({
-  blockhash: superstruct.string(),
-  feeCalculator: superstruct.type({
-    lamportsPerSignature: superstruct.number()
-  })
-}));
-
 /**
  * Expected JSON RPC response for the "getLatestBlockhash" message
  */
@@ -6394,13 +6382,27 @@ class Connection {
    * @deprecated Deprecated since RPC v1.9.0. Please use {@link getLatestBlockhash} instead.
    */
   async getRecentBlockhashAndContext(commitment) {
-    const args = this._buildArgs([], commitment);
-    const unsafeRes = await this._rpcRequest('getRecentBlockhash', args);
-    const res = superstruct.create(unsafeRes, GetRecentBlockhashAndContextRpcResult);
-    if ('error' in res) {
-      throw new SolanaJSONRPCError(res.error, 'failed to get recent blockhash');
-    }
-    return res.result;
+    const {
+      context,
+      value: {
+        blockhash
+      }
+    } = await this.getLatestBlockhashAndContext(commitment);
+    const feeCalculator = {
+      get lamportsPerSignature() {
+        throw new Error('The capability to fetch `lamportsPerSignature` using the `getRecentBlockhash` API is ' + 'no longer offered by the network. Use the `getFeeForMessage` API to obtain the fee ' + 'for a given message.');
+      },
+      toJSON() {
+        return {};
+      }
+    };
+    return {
+      context,
+      value: {
+        blockhash,
+        feeCalculator
+      }
+    };
   }
 
   /**
@@ -6959,7 +6961,7 @@ class Connection {
    */
   async getConfirmedTransaction(signature, commitment) {
     const args = this._buildArgsAtLeastConfirmed([signature], commitment);
-    const unsafeRes = await this._rpcRequest('getConfirmedTransaction', args);
+    const unsafeRes = await this._rpcRequest('getTransaction', args);
     const res = superstruct.create(unsafeRes, GetTransactionRpcResult);
     if ('error' in res) {
       throw new SolanaJSONRPCError(res.error, 'failed to get transaction');
@@ -6981,7 +6983,7 @@ class Connection {
    */
   async getParsedConfirmedTransaction(signature, commitment) {
     const args = this._buildArgsAtLeastConfirmed([signature], commitment, 'jsonParsed');
-    const unsafeRes = await this._rpcRequest('getConfirmedTransaction', args);
+    const unsafeRes = await this._rpcRequest('getTransaction', args);
     const res = superstruct.create(unsafeRes, GetParsedTransactionRpcResult);
     if ('error' in res) {
       throw new SolanaJSONRPCError(res.error, 'failed to get confirmed transaction');
@@ -6998,7 +7000,7 @@ class Connection {
     const batch = signatures.map(signature => {
       const args = this._buildArgsAtLeastConfirmed([signature], commitment, 'jsonParsed');
       return {
-        methodName: 'getConfirmedTransaction',
+        methodName: 'getTransaction',
         args
       };
     });