@solana/web3.js 1.45.1 → 1.46.1

package/lib/index.cjs.js

@@ -3160,7 +3160,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({
@@ -4724,9 +4725,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'),
@@ -5599,7 +5623,7 @@ const LogsNotificationResult = superstruct.type({
 
 /** @internal */
 const COMMON_HTTP_HEADERS = {
-  'solana-client': `js/${(_process$env$npm_pack = "1.45.1") !== null && _process$env$npm_pack !== void 0 ? _process$env$npm_pack : 'UNKNOWN'}`
+  'solana-client': `js/${(_process$env$npm_pack = "1.46.1") !== null && _process$env$npm_pack !== void 0 ? _process$env$npm_pack : 'UNKNOWN'}`
 };
 /**
  * A connection to a fullnode JSON RPC endpoint
@@ -5769,8 +5793,16 @@ 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()));
@@ -5786,8 +5818,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);
     });
   }
@@ -5909,7 +5941,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) {
@@ -5922,7 +5958,7 @@ 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);
@@ -6006,8 +6042,13 @@ 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)));
@@ -6040,9 +6081,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);
@@ -6053,10 +6094,14 @@ 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))));
@@ -6072,8 +6117,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;
   }
   /**
@@ -6081,10 +6126,17 @@ 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));
@@ -6103,28 +6155,16 @@ 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)));
@@ -6143,22 +6183,12 @@ 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)));
@@ -6325,8 +6355,15 @@ 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()));
@@ -6342,8 +6379,15 @@ 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()));
@@ -6416,8 +6460,15 @@ 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()));
@@ -6464,9 +6515,16 @@ 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);
@@ -6483,8 +6541,15 @@ 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);
@@ -6655,9 +6720,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);
@@ -6669,8 +6734,15 @@ 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);
@@ -6748,8 +6820,15 @@ 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()));
@@ -7478,6 +7557,10 @@ class Connection {
       config.maxRetries = options.maxRetries;
     }
 
+    if (options && options.minContextSlot != null) {
+      config.minContextSlot = options.minContextSlot;
+    }
+
     if (skipPreflight) {
       config.skipPreflight = skipPreflight;
     }
@@ -9885,7 +9968,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;