@injectivelabs/wallet-core 1.19.18 → 1.19.20

package/dist/cjs/index.cjs

@@ -373,8 +373,9 @@ var MsgBroadcaster = class {
 	* @param privateKey Taker (autosign) private key — hex, with or without `0x`
 	* @returns transaction response with txHash
 	*/
-	async broadcastWithFeePayerSig({ tx, skipPoll, privateKey, feePayerSig, accountNumber }) {
-		const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks } = this;
+	async broadcastWithFeePayerSig({ tx, privateKey, feePayerSig, accountNumber, txTimeoutInBlocks: txTimeoutInBlocksParam }) {
+		const { chainId, endpoints, walletStrategy } = this;
+		const txTimeoutInBlocks = this.resolveTimeoutInBlocks(txTimeoutInBlocksParam);
 		const pk = __injectivelabs_sdk_ts_core_accounts.PrivateKey.fromHex(privateKey);
 		if (__injectivelabs_sdk_ts_utils.ofacList.includes(pk.toHex().toLowerCase())) throw new __injectivelabs_exceptions.GeneralException(/* @__PURE__ */ new Error("You cannot execute this transaction"));
 		const txBytes = typeof tx === "string" ? (0, __injectivelabs_sdk_ts_utils.base64ToUint8Array)(tx) : tx;
@@ -393,8 +394,10 @@ var MsgBroadcaster = class {
 			txRaw.signatures = [takerSig, feePayerSig.startsWith("0x") ? (0, __injectivelabs_sdk_ts_utils.hexToUint8Array)(feePayerSig.slice(2)) : (0, __injectivelabs_sdk_ts_utils.base64ToUint8Array)(feePayerSig)];
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastStart);
 			const txResponse = await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).broadcast(txRaw, {
-				skipPoll,
-				txTimeout: txTimeoutInBlocks
+				txTimeout: txTimeoutInBlocks,
+				onBroadcast: () => {
+					walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
+				}
 			});
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 			if (txResponse.code !== 0) throw new __injectivelabs_exceptions.TransactionException(/* @__PURE__ */ new Error(`Transaction failed - ${txResponse.rawLog} - ${txResponse.txHash}`), {
@@ -410,6 +413,9 @@ var MsgBroadcaster = class {
 			throw new __injectivelabs_exceptions.TransactionException(new Error(error));
 		}
 	}
+	resolveTimeoutInBlocks(override) {
+		return typeof override === "number" && Number.isInteger(override) && override > 0 ? override : this.txTimeout;
+	}
 	/**
 	* Prepare/sign/broadcast transaction using
 	* Ethereum native wallets on the client side.
@@ -421,7 +427,8 @@ var MsgBroadcaster = class {
 	*/
 	async broadcastEip712(tx) {
 		var _tx$gas, _baseAccount$pubKey;
-		const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks } = this;
+		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)]);
 		if (!evmChainId) throw new __injectivelabs_exceptions.GeneralException(/* @__PURE__ */ new Error("Please provide evmChainId"));
@@ -496,9 +503,10 @@ var MsgBroadcaster = class {
 			txTimeout: txTimeoutInBlocks,
 			address: tx.injectiveAddress
 		});
+		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
+		const confirmedTx = await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-		if (tx.skipPoll) return response;
-		return await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+		return confirmedTx;
 	}
 	/**
 	* Prepare/sign/broadcast transaction using
@@ -511,7 +519,8 @@ var MsgBroadcaster = class {
 	*/
 	async broadcastEip712V2(tx) {
 		var _tx$gas2, _baseAccount$pubKey2;
-		const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks } = this;
+		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)]);
 		if (!evmChainId) throw new __injectivelabs_exceptions.GeneralException(/* @__PURE__ */ new Error("Please provide evmChainId"));
@@ -588,9 +597,10 @@ var MsgBroadcaster = class {
 			txTimeout: txTimeoutInBlocks,
 			address: tx.injectiveAddress
 		});
+		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
+		const confirmedTx = await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-		if (tx.skipPoll) return response;
-		return await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+		return confirmedTx;
 	}
 	/**
 	* Prepare/sign/broadcast transaction using
@@ -600,7 +610,8 @@ var MsgBroadcaster = class {
 	* @returns transaction hash
 	*/
 	async broadcastEip712WithFeeDelegation(tx) {
-		const { endpoints, simulateTx, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation, txTimeout: txTimeoutInBlocks } = this;
+		const { endpoints, simulateTx, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation } = this;
+		const txTimeoutInBlocks = this.resolveTimeoutInBlocks(tx.txTimeoutInBlocks);
 		const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
 		const web3Msgs = msgs.map((msg) => msg.toWeb3());
 		const evmChainId = await this.getEvmChainId();
@@ -632,18 +643,10 @@ var MsgBroadcaster = class {
 		try {
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastStart);
 			const response = await broadcast();
+			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
+			const confirmedTx = await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-			if (tx.skipPoll) return {
-				txHash: response.txHash,
-				height: Number(response.height),
-				codespace: response.codespace,
-				code: response.code,
-				rawLog: response.rawLog,
-				timestamp: response.timestamp,
-				gasWanted: 0,
-				gasUsed: 0
-			};
-			return await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+			return confirmedTx;
 		} catch (e) {
 			const error = e;
 			if ((0, __injectivelabs_exceptions.isThrownException)(error)) {
@@ -673,7 +676,8 @@ var MsgBroadcaster = class {
 	*/
 	async broadcastDirectSign(tx) {
 		var _tx$gas3;
-		const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks } = this;
+		const { chainId, endpoints, walletStrategy } = this;
+		const txTimeoutInBlocks = this.resolveTimeoutInBlocks(tx.txTimeoutInBlocks);
 		const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
 		/**
 		* When using Ledger with Keplr/Leap we have
@@ -728,9 +732,10 @@ var MsgBroadcaster = class {
 				address: tx.injectiveAddress,
 				txTimeout: txTimeoutInBlocks
 			});
+			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
+			const confirmedTx$1 = await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response$1.txHash, txTimeoutTimeInMilliSeconds);
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-			if (tx.skipPoll) return response$1;
-			return await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response$1.txHash, txTimeoutTimeInMilliSeconds);
+			return confirmedTx$1;
 		}
 		const directSignResponse = await walletStrategy.signCosmosTransaction({
 			txRaw,
@@ -745,9 +750,10 @@ var MsgBroadcaster = class {
 			txTimeout: txTimeoutInBlocks,
 			address: tx.injectiveAddress
 		});
+		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
+		const confirmedTx = await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-		if (tx.skipPoll) return response;
-		return await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+		return confirmedTx;
 	}
 	/**
 	* We use this method only when we want to broadcast a transaction using Ledger on Keplr/Leap for Injective
@@ -757,7 +763,8 @@ var MsgBroadcaster = class {
 	*/
 	async experimentalBroadcastWalletThroughLedger(tx) {
 		var _tx$gas5, _tx$gas6;
-		const { chainId, endpoints, evmChainId, simulateTx, walletStrategy, txTimeout: txTimeoutInBlocks } = this;
+		const { chainId, endpoints, evmChainId, simulateTx, walletStrategy } = this;
+		const txTimeoutInBlocks = this.resolveTimeoutInBlocks(tx.txTimeoutInBlocks);
 		const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
 		/**
 		* We can only use this method
@@ -820,13 +827,16 @@ var MsgBroadcaster = class {
 		/** Broadcast the transaction */
 		const response = await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).broadcast(txRawEip712, {
 			txTimeout: txTimeoutInBlocks,
-			skipPoll: tx.skipPoll
+			onBroadcast: () => {
+				walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
+			}
 		});
 		if (response.code !== 0) throw new __injectivelabs_exceptions.TransactionException(new Error(response.rawLog), {
 			code: __injectivelabs_exceptions.UnspecifiedErrorCode,
 			contextCode: response.code,
 			contextModule: response.codespace
 		});
+		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 		return response;
 	}
 	/**
@@ -838,7 +848,8 @@ var MsgBroadcaster = class {
 	*/
 	async broadcastDirectSignWithFeeDelegation(tx) {
 		var _tx$gas7;
-		const { options, chainId, endpoints, simulateTx, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation, txTimeout: txTimeoutInBlocks } = this;
+		const { options, chainId, endpoints, simulateTx, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation } = this;
+		const txTimeoutInBlocks = this.resolveTimeoutInBlocks(tx.txTimeoutInBlocks);
 		const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
 		/**
 		* We can only use this method when Keplr is connected
@@ -930,19 +941,11 @@ var MsgBroadcaster = class {
 		try {
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastStart);
 			const response = await broadcast();
-			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
+			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
 			if (canDisableCosmosGasCheck && cosmosWallet.enableGasCheck) cosmosWallet.enableGasCheck(chainId);
-			if (tx.skipPoll) return {
-				txHash: response.txHash,
-				height: Number(response.height),
-				codespace: response.codespace,
-				code: response.code,
-				rawLog: response.rawLog,
-				timestamp: response.timestamp,
-				gasWanted: 0,
-				gasUsed: 0
-			};
-			return await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+			const confirmedTx = await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
+			return confirmedTx;
 		} catch (e) {
 			const error = e;
 			if ((0, __injectivelabs_exceptions.isThrownException)(error)) {

package/dist/cjs/index.d.cts

@@ -76,12 +76,11 @@ declare class BaseWalletStrategy implements WalletStrategy {
 //#region src/broadcaster/types.d.ts
 interface MsgBroadcasterTxOptions {
   memo?: string;
+  msgs: Msgs | Msgs[];
   ethereumAddress?: string;
   injectiveAddress?: string;
-  msgs: Msgs | Msgs[];
   accountDetails?: AuthBaseAccount;
-  /** Return txHash immediately without polling for block inclusion. Note: gasWanted/gasUsed will be 0 in fee-delegation paths. */
-  skipPoll?: boolean;
+  txTimeoutInBlocks?: number;
   gas?: {
     gasPrice?: string;
     gas?: number; /** gas limit */
@@ -180,17 +179,18 @@ declare class MsgBroadcaster {
    */
   broadcastWithFeePayerSig({
     tx,
-    skipPoll,
     privateKey,
     feePayerSig,
-    accountNumber
+    accountNumber,
+    txTimeoutInBlocks: txTimeoutInBlocksParam
   }: {
     privateKey: string;
-    skipPoll?: boolean;
     feePayerSig: string;
     accountNumber: number;
     tx: Uint8Array | string;
+    txTimeoutInBlocks?: number;
   }): Promise<TxResponse>;
+  private resolveTimeoutInBlocks;
   /**
    * Prepare/sign/broadcast transaction using
    * Ethereum native wallets on the client side.

package/dist/esm/index.d.ts

@@ -76,12 +76,11 @@ declare class BaseWalletStrategy implements WalletStrategy {
 //#region src/broadcaster/types.d.ts
 interface MsgBroadcasterTxOptions {
   memo?: string;
+  msgs: Msgs | Msgs[];
   ethereumAddress?: string;
   injectiveAddress?: string;
-  msgs: Msgs | Msgs[];
   accountDetails?: AuthBaseAccount;
-  /** Return txHash immediately without polling for block inclusion. Note: gasWanted/gasUsed will be 0 in fee-delegation paths. */
-  skipPoll?: boolean;
+  txTimeoutInBlocks?: number;
   gas?: {
     gasPrice?: string;
     gas?: number; /** gas limit */
@@ -180,17 +179,18 @@ declare class MsgBroadcaster {
    */
   broadcastWithFeePayerSig({
     tx,
-    skipPoll,
     privateKey,
     feePayerSig,
-    accountNumber
+    accountNumber,
+    txTimeoutInBlocks: txTimeoutInBlocksParam
   }: {
     privateKey: string;
-    skipPoll?: boolean;
     feePayerSig: string;
     accountNumber: number;
     tx: Uint8Array | string;
+    txTimeoutInBlocks?: number;
   }): Promise<TxResponse>;
+  private resolveTimeoutInBlocks;
   /**
    * Prepare/sign/broadcast transaction using
    * Ethereum native wallets on the client side.

package/dist/esm/index.js

@@ -373,8 +373,9 @@ var MsgBroadcaster = class {
 	* @param privateKey Taker (autosign) private key — hex, with or without `0x`
 	* @returns transaction response with txHash
 	*/
-	async broadcastWithFeePayerSig({ tx, skipPoll, privateKey, feePayerSig, accountNumber }) {
-		const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks } = this;
+	async broadcastWithFeePayerSig({ tx, privateKey, feePayerSig, accountNumber, txTimeoutInBlocks: txTimeoutInBlocksParam }) {
+		const { chainId, endpoints, walletStrategy } = this;
+		const txTimeoutInBlocks = this.resolveTimeoutInBlocks(txTimeoutInBlocksParam);
 		const pk = PrivateKey.fromHex(privateKey);
 		if (ofacList.includes(pk.toHex().toLowerCase())) throw new GeneralException(/* @__PURE__ */ new Error("You cannot execute this transaction"));
 		const txBytes = typeof tx === "string" ? base64ToUint8Array(tx) : tx;
@@ -393,8 +394,10 @@ var MsgBroadcaster = class {
 			txRaw.signatures = [takerSig, feePayerSig.startsWith("0x") ? hexToUint8Array(feePayerSig.slice(2)) : base64ToUint8Array(feePayerSig)];
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastStart);
 			const txResponse = await new TxGrpcApi(endpoints.grpc).broadcast(txRaw, {
-				skipPoll,
-				txTimeout: txTimeoutInBlocks
+				txTimeout: txTimeoutInBlocks,
+				onBroadcast: () => {
+					walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
+				}
 			});
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 			if (txResponse.code !== 0) throw new TransactionException(/* @__PURE__ */ new Error(`Transaction failed - ${txResponse.rawLog} - ${txResponse.txHash}`), {
@@ -410,6 +413,9 @@ var MsgBroadcaster = class {
 			throw new TransactionException(new Error(error));
 		}
 	}
+	resolveTimeoutInBlocks(override) {
+		return typeof override === "number" && Number.isInteger(override) && override > 0 ? override : this.txTimeout;
+	}
 	/**
 	* Prepare/sign/broadcast transaction using
 	* Ethereum native wallets on the client side.
@@ -421,7 +427,8 @@ var MsgBroadcaster = class {
 	*/
 	async broadcastEip712(tx) {
 		var _tx$gas, _baseAccount$pubKey;
-		const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks } = this;
+		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)]);
 		if (!evmChainId) throw new GeneralException(/* @__PURE__ */ new Error("Please provide evmChainId"));
@@ -496,9 +503,10 @@ var MsgBroadcaster = class {
 			txTimeout: txTimeoutInBlocks,
 			address: tx.injectiveAddress
 		});
+		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
+		const confirmedTx = await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-		if (tx.skipPoll) return response;
-		return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+		return confirmedTx;
 	}
 	/**
 	* Prepare/sign/broadcast transaction using
@@ -511,7 +519,8 @@ var MsgBroadcaster = class {
 	*/
 	async broadcastEip712V2(tx) {
 		var _tx$gas2, _baseAccount$pubKey2;
-		const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks } = this;
+		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)]);
 		if (!evmChainId) throw new GeneralException(/* @__PURE__ */ new Error("Please provide evmChainId"));
@@ -588,9 +597,10 @@ var MsgBroadcaster = class {
 			txTimeout: txTimeoutInBlocks,
 			address: tx.injectiveAddress
 		});
+		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
+		const confirmedTx = await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-		if (tx.skipPoll) return response;
-		return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+		return confirmedTx;
 	}
 	/**
 	* Prepare/sign/broadcast transaction using
@@ -600,7 +610,8 @@ var MsgBroadcaster = class {
 	* @returns transaction hash
 	*/
 	async broadcastEip712WithFeeDelegation(tx) {
-		const { endpoints, simulateTx, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation, txTimeout: txTimeoutInBlocks } = this;
+		const { endpoints, simulateTx, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation } = this;
+		const txTimeoutInBlocks = this.resolveTimeoutInBlocks(tx.txTimeoutInBlocks);
 		const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
 		const web3Msgs = msgs.map((msg) => msg.toWeb3());
 		const evmChainId = await this.getEvmChainId();
@@ -632,18 +643,10 @@ var MsgBroadcaster = class {
 		try {
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastStart);
 			const response = await broadcast();
+			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
+			const confirmedTx = await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-			if (tx.skipPoll) return {
-				txHash: response.txHash,
-				height: Number(response.height),
-				codespace: response.codespace,
-				code: response.code,
-				rawLog: response.rawLog,
-				timestamp: response.timestamp,
-				gasWanted: 0,
-				gasUsed: 0
-			};
-			return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+			return confirmedTx;
 		} catch (e) {
 			const error = e;
 			if (isThrownException(error)) {
@@ -673,7 +676,8 @@ var MsgBroadcaster = class {
 	*/
 	async broadcastDirectSign(tx) {
 		var _tx$gas3;
-		const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks } = this;
+		const { chainId, endpoints, walletStrategy } = this;
+		const txTimeoutInBlocks = this.resolveTimeoutInBlocks(tx.txTimeoutInBlocks);
 		const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
 		/**
 		* When using Ledger with Keplr/Leap we have
@@ -728,9 +732,10 @@ var MsgBroadcaster = class {
 				address: tx.injectiveAddress,
 				txTimeout: txTimeoutInBlocks
 			});
+			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
+			const confirmedTx$1 = await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response$1.txHash, txTimeoutTimeInMilliSeconds);
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-			if (tx.skipPoll) return response$1;
-			return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response$1.txHash, txTimeoutTimeInMilliSeconds);
+			return confirmedTx$1;
 		}
 		const directSignResponse = await walletStrategy.signCosmosTransaction({
 			txRaw,
@@ -745,9 +750,10 @@ var MsgBroadcaster = class {
 			txTimeout: txTimeoutInBlocks,
 			address: tx.injectiveAddress
 		});
+		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
+		const confirmedTx = await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-		if (tx.skipPoll) return response;
-		return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+		return confirmedTx;
 	}
 	/**
 	* We use this method only when we want to broadcast a transaction using Ledger on Keplr/Leap for Injective
@@ -757,7 +763,8 @@ var MsgBroadcaster = class {
 	*/
 	async experimentalBroadcastWalletThroughLedger(tx) {
 		var _tx$gas5, _tx$gas6;
-		const { chainId, endpoints, evmChainId, simulateTx, walletStrategy, txTimeout: txTimeoutInBlocks } = this;
+		const { chainId, endpoints, evmChainId, simulateTx, walletStrategy } = this;
+		const txTimeoutInBlocks = this.resolveTimeoutInBlocks(tx.txTimeoutInBlocks);
 		const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
 		/**
 		* We can only use this method
@@ -820,13 +827,16 @@ var MsgBroadcaster = class {
 		/** Broadcast the transaction */
 		const response = await new TxGrpcApi(endpoints.grpc).broadcast(txRawEip712, {
 			txTimeout: txTimeoutInBlocks,
-			skipPoll: tx.skipPoll
+			onBroadcast: () => {
+				walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
+			}
 		});
 		if (response.code !== 0) throw new TransactionException(new Error(response.rawLog), {
 			code: UnspecifiedErrorCode,
 			contextCode: response.code,
 			contextModule: response.codespace
 		});
+		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 		return response;
 	}
 	/**
@@ -838,7 +848,8 @@ var MsgBroadcaster = class {
 	*/
 	async broadcastDirectSignWithFeeDelegation(tx) {
 		var _tx$gas7;
-		const { options, chainId, endpoints, simulateTx, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation, txTimeout: txTimeoutInBlocks } = this;
+		const { options, chainId, endpoints, simulateTx, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation } = this;
+		const txTimeoutInBlocks = this.resolveTimeoutInBlocks(tx.txTimeoutInBlocks);
 		const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
 		/**
 		* We can only use this method when Keplr is connected
@@ -930,19 +941,11 @@ var MsgBroadcaster = class {
 		try {
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastStart);
 			const response = await broadcast();
-			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
+			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
 			if (canDisableCosmosGasCheck && cosmosWallet.enableGasCheck) cosmosWallet.enableGasCheck(chainId);
-			if (tx.skipPoll) return {
-				txHash: response.txHash,
-				height: Number(response.height),
-				codespace: response.codespace,
-				code: response.code,
-				rawLog: response.rawLog,
-				timestamp: response.timestamp,
-				gasWanted: 0,
-				gasUsed: 0
-			};
-			return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+			const confirmedTx = await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
+			return confirmedTx;
 		} catch (e) {
 			const error = e;
 			if (isThrownException(error)) {

package/package.json

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