@solana/web3.js 1.44.2 → 1.46.0

package/lib/index.iife.js

@@ -14201,24 +14201,27 @@ var solanaWeb3 = (function (exports) {
 	      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');
 	    }
 
@@ -14233,15 +14236,15 @@ var solanaWeb3 = (function (exports) {
 	      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
 	        });
@@ -14351,7 +14354,7 @@ var solanaWeb3 = (function (exports) {
 	      }
 	    });
 	    const accountKeys = signedKeys.concat(unsignedKeys);
-	    const instructions = this.instructions.map(instruction => {
+	    const compiledInstructions = instructions.map(instruction => {
 	      const {
 	        data,
 	        programId
@@ -14362,7 +14365,7 @@ var solanaWeb3 = (function (exports) {
 	        data: bs58$1.encode(data)
 	      };
 	    });
-	    instructions.forEach(instruction => {
+	    compiledInstructions.forEach(instruction => {
 	      assert$c(instruction.programIdIndex >= 0);
 	      instruction.accounts.forEach(keyIndex => assert$c(keyIndex >= 0));
 	    });
@@ -14374,7 +14377,7 @@ var solanaWeb3 = (function (exports) {
 	      },
 	      accountKeys,
 	      recentBlockhash,
-	      instructions
+	      instructions: compiledInstructions
 	    });
 	  }
 	  /**
@@ -14761,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({
@@ -19421,6 +19425,7 @@ var solanaWeb3 = (function (exports) {
 	  return url.toString();
 	}
 
+	var _process$env$npm_pack;
 	const PublicKeyFromString = coerce(instance(PublicKey), string(), value => new PublicKey(value));
 	const RawAccountDataResult = tuple([string(), literal('base64')]);
 	const BufferFromRawAccountData = coerce(instance(buffer.Buffer), RawAccountDataResult, value => buffer.Buffer.from(value[0], 'base64'));
@@ -19437,9 +19442,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'),
@@ -19631,7 +19659,7 @@ var solanaWeb3 = (function (exports) {
 	      agent,
 	      headers: Object.assign({
 	        'Content-Type': 'application/json'
-	      }, httpHeaders || {})
+	      }, httpHeaders || {}, COMMON_HTTP_HEADERS)
 	    };
 
 	    try {
@@ -20304,9 +20332,14 @@ var solanaWeb3 = (function (exports) {
 	 * 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 */
 
@@ -20471,8 +20504,16 @@ 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()));
@@ -20488,8 +20529,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);
 	    });
 	  }
@@ -20611,7 +20652,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) {
@@ -20624,7 +20669,7 @@ 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);
@@ -20708,8 +20753,13 @@ 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)));
@@ -20742,9 +20792,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);
@@ -20755,10 +20805,14 @@ 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))));
@@ -20774,8 +20828,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;
 	  }
 	  /**
@@ -20783,10 +20837,17 @@ 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));
@@ -20805,28 +20866,16 @@ 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)));
@@ -20845,22 +20894,12 @@ 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)));
@@ -21027,8 +21066,15 @@ 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()));
@@ -21044,8 +21090,15 @@ 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()));
@@ -21118,8 +21171,15 @@ 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()));
@@ -21166,9 +21226,16 @@ 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);
@@ -21185,8 +21252,15 @@ 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);
@@ -21357,9 +21431,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);
@@ -21371,8 +21445,15 @@ 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);
@@ -21450,8 +21531,15 @@ 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()));
@@ -22180,6 +22268,10 @@ var solanaWeb3 = (function (exports) {
 	      config.maxRetries = options.maxRetries;
 	    }
 
+	    if (options && options.minContextSlot != null) {
+	      config.minContextSlot = options.minContextSlot;
+	    }
+
 	    if (skipPreflight) {
 	      config.skipPreflight = skipPreflight;
 	    }
@@ -30182,7 +30274,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;