@solana/web3.js 1.45.0 → 1.47.1

package/lib/index.cjs.js

@@ -3131,7 +3131,8 @@ async function sendAndConfirmTransaction(connection, transaction, signers, optio
   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({
@@ -4607,6 +4608,41 @@ class SendTransactionError extends Error {
     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';
+  }
+
 }
 
 async function fetchImpl (input, init) {
@@ -4695,9 +4731,32 @@ const BLOCKHASH_CACHE_TIMEOUT_MS = 30 * 1000;
  * 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 superstruct.union([superstruct.type({
     jsonrpc: superstruct.literal('2.0'),
@@ -5740,14 +5799,22 @@ class Connection {
    */
 
 
-  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 = superstruct.create(unsafeRes, jsonRpcResultAndContext(superstruct.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;
@@ -5757,8 +5824,8 @@ class Connection {
    */
 
 
-  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);
     });
   }
@@ -5772,7 +5839,7 @@ class Connection {
     const res = superstruct.create(unsafeRes, jsonRpcResult(superstruct.nullable(superstruct.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;
@@ -5788,7 +5855,7 @@ class Connection {
     const res = superstruct.create(unsafeRes, jsonRpcResult(superstruct.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;
@@ -5803,7 +5870,7 @@ class Connection {
     const res = superstruct.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;
@@ -5834,7 +5901,7 @@ class Connection {
     const res = superstruct.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;
@@ -5851,7 +5918,7 @@ class Connection {
     const res = superstruct.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;
@@ -5868,7 +5935,7 @@ class Connection {
     const res = superstruct.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;
@@ -5880,7 +5947,11 @@ class Connection {
    */
 
 
-  async getTokenAccountsByOwner(ownerAddress, filter, commitment) {
+  async getTokenAccountsByOwner(ownerAddress, filter, commitmentOrConfig) {
+    const {
+      commitment,
+      config
+    } = extractCommitmentFromConfig(commitmentOrConfig);
     let _args = [ownerAddress.toBase58()];
 
     if ('mint' in filter) {
@@ -5893,13 +5964,13 @@ class Connection {
       });
     }
 
-    const args = this._buildArgs(_args, commitment, 'base64');
+    const args = this._buildArgs(_args, commitment, 'base64', config);
 
     const unsafeRes = await this._rpcRequest('getTokenAccountsByOwner', args);
     const res = superstruct.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;
@@ -5930,7 +6001,7 @@ class Connection {
     const res = superstruct.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;
@@ -5949,7 +6020,7 @@ class Connection {
     const res = superstruct.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;
@@ -5967,7 +6038,7 @@ class Connection {
     const res = superstruct.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;
@@ -5977,14 +6048,19 @@ class Connection {
    */
 
 
-  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 = superstruct.create(unsafeRes, jsonRpcResultAndContext(superstruct.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;
@@ -6001,7 +6077,7 @@ class Connection {
     const res = superstruct.create(unsafeRes, jsonRpcResultAndContext(superstruct.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;
@@ -6011,9 +6087,9 @@ class Connection {
    */
 
 
-  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);
@@ -6024,16 +6100,20 @@ class Connection {
    */
 
 
-  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 = superstruct.create(unsafeRes, jsonRpcResultAndContext(superstruct.array(superstruct.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;
@@ -6043,8 +6123,8 @@ class Connection {
    */
 
 
-  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;
   }
   /**
@@ -6052,16 +6132,23 @@ class Connection {
    */
 
 
-  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 = superstruct.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;
@@ -6074,34 +6161,22 @@ class Connection {
 
 
   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 = superstruct.create(unsafeRes, jsonRpcResult(superstruct.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;
@@ -6114,28 +6189,18 @@ class Connection {
 
 
   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 = superstruct.create(unsafeRes, jsonRpcResult(superstruct.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;
@@ -6269,7 +6334,7 @@ class Connection {
     const res = superstruct.create(unsafeRes, jsonRpcResult(superstruct.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;
@@ -6286,7 +6351,7 @@ class Connection {
     const res = superstruct.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;
@@ -6296,14 +6361,21 @@ class Connection {
    */
 
 
-  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 = superstruct.create(unsafeRes, jsonRpcResult(superstruct.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;
@@ -6313,14 +6385,21 @@ class Connection {
    */
 
 
-  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 = superstruct.create(unsafeRes, jsonRpcResult(superstruct.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;
@@ -6339,7 +6418,7 @@ class Connection {
     const res = superstruct.create(unsafeRes, jsonRpcResult(superstruct.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;
@@ -6377,7 +6456,7 @@ class Connection {
     const res = superstruct.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;
@@ -6387,14 +6466,21 @@ class Connection {
    */
 
 
-  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 = superstruct.create(unsafeRes, jsonRpcResult(superstruct.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;
@@ -6425,7 +6511,7 @@ class Connection {
     const res = superstruct.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;
@@ -6435,16 +6521,23 @@ class Connection {
    */
 
 
-  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 = superstruct.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;
@@ -6454,14 +6547,21 @@ class Connection {
    */
 
 
-  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 = superstruct.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;
@@ -6476,7 +6576,7 @@ class Connection {
     const res = superstruct.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;
@@ -6493,7 +6593,7 @@ class Connection {
     const res = superstruct.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;
@@ -6532,7 +6632,7 @@ class Connection {
     const res = superstruct.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;
@@ -6550,7 +6650,7 @@ class Connection {
     const res = superstruct.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;
@@ -6569,7 +6669,7 @@ class Connection {
     const res = superstruct.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 {
@@ -6595,7 +6695,7 @@ class Connection {
     const res = superstruct.create(unsafeRes, jsonRpcResultAndContext(superstruct.nullable(superstruct.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) {
@@ -6626,9 +6726,9 @@ class Connection {
    */
 
 
-  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);
@@ -6640,14 +6740,21 @@ class Connection {
    */
 
 
-  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 = superstruct.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;
@@ -6662,7 +6769,7 @@ class Connection {
     const res = superstruct.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;
@@ -6677,7 +6784,7 @@ class Connection {
     const res = superstruct.create(unsafeRes, jsonRpcResult(superstruct.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;
@@ -6694,7 +6801,7 @@ class Connection {
     const res = superstruct.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;
@@ -6719,14 +6826,21 @@ class Connection {
    */
 
 
-  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 = superstruct.create(unsafeRes, jsonRpcResult(superstruct.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;
@@ -6757,7 +6871,7 @@ class Connection {
     const res = superstruct.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;
@@ -6774,7 +6888,7 @@ class Connection {
     const res = superstruct.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;
@@ -6797,7 +6911,7 @@ class Connection {
     const res = superstruct.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;
@@ -6821,7 +6935,7 @@ class Connection {
       const res = superstruct.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;
@@ -6848,7 +6962,7 @@ class Connection {
       const res = superstruct.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;
@@ -6876,7 +6990,7 @@ class Connection {
     const res = superstruct.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;
@@ -6923,7 +7037,7 @@ class Connection {
     const res = superstruct.create(unsafeRes, jsonRpcResult(superstruct.array(superstruct.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;
@@ -6943,7 +7057,7 @@ class Connection {
     const res = superstruct.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;
@@ -6971,7 +7085,7 @@ class Connection {
     const res = superstruct.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;
@@ -6996,7 +7110,7 @@ class Connection {
     const res = superstruct.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;
@@ -7021,7 +7135,7 @@ class Connection {
     const res = superstruct.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;
@@ -7047,7 +7161,7 @@ class Connection {
       const res = superstruct.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;
@@ -7136,7 +7250,7 @@ class Connection {
     const res = superstruct.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;
@@ -7158,7 +7272,7 @@ class Connection {
     const res = superstruct.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;
@@ -7215,7 +7329,7 @@ class Connection {
     const res = superstruct.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;
@@ -7445,10 +7559,14 @@ class Connection {
     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;
     }
@@ -9858,7 +9976,8 @@ async function sendAndConfirmRawTransaction(connection, rawTransaction, confirma
 
   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;
@@ -9950,6 +10069,8 @@ exports.SYSVAR_SLOT_HISTORY_PUBKEY = SYSVAR_SLOT_HISTORY_PUBKEY;
 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;