@solana/web3.js 1.45.0 → 1.46.0

package/lib/index.browser.esm.js

@@ -3073,7 +3073,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({
@@ -4585,9 +4586,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 union([type({
     jsonrpc: literal('2.0'),
@@ -5624,8 +5648,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 = create(unsafeRes, jsonRpcResultAndContext(number()));
@@ -5641,8 +5673,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);
     });
   }
@@ -5764,7 +5796,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) {
@@ -5777,7 +5813,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 = create(unsafeRes, GetTokenAccountsByOwner);
@@ -5861,8 +5897,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 = create(unsafeRes, jsonRpcResultAndContext(nullable(AccountInfoResult)));
@@ -5895,9 +5936,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);
@@ -5908,10 +5949,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 = create(unsafeRes, jsonRpcResultAndContext(array(nullable(AccountInfoResult))));
@@ -5927,8 +5972,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;
   }
   /**
@@ -5936,10 +5981,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 = create(unsafeRes, jsonRpcResult(StakeActivationResult));
@@ -5958,28 +6010,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 = create(unsafeRes, jsonRpcResult(array(KeyedAccountInfoResult)));
@@ -5998,22 +6038,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 = create(unsafeRes, jsonRpcResult(array(KeyedParsedAccountInfoResult)));
@@ -6180,8 +6210,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 = create(unsafeRes, jsonRpcResult(number()));
@@ -6197,8 +6234,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 = create(unsafeRes, jsonRpcResult(string()));
@@ -6271,8 +6315,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 = create(unsafeRes, jsonRpcResult(number()));
@@ -6319,9 +6370,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);
@@ -6338,8 +6396,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 = create(unsafeRes, GetEpochInfoRpcResult);
@@ -6510,9 +6575,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);
@@ -6524,8 +6589,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 = create(unsafeRes, GetLatestBlockhashRpcResult);
@@ -6603,8 +6675,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 = create(unsafeRes, jsonRpcResult(number()));
@@ -7333,6 +7412,10 @@ class Connection {
       config.maxRetries = options.maxRetries;
     }
 
+    if (options && options.minContextSlot != null) {
+      config.minContextSlot = options.minContextSlot;
+    }
+
     if (skipPreflight) {
       config.skipPreflight = skipPreflight;
     }
@@ -9742,7 +9825,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;