@solana/web3.js 1.67.1 → 1.68.0

package/lib/index.cjs.js

@@ -4421,6 +4421,16 @@ const ConfirmedTransactionResult = superstruct.type({
     addressTableLookups: superstruct.optional(superstruct.array(AddressTableLookupStruct))
   })
 });
+const AnnotatedAccountKey = superstruct.type({
+  pubkey: PublicKeyFromString,
+  signer: superstruct.boolean(),
+  writable: superstruct.boolean(),
+  source: superstruct.optional(superstruct.union([superstruct.literal('transaction'), superstruct.literal('lookupTable')]))
+});
+const ConfirmedTransactionAccountsModeResult = superstruct.type({
+  accountKeys: superstruct.array(AnnotatedAccountKey),
+  signatures: superstruct.array(superstruct.string())
+});
 const ParsedInstructionResult = superstruct.type({
   parsed: superstruct.unknown(),
   program: superstruct.string(),
@@ -4455,12 +4465,7 @@ const ParsedOrRawInstruction = superstruct.coerce(InstructionResult, UnknownInst
 const ParsedConfirmedTransactionResult = superstruct.type({
   signatures: superstruct.array(superstruct.string()),
   message: superstruct.type({
-    accountKeys: superstruct.array(superstruct.type({
-      pubkey: PublicKeyFromString,
-      signer: superstruct.boolean(),
-      writable: superstruct.boolean(),
-      source: superstruct.optional(superstruct.union([superstruct.literal('transaction'), superstruct.literal('lookupTable')]))
-    })),
+    accountKeys: superstruct.array(AnnotatedAccountKey),
     instructions: superstruct.array(ParsedOrRawInstruction),
     recentBlockhash: superstruct.string(),
     addressTableLookups: superstruct.optional(superstruct.nullable(superstruct.array(AddressTableLookupStruct)))
@@ -4519,6 +4524,14 @@ const ParsedConfirmedTransactionMetaResult = superstruct.type({
   computeUnitsConsumed: superstruct.optional(superstruct.number())
 });
 const TransactionVersionStruct = superstruct.union([superstruct.literal(0), superstruct.literal('legacy')]);
+/** @internal */
+
+const RewardsResult = superstruct.type({
+  pubkey: superstruct.string(),
+  lamports: superstruct.number(),
+  postBalance: superstruct.nullable(superstruct.number()),
+  rewardType: superstruct.nullable(superstruct.string())
+});
 /**
  * Expected JSON RPC response for the "getBlock" message
  */
@@ -4532,12 +4545,36 @@ const GetBlockRpcResult = jsonRpcResult(superstruct.nullable(superstruct.type({
     meta: superstruct.nullable(ConfirmedTransactionMetaResult),
     version: superstruct.optional(TransactionVersionStruct)
   })),
-  rewards: superstruct.optional(superstruct.array(superstruct.type({
-    pubkey: superstruct.string(),
-    lamports: superstruct.number(),
-    postBalance: superstruct.nullable(superstruct.number()),
-    rewardType: superstruct.nullable(superstruct.string())
-  }))),
+  rewards: superstruct.optional(superstruct.array(RewardsResult)),
+  blockTime: superstruct.nullable(superstruct.number()),
+  blockHeight: superstruct.nullable(superstruct.number())
+})));
+/**
+ * Expected JSON RPC response for the "getBlock" message when `transactionDetails` is `none`
+ */
+
+const GetNoneModeBlockRpcResult = jsonRpcResult(superstruct.nullable(superstruct.type({
+  blockhash: superstruct.string(),
+  previousBlockhash: superstruct.string(),
+  parentSlot: superstruct.number(),
+  rewards: superstruct.optional(superstruct.array(RewardsResult)),
+  blockTime: superstruct.nullable(superstruct.number()),
+  blockHeight: superstruct.nullable(superstruct.number())
+})));
+/**
+ * Expected JSON RPC response for the "getBlock" message when `transactionDetails` is `accounts`
+ */
+
+const GetAccountsModeBlockRpcResult = jsonRpcResult(superstruct.nullable(superstruct.type({
+  blockhash: superstruct.string(),
+  previousBlockhash: superstruct.string(),
+  parentSlot: superstruct.number(),
+  transactions: superstruct.array(superstruct.type({
+    transaction: ConfirmedTransactionAccountsModeResult,
+    meta: superstruct.nullable(ConfirmedTransactionMetaResult),
+    version: superstruct.optional(TransactionVersionStruct)
+  })),
+  rewards: superstruct.optional(superstruct.array(RewardsResult)),
   blockTime: superstruct.nullable(superstruct.number()),
   blockHeight: superstruct.nullable(superstruct.number())
 })));
@@ -4554,12 +4591,36 @@ const GetParsedBlockRpcResult = jsonRpcResult(superstruct.nullable(superstruct.t
     meta: superstruct.nullable(ParsedConfirmedTransactionMetaResult),
     version: superstruct.optional(TransactionVersionStruct)
   })),
-  rewards: superstruct.optional(superstruct.array(superstruct.type({
-    pubkey: superstruct.string(),
-    lamports: superstruct.number(),
-    postBalance: superstruct.nullable(superstruct.number()),
-    rewardType: superstruct.nullable(superstruct.string())
-  }))),
+  rewards: superstruct.optional(superstruct.array(RewardsResult)),
+  blockTime: superstruct.nullable(superstruct.number()),
+  blockHeight: superstruct.nullable(superstruct.number())
+})));
+/**
+ * Expected parsed JSON RPC response for the "getBlock" message  when `transactionDetails` is `accounts`
+ */
+
+const GetParsedAccountsModeBlockRpcResult = jsonRpcResult(superstruct.nullable(superstruct.type({
+  blockhash: superstruct.string(),
+  previousBlockhash: superstruct.string(),
+  parentSlot: superstruct.number(),
+  transactions: superstruct.array(superstruct.type({
+    transaction: ConfirmedTransactionAccountsModeResult,
+    meta: superstruct.nullable(ParsedConfirmedTransactionMetaResult),
+    version: superstruct.optional(TransactionVersionStruct)
+  })),
+  rewards: superstruct.optional(superstruct.array(RewardsResult)),
+  blockTime: superstruct.nullable(superstruct.number()),
+  blockHeight: superstruct.nullable(superstruct.number())
+})));
+/**
+ * Expected parsed JSON RPC response for the "getBlock" message  when `transactionDetails` is `none`
+ */
+
+const GetParsedNoneModeBlockRpcResult = jsonRpcResult(superstruct.nullable(superstruct.type({
+  blockhash: superstruct.string(),
+  previousBlockhash: superstruct.string(),
+  parentSlot: superstruct.number(),
+  rewards: superstruct.optional(superstruct.array(RewardsResult)),
   blockTime: superstruct.nullable(superstruct.number()),
   blockHeight: superstruct.nullable(superstruct.number())
 })));
@@ -4577,12 +4638,7 @@ const GetConfirmedBlockRpcResult = jsonRpcResult(superstruct.nullable(superstruc
     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())
-  }))),
+  rewards: superstruct.optional(superstruct.array(RewardsResult)),
   blockTime: superstruct.nullable(superstruct.number())
 })));
 /**
@@ -6079,7 +6135,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);
 
@@ -6204,33 +6260,67 @@ class Connection {
     , config);
 
     const unsafeRes = await this._rpcRequest('getBlock', args);
-    const res = superstruct.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 = superstruct.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 = superstruct.create(unsafeRes, GetNoneModeBlockRpcResult);
+
+            if ('error' in res) {
+              throw res.error;
+            }
+
+            return res.result;
+          }
+
+        default:
+          {
+            const res = superstruct.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,
@@ -6240,13 +6330,45 @@ class Connection {
     const args = this._buildArgsAtLeastConfirmed([slot], commitment, 'jsonParsed', config);
 
     const unsafeRes = await this._rpcRequest('getBlock', args);
-    const res = superstruct.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 = superstruct.create(unsafeRes, GetParsedAccountsModeBlockRpcResult);
 
-    return res.result;
+            if ('error' in res) {
+              throw res.error;
+            }
+
+            return res.result;
+          }
+
+        case 'none':
+          {
+            const res = superstruct.create(unsafeRes, GetParsedNoneModeBlockRpcResult);
+
+            if ('error' in res) {
+              throw res.error;
+            }
+
+            return res.result;
+          }
+
+        default:
+          {
+            const res = superstruct.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