@solana/web3.js 1.45.0 → 1.47.1

package/lib/index.iife.js

@@ -14764,7 +14764,8 @@ var solanaWeb3 = (function (exports) {
 	  const sendOptions = options && {
 	    skipPreflight: options.skipPreflight,
 	    preflightCommitment: options.preflightCommitment || options.commitment,
-	    maxRetries: options.maxRetries
+	    maxRetries: options.maxRetries,
+	    minContextSlot: options.minContextSlot
 	  };
 	  const signature = await connection.sendTransaction(transaction, signers, sendOptions);
 	  const status = transaction.recentBlockhash != null && transaction.lastValidBlockHeight != null ? (await connection.confirmTransaction({
@@ -19356,6 +19357,41 @@ var solanaWeb3 = (function (exports) {
 	    this.logs = logs;
 	  }
 
+	} // Keep in sync with client/src/rpc_custom_errors.rs
+	// Typescript `enums` thwart tree-shaking. See https://bargsten.org/jsts/enums/
+
+	const SolanaJSONRPCErrorCode = {
+	  JSON_RPC_SERVER_ERROR_BLOCK_CLEANED_UP: -32001,
+	  JSON_RPC_SERVER_ERROR_SEND_TRANSACTION_PREFLIGHT_FAILURE: -32002,
+	  JSON_RPC_SERVER_ERROR_TRANSACTION_SIGNATURE_VERIFICATION_FAILURE: -32003,
+	  JSON_RPC_SERVER_ERROR_BLOCK_NOT_AVAILABLE: -32004,
+	  JSON_RPC_SERVER_ERROR_NODE_UNHEALTHY: -32005,
+	  JSON_RPC_SERVER_ERROR_TRANSACTION_PRECOMPILE_VERIFICATION_FAILURE: -32006,
+	  JSON_RPC_SERVER_ERROR_SLOT_SKIPPED: -32007,
+	  JSON_RPC_SERVER_ERROR_NO_SNAPSHOT: -32008,
+	  JSON_RPC_SERVER_ERROR_LONG_TERM_STORAGE_SLOT_SKIPPED: -32009,
+	  JSON_RPC_SERVER_ERROR_KEY_EXCLUDED_FROM_SECONDARY_INDEX: -32010,
+	  JSON_RPC_SERVER_ERROR_TRANSACTION_HISTORY_NOT_AVAILABLE: -32011,
+	  JSON_RPC_SCAN_ERROR: -32012,
+	  JSON_RPC_SERVER_ERROR_TRANSACTION_SIGNATURE_LEN_MISMATCH: -32013,
+	  JSON_RPC_SERVER_ERROR_BLOCK_STATUS_NOT_AVAILABLE_YET: -32014,
+	  JSON_RPC_SERVER_ERROR_UNSUPPORTED_TRANSACTION_VERSION: -32015,
+	  JSON_RPC_SERVER_ERROR_MIN_CONTEXT_SLOT_NOT_REACHED: -32016
+	};
+	class SolanaJSONRPCError extends Error {
+	  constructor({
+	    code,
+	    message,
+	    data
+	  }, customMessage) {
+	    super(customMessage != null ? `${customMessage}: ${message}` : message);
+	    this.code = void 0;
+	    this.data = void 0;
+	    this.code = code;
+	    this.data = data;
+	    this.name = 'SolanaJSONRPCError';
+	  }
+
 	}
 
 	var fetchImpl = globalThis.fetch;
@@ -19441,9 +19477,32 @@ var solanaWeb3 = (function (exports) {
 	 * https://gist.github.com/steveluscher/c057eca81d479ef705cdb53162f9971d
 	 */
 
+	/** @internal */
+	function extractCommitmentFromConfig(commitmentOrConfig) {
+	  let commitment;
+	  let config;
+
+	  if (typeof commitmentOrConfig === 'string') {
+	    commitment = commitmentOrConfig;
+	  } else if (commitmentOrConfig) {
+	    const {
+	      commitment: specifiedCommitment,
+	      ...specifiedConfig
+	    } = commitmentOrConfig;
+	    commitment = specifiedCommitment;
+	    config = specifiedConfig;
+	  }
+
+	  return {
+	    commitment,
+	    config
+	  };
+	}
 	/**
 	 * @internal
 	 */
+
+
 	function createRpcResult(result) {
 	  return union([type({
 	    jsonrpc: literal('2.0'),
@@ -20480,14 +20539,22 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async getBalanceAndContext(publicKey, commitment) {
-	    const args = this._buildArgs([publicKey.toBase58()], commitment);
+	  async getBalanceAndContext(publicKey, commitmentOrConfig) {
+	    /** @internal */
+	    const {
+	      commitment,
+	      config
+	    } = extractCommitmentFromConfig(commitmentOrConfig);
+
+	    const args = this._buildArgs([publicKey.toBase58()], commitment, undefined
+	    /* encoding */
+	    , config);
 
 	    const unsafeRes = await this._rpcRequest('getBalance', args);
 	    const res = create(unsafeRes, jsonRpcResultAndContext(number()));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get balance for ' + publicKey.toBase58() + ': ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, `failed to get balance for ${publicKey.toBase58()}`);
 	    }
 
 	    return res.result;
@@ -20497,8 +20564,8 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async getBalance(publicKey, commitment) {
-	    return await this.getBalanceAndContext(publicKey, commitment).then(x => x.value).catch(e => {
+	  async getBalance(publicKey, commitmentOrConfig) {
+	    return await this.getBalanceAndContext(publicKey, commitmentOrConfig).then(x => x.value).catch(e => {
 	      throw new Error('failed to get balance of account ' + publicKey.toBase58() + ': ' + e);
 	    });
 	  }
@@ -20512,7 +20579,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, jsonRpcResult(nullable(number())));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get block time for slot ' + slot + ': ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, `failed to get block time for slot ${slot}`);
 	    }
 
 	    return res.result;
@@ -20528,7 +20595,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, jsonRpcResult(number()));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get minimum ledger slot: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get minimum ledger slot');
 	    }
 
 	    return res.result;
@@ -20543,7 +20610,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, SlotRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get first available block: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get first available block');
 	    }
 
 	    return res.result;
@@ -20574,7 +20641,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetSupplyRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get supply: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get supply');
 	    }
 
 	    return res.result;
@@ -20591,7 +20658,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, jsonRpcResultAndContext(TokenAmountResult));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get token supply: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get token supply');
 	    }
 
 	    return res.result;
@@ -20608,7 +20675,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, jsonRpcResultAndContext(TokenAmountResult));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get token account balance: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get token account balance');
 	    }
 
 	    return res.result;
@@ -20620,7 +20687,11 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async getTokenAccountsByOwner(ownerAddress, filter, commitment) {
+	  async getTokenAccountsByOwner(ownerAddress, filter, commitmentOrConfig) {
+	    const {
+	      commitment,
+	      config
+	    } = extractCommitmentFromConfig(commitmentOrConfig);
 	    let _args = [ownerAddress.toBase58()];
 
 	    if ('mint' in filter) {
@@ -20633,13 +20704,13 @@ var solanaWeb3 = (function (exports) {
 	      });
 	    }
 
-	    const args = this._buildArgs(_args, commitment, 'base64');
+	    const args = this._buildArgs(_args, commitment, 'base64', config);
 
 	    const unsafeRes = await this._rpcRequest('getTokenAccountsByOwner', args);
 	    const res = create(unsafeRes, GetTokenAccountsByOwner);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get token accounts owned by account ' + ownerAddress.toBase58() + ': ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, `failed to get token accounts owned by account ${ownerAddress.toBase58()}`);
 	    }
 
 	    return res.result;
@@ -20670,7 +20741,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetParsedTokenAccountsByOwner);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get token accounts owned by account ' + ownerAddress.toBase58() + ': ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, `failed to get token accounts owned by account ${ownerAddress.toBase58()}`);
 	    }
 
 	    return res.result;
@@ -20689,7 +20760,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetLargestAccountsRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get largest accounts: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get largest accounts');
 	    }
 
 	    return res.result;
@@ -20707,7 +20778,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetTokenLargestAccountsResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get token largest accounts: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get token largest accounts');
 	    }
 
 	    return res.result;
@@ -20717,14 +20788,19 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async getAccountInfoAndContext(publicKey, commitment) {
-	    const args = this._buildArgs([publicKey.toBase58()], commitment, 'base64');
+	  async getAccountInfoAndContext(publicKey, commitmentOrConfig) {
+	    const {
+	      commitment,
+	      config
+	    } = extractCommitmentFromConfig(commitmentOrConfig);
+
+	    const args = this._buildArgs([publicKey.toBase58()], commitment, 'base64', config);
 
 	    const unsafeRes = await this._rpcRequest('getAccountInfo', args);
 	    const res = create(unsafeRes, jsonRpcResultAndContext(nullable(AccountInfoResult)));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get info about account ' + publicKey.toBase58() + ': ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, `failed to get info about account ${publicKey.toBase58()}`);
 	    }
 
 	    return res.result;
@@ -20741,7 +20817,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, jsonRpcResultAndContext(nullable(ParsedAccountInfoResult)));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get info about account ' + publicKey.toBase58() + ': ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, `failed to get info about account ${publicKey.toBase58()}`);
 	    }
 
 	    return res.result;
@@ -20751,9 +20827,9 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async getAccountInfo(publicKey, commitment) {
+	  async getAccountInfo(publicKey, commitmentOrConfig) {
 	    try {
-	      const res = await this.getAccountInfoAndContext(publicKey, commitment);
+	      const res = await this.getAccountInfoAndContext(publicKey, commitmentOrConfig);
 	      return res.value;
 	    } catch (e) {
 	      throw new Error('failed to get info about account ' + publicKey.toBase58() + ': ' + e);
@@ -20764,16 +20840,20 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async getMultipleAccountsInfoAndContext(publicKeys, commitment) {
+	  async getMultipleAccountsInfoAndContext(publicKeys, commitmentOrConfig) {
+	    const {
+	      commitment,
+	      config
+	    } = extractCommitmentFromConfig(commitmentOrConfig);
 	    const keys = publicKeys.map(key => key.toBase58());
 
-	    const args = this._buildArgs([keys], commitment, 'base64');
+	    const args = this._buildArgs([keys], commitment, 'base64', config);
 
 	    const unsafeRes = await this._rpcRequest('getMultipleAccounts', args);
 	    const res = create(unsafeRes, jsonRpcResultAndContext(array(nullable(AccountInfoResult))));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get info for accounts ' + keys + ': ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, `failed to get info for accounts ${keys}`);
 	    }
 
 	    return res.result;
@@ -20783,8 +20863,8 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async getMultipleAccountsInfo(publicKeys, commitment) {
-	    const res = await this.getMultipleAccountsInfoAndContext(publicKeys, commitment);
+	  async getMultipleAccountsInfo(publicKeys, commitmentOrConfig) {
+	    const res = await this.getMultipleAccountsInfoAndContext(publicKeys, commitmentOrConfig);
 	    return res.value;
 	  }
 	  /**
@@ -20792,16 +20872,23 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async getStakeActivation(publicKey, commitment, epoch) {
-	    const args = this._buildArgs([publicKey.toBase58()], commitment, undefined, epoch !== undefined ? {
-	      epoch
-	    } : undefined);
+	  async getStakeActivation(publicKey, commitmentOrConfig, epoch) {
+	    const {
+	      commitment,
+	      config
+	    } = extractCommitmentFromConfig(commitmentOrConfig);
+
+	    const args = this._buildArgs([publicKey.toBase58()], commitment, undefined
+	    /* encoding */
+	    , { ...config,
+	      epoch: epoch != null ? epoch : config === null || config === void 0 ? void 0 : config.epoch
+	    });
 
 	    const unsafeRes = await this._rpcRequest('getStakeActivation', args);
 	    const res = create(unsafeRes, jsonRpcResult(StakeActivationResult));
 
 	    if ('error' in res) {
-	      throw new Error(`failed to get Stake Activation ${publicKey.toBase58()}: ${res.error.message}`);
+	      throw new SolanaJSONRPCError(res.error, `failed to get Stake Activation ${publicKey.toBase58()}`);
 	    }
 
 	    return res.result;
@@ -20814,34 +20901,22 @@ var solanaWeb3 = (function (exports) {
 
 
 	  async getProgramAccounts(programId, configOrCommitment) {
-	    const extra = {};
-	    let commitment;
-	    let encoding;
-
-	    if (configOrCommitment) {
-	      if (typeof configOrCommitment === 'string') {
-	        commitment = configOrCommitment;
-	      } else {
-	        commitment = configOrCommitment.commitment;
-	        encoding = configOrCommitment.encoding;
-
-	        if (configOrCommitment.dataSlice) {
-	          extra.dataSlice = configOrCommitment.dataSlice;
-	        }
-
-	        if (configOrCommitment.filters) {
-	          extra.filters = configOrCommitment.filters;
-	        }
-	      }
-	    }
+	    const {
+	      commitment,
+	      config
+	    } = extractCommitmentFromConfig(configOrCommitment);
+	    const {
+	      encoding,
+	      ...configWithoutEncoding
+	    } = config || {};
 
-	    const args = this._buildArgs([programId.toBase58()], commitment, encoding || 'base64', extra);
+	    const args = this._buildArgs([programId.toBase58()], commitment, encoding || 'base64', configWithoutEncoding);
 
 	    const unsafeRes = await this._rpcRequest('getProgramAccounts', args);
 	    const res = create(unsafeRes, jsonRpcResult(array(KeyedAccountInfoResult)));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get accounts owned by program ' + programId.toBase58() + ': ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, `failed to get accounts owned by program ${programId.toBase58()}`);
 	    }
 
 	    return res.result;
@@ -20854,28 +20929,18 @@ var solanaWeb3 = (function (exports) {
 
 
 	  async getParsedProgramAccounts(programId, configOrCommitment) {
-	    const extra = {};
-	    let commitment;
-
-	    if (configOrCommitment) {
-	      if (typeof configOrCommitment === 'string') {
-	        commitment = configOrCommitment;
-	      } else {
-	        commitment = configOrCommitment.commitment;
-
-	        if (configOrCommitment.filters) {
-	          extra.filters = configOrCommitment.filters;
-	        }
-	      }
-	    }
+	    const {
+	      commitment,
+	      config
+	    } = extractCommitmentFromConfig(configOrCommitment);
 
-	    const args = this._buildArgs([programId.toBase58()], commitment, 'jsonParsed', extra);
+	    const args = this._buildArgs([programId.toBase58()], commitment, 'jsonParsed', config);
 
 	    const unsafeRes = await this._rpcRequest('getProgramAccounts', args);
 	    const res = create(unsafeRes, jsonRpcResult(array(KeyedParsedAccountInfoResult)));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get accounts owned by program ' + programId.toBase58() + ': ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, `failed to get accounts owned by program ${programId.toBase58()}`);
 	    }
 
 	    return res.result;
@@ -21009,7 +21074,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, jsonRpcResult(array(ContactInfoResult)));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get cluster nodes: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get cluster nodes');
 	    }
 
 	    return res.result;
@@ -21026,7 +21091,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetVoteAccounts);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get vote accounts: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get vote accounts');
 	    }
 
 	    return res.result;
@@ -21036,14 +21101,21 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async getSlot(commitment) {
-	    const args = this._buildArgs([], commitment);
+	  async getSlot(commitmentOrConfig) {
+	    const {
+	      commitment,
+	      config
+	    } = extractCommitmentFromConfig(commitmentOrConfig);
+
+	    const args = this._buildArgs([], commitment, undefined
+	    /* encoding */
+	    , config);
 
 	    const unsafeRes = await this._rpcRequest('getSlot', args);
 	    const res = create(unsafeRes, jsonRpcResult(number()));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get slot: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get slot');
 	    }
 
 	    return res.result;
@@ -21053,14 +21125,21 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async getSlotLeader(commitment) {
-	    const args = this._buildArgs([], commitment);
+	  async getSlotLeader(commitmentOrConfig) {
+	    const {
+	      commitment,
+	      config
+	    } = extractCommitmentFromConfig(commitmentOrConfig);
+
+	    const args = this._buildArgs([], commitment, undefined
+	    /* encoding */
+	    , config);
 
 	    const unsafeRes = await this._rpcRequest('getSlotLeader', args);
 	    const res = create(unsafeRes, jsonRpcResult(string()));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get slot leader: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get slot leader');
 	    }
 
 	    return res.result;
@@ -21079,7 +21158,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, jsonRpcResult(array(PublicKeyFromString)));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get slot leaders: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get slot leaders');
 	    }
 
 	    return res.result;
@@ -21117,7 +21196,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetSignatureStatusesRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get signature status: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get signature status');
 	    }
 
 	    return res.result;
@@ -21127,14 +21206,21 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async getTransactionCount(commitment) {
-	    const args = this._buildArgs([], commitment);
+	  async getTransactionCount(commitmentOrConfig) {
+	    const {
+	      commitment,
+	      config
+	    } = extractCommitmentFromConfig(commitmentOrConfig);
+
+	    const args = this._buildArgs([], commitment, undefined
+	    /* encoding */
+	    , config);
 
 	    const unsafeRes = await this._rpcRequest('getTransactionCount', args);
 	    const res = create(unsafeRes, jsonRpcResult(number()));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get transaction count: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get transaction count');
 	    }
 
 	    return res.result;
@@ -21165,7 +21251,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetInflationGovernorRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get inflation: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get inflation');
 	    }
 
 	    return res.result;
@@ -21175,16 +21261,23 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async getInflationReward(addresses, epoch, commitment) {
-	    const args = this._buildArgs([addresses.map(pubkey => pubkey.toBase58())], commitment, undefined, {
-	      epoch
+	  async getInflationReward(addresses, epoch, commitmentOrConfig) {
+	    const {
+	      commitment,
+	      config
+	    } = extractCommitmentFromConfig(commitmentOrConfig);
+
+	    const args = this._buildArgs([addresses.map(pubkey => pubkey.toBase58())], commitment, undefined
+	    /* encoding */
+	    , { ...config,
+	      epoch: epoch != null ? epoch : config === null || config === void 0 ? void 0 : config.epoch
 	    });
 
 	    const unsafeRes = await this._rpcRequest('getInflationReward', args);
 	    const res = create(unsafeRes, GetInflationRewardResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get inflation reward: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get inflation reward');
 	    }
 
 	    return res.result;
@@ -21194,14 +21287,21 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async getEpochInfo(commitment) {
-	    const args = this._buildArgs([], commitment);
+	  async getEpochInfo(commitmentOrConfig) {
+	    const {
+	      commitment,
+	      config
+	    } = extractCommitmentFromConfig(commitmentOrConfig);
+
+	    const args = this._buildArgs([], commitment, undefined
+	    /* encoding */
+	    , config);
 
 	    const unsafeRes = await this._rpcRequest('getEpochInfo', args);
 	    const res = create(unsafeRes, GetEpochInfoRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get epoch info: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get epoch info');
 	    }
 
 	    return res.result;
@@ -21216,7 +21316,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetEpochScheduleRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get epoch schedule: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get epoch schedule');
 	    }
 
 	    const epochSchedule = res.result;
@@ -21233,7 +21333,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetLeaderScheduleRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get leader schedule: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get leader schedule');
 	    }
 
 	    return res.result;
@@ -21272,7 +21372,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetRecentBlockhashAndContextRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get recent blockhash: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get recent blockhash');
 	    }
 
 	    return res.result;
@@ -21290,7 +21390,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetRecentPerformanceSamplesRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get recent performance samples: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get recent performance samples');
 	    }
 
 	    return res.result;
@@ -21309,7 +21409,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetFeeCalculatorRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get fee calculator: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get fee calculator');
 	    }
 
 	    const {
@@ -21335,7 +21435,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, jsonRpcResultAndContext(nullable(number())));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get slot: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get slot');
 	    }
 
 	    if (res.result === null) {
@@ -21366,9 +21466,9 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async getLatestBlockhash(commitment) {
+	  async getLatestBlockhash(commitmentOrConfig) {
 	    try {
-	      const res = await this.getLatestBlockhashAndContext(commitment);
+	      const res = await this.getLatestBlockhashAndContext(commitmentOrConfig);
 	      return res.value;
 	    } catch (e) {
 	      throw new Error('failed to get recent blockhash: ' + e);
@@ -21380,14 +21480,21 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async getLatestBlockhashAndContext(commitment) {
-	    const args = this._buildArgs([], commitment);
+	  async getLatestBlockhashAndContext(commitmentOrConfig) {
+	    const {
+	      commitment,
+	      config
+	    } = extractCommitmentFromConfig(commitmentOrConfig);
+
+	    const args = this._buildArgs([], commitment, undefined
+	    /* encoding */
+	    , config);
 
 	    const unsafeRes = await this._rpcRequest('getLatestBlockhash', args);
 	    const res = create(unsafeRes, GetLatestBlockhashRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get latest blockhash: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get latest blockhash');
 	    }
 
 	    return res.result;
@@ -21402,7 +21509,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, jsonRpcResult(VersionResult));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get version: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get version');
 	    }
 
 	    return res.result;
@@ -21417,7 +21524,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, jsonRpcResult(string()));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get genesis hash: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get genesis hash');
 	    }
 
 	    return res.result;
@@ -21434,7 +21541,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetBlockRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get confirmed block: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get confirmed block');
 	    }
 
 	    const result = res.result;
@@ -21459,14 +21566,21 @@ var solanaWeb3 = (function (exports) {
 	   */
 
 
-	  async getBlockHeight(commitment) {
-	    const args = this._buildArgs([], commitment);
+	  async getBlockHeight(commitmentOrConfig) {
+	    const {
+	      commitment,
+	      config
+	    } = extractCommitmentFromConfig(commitmentOrConfig);
+
+	    const args = this._buildArgs([], commitment, undefined
+	    /* encoding */
+	    , config);
 
 	    const unsafeRes = await this._rpcRequest('getBlockHeight', args);
 	    const res = create(unsafeRes, jsonRpcResult(number()));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get block height information: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get block height information');
 	    }
 
 	    return res.result;
@@ -21497,7 +21611,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, BlockProductionResponseStruct);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get block production information: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get block production information');
 	    }
 
 	    return res.result;
@@ -21514,7 +21628,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetTransactionRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get transaction: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get transaction');
 	    }
 
 	    const result = res.result;
@@ -21537,7 +21651,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetParsedTransactionRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get transaction: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get transaction');
 	    }
 
 	    return res.result;
@@ -21561,7 +21675,7 @@ var solanaWeb3 = (function (exports) {
 	      const res = create(unsafeRes, GetParsedTransactionRpcResult);
 
 	      if ('error' in res) {
-	        throw new Error('failed to get transactions: ' + res.error.message);
+	        throw new SolanaJSONRPCError(res.error, 'failed to get transactions');
 	      }
 
 	      return res.result;
@@ -21588,7 +21702,7 @@ var solanaWeb3 = (function (exports) {
 	      const res = create(unsafeRes, GetTransactionRpcResult);
 
 	      if ('error' in res) {
-	        throw new Error('failed to get transactions: ' + res.error.message);
+	        throw new SolanaJSONRPCError(res.error, 'failed to get transactions');
 	      }
 
 	      const result = res.result;
@@ -21616,7 +21730,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetConfirmedBlockRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get confirmed block: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get confirmed block');
 	    }
 
 	    const result = res.result;
@@ -21663,7 +21777,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, jsonRpcResult(array(number())));
 
 	    if ('error' in res) {
-	      throw new Error('failed to get blocks: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get blocks');
 	    }
 
 	    return res.result;
@@ -21683,7 +21797,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetBlockSignaturesRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get block: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get block');
 	    }
 
 	    const result = res.result;
@@ -21711,7 +21825,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetBlockSignaturesRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get confirmed block: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get confirmed block');
 	    }
 
 	    const result = res.result;
@@ -21736,7 +21850,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetTransactionRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get transaction: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get transaction');
 	    }
 
 	    const result = res.result;
@@ -21761,7 +21875,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetParsedTransactionRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get confirmed transaction: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get confirmed transaction');
 	    }
 
 	    return res.result;
@@ -21787,7 +21901,7 @@ var solanaWeb3 = (function (exports) {
 	      const res = create(unsafeRes, GetParsedTransactionRpcResult);
 
 	      if ('error' in res) {
-	        throw new Error('failed to get confirmed transactions: ' + res.error.message);
+	        throw new SolanaJSONRPCError(res.error, 'failed to get confirmed transactions');
 	      }
 
 	      return res.result;
@@ -21876,7 +21990,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetConfirmedSignaturesForAddress2RpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get confirmed signatures for address: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get confirmed signatures for address');
 	    }
 
 	    return res.result;
@@ -21898,7 +22012,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, GetSignaturesForAddressRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('failed to get signatures for address: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, 'failed to get signatures for address');
 	    }
 
 	    return res.result;
@@ -21955,7 +22069,7 @@ var solanaWeb3 = (function (exports) {
 	    const res = create(unsafeRes, RequestAirdropRpcResult);
 
 	    if ('error' in res) {
-	      throw new Error('airdrop to ' + to.toBase58() + ' failed: ' + res.error.message);
+	      throw new SolanaJSONRPCError(res.error, `airdrop to ${to.toBase58()} failed`);
 	    }
 
 	    return res.result;
@@ -22185,10 +22299,14 @@ var solanaWeb3 = (function (exports) {
 	    const skipPreflight = options && options.skipPreflight;
 	    const preflightCommitment = options && options.preflightCommitment || this.commitment;
 
-	    if (options && options.maxRetries) {
+	    if (options && options.maxRetries != null) {
 	      config.maxRetries = options.maxRetries;
 	    }
 
+	    if (options && options.minContextSlot != null) {
+	      config.minContextSlot = options.minContextSlot;
+	    }
+
 	    if (skipPreflight) {
 	      config.skipPreflight = skipPreflight;
 	    }
@@ -30191,7 +30309,8 @@ var solanaWeb3 = (function (exports) {
 
 	  const sendOptions = options && {
 	    skipPreflight: options.skipPreflight,
-	    preflightCommitment: options.preflightCommitment || options.commitment
+	    preflightCommitment: options.preflightCommitment || options.commitment,
+	    minContextSlot: options.minContextSlot
 	  };
 	  const signature = await connection.sendRawTransaction(rawTransaction, sendOptions);
 	  const commitment = options && options.commitment;
@@ -30283,6 +30402,8 @@ var solanaWeb3 = (function (exports) {
 	exports.SYSVAR_STAKE_HISTORY_PUBKEY = SYSVAR_STAKE_HISTORY_PUBKEY;
 	exports.Secp256k1Program = Secp256k1Program;
 	exports.SendTransactionError = SendTransactionError;
+	exports.SolanaJSONRPCError = SolanaJSONRPCError;
+	exports.SolanaJSONRPCErrorCode = SolanaJSONRPCErrorCode;
 	exports.StakeAuthorizationLayout = StakeAuthorizationLayout;
 	exports.StakeInstruction = StakeInstruction;
 	exports.StakeProgram = StakeProgram;