@injectivelabs/wallet-core 1.20.14 → 1.20.16

package/dist/cjs/{BaseWalletStrategy-Bvs5nQRI.d.cts → BaseWalletStrategy-CD9sBzZB.d.cts}

@@ -1,6 +1,6 @@
 import { AccountAddress, ChainId, EvmChainId } from "@injectivelabs/ts-types";
 import { TxResponse } from "@injectivelabs/sdk-ts/core/tx";
-import { ConcreteStrategiesArg, ConcreteWalletStrategy, CosmosWalletAbstraction, Eip1193Provider, SendTransactionOptions, Wallet, WalletDeviceType, WalletMetadata, WalletStrategy, WalletStrategyArguments, WalletStrategyEmitter, onAccountChangeCallback, onChainIdChangeCallback } from "@injectivelabs/wallet-base/light";
+import { ConcreteStrategiesArg, ConcreteWalletStrategy, CosmosWalletAbstraction, Eip1193Provider, SendTransactionOptions, Wallet, WalletDeviceType, WalletMetadata, WalletStrategy, WalletStrategyArguments, WalletStrategyEmitter, onAccountChangeCallback, onChainIdChangeCallback } from "@injectivelabs/wallet-base/runtime-light";
 import { StdSignDoc } from "@keplr-wallet/types";
 import { OfflineSigner } from "@cosmjs/proto-signing";
 import { AminoSignResponse, DirectSignResponse, TxRaw } from "@injectivelabs/sdk-ts/types";

package/dist/cjs/{broadcaster-CuStNJ2g.cjs → broadcaster-DTwN2Hve.cjs}

@@ -41,6 +41,7 @@ var MsgBroadcaster = class {
 		require_defineProperty._defineProperty(this, "chainId", void 0);
 		require_defineProperty._defineProperty(this, "txTimeout", __injectivelabs_utils.DEFAULT_BLOCK_TIMEOUT_HEIGHT);
 		require_defineProperty._defineProperty(this, "simulateTx", true);
+		require_defineProperty._defineProperty(this, "useDynamicBaseFee", false);
 		require_defineProperty._defineProperty(this, "txTimeoutOnFeeDelegation", false);
 		require_defineProperty._defineProperty(this, "evmChainId", void 0);
 		require_defineProperty._defineProperty(this, "gasBufferCoefficient", 1.2);
@@ -50,6 +51,7 @@ var MsgBroadcaster = class {
 		const networkInfo = (0, __injectivelabs_networks.getNetworkInfo)(options.network);
 		this.options = options;
 		this.simulateTx = options.simulateTx !== void 0 ? options.simulateTx : true;
+		this.useDynamicBaseFee = options.useDynamicBaseFee !== void 0 ? options.useDynamicBaseFee : false;
 		this.txTimeout = options.txTimeout || __injectivelabs_utils.DEFAULT_BLOCK_TIMEOUT_HEIGHT;
 		this.txTimeoutOnFeeDelegation = options.txTimeoutOnFeeDelegation !== void 0 ? options.txTimeoutOnFeeDelegation : true;
 		this.gasBufferCoefficient = options.gasBufferCoefficient || 1.2;
@@ -61,10 +63,11 @@ var MsgBroadcaster = class {
 		this.txInclusion = options.txInclusion;
 	}
 	setOptions(options) {
-		this.simulateTx = options.simulateTx || this.simulateTx;
-		this.txTimeout = options.txTimeout || this.txTimeout;
-		this.txTimeoutOnFeeDelegation = options.txTimeoutOnFeeDelegation || this.txTimeoutOnFeeDelegation;
-		this.txInclusion = options.txInclusion || this.txInclusion;
+		this.simulateTx = options.simulateTx !== void 0 ? options.simulateTx : this.simulateTx;
+		this.useDynamicBaseFee = options.useDynamicBaseFee !== void 0 ? options.useDynamicBaseFee : this.useDynamicBaseFee;
+		this.txTimeout = options.txTimeout !== void 0 ? options.txTimeout : this.txTimeout;
+		this.txTimeoutOnFeeDelegation = options.txTimeoutOnFeeDelegation !== void 0 ? options.txTimeoutOnFeeDelegation : this.txTimeoutOnFeeDelegation;
+		this.txInclusion = options.txInclusion !== void 0 ? options.txInclusion : this.txInclusion;
 	}
 	async getEvmChainId() {
 		const { walletStrategy } = this;
@@ -234,9 +237,18 @@ var MsgBroadcaster = class {
 		const { chainId, endpoints, walletStrategy } = this;
 		const txTimeoutInBlocks = this.resolveTimeoutInBlocks(tx.txTimeoutInBlocks);
 		const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
-		const [evmChainId, { baseAccount, latestHeight }] = await Promise.all([this.getEvmChainId(), this.fetchAccountAndBlockDetails(tx.injectiveAddress, tx.accountDetails)]);
+		const [evmChainId, { baseAccount, latestHeight }] = await Promise.all([this.getEvmChainId(), this.fetchAccountAndBlockDetails({
+			latestHeight: tx.latestHeight,
+			timeoutHeight: tx.timeoutHeight,
+			address: tx.injectiveAddress,
+			existingAccountDetails: tx.accountDetails
+		})]);
 		if (!evmChainId) throw new __injectivelabs_exceptions.GeneralException(/* @__PURE__ */ new Error("Please provide evmChainId"));
-		const timeoutHeight = (0, __injectivelabs_utils.toBigNumber)(latestHeight.toString()).plus(txTimeoutInBlocks);
+		const timeoutHeight = this.resolveTimeoutHeight({
+			tx,
+			latestHeight,
+			txTimeoutInBlocks
+		});
 		const txTimeoutTimeInSeconds = txTimeoutInBlocks * __injectivelabs_utils.DEFAULT_BLOCK_TIME_IN_SECONDS;
 		const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1e3;
 		const gas = (((_tx$gas = tx.gas) === null || _tx$gas === void 0 ? void 0 : _tx$gas.gas) || (0, __injectivelabs_sdk_ts_utils.getGasPriceBasedOnMessage)(msgs)).toString();
@@ -345,9 +357,18 @@ var MsgBroadcaster = class {
 		const { chainId, endpoints, walletStrategy } = this;
 		const txTimeoutInBlocks = this.resolveTimeoutInBlocks(tx.txTimeoutInBlocks);
 		const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
-		const [evmChainId, { baseAccount, latestHeight }] = await Promise.all([this.getEvmChainId(), this.fetchAccountAndBlockDetails(tx.injectiveAddress, tx.accountDetails)]);
+		const [evmChainId, { baseAccount, latestHeight }] = await Promise.all([this.getEvmChainId(), this.fetchAccountAndBlockDetails({
+			latestHeight: tx.latestHeight,
+			timeoutHeight: tx.timeoutHeight,
+			address: tx.injectiveAddress,
+			existingAccountDetails: tx.accountDetails
+		})]);
 		if (!evmChainId) throw new __injectivelabs_exceptions.GeneralException(/* @__PURE__ */ new Error("Please provide evmChainId"));
-		const timeoutHeight = (0, __injectivelabs_utils.toBigNumber)(latestHeight).plus(txTimeoutInBlocks);
+		const timeoutHeight = this.resolveTimeoutHeight({
+			tx,
+			latestHeight,
+			txTimeoutInBlocks
+		});
 		const txTimeoutTimeInSeconds = txTimeoutInBlocks * __injectivelabs_utils.DEFAULT_BLOCK_TIME_IN_SECONDS;
 		const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1e3;
 		const gas = (((_tx$gas2 = tx.gas) === null || _tx$gas2 === void 0 ? void 0 : _tx$gas2.gas) || (0, __injectivelabs_sdk_ts_utils.getGasPriceBasedOnMessage)(msgs)).toString();
@@ -462,11 +483,22 @@ var MsgBroadcaster = class {
 		if (httpHeaders) transactionApi.setMetadata(httpHeaders);
 		const txTimeoutTimeInSeconds = txTimeoutInBlocks * __injectivelabs_utils.DEFAULT_BLOCK_TIME_IN_SECONDS;
 		const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1e3;
-		let timeoutHeight = void 0;
-		if (txTimeoutOnFeeDelegation) timeoutHeight = (0, __injectivelabs_utils.toBigNumber)((await new __injectivelabs_sdk_ts_client_chain.ChainGrpcTendermintApi(endpoints.grpc).fetchLatestBlock()).header.height.toString()).plus(txTimeoutInBlocks).toNumber();
+		let timeoutHeight = this.resolveOptionalTimeoutHeight({
+			tx,
+			latestHeight: tx.latestHeight,
+			txTimeoutInBlocks
+		});
+		if (timeoutHeight === void 0 && txTimeoutOnFeeDelegation) {
+			const latestHeight = (await new __injectivelabs_sdk_ts_client_chain.ChainGrpcTendermintApi(endpoints.grpc).fetchLatestBlock()).header.height.toString();
+			timeoutHeight = this.resolveTimeoutHeight({
+				tx,
+				latestHeight,
+				txTimeoutInBlocks
+			});
+		}
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionPreparationStart);
 		const prepareTxResponse = await transactionApi.prepareTxRequest({
-			timeoutHeight,
+			timeoutHeight: timeoutHeight === null || timeoutHeight === void 0 ? void 0 : timeoutHeight.toNumber(),
 			memo: tx.memo,
 			message: web3Msgs,
 			address: tx.ethereumAddress,
@@ -532,8 +564,17 @@ var MsgBroadcaster = class {
 		if ([__injectivelabs_wallet_base.Wallet.Keplr, __injectivelabs_wallet_base.Wallet.Leap].includes(walletStrategy.getWallet())) {
 			if (await walletStrategy.getWalletDeviceType() === __injectivelabs_wallet_base.WalletDeviceType.Hardware) return this.experimentalBroadcastWalletThroughLedger(tx);
 		}
-		const [{ baseAccount, latestHeight }, pubKey] = await Promise.all([this.fetchAccountAndBlockDetails(tx.injectiveAddress, tx.accountDetails), walletStrategy.getPubKey(tx.injectiveAddress)]);
-		const timeoutHeight = (0, __injectivelabs_utils.toBigNumber)(latestHeight).plus(txTimeoutInBlocks);
+		const [{ baseAccount, latestHeight }, pubKey] = await Promise.all([this.fetchAccountAndBlockDetails({
+			latestHeight: tx.latestHeight,
+			timeoutHeight: tx.timeoutHeight,
+			address: tx.injectiveAddress,
+			existingAccountDetails: tx.accountDetails
+		}), walletStrategy.getPubKey(tx.injectiveAddress)]);
+		const timeoutHeight = this.resolveTimeoutHeight({
+			tx,
+			latestHeight,
+			txTimeoutInBlocks
+		});
 		const txTimeoutTimeInMilliSeconds = txTimeoutInBlocks * __injectivelabs_utils.DEFAULT_BLOCK_TIME_IN_SECONDS * 1e3;
 		const signMode = (0, __injectivelabs_wallet_base.isCosmosAminoOnlyWallet)(walletStrategy.wallet) ? __injectivelabs_sdk_ts_core_tx.SIGN_EIP712 : __injectivelabs_sdk_ts_core_tx.SIGN_DIRECT;
 		const gas = (((_tx$gas3 = tx.gas) === null || _tx$gas3 === void 0 ? void 0 : _tx$gas3.gas) || (0, __injectivelabs_sdk_ts_utils.getGasPriceBasedOnMessage)(msgs)).toString();
@@ -659,8 +700,17 @@ var MsgBroadcaster = class {
 		}
 		if (!evmChainId) throw new __injectivelabs_exceptions.GeneralException(/* @__PURE__ */ new Error("Please provide evmChainId"));
 		const cosmosWallet = walletStrategy.getCosmosWallet(chainId);
-		const [{ baseAccount, latestHeight }, pubKey] = await Promise.all([this.fetchAccountAndBlockDetails(tx.injectiveAddress, tx.accountDetails), walletStrategy.getPubKey()]);
-		const timeoutHeight = (0, __injectivelabs_utils.toBigNumber)(latestHeight).plus(txTimeoutInBlocks);
+		const [{ baseAccount, latestHeight }, pubKey] = await Promise.all([this.fetchAccountAndBlockDetails({
+			latestHeight: tx.latestHeight,
+			timeoutHeight: tx.timeoutHeight,
+			address: tx.injectiveAddress,
+			existingAccountDetails: tx.accountDetails
+		}), walletStrategy.getPubKey()]);
+		const timeoutHeight = this.resolveTimeoutHeight({
+			tx,
+			latestHeight,
+			txTimeoutInBlocks
+		});
 		const gas = (((_tx$gas5 = tx.gas) === null || _tx$gas5 === void 0 ? void 0 : _tx$gas5.gas) || (0, __injectivelabs_sdk_ts_utils.getGasPriceBasedOnMessage)(msgs)).toString();
 		/** EIP712 for signing on Ethereum wallets */
 		const eip712TypedData = (0, __injectivelabs_sdk_ts_core_tx.getEip712TypedData)({
@@ -751,7 +801,12 @@ var MsgBroadcaster = class {
 		if (httpHeaders) transactionApi.setMetadata(httpHeaders);
 		const fetchAccountBlockDetails = async () => {
 			try {
-				const { baseAccount: baseAccount$1, latestHeight: latestHeight$1 } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress, tx.accountDetails);
+				const { baseAccount: baseAccount$1, latestHeight: latestHeight$1 } = await this.fetchAccountAndBlockDetails({
+					latestHeight: tx.latestHeight,
+					timeoutHeight: tx.timeoutHeight,
+					address: tx.injectiveAddress,
+					existingAccountDetails: tx.accountDetails
+				});
 				return {
 					baseAccount: baseAccount$1,
 					latestHeight: latestHeight$1
@@ -765,7 +820,11 @@ var MsgBroadcaster = class {
 						memo: tx.memo,
 						estimateGas: simulateTx
 					});
-					const { baseAccount: baseAccount$1, latestHeight: latestHeight$1 } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
+					const { baseAccount: baseAccount$1, latestHeight: latestHeight$1 } = await this.fetchAccountAndBlockDetails({
+						latestHeight: tx.latestHeight,
+						timeoutHeight: tx.timeoutHeight,
+						address: tx.injectiveAddress
+					});
 					return {
 						baseAccount: baseAccount$1,
 						latestHeight: latestHeight$1
@@ -774,14 +833,21 @@ var MsgBroadcaster = class {
 				throw e;
 			}
 		};
-		/** Account Details * */
-		const { baseAccount, latestHeight } = await fetchAccountBlockDetails();
 		const chainGrpcAuthApi = new __injectivelabs_sdk_ts_client_chain.ChainGrpcAuthApi(endpoints.grpc);
 		if (httpHeaders) chainGrpcAuthApi.setMetadata(httpHeaders);
-		const { baseAccount: feePayerBaseAccount } = await chainGrpcAuthApi.fetchAccount(feePayer);
-		const timeoutHeight = (0, __injectivelabs_utils.toBigNumber)(latestHeight).plus(txTimeoutOnFeeDelegation ? txTimeoutInBlocks : __injectivelabs_utils.DEFAULT_BLOCK_TIMEOUT_HEIGHT);
+		const [accountBlockDetails, feePayerAccountDetails, pubKey] = await Promise.all([
+			fetchAccountBlockDetails(),
+			chainGrpcAuthApi.fetchAccount(feePayer),
+			walletStrategy.getPubKey()
+		]);
+		const { baseAccount, latestHeight } = accountBlockDetails;
+		const { baseAccount: feePayerBaseAccount } = feePayerAccountDetails;
+		const timeoutHeight = this.resolveTimeoutHeight({
+			tx,
+			latestHeight,
+			txTimeoutInBlocks: txTimeoutOnFeeDelegation ? txTimeoutInBlocks : __injectivelabs_utils.DEFAULT_BLOCK_TIMEOUT_HEIGHT
+		});
 		const txTimeoutTimeInMilliSeconds = txTimeoutInBlocks * __injectivelabs_utils.DEFAULT_BLOCK_TIME_IN_SECONDS * 1e3;
-		const pubKey = await walletStrategy.getPubKey();
 		const gas = (((_tx$gas7 = tx.gas) === null || _tx$gas7 === void 0 ? void 0 : _tx$gas7.gas) || (0, __injectivelabs_sdk_ts_utils.getGasPriceBasedOnMessage)(msgs)).toString();
 		/** Prepare the Transaction * */
 		const { txRaw } = await this.getTxWithSignersAndStdFee({
@@ -872,7 +938,9 @@ var MsgBroadcaster = class {
 		return response.feePayerPubKey.key;
 	}
 	async getStdFeeWithDynamicBaseFee(args) {
-		const client = new __injectivelabs_sdk_ts_client_chain.ChainGrpcTxFeesApi(this.endpoints.grpc);
+		const { endpoints, useDynamicBaseFee } = this;
+		if (!useDynamicBaseFee) return (0, __injectivelabs_utils.getStdFee)(args);
+		const client = new __injectivelabs_sdk_ts_client_chain.ChainGrpcTxFeesApi(endpoints.grpc);
 		let baseFee = __injectivelabs_utils.DEFAULT_GAS_PRICE;
 		try {
 			const response = await client.fetchEipBaseFee();
@@ -960,23 +1028,52 @@ var MsgBroadcaster = class {
 			throw e;
 		}
 	}
-	async fetchAccountAndBlockDetails(address, existingAccountDetails) {
+	async fetchAccountAndBlockDetails({ address, latestHeight, timeoutHeight, existingAccountDetails }) {
 		const { endpoints, httpHeaders } = this;
-		const tendermintClient = new __injectivelabs_sdk_ts_client_chain.ChainGrpcTendermintApi(endpoints.grpc);
-		if (httpHeaders) tendermintClient.setMetadata(httpHeaders);
-		if (existingAccountDetails) return {
-			baseAccount: existingAccountDetails,
-			latestHeight: (await tendermintClient.fetchLatestBlock()).header.height.toString()
-		};
+		const shouldFetchLatestHeight = latestHeight === void 0 && timeoutHeight === void 0;
+		if (existingAccountDetails) {
+			if (!shouldFetchLatestHeight) return {
+				latestHeight: latestHeight === null || latestHeight === void 0 ? void 0 : latestHeight.toString(),
+				baseAccount: existingAccountDetails
+			};
+			const tendermintClient$1 = new __injectivelabs_sdk_ts_client_chain.ChainGrpcTendermintApi(endpoints.grpc);
+			if (httpHeaders) tendermintClient$1.setMetadata(httpHeaders);
+			return {
+				baseAccount: existingAccountDetails,
+				latestHeight: (await tendermintClient$1.fetchLatestBlock()).header.height.toString()
+			};
+		}
 		const chainClient = new __injectivelabs_sdk_ts_client_chain.ChainGrpcAuthApi(endpoints.grpc);
 		if (httpHeaders) chainClient.setMetadata(httpHeaders);
+		if (!shouldFetchLatestHeight) {
+			const accountDetails$1 = await chainClient.fetchAccount(address);
+			return {
+				latestHeight: latestHeight === null || latestHeight === void 0 ? void 0 : latestHeight.toString(),
+				baseAccount: accountDetails$1.baseAccount
+			};
+		}
+		const tendermintClient = new __injectivelabs_sdk_ts_client_chain.ChainGrpcTendermintApi(endpoints.grpc);
+		if (httpHeaders) tendermintClient.setMetadata(httpHeaders);
 		const [accountDetails, latestBlock] = await Promise.all([chainClient.fetchAccount(address), tendermintClient.fetchLatestBlock()]);
-		const { baseAccount } = accountDetails;
 		return {
-			baseAccount,
+			baseAccount: accountDetails.baseAccount,
 			latestHeight: latestBlock.header.height.toString()
 		};
 	}
+	resolveOptionalTimeoutHeight({ tx, latestHeight, txTimeoutInBlocks }) {
+		if (tx.timeoutHeight !== void 0) return (0, __injectivelabs_utils.toBigNumber)(tx.timeoutHeight);
+		if (latestHeight === void 0) return;
+		return (0, __injectivelabs_utils.toBigNumber)(latestHeight).plus(txTimeoutInBlocks);
+	}
+	resolveTimeoutHeight({ tx, latestHeight, txTimeoutInBlocks }) {
+		const timeoutHeight = this.resolveOptionalTimeoutHeight({
+			tx,
+			latestHeight,
+			txTimeoutInBlocks
+		});
+		if (!timeoutHeight) throw new __injectivelabs_exceptions.GeneralException(/* @__PURE__ */ new Error("Please provide latestHeight or timeoutHeight"));
+		return timeoutHeight;
+	}
 	resolveTimeoutInBlocks(override) {
 		return typeof override === "number" && Number.isInteger(override) && override > 0 ? override : this.txTimeout;
 	}

package/dist/cjs/broadcaster.cjs

@@ -1,4 +1,4 @@
-const require_broadcaster = require('./broadcaster-CuStNJ2g.cjs');
+const require_broadcaster = require('./broadcaster-DTwN2Hve.cjs');
 require('./defineProperty-CImP5zIM.cjs');
 
 exports.MsgBroadcaster = require_broadcaster.MsgBroadcaster;

package/dist/cjs/broadcaster.d.cts

@@ -1,3 +1,3 @@
-import "./BaseWalletStrategy-Bvs5nQRI.cjs";
-import { a as MsgBroadcasterTxOptionsWithAddresses, i as MsgBroadcasterTxOptions, n as MsgBroadcaster, r as MsgBroadcasterOptions, t as Web3Broadcaster } from "./index-aQCoSOFW.cjs";
+import "./BaseWalletStrategy-CD9sBzZB.cjs";
+import { a as MsgBroadcasterTxOptionsWithAddresses, i as MsgBroadcasterTxOptions, n as MsgBroadcaster, r as MsgBroadcasterOptions, t as Web3Broadcaster } from "./index-DIurlb8S.cjs";
 export { MsgBroadcaster, MsgBroadcasterOptions, MsgBroadcasterTxOptions, MsgBroadcasterTxOptionsWithAddresses, Web3Broadcaster };

package/dist/cjs/{index-aQCoSOFW.d.cts → index-DIurlb8S.d.cts}

@@ -1,4 +1,4 @@
-import { t as BaseWalletStrategy } from "./BaseWalletStrategy-Bvs5nQRI.cjs";
+import { t as BaseWalletStrategy } from "./BaseWalletStrategy-CD9sBzZB.cjs";
 import { Msgs } from "@injectivelabs/sdk-ts/core/modules";
 import { ChainId, EvmChainId } from "@injectivelabs/ts-types";
 import { Network, NetworkEndpoints } from "@injectivelabs/networks";
@@ -12,6 +12,8 @@ interface MsgBroadcasterTxOptions {
   ethereumAddress?: string;
   injectiveAddress?: string;
   accountDetails?: AuthBaseAccount;
+  latestHeight?: number | string;
+  timeoutHeight?: number | string;
   txTimeoutInBlocks?: number;
   txInclusion?: TxClientInclusionOptions;
   gas?: {
@@ -27,15 +29,16 @@ interface MsgBroadcasterTxOptionsWithAddresses extends MsgBroadcasterTxOptions {
 }
 interface MsgBroadcasterOptions {
   network: Network;
-  endpoints?: NetworkEndpoints;
   chainId?: ChainId;
+  txTimeout?: number;
+  simulateTx?: boolean;
   evmChainId?: EvmChainId;
   feePayerPubKey?: string;
-  simulateTx?: boolean;
-  txTimeoutOnFeeDelegation?: boolean;
-  txTimeout?: number;
+  endpoints?: NetworkEndpoints;
   txInclusion?: TxClientInclusionOptions;
   walletStrategy: BaseWalletStrategy;
+  useDynamicBaseFee?: boolean;
+  txTimeoutOnFeeDelegation?: boolean;
   gasBufferCoefficient?: number;
   httpHeaders?: Record<string, string>;
 }
@@ -55,6 +58,7 @@ declare class MsgBroadcaster {
   chainId: ChainId;
   txTimeout: number;
   simulateTx: boolean;
+  useDynamicBaseFee: boolean;
   txTimeoutOnFeeDelegation: boolean;
   evmChainId?: EvmChainId;
   gasBufferCoefficient: number;
@@ -204,6 +208,8 @@ declare class MsgBroadcaster {
   private simulateTxWithSigners;
   private retryOnException;
   private fetchAccountAndBlockDetails;
+  private resolveOptionalTimeoutHeight;
+  private resolveTimeoutHeight;
   private resolveTimeoutInBlocks;
   private resolveTxInclusionOptions;
   private createTxGrpcApi;

package/dist/cjs/index.cjs

@@ -1,6 +1,6 @@
-const require_broadcaster = require('./broadcaster-CuStNJ2g.cjs');
+const require_broadcaster = require('./broadcaster-DTwN2Hve.cjs');
 require('./defineProperty-CImP5zIM.cjs');
-const require_strategy = require('./strategy-D8mmr647.cjs');
+const require_strategy = require('./strategy-BxKznCI0.cjs');
 
 exports.BaseWalletStrategy = require_strategy.BaseWalletStrategy;
 exports.MsgBroadcaster = require_broadcaster.MsgBroadcaster;

package/dist/cjs/index.d.cts

@@ -1,5 +1,5 @@
-import { t as BaseWalletStrategy } from "./BaseWalletStrategy-Bvs5nQRI.cjs";
-import { a as MsgBroadcasterTxOptionsWithAddresses, i as MsgBroadcasterTxOptions, n as MsgBroadcaster, r as MsgBroadcasterOptions, t as Web3Broadcaster } from "./index-aQCoSOFW.cjs";
+import { t as BaseWalletStrategy } from "./BaseWalletStrategy-CD9sBzZB.cjs";
+import { a as MsgBroadcasterTxOptionsWithAddresses, i as MsgBroadcasterTxOptions, n as MsgBroadcaster, r as MsgBroadcasterOptions, t as Web3Broadcaster } from "./index-DIurlb8S.cjs";
 import "./index-DLoAMD9J.cjs";
 
 //#region src/utils/tx.d.ts

package/dist/cjs/{strategy-D8mmr647.cjs → strategy-BxKznCI0.cjs}

@@ -1,15 +1,15 @@
 const require_defineProperty = require('./defineProperty-CImP5zIM.cjs');
 let __injectivelabs_exceptions = require("@injectivelabs/exceptions");
 let eventemitter3 = require("eventemitter3");
-let __injectivelabs_wallet_base_light = require("@injectivelabs/wallet-base/light");
+let __injectivelabs_wallet_base_runtime_light = require("@injectivelabs/wallet-base/runtime-light");
 
 //#region src/strategy/BaseWalletStrategy.ts
 const getInitialWallet = (args) => {
 	if (args.wallet) return args.wallet;
 	const keys = Object.keys(args.strategies || {});
-	if (keys.length === 0) return __injectivelabs_wallet_base_light.Wallet.Metamask;
-	if (keys.includes(__injectivelabs_wallet_base_light.Wallet.Metamask) && args.evmOptions) return __injectivelabs_wallet_base_light.Wallet.Metamask;
-	if (keys.includes(__injectivelabs_wallet_base_light.Wallet.Keplr) && !args.evmOptions) return __injectivelabs_wallet_base_light.Wallet.Keplr;
+	if (keys.length === 0) return __injectivelabs_wallet_base_runtime_light.Wallet.Metamask;
+	if (keys.includes(__injectivelabs_wallet_base_runtime_light.Wallet.Metamask) && args.evmOptions) return __injectivelabs_wallet_base_runtime_light.Wallet.Metamask;
+	if (keys.includes(__injectivelabs_wallet_base_runtime_light.Wallet.Keplr) && !args.evmOptions) return __injectivelabs_wallet_base_runtime_light.Wallet.Keplr;
 	return keys[0];
 };
 var BaseWalletStrategy = class {
@@ -101,33 +101,33 @@ var BaseWalletStrategy = class {
 		return this.getStrategy().sendEvmTransaction(tx, options);
 	}
 	async signEip712TypedData(eip712TypedData, address, options = {}) {
-		if ((0, __injectivelabs_wallet_base_light.isCosmosWallet)(this.wallet)) throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`You can't sign Ethereum Transaction using ${this.wallet}`));
+		if ((0, __injectivelabs_wallet_base_runtime_light.isCosmosWallet)(this.wallet)) throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`You can't sign Ethereum Transaction using ${this.wallet}`));
 		/** Phantom wallet needs enabling before signing */
-		if (this.wallet === __injectivelabs_wallet_base_light.Wallet.Phantom) await this.enable();
-		this.emit(__injectivelabs_wallet_base_light.WalletStrategyEmitterEventType.TransactionSignStart);
+		if (this.wallet === __injectivelabs_wallet_base_runtime_light.Wallet.Phantom) await this.enable();
+		this.emit(__injectivelabs_wallet_base_runtime_light.WalletStrategyEmitterEventType.TransactionSignStart);
 		const response = await this.getStrategy().signEip712TypedData(eip712TypedData, address, options);
-		this.emit(__injectivelabs_wallet_base_light.WalletStrategyEmitterEventType.TransactionSigned);
+		this.emit(__injectivelabs_wallet_base_runtime_light.WalletStrategyEmitterEventType.TransactionSigned);
 		return response;
 	}
 	async signAminoCosmosTransaction(transaction) {
-		if ((0, __injectivelabs_wallet_base_light.isEvmWallet)(this.wallet)) throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`You can't sign Cosmos Transaction using ${this.wallet}`));
-		this.emit(__injectivelabs_wallet_base_light.WalletStrategyEmitterEventType.TransactionSignStart);
+		if ((0, __injectivelabs_wallet_base_runtime_light.isEvmWallet)(this.wallet)) throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`You can't sign Cosmos Transaction using ${this.wallet}`));
+		this.emit(__injectivelabs_wallet_base_runtime_light.WalletStrategyEmitterEventType.TransactionSignStart);
 		const response = await this.getStrategy().signAminoCosmosTransaction(transaction);
-		this.emit(__injectivelabs_wallet_base_light.WalletStrategyEmitterEventType.TransactionSigned);
+		this.emit(__injectivelabs_wallet_base_runtime_light.WalletStrategyEmitterEventType.TransactionSigned);
 		return response;
 	}
 	async signCosmosTransaction(transaction) {
-		if ((0, __injectivelabs_wallet_base_light.isEvmWallet)(this.wallet)) throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`You can't sign Cosmos Transaction using ${this.wallet}`));
-		this.emit(__injectivelabs_wallet_base_light.WalletStrategyEmitterEventType.TransactionSignStart);
+		if ((0, __injectivelabs_wallet_base_runtime_light.isEvmWallet)(this.wallet)) throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error(`You can't sign Cosmos Transaction using ${this.wallet}`));
+		this.emit(__injectivelabs_wallet_base_runtime_light.WalletStrategyEmitterEventType.TransactionSignStart);
 		const response = await this.getStrategy().signCosmosTransaction(transaction);
-		this.emit(__injectivelabs_wallet_base_light.WalletStrategyEmitterEventType.TransactionSigned);
+		this.emit(__injectivelabs_wallet_base_runtime_light.WalletStrategyEmitterEventType.TransactionSigned);
 		return response;
 	}
 	async signArbitrary(signer, data) {
 		if (this.getStrategy().signArbitrary) {
-			this.emit(__injectivelabs_wallet_base_light.WalletStrategyEmitterEventType.TransactionSignStart);
+			this.emit(__injectivelabs_wallet_base_runtime_light.WalletStrategyEmitterEventType.TransactionSignStart);
 			const response = await this.getStrategy().signArbitrary(signer, data);
-			this.emit(__injectivelabs_wallet_base_light.WalletStrategyEmitterEventType.TransactionSigned);
+			this.emit(__injectivelabs_wallet_base_runtime_light.WalletStrategyEmitterEventType.TransactionSigned);
 			return response;
 		}
 	}
@@ -140,7 +140,7 @@ var BaseWalletStrategy = class {
 	async disconnect() {
 		if (this.getStrategy().disconnect) {
 			await this.getStrategy().disconnect();
-			this.emit(__injectivelabs_wallet_base_light.WalletStrategyEmitterEventType.WalletStrategyDisconnect);
+			this.emit(__injectivelabs_wallet_base_runtime_light.WalletStrategyEmitterEventType.WalletStrategyDisconnect);
 		}
 	}
 	getCosmosWallet(chainId) {

package/dist/cjs/strategy.cjs

@@ -1,4 +1,4 @@
 require('./defineProperty-CImP5zIM.cjs');
-const require_strategy = require('./strategy-D8mmr647.cjs');
+const require_strategy = require('./strategy-BxKznCI0.cjs');
 
 exports.BaseWalletStrategy = require_strategy.BaseWalletStrategy;

package/dist/cjs/strategy.d.cts

@@ -1,3 +1,3 @@
-import { t as BaseWalletStrategy } from "./BaseWalletStrategy-Bvs5nQRI.cjs";
+import { t as BaseWalletStrategy } from "./BaseWalletStrategy-CD9sBzZB.cjs";
 import "./index-DLoAMD9J.cjs";
 export { BaseWalletStrategy };

package/dist/esm/{BaseWalletStrategy-D2xNJmzo.d.ts → BaseWalletStrategy-2HVN2oeB.d.ts}

@@ -1,4 +1,4 @@
-import { ConcreteStrategiesArg, ConcreteWalletStrategy, CosmosWalletAbstraction, Eip1193Provider, SendTransactionOptions, Wallet, WalletDeviceType, WalletMetadata, WalletStrategy, WalletStrategyArguments, WalletStrategyEmitter, onAccountChangeCallback, onChainIdChangeCallback } from "@injectivelabs/wallet-base/light";
+import { ConcreteStrategiesArg, ConcreteWalletStrategy, CosmosWalletAbstraction, Eip1193Provider, SendTransactionOptions, Wallet, WalletDeviceType, WalletMetadata, WalletStrategy, WalletStrategyArguments, WalletStrategyEmitter, onAccountChangeCallback, onChainIdChangeCallback } from "@injectivelabs/wallet-base/runtime-light";
 import { AccountAddress, ChainId, EvmChainId } from "@injectivelabs/ts-types";
 import { TxResponse } from "@injectivelabs/sdk-ts/core/tx";
 import { StdSignDoc } from "@keplr-wallet/types";

package/dist/esm/{broadcaster-ZH8xuuQH.js → broadcaster-DzLAEG3E.js}

@@ -41,6 +41,7 @@ var MsgBroadcaster = class {
 		_defineProperty(this, "chainId", void 0);
 		_defineProperty(this, "txTimeout", DEFAULT_BLOCK_TIMEOUT_HEIGHT);
 		_defineProperty(this, "simulateTx", true);
+		_defineProperty(this, "useDynamicBaseFee", false);
 		_defineProperty(this, "txTimeoutOnFeeDelegation", false);
 		_defineProperty(this, "evmChainId", void 0);
 		_defineProperty(this, "gasBufferCoefficient", 1.2);
@@ -50,6 +51,7 @@ var MsgBroadcaster = class {
 		const networkInfo = getNetworkInfo(options.network);
 		this.options = options;
 		this.simulateTx = options.simulateTx !== void 0 ? options.simulateTx : true;
+		this.useDynamicBaseFee = options.useDynamicBaseFee !== void 0 ? options.useDynamicBaseFee : false;
 		this.txTimeout = options.txTimeout || DEFAULT_BLOCK_TIMEOUT_HEIGHT;
 		this.txTimeoutOnFeeDelegation = options.txTimeoutOnFeeDelegation !== void 0 ? options.txTimeoutOnFeeDelegation : true;
 		this.gasBufferCoefficient = options.gasBufferCoefficient || 1.2;
@@ -61,10 +63,11 @@ var MsgBroadcaster = class {
 		this.txInclusion = options.txInclusion;
 	}
 	setOptions(options) {
-		this.simulateTx = options.simulateTx || this.simulateTx;
-		this.txTimeout = options.txTimeout || this.txTimeout;
-		this.txTimeoutOnFeeDelegation = options.txTimeoutOnFeeDelegation || this.txTimeoutOnFeeDelegation;
-		this.txInclusion = options.txInclusion || this.txInclusion;
+		this.simulateTx = options.simulateTx !== void 0 ? options.simulateTx : this.simulateTx;
+		this.useDynamicBaseFee = options.useDynamicBaseFee !== void 0 ? options.useDynamicBaseFee : this.useDynamicBaseFee;
+		this.txTimeout = options.txTimeout !== void 0 ? options.txTimeout : this.txTimeout;
+		this.txTimeoutOnFeeDelegation = options.txTimeoutOnFeeDelegation !== void 0 ? options.txTimeoutOnFeeDelegation : this.txTimeoutOnFeeDelegation;
+		this.txInclusion = options.txInclusion !== void 0 ? options.txInclusion : this.txInclusion;
 	}
 	async getEvmChainId() {
 		const { walletStrategy } = this;
@@ -234,9 +237,18 @@ var MsgBroadcaster = class {
 		const { chainId, endpoints, walletStrategy } = this;
 		const txTimeoutInBlocks = this.resolveTimeoutInBlocks(tx.txTimeoutInBlocks);
 		const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
-		const [evmChainId, { baseAccount, latestHeight }] = await Promise.all([this.getEvmChainId(), this.fetchAccountAndBlockDetails(tx.injectiveAddress, tx.accountDetails)]);
+		const [evmChainId, { baseAccount, latestHeight }] = await Promise.all([this.getEvmChainId(), this.fetchAccountAndBlockDetails({
+			latestHeight: tx.latestHeight,
+			timeoutHeight: tx.timeoutHeight,
+			address: tx.injectiveAddress,
+			existingAccountDetails: tx.accountDetails
+		})]);
 		if (!evmChainId) throw new GeneralException(/* @__PURE__ */ new Error("Please provide evmChainId"));
-		const timeoutHeight = toBigNumber(latestHeight.toString()).plus(txTimeoutInBlocks);
+		const timeoutHeight = this.resolveTimeoutHeight({
+			tx,
+			latestHeight,
+			txTimeoutInBlocks
+		});
 		const txTimeoutTimeInSeconds = txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS;
 		const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1e3;
 		const gas = (((_tx$gas = tx.gas) === null || _tx$gas === void 0 ? void 0 : _tx$gas.gas) || getGasPriceBasedOnMessage(msgs)).toString();
@@ -345,9 +357,18 @@ var MsgBroadcaster = class {
 		const { chainId, endpoints, walletStrategy } = this;
 		const txTimeoutInBlocks = this.resolveTimeoutInBlocks(tx.txTimeoutInBlocks);
 		const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
-		const [evmChainId, { baseAccount, latestHeight }] = await Promise.all([this.getEvmChainId(), this.fetchAccountAndBlockDetails(tx.injectiveAddress, tx.accountDetails)]);
+		const [evmChainId, { baseAccount, latestHeight }] = await Promise.all([this.getEvmChainId(), this.fetchAccountAndBlockDetails({
+			latestHeight: tx.latestHeight,
+			timeoutHeight: tx.timeoutHeight,
+			address: tx.injectiveAddress,
+			existingAccountDetails: tx.accountDetails
+		})]);
 		if (!evmChainId) throw new GeneralException(/* @__PURE__ */ new Error("Please provide evmChainId"));
-		const timeoutHeight = toBigNumber(latestHeight).plus(txTimeoutInBlocks);
+		const timeoutHeight = this.resolveTimeoutHeight({
+			tx,
+			latestHeight,
+			txTimeoutInBlocks
+		});
 		const txTimeoutTimeInSeconds = txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS;
 		const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1e3;
 		const gas = (((_tx$gas2 = tx.gas) === null || _tx$gas2 === void 0 ? void 0 : _tx$gas2.gas) || getGasPriceBasedOnMessage(msgs)).toString();
@@ -462,11 +483,22 @@ var MsgBroadcaster = class {
 		if (httpHeaders) transactionApi.setMetadata(httpHeaders);
 		const txTimeoutTimeInSeconds = txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS;
 		const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1e3;
-		let timeoutHeight = void 0;
-		if (txTimeoutOnFeeDelegation) timeoutHeight = toBigNumber((await new ChainGrpcTendermintApi(endpoints.grpc).fetchLatestBlock()).header.height.toString()).plus(txTimeoutInBlocks).toNumber();
+		let timeoutHeight = this.resolveOptionalTimeoutHeight({
+			tx,
+			latestHeight: tx.latestHeight,
+			txTimeoutInBlocks
+		});
+		if (timeoutHeight === void 0 && txTimeoutOnFeeDelegation) {
+			const latestHeight = (await new ChainGrpcTendermintApi(endpoints.grpc).fetchLatestBlock()).header.height.toString();
+			timeoutHeight = this.resolveTimeoutHeight({
+				tx,
+				latestHeight,
+				txTimeoutInBlocks
+			});
+		}
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionPreparationStart);
 		const prepareTxResponse = await transactionApi.prepareTxRequest({
-			timeoutHeight,
+			timeoutHeight: timeoutHeight === null || timeoutHeight === void 0 ? void 0 : timeoutHeight.toNumber(),
 			memo: tx.memo,
 			message: web3Msgs,
 			address: tx.ethereumAddress,
@@ -532,8 +564,17 @@ var MsgBroadcaster = class {
 		if ([Wallet.Keplr, Wallet.Leap].includes(walletStrategy.getWallet())) {
 			if (await walletStrategy.getWalletDeviceType() === WalletDeviceType.Hardware) return this.experimentalBroadcastWalletThroughLedger(tx);
 		}
-		const [{ baseAccount, latestHeight }, pubKey] = await Promise.all([this.fetchAccountAndBlockDetails(tx.injectiveAddress, tx.accountDetails), walletStrategy.getPubKey(tx.injectiveAddress)]);
-		const timeoutHeight = toBigNumber(latestHeight).plus(txTimeoutInBlocks);
+		const [{ baseAccount, latestHeight }, pubKey] = await Promise.all([this.fetchAccountAndBlockDetails({
+			latestHeight: tx.latestHeight,
+			timeoutHeight: tx.timeoutHeight,
+			address: tx.injectiveAddress,
+			existingAccountDetails: tx.accountDetails
+		}), walletStrategy.getPubKey(tx.injectiveAddress)]);
+		const timeoutHeight = this.resolveTimeoutHeight({
+			tx,
+			latestHeight,
+			txTimeoutInBlocks
+		});
 		const txTimeoutTimeInMilliSeconds = txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS * 1e3;
 		const signMode = isCosmosAminoOnlyWallet(walletStrategy.wallet) ? SIGN_EIP712 : SIGN_DIRECT;
 		const gas = (((_tx$gas3 = tx.gas) === null || _tx$gas3 === void 0 ? void 0 : _tx$gas3.gas) || getGasPriceBasedOnMessage(msgs)).toString();
@@ -659,8 +700,17 @@ var MsgBroadcaster = class {
 		}
 		if (!evmChainId) throw new GeneralException(/* @__PURE__ */ new Error("Please provide evmChainId"));
 		const cosmosWallet = walletStrategy.getCosmosWallet(chainId);
-		const [{ baseAccount, latestHeight }, pubKey] = await Promise.all([this.fetchAccountAndBlockDetails(tx.injectiveAddress, tx.accountDetails), walletStrategy.getPubKey()]);
-		const timeoutHeight = toBigNumber(latestHeight).plus(txTimeoutInBlocks);
+		const [{ baseAccount, latestHeight }, pubKey] = await Promise.all([this.fetchAccountAndBlockDetails({
+			latestHeight: tx.latestHeight,
+			timeoutHeight: tx.timeoutHeight,
+			address: tx.injectiveAddress,
+			existingAccountDetails: tx.accountDetails
+		}), walletStrategy.getPubKey()]);
+		const timeoutHeight = this.resolveTimeoutHeight({
+			tx,
+			latestHeight,
+			txTimeoutInBlocks
+		});
 		const gas = (((_tx$gas5 = tx.gas) === null || _tx$gas5 === void 0 ? void 0 : _tx$gas5.gas) || getGasPriceBasedOnMessage(msgs)).toString();
 		/** EIP712 for signing on Ethereum wallets */
 		const eip712TypedData = getEip712TypedData({
@@ -751,7 +801,12 @@ var MsgBroadcaster = class {
 		if (httpHeaders) transactionApi.setMetadata(httpHeaders);
 		const fetchAccountBlockDetails = async () => {
 			try {
-				const { baseAccount: baseAccount$1, latestHeight: latestHeight$1 } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress, tx.accountDetails);
+				const { baseAccount: baseAccount$1, latestHeight: latestHeight$1 } = await this.fetchAccountAndBlockDetails({
+					latestHeight: tx.latestHeight,
+					timeoutHeight: tx.timeoutHeight,
+					address: tx.injectiveAddress,
+					existingAccountDetails: tx.accountDetails
+				});
 				return {
 					baseAccount: baseAccount$1,
 					latestHeight: latestHeight$1
@@ -765,7 +820,11 @@ var MsgBroadcaster = class {
 						memo: tx.memo,
 						estimateGas: simulateTx
 					});
-					const { baseAccount: baseAccount$1, latestHeight: latestHeight$1 } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
+					const { baseAccount: baseAccount$1, latestHeight: latestHeight$1 } = await this.fetchAccountAndBlockDetails({
+						latestHeight: tx.latestHeight,
+						timeoutHeight: tx.timeoutHeight,
+						address: tx.injectiveAddress
+					});
 					return {
 						baseAccount: baseAccount$1,
 						latestHeight: latestHeight$1
@@ -774,14 +833,21 @@ var MsgBroadcaster = class {
 				throw e;
 			}
 		};
-		/** Account Details * */
-		const { baseAccount, latestHeight } = await fetchAccountBlockDetails();
 		const chainGrpcAuthApi = new ChainGrpcAuthApi(endpoints.grpc);
 		if (httpHeaders) chainGrpcAuthApi.setMetadata(httpHeaders);
-		const { baseAccount: feePayerBaseAccount } = await chainGrpcAuthApi.fetchAccount(feePayer);
-		const timeoutHeight = toBigNumber(latestHeight).plus(txTimeoutOnFeeDelegation ? txTimeoutInBlocks : DEFAULT_BLOCK_TIMEOUT_HEIGHT);
+		const [accountBlockDetails, feePayerAccountDetails, pubKey] = await Promise.all([
+			fetchAccountBlockDetails(),
+			chainGrpcAuthApi.fetchAccount(feePayer),
+			walletStrategy.getPubKey()
+		]);
+		const { baseAccount, latestHeight } = accountBlockDetails;
+		const { baseAccount: feePayerBaseAccount } = feePayerAccountDetails;
+		const timeoutHeight = this.resolveTimeoutHeight({
+			tx,
+			latestHeight,
+			txTimeoutInBlocks: txTimeoutOnFeeDelegation ? txTimeoutInBlocks : DEFAULT_BLOCK_TIMEOUT_HEIGHT
+		});
 		const txTimeoutTimeInMilliSeconds = txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS * 1e3;
-		const pubKey = await walletStrategy.getPubKey();
 		const gas = (((_tx$gas7 = tx.gas) === null || _tx$gas7 === void 0 ? void 0 : _tx$gas7.gas) || getGasPriceBasedOnMessage(msgs)).toString();
 		/** Prepare the Transaction * */
 		const { txRaw } = await this.getTxWithSignersAndStdFee({
@@ -872,7 +938,9 @@ var MsgBroadcaster = class {
 		return response.feePayerPubKey.key;
 	}
 	async getStdFeeWithDynamicBaseFee(args) {
-		const client = new ChainGrpcTxFeesApi(this.endpoints.grpc);
+		const { endpoints, useDynamicBaseFee } = this;
+		if (!useDynamicBaseFee) return getStdFee(args);
+		const client = new ChainGrpcTxFeesApi(endpoints.grpc);
 		let baseFee = DEFAULT_GAS_PRICE;
 		try {
 			const response = await client.fetchEipBaseFee();
@@ -960,23 +1028,52 @@ var MsgBroadcaster = class {
 			throw e;
 		}
 	}
-	async fetchAccountAndBlockDetails(address, existingAccountDetails) {
+	async fetchAccountAndBlockDetails({ address, latestHeight, timeoutHeight, existingAccountDetails }) {
 		const { endpoints, httpHeaders } = this;
-		const tendermintClient = new ChainGrpcTendermintApi(endpoints.grpc);
-		if (httpHeaders) tendermintClient.setMetadata(httpHeaders);
-		if (existingAccountDetails) return {
-			baseAccount: existingAccountDetails,
-			latestHeight: (await tendermintClient.fetchLatestBlock()).header.height.toString()
-		};
+		const shouldFetchLatestHeight = latestHeight === void 0 && timeoutHeight === void 0;
+		if (existingAccountDetails) {
+			if (!shouldFetchLatestHeight) return {
+				latestHeight: latestHeight === null || latestHeight === void 0 ? void 0 : latestHeight.toString(),
+				baseAccount: existingAccountDetails
+			};
+			const tendermintClient$1 = new ChainGrpcTendermintApi(endpoints.grpc);
+			if (httpHeaders) tendermintClient$1.setMetadata(httpHeaders);
+			return {
+				baseAccount: existingAccountDetails,
+				latestHeight: (await tendermintClient$1.fetchLatestBlock()).header.height.toString()
+			};
+		}
 		const chainClient = new ChainGrpcAuthApi(endpoints.grpc);
 		if (httpHeaders) chainClient.setMetadata(httpHeaders);
+		if (!shouldFetchLatestHeight) {
+			const accountDetails$1 = await chainClient.fetchAccount(address);
+			return {
+				latestHeight: latestHeight === null || latestHeight === void 0 ? void 0 : latestHeight.toString(),
+				baseAccount: accountDetails$1.baseAccount
+			};
+		}
+		const tendermintClient = new ChainGrpcTendermintApi(endpoints.grpc);
+		if (httpHeaders) tendermintClient.setMetadata(httpHeaders);
 		const [accountDetails, latestBlock] = await Promise.all([chainClient.fetchAccount(address), tendermintClient.fetchLatestBlock()]);
-		const { baseAccount } = accountDetails;
 		return {
-			baseAccount,
+			baseAccount: accountDetails.baseAccount,
 			latestHeight: latestBlock.header.height.toString()
 		};
 	}
+	resolveOptionalTimeoutHeight({ tx, latestHeight, txTimeoutInBlocks }) {
+		if (tx.timeoutHeight !== void 0) return toBigNumber(tx.timeoutHeight);
+		if (latestHeight === void 0) return;
+		return toBigNumber(latestHeight).plus(txTimeoutInBlocks);
+	}
+	resolveTimeoutHeight({ tx, latestHeight, txTimeoutInBlocks }) {
+		const timeoutHeight = this.resolveOptionalTimeoutHeight({
+			tx,
+			latestHeight,
+			txTimeoutInBlocks
+		});
+		if (!timeoutHeight) throw new GeneralException(/* @__PURE__ */ new Error("Please provide latestHeight or timeoutHeight"));
+		return timeoutHeight;
+	}
 	resolveTimeoutInBlocks(override) {
 		return typeof override === "number" && Number.isInteger(override) && override > 0 ? override : this.txTimeout;
 	}

package/dist/esm/broadcaster.d.ts

@@ -1,3 +1,3 @@
-import "./BaseWalletStrategy-D2xNJmzo.js";
-import { a as MsgBroadcasterTxOptionsWithAddresses, i as MsgBroadcasterTxOptions, n as MsgBroadcaster, r as MsgBroadcasterOptions, t as Web3Broadcaster } from "./index-D2pR5txS.js";
+import "./BaseWalletStrategy-2HVN2oeB.js";
+import { a as MsgBroadcasterTxOptionsWithAddresses, i as MsgBroadcasterTxOptions, n as MsgBroadcaster, r as MsgBroadcasterOptions, t as Web3Broadcaster } from "./index-mLvMuoGv.js";
 export { MsgBroadcaster, MsgBroadcasterOptions, MsgBroadcasterTxOptions, MsgBroadcasterTxOptionsWithAddresses, Web3Broadcaster };

package/dist/esm/broadcaster.js

@@ -1,4 +1,4 @@
-import { n as MsgBroadcaster, t as Web3Broadcaster } from "./broadcaster-ZH8xuuQH.js";
+import { n as MsgBroadcaster, t as Web3Broadcaster } from "./broadcaster-DzLAEG3E.js";
 import "./defineProperty-D4YE9KXX.js";
 
 export { MsgBroadcaster, Web3Broadcaster };

package/dist/esm/{index-D2pR5txS.d.ts → index-mLvMuoGv.d.ts}

@@ -1,4 +1,4 @@
-import { t as BaseWalletStrategy } from "./BaseWalletStrategy-D2xNJmzo.js";
+import { t as BaseWalletStrategy } from "./BaseWalletStrategy-2HVN2oeB.js";
 import { ChainId, EvmChainId } from "@injectivelabs/ts-types";
 import { Network, NetworkEndpoints } from "@injectivelabs/networks";
 import { AuthBaseAccount } from "@injectivelabs/sdk-ts/client/chain";
@@ -12,6 +12,8 @@ interface MsgBroadcasterTxOptions {
   ethereumAddress?: string;
   injectiveAddress?: string;
   accountDetails?: AuthBaseAccount;
+  latestHeight?: number | string;
+  timeoutHeight?: number | string;
   txTimeoutInBlocks?: number;
   txInclusion?: TxClientInclusionOptions;
   gas?: {
@@ -27,15 +29,16 @@ interface MsgBroadcasterTxOptionsWithAddresses extends MsgBroadcasterTxOptions {
 }
 interface MsgBroadcasterOptions {
   network: Network;
-  endpoints?: NetworkEndpoints;
   chainId?: ChainId;
+  txTimeout?: number;
+  simulateTx?: boolean;
   evmChainId?: EvmChainId;
   feePayerPubKey?: string;
-  simulateTx?: boolean;
-  txTimeoutOnFeeDelegation?: boolean;
-  txTimeout?: number;
+  endpoints?: NetworkEndpoints;
   txInclusion?: TxClientInclusionOptions;
   walletStrategy: BaseWalletStrategy;
+  useDynamicBaseFee?: boolean;
+  txTimeoutOnFeeDelegation?: boolean;
   gasBufferCoefficient?: number;
   httpHeaders?: Record<string, string>;
 }
@@ -55,6 +58,7 @@ declare class MsgBroadcaster {
   chainId: ChainId;
   txTimeout: number;
   simulateTx: boolean;
+  useDynamicBaseFee: boolean;
   txTimeoutOnFeeDelegation: boolean;
   evmChainId?: EvmChainId;
   gasBufferCoefficient: number;
@@ -204,6 +208,8 @@ declare class MsgBroadcaster {
   private simulateTxWithSigners;
   private retryOnException;
   private fetchAccountAndBlockDetails;
+  private resolveOptionalTimeoutHeight;
+  private resolveTimeoutHeight;
   private resolveTimeoutInBlocks;
   private resolveTxInclusionOptions;
   private createTxGrpcApi;

package/dist/esm/index.d.ts

@@ -1,5 +1,5 @@
-import { t as BaseWalletStrategy } from "./BaseWalletStrategy-D2xNJmzo.js";
-import { a as MsgBroadcasterTxOptionsWithAddresses, i as MsgBroadcasterTxOptions, n as MsgBroadcaster, r as MsgBroadcasterOptions, t as Web3Broadcaster } from "./index-D2pR5txS.js";
+import { t as BaseWalletStrategy } from "./BaseWalletStrategy-2HVN2oeB.js";
+import { a as MsgBroadcasterTxOptionsWithAddresses, i as MsgBroadcasterTxOptions, n as MsgBroadcaster, r as MsgBroadcasterOptions, t as Web3Broadcaster } from "./index-mLvMuoGv.js";
 import "./index-DRYular4.js";
 
 //#region src/utils/tx.d.ts

package/dist/esm/index.js

@@ -1,5 +1,5 @@
-import { n as MsgBroadcaster, r as checkIfTxRunOutOfGas, t as Web3Broadcaster } from "./broadcaster-ZH8xuuQH.js";
+import { n as MsgBroadcaster, r as checkIfTxRunOutOfGas, t as Web3Broadcaster } from "./broadcaster-DzLAEG3E.js";
 import "./defineProperty-D4YE9KXX.js";
-import { t as BaseWalletStrategy } from "./strategy-DU-V-GfI.js";
+import { t as BaseWalletStrategy } from "./strategy-Co4vD1wN.js";
 
 export { BaseWalletStrategy, MsgBroadcaster, Web3Broadcaster, checkIfTxRunOutOfGas };

package/dist/esm/{strategy-DU-V-GfI.js → strategy-Co4vD1wN.js}

@@ -1,7 +1,7 @@
 import { t as _defineProperty } from "./defineProperty-D4YE9KXX.js";
 import { GeneralException, WalletException } from "@injectivelabs/exceptions";
 import { EventEmitter } from "eventemitter3";
-import { Wallet, WalletStrategyEmitterEventType, isCosmosWallet, isEvmWallet } from "@injectivelabs/wallet-base/light";
+import { Wallet, WalletStrategyEmitterEventType, isCosmosWallet, isEvmWallet } from "@injectivelabs/wallet-base/runtime-light";
 
 //#region src/strategy/BaseWalletStrategy.ts
 const getInitialWallet = (args) => {

package/dist/esm/strategy.d.ts

@@ -1,3 +1,3 @@
-import { t as BaseWalletStrategy } from "./BaseWalletStrategy-D2xNJmzo.js";
+import { t as BaseWalletStrategy } from "./BaseWalletStrategy-2HVN2oeB.js";
 import "./index-DRYular4.js";
 export { BaseWalletStrategy };

package/dist/esm/strategy.js

@@ -1,4 +1,4 @@
 import "./defineProperty-D4YE9KXX.js";
-import { t as BaseWalletStrategy } from "./strategy-DU-V-GfI.js";
+import { t as BaseWalletStrategy } from "./strategy-Co4vD1wN.js";
 
 export { BaseWalletStrategy };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@injectivelabs/wallet-core",
-  "version": "1.20.14",
+  "version": "1.20.16",
   "description": "Core wallet strategy",
   "license": "Apache-2.0",
   "author": {
@@ -84,12 +84,12 @@
   "dependencies": {
     "@keplr-wallet/types": "^0.12.296",
     "eventemitter3": "^5.0.1",
-    "@injectivelabs/exceptions": "1.20.14",
-    "@injectivelabs/networks": "1.20.14",
-    "@injectivelabs/sdk-ts": "1.20.14",
-    "@injectivelabs/wallet-base": "1.20.14",
-    "@injectivelabs/ts-types": "1.20.14",
-    "@injectivelabs/utils": "1.20.14"
+    "@injectivelabs/exceptions": "1.20.16",
+    "@injectivelabs/networks": "1.20.16",
+    "@injectivelabs/ts-types": "1.20.16",
+    "@injectivelabs/sdk-ts": "1.20.16",
+    "@injectivelabs/utils": "1.20.16",
+    "@injectivelabs/wallet-base": "1.20.16"
   },
   "publishConfig": {
     "access": "public"