@solana/web3.js 1.67.1 → 1.68.0

package/lib/index.iife.js

@@ -17978,6 +17978,16 @@ var solanaWeb3 = (function (exports) {
 	    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(),
@@ -18012,12 +18022,7 @@ var solanaWeb3 = (function (exports) {
 	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)))
@@ -18076,6 +18081,14 @@ var solanaWeb3 = (function (exports) {
 	  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
 	 */
@@ -18089,12 +18102,36 @@ var solanaWeb3 = (function (exports) {
 	    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())
 	})));
@@ -18111,12 +18148,36 @@ var solanaWeb3 = (function (exports) {
 	    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())
 	})));
@@ -18134,12 +18195,7 @@ var solanaWeb3 = (function (exports) {
 	    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())
 	})));
 	/**
@@ -19636,7 +19692,7 @@ var solanaWeb3 = (function (exports) {
 
 
 	  async getFeeForMessage(message, commitment) {
-	    const wireMessage = message.serialize().toString('base64');
+	    const wireMessage = toBuffer(message.serialize()).toString('base64');
 
 	    const args = this._buildArgs([wireMessage], commitment);
 
@@ -19761,33 +19817,67 @@ var solanaWeb3 = (function (exports) {
 	    , 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,
@@ -19797,13 +19887,45 @@ var solanaWeb3 = (function (exports) {
 	    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