@solana/web3.js 1.67.1 → 1.68.0

package/lib/index.browser.esm.js

@@ -4325,6 +4325,16 @@ const ConfirmedTransactionResult = type({
     addressTableLookups: optional(array(AddressTableLookupStruct))
   })
 });
+const AnnotatedAccountKey = type({
+  pubkey: PublicKeyFromString,
+  signer: boolean(),
+  writable: boolean(),
+  source: optional(union([literal('transaction'), literal('lookupTable')]))
+});
+const ConfirmedTransactionAccountsModeResult = type({
+  accountKeys: array(AnnotatedAccountKey),
+  signatures: array(string())
+});
 const ParsedInstructionResult = type({
   parsed: unknown(),
   program: string(),
@@ -4359,12 +4369,7 @@ const ParsedOrRawInstruction = coerce(InstructionResult, UnknownInstructionResul
 const ParsedConfirmedTransactionResult = type({
   signatures: array(string()),
   message: type({
-    accountKeys: array(type({
-      pubkey: PublicKeyFromString,
-      signer: boolean(),
-      writable: boolean(),
-      source: optional(union([literal('transaction'), literal('lookupTable')]))
-    })),
+    accountKeys: array(AnnotatedAccountKey),
     instructions: array(ParsedOrRawInstruction),
     recentBlockhash: string(),
     addressTableLookups: optional(nullable(array(AddressTableLookupStruct)))
@@ -4423,6 +4428,14 @@ const ParsedConfirmedTransactionMetaResult = type({
   computeUnitsConsumed: optional(number())
 });
 const TransactionVersionStruct = union([literal(0), literal('legacy')]);
+/** @internal */
+
+const RewardsResult = type({
+  pubkey: string(),
+  lamports: number(),
+  postBalance: nullable(number()),
+  rewardType: nullable(string())
+});
 /**
  * Expected JSON RPC response for the "getBlock" message
  */
@@ -4436,12 +4449,36 @@ const GetBlockRpcResult = jsonRpcResult(nullable(type({
     meta: nullable(ConfirmedTransactionMetaResult),
     version: optional(TransactionVersionStruct)
   })),
-  rewards: optional(array(type({
-    pubkey: string(),
-    lamports: number(),
-    postBalance: nullable(number()),
-    rewardType: nullable(string())
-  }))),
+  rewards: optional(array(RewardsResult)),
+  blockTime: nullable(number()),
+  blockHeight: nullable(number())
+})));
+/**
+ * Expected JSON RPC response for the "getBlock" message when `transactionDetails` is `none`
+ */
+
+const GetNoneModeBlockRpcResult = jsonRpcResult(nullable(type({
+  blockhash: string(),
+  previousBlockhash: string(),
+  parentSlot: number(),
+  rewards: optional(array(RewardsResult)),
+  blockTime: nullable(number()),
+  blockHeight: nullable(number())
+})));
+/**
+ * Expected JSON RPC response for the "getBlock" message when `transactionDetails` is `accounts`
+ */
+
+const GetAccountsModeBlockRpcResult = jsonRpcResult(nullable(type({
+  blockhash: string(),
+  previousBlockhash: string(),
+  parentSlot: number(),
+  transactions: array(type({
+    transaction: ConfirmedTransactionAccountsModeResult,
+    meta: nullable(ConfirmedTransactionMetaResult),
+    version: optional(TransactionVersionStruct)
+  })),
+  rewards: optional(array(RewardsResult)),
   blockTime: nullable(number()),
   blockHeight: nullable(number())
 })));
@@ -4458,12 +4495,36 @@ const GetParsedBlockRpcResult = jsonRpcResult(nullable(type({
     meta: nullable(ParsedConfirmedTransactionMetaResult),
     version: optional(TransactionVersionStruct)
   })),
-  rewards: optional(array(type({
-    pubkey: string(),
-    lamports: number(),
-    postBalance: nullable(number()),
-    rewardType: nullable(string())
-  }))),
+  rewards: optional(array(RewardsResult)),
+  blockTime: nullable(number()),
+  blockHeight: nullable(number())
+})));
+/**
+ * Expected parsed JSON RPC response for the "getBlock" message  when `transactionDetails` is `accounts`
+ */
+
+const GetParsedAccountsModeBlockRpcResult = jsonRpcResult(nullable(type({
+  blockhash: string(),
+  previousBlockhash: string(),
+  parentSlot: number(),
+  transactions: array(type({
+    transaction: ConfirmedTransactionAccountsModeResult,
+    meta: nullable(ParsedConfirmedTransactionMetaResult),
+    version: optional(TransactionVersionStruct)
+  })),
+  rewards: optional(array(RewardsResult)),
+  blockTime: nullable(number()),
+  blockHeight: nullable(number())
+})));
+/**
+ * Expected parsed JSON RPC response for the "getBlock" message  when `transactionDetails` is `none`
+ */
+
+const GetParsedNoneModeBlockRpcResult = jsonRpcResult(nullable(type({
+  blockhash: string(),
+  previousBlockhash: string(),
+  parentSlot: number(),
+  rewards: optional(array(RewardsResult)),
   blockTime: nullable(number()),
   blockHeight: nullable(number())
 })));
@@ -4481,12 +4542,7 @@ const GetConfirmedBlockRpcResult = jsonRpcResult(nullable(type({
     transaction: ConfirmedTransactionResult,
     meta: nullable(ConfirmedTransactionMetaResult)
   })),
-  rewards: optional(array(type({
-    pubkey: string(),
-    lamports: number(),
-    postBalance: nullable(number()),
-    rewardType: nullable(string())
-  }))),
+  rewards: optional(array(RewardsResult)),
   blockTime: nullable(number())
 })));
 /**
@@ -5983,7 +6039,7 @@ class Connection {
 
 
   async getFeeForMessage(message, commitment) {
-    const wireMessage = message.serialize().toString('base64');
+    const wireMessage = toBuffer(message.serialize()).toString('base64');
 
     const args = this._buildArgs([wireMessage], commitment);
 
@@ -6108,33 +6164,67 @@ class Connection {
     , config);
 
     const unsafeRes = await this._rpcRequest('getBlock', args);
-    const res = create(unsafeRes, GetBlockRpcResult);
 
-    if ('error' in res) {
-      throw new SolanaJSONRPCError(res.error, 'failed to get confirmed block');
-    }
+    try {
+      switch (config === null || config === void 0 ? void 0 : config.transactionDetails) {
+        case 'accounts':
+          {
+            const res = create(unsafeRes, GetAccountsModeBlockRpcResult);
 
-    const result = res.result;
-    if (!result) return result;
-    return { ...result,
-      transactions: result.transactions.map(({
-        transaction,
-        meta,
-        version
-      }) => ({
-        meta,
-        transaction: { ...transaction,
-          message: versionedMessageFromResponse(version, transaction.message)
-        },
-        version
-      }))
-    };
+            if ('error' in res) {
+              throw res.error;
+            }
+
+            return res.result;
+          }
+
+        case 'none':
+          {
+            const res = create(unsafeRes, GetNoneModeBlockRpcResult);
+
+            if ('error' in res) {
+              throw res.error;
+            }
+
+            return res.result;
+          }
+
+        default:
+          {
+            const res = create(unsafeRes, GetBlockRpcResult);
+
+            if ('error' in res) {
+              throw res.error;
+            }
+
+            const {
+              result
+            } = res;
+            return result ? { ...result,
+              transactions: result.transactions.map(({
+                transaction,
+                meta,
+                version
+              }) => ({
+                meta,
+                transaction: { ...transaction,
+                  message: versionedMessageFromResponse(version, transaction.message)
+                },
+                version
+              }))
+            } : null;
+          }
+      }
+    } catch (e) {
+      throw new SolanaJSONRPCError(e, 'failed to get confirmed block');
+    }
   }
   /**
    * Fetch parsed transaction details for a confirmed or finalized block
    */
 
 
+  // eslint-disable-next-line no-dupe-class-members
   async getParsedBlock(slot, rawConfig) {
     const {
       commitment,
@@ -6144,13 +6234,45 @@ class Connection {
     const args = this._buildArgsAtLeastConfirmed([slot], commitment, 'jsonParsed', config);
 
     const unsafeRes = await this._rpcRequest('getBlock', args);
-    const res = create(unsafeRes, GetParsedBlockRpcResult);
 
-    if ('error' in res) {
-      throw new SolanaJSONRPCError(res.error, 'failed to get block');
-    }
+    try {
+      switch (config === null || config === void 0 ? void 0 : config.transactionDetails) {
+        case 'accounts':
+          {
+            const res = create(unsafeRes, GetParsedAccountsModeBlockRpcResult);
 
-    return res.result;
+            if ('error' in res) {
+              throw res.error;
+            }
+
+            return res.result;
+          }
+
+        case 'none':
+          {
+            const res = create(unsafeRes, GetParsedNoneModeBlockRpcResult);
+
+            if ('error' in res) {
+              throw res.error;
+            }
+
+            return res.result;
+          }
+
+        default:
+          {
+            const res = create(unsafeRes, GetParsedBlockRpcResult);
+
+            if ('error' in res) {
+              throw res.error;
+            }
+
+            return res.result;
+          }
+      }
+    } catch (e) {
+      throw new SolanaJSONRPCError(e, 'failed to get block');
+    }
   }
   /*
    * Returns the current block height of the node