@solana/web3.js 1.44.2 → 1.46.0

package/lib/index.cjs.js

@@ -2568,24 +2568,27 @@ class Transaction {
       return this._message;
     }
 
-    const {
-      nonceInfo
-    } = this;
+    let recentBlockhash;
+    let instructions;
 
-    if (nonceInfo && this.instructions[0] != nonceInfo.nonceInstruction) {
-      this.recentBlockhash = nonceInfo.nonce;
-      this.instructions.unshift(nonceInfo.nonceInstruction);
-    }
+    if (this.nonceInfo) {
+      recentBlockhash = this.nonceInfo.nonce;
 
-    const {
-      recentBlockhash
-    } = this;
+      if (this.instructions[0] != this.nonceInfo.nonceInstruction) {
+        instructions = [this.nonceInfo.nonceInstruction, ...this.instructions];
+      } else {
+        instructions = this.instructions;
+      }
+    } else {
+      recentBlockhash = this.recentBlockhash;
+      instructions = this.instructions;
+    }
 
     if (!recentBlockhash) {
       throw new Error('Transaction recentBlockhash required');
     }
 
-    if (this.instructions.length < 1) {
+    if (instructions.length < 1) {
       console.warn('No instructions provided');
     }
 
@@ -2600,15 +2603,15 @@ class Transaction {
       throw new Error('Transaction fee payer required');
     }
 
-    for (let i = 0; i < this.instructions.length; i++) {
-      if (this.instructions[i].programId === undefined) {
+    for (let i = 0; i < instructions.length; i++) {
+      if (instructions[i].programId === undefined) {
         throw new Error(`Transaction instruction index ${i} has undefined program id`);
       }
     }
 
     const programIds = [];
     const accountMetas = [];
-    this.instructions.forEach(instruction => {
+    instructions.forEach(instruction => {
       instruction.keys.forEach(accountMeta => {
         accountMetas.push({ ...accountMeta
         });
@@ -2718,7 +2721,7 @@ class Transaction {
       }
     });
     const accountKeys = signedKeys.concat(unsignedKeys);
-    const instructions = this.instructions.map(instruction => {
+    const compiledInstructions = instructions.map(instruction => {
       const {
         data,
         programId
@@ -2729,7 +2732,7 @@ class Transaction {
         data: bs58__default["default"].encode(data)
       };
     });
-    instructions.forEach(instruction => {
+    compiledInstructions.forEach(instruction => {
       assert(instruction.programIdIndex >= 0);
       instruction.accounts.forEach(keyIndex => assert(keyIndex >= 0));
     });
@@ -2741,7 +2744,7 @@ class Transaction {
       },
       accountKeys,
       recentBlockhash,
-      instructions
+      instructions: compiledInstructions
     });
   }
   /**
@@ -3128,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({
@@ -4675,6 +4679,7 @@ function makeWebsocketUrl(endpoint) {
   return url.toString();
 }
 
+var _process$env$npm_pack;
 const PublicKeyFromString = superstruct.coerce(superstruct.instance(PublicKey), superstruct.string(), value => new PublicKey(value));
 const RawAccountDataResult = superstruct.tuple([superstruct.string(), superstruct.literal('base64')]);
 const BufferFromRawAccountData = superstruct.coerce(superstruct.instance(buffer.Buffer), RawAccountDataResult, value => buffer.Buffer.from(value[0], 'base64'));
@@ -4691,9 +4696,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'),
@@ -4890,7 +4918,7 @@ function createRpcClient(url, useHttps, httpHeaders, customFetch, fetchMiddlewar
       agent,
       headers: Object.assign({
         'Content-Type': 'application/json'
-      }, httpHeaders || {})
+      }, httpHeaders || {}, COMMON_HTTP_HEADERS)
     };
 
     try {
@@ -5564,9 +5592,14 @@ const LogsNotificationResult = superstruct.type({
  * Filter for log subscriptions.
  */
 
+/** @internal */
+const COMMON_HTTP_HEADERS = {
+  'solana-client': `js/${(_process$env$npm_pack = "0.0.0-development") !== null && _process$env$npm_pack !== void 0 ? _process$env$npm_pack : 'UNKNOWN'}`
+};
 /**
  * A connection to a fullnode JSON RPC endpoint
  */
+
 class Connection {
   /** @internal */
 
@@ -5731,8 +5764,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()));
@@ -5748,8 +5789,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);
     });
   }
@@ -5871,7 +5912,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) {
@@ -5884,7 +5929,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);
@@ -5968,8 +6013,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)));
@@ -6002,9 +6052,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);
@@ -6015,10 +6065,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))));
@@ -6034,8 +6088,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;
   }
   /**
@@ -6043,10 +6097,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));
@@ -6065,28 +6126,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)));
@@ -6105,22 +6154,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)));
@@ -6287,8 +6326,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()));
@@ -6304,8 +6350,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()));
@@ -6378,8 +6431,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()));
@@ -6426,9 +6486,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);
@@ -6445,8 +6512,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);
@@ -6617,9 +6691,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);
@@ -6631,8 +6705,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);
@@ -6710,8 +6791,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()));
@@ -7440,6 +7528,10 @@ class Connection {
       config.maxRetries = options.maxRetries;
     }
 
+    if (options && options.minContextSlot != null) {
+      config.minContextSlot = options.minContextSlot;
+    }
+
     if (skipPreflight) {
       config.skipPreflight = skipPreflight;
     }
@@ -9849,7 +9941,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;