@injectivelabs/wallet-core 1.19.27 → 1.19.28

package/dist/cjs/index.cjs

@@ -396,9 +396,10 @@ var MsgBroadcaster = class {
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionPreparationEnd);
 			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 txInclusionOptions = this.resolveTxInclusionOptions({ txInclusion });
 			const txResponse = await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).broadcast(txRaw, {
 				txTimeout: txTimeoutInBlocks,
-				...this.resolveTxInclusionOptions({ txInclusion }),
+				...txInclusionOptions,
 				onBroadcast: () => {
 					walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
 				}
@@ -417,40 +418,6 @@ 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;
-	}
-	resolveTxInclusionOptions(tx) {
-		var _txInclusion$eventInc;
-		const txInclusion = (tx === null || tx === void 0 ? void 0 : tx.txInclusion) || this.txInclusion;
-		if (!txInclusion) return;
-		return {
-			...txInclusion,
-			eventInclusion: {
-				...txInclusion.eventInclusion,
-				rpcEndpoint: ((_txInclusion$eventInc = txInclusion.eventInclusion) === null || _txInclusion$eventInc === void 0 ? void 0 : _txInclusion$eventInc.rpcEndpoint) || this.endpoints.rpc
-			}
-		};
-	}
-	createTxGrpcApi() {
-		const client = new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(this.endpoints.grpc);
-		if (this.httpHeaders) client.setMetadata(this.httpHeaders);
-		return client;
-	}
-	async waitForTxInclusion(txHash, timeout, tx) {
-		return this.createTxGrpcApi().waitForTxInclusion(txHash, timeout, this.resolveTxInclusionOptions(tx));
-	}
-	async prepareTxInclusionWaiter(txRawOrSignResponse, timeout, tx) {
-		const txRaw = (0, __injectivelabs_sdk_ts_core_tx.createTxRawFromSigResponse)(txRawOrSignResponse);
-		const txHash = __injectivelabs_sdk_ts_core_tx.TxClient.hash(txRaw);
-		return this.createTxGrpcApi().prepareTxInclusionWait(txHash, timeout, this.resolveTxInclusionOptions(tx));
-	}
-	async waitForPreparedTxInclusion(responseTxHash, timeout, tx, inclusionWaiter) {
-		if (!inclusionWaiter) return this.waitForTxInclusion(responseTxHash, timeout, tx);
-		const confirmedTx = await inclusionWaiter.wait(responseTxHash);
-		if (!confirmedTx) throw new __injectivelabs_exceptions.TransactionException(/* @__PURE__ */ new Error(`The transaction with ${responseTxHash} is not found`));
-		return confirmedTx;
-	}
 	/**
 	* Prepare/sign/broadcast transaction using
 	* Ethereum native wallets on the client side.
@@ -532,7 +499,11 @@ var MsgBroadcaster = class {
 		const txRawEip712 = (0, __injectivelabs_sdk_ts_core_tx.createTxRawEIP712)(txRaw, (0, __injectivelabs_sdk_ts_core_tx.createWeb3Extension)({ evmChainId }));
 		/** Append Signatures */
 		txRawEip712.signatures = [(0, __injectivelabs_sdk_ts_utils.hexToBuff)(signature)];
-		const inclusionWaiter = await this.prepareTxInclusionWaiter(txRawEip712, txTimeoutTimeInMilliSeconds, tx);
+		const inclusionWaiter = await this.prepareTxInclusionWaiter({
+			tx,
+			txRawOrSignResponse: txRawEip712,
+			timeout: txTimeoutTimeInMilliSeconds
+		});
 		let response;
 		try {
 			response = await walletStrategy.sendTransaction(txRawEip712, {
@@ -546,7 +517,12 @@ var MsgBroadcaster = class {
 			throw e;
 		}
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-		const confirmedTx = await this.waitForPreparedTxInclusion(response.txHash, txTimeoutTimeInMilliSeconds, tx, inclusionWaiter);
+		const confirmedTx = await this.waitForPreparedTxInclusion({
+			tx,
+			inclusionWaiter,
+			responseTxHash: response.txHash,
+			timeout: txTimeoutTimeInMilliSeconds
+		});
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 		return confirmedTx;
 	}
@@ -633,7 +609,11 @@ var MsgBroadcaster = class {
 		const txRawEip712 = (0, __injectivelabs_sdk_ts_core_tx.createTxRawEIP712)(txRaw, (0, __injectivelabs_sdk_ts_core_tx.createWeb3Extension)({ evmChainId }));
 		/** Append Signatures */
 		txRawEip712.signatures = [(0, __injectivelabs_sdk_ts_utils.hexToBuff)(signature)];
-		const inclusionWaiter = await this.prepareTxInclusionWaiter(txRawEip712, txTimeoutTimeInMilliSeconds, tx);
+		const inclusionWaiter = await this.prepareTxInclusionWaiter({
+			tx,
+			timeout: txTimeoutTimeInMilliSeconds,
+			txRawOrSignResponse: txRawEip712
+		});
 		let response;
 		try {
 			response = await walletStrategy.sendTransaction(txRawEip712, {
@@ -647,7 +627,12 @@ var MsgBroadcaster = class {
 			throw e;
 		}
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-		const confirmedTx = await this.waitForPreparedTxInclusion(response.txHash, txTimeoutTimeInMilliSeconds, tx, inclusionWaiter);
+		const confirmedTx = await this.waitForPreparedTxInclusion({
+			tx,
+			inclusionWaiter,
+			responseTxHash: response.txHash,
+			timeout: txTimeoutTimeInMilliSeconds
+		});
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 		return confirmedTx;
 	}
@@ -693,7 +678,11 @@ var MsgBroadcaster = class {
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastStart);
 			const response = await broadcast();
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-			const confirmedTx = await this.waitForTxInclusion(response.txHash, txTimeoutTimeInMilliSeconds, tx);
+			const confirmedTx = await this.waitForTxInclusion({
+				tx,
+				txHash: response.txHash,
+				timeout: txTimeoutTimeInMilliSeconds
+			});
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 			return confirmedTx;
 		} catch (e) {
@@ -775,7 +764,11 @@ var MsgBroadcaster = class {
 				address: tx.injectiveAddress
 			})).signature.signature)];
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastStart);
-			const inclusionWaiter$1 = await this.prepareTxInclusionWaiter(txRaw, txTimeoutTimeInMilliSeconds, tx);
+			const inclusionWaiter$1 = await this.prepareTxInclusionWaiter({
+				tx,
+				txRawOrSignResponse: txRaw,
+				timeout: txTimeoutTimeInMilliSeconds
+			});
 			let response$1;
 			try {
 				response$1 = await walletStrategy.sendTransaction(txRaw, {
@@ -789,7 +782,12 @@ var MsgBroadcaster = class {
 				throw e;
 			}
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-			const confirmedTx$1 = await this.waitForPreparedTxInclusion(response$1.txHash, txTimeoutTimeInMilliSeconds, tx, inclusionWaiter$1);
+			const confirmedTx$1 = await this.waitForPreparedTxInclusion({
+				tx,
+				inclusionWaiter: inclusionWaiter$1,
+				timeout: txTimeoutTimeInMilliSeconds,
+				responseTxHash: response$1.txHash
+			});
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 			return confirmedTx$1;
 		}
@@ -800,7 +798,11 @@ var MsgBroadcaster = class {
 			accountNumber: baseAccount.accountNumber
 		});
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastStart);
-		const inclusionWaiter = await this.prepareTxInclusionWaiter(directSignResponse, txTimeoutTimeInMilliSeconds, tx);
+		const inclusionWaiter = await this.prepareTxInclusionWaiter({
+			tx,
+			timeout: txTimeoutTimeInMilliSeconds,
+			txRawOrSignResponse: directSignResponse
+		});
 		let response;
 		try {
 			response = await walletStrategy.sendTransaction(directSignResponse, {
@@ -814,7 +816,12 @@ var MsgBroadcaster = class {
 			throw e;
 		}
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-		const confirmedTx = await this.waitForPreparedTxInclusion(response.txHash, txTimeoutTimeInMilliSeconds, tx, inclusionWaiter);
+		const confirmedTx = await this.waitForPreparedTxInclusion({
+			tx,
+			inclusionWaiter,
+			responseTxHash: response.txHash,
+			timeout: txTimeoutTimeInMilliSeconds
+		});
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 		return confirmedTx;
 	}
@@ -875,14 +882,14 @@ var MsgBroadcaster = class {
 		*/
 		const { txRaw } = (0, __injectivelabs_sdk_ts_core_tx.createTransaction)({
 			pubKey,
+			chainId,
 			message: msgs,
-			memo: aminoSignResponse.signed.memo,
 			signMode: __injectivelabs_sdk_ts_core_tx.SIGN_EIP712,
+			memo: aminoSignResponse.signed.memo,
 			fee: aminoSignResponse.signed.fee,
 			sequence: parseInt(aminoSignResponse.signed.sequence, 10),
-			timeoutHeight: parseInt(aminoSignResponse.signed.timeout_height, 10),
 			accountNumber: parseInt(aminoSignResponse.signed.account_number, 10),
-			chainId
+			timeoutHeight: parseInt(aminoSignResponse.signed.timeout_height, 10)
 		});
 		const txRawEip712 = (0, __injectivelabs_sdk_ts_core_tx.createTxRawEIP712)(txRaw, (0, __injectivelabs_sdk_ts_core_tx.createWeb3Extension)({ evmChainId }));
 		if (simulateTx) await this.simulateTxRaw(txRawEip712);
@@ -995,8 +1002,8 @@ var MsgBroadcaster = class {
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionPreparationEnd);
 		const signedTxRaw = (0, __injectivelabs_sdk_ts_core_tx.createTxRawFromSigResponse)(directSignResponse);
 		const broadcast = async () => await transactionApi.broadcastCosmosTxRequest({
-			address: tx.injectiveAddress,
 			txRaw: signedTxRaw,
+			address: tx.injectiveAddress,
 			signature: directSignResponse.signature.signature,
 			pubKey: directSignResponse.signature.pub_key || {
 				value: pubKey,
@@ -1005,7 +1012,11 @@ var MsgBroadcaster = class {
 		});
 		try {
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastStart);
-			const inclusionWaiter = await this.prepareTxInclusionWaiter(signedTxRaw, txTimeoutTimeInMilliSeconds, tx);
+			const inclusionWaiter = await this.prepareTxInclusionWaiter({
+				tx,
+				txRawOrSignResponse: signedTxRaw,
+				timeout: txTimeoutTimeInMilliSeconds
+			});
 			let response;
 			try {
 				response = await broadcast();
@@ -1015,7 +1026,12 @@ var MsgBroadcaster = class {
 			}
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
 			if (canDisableCosmosGasCheck && cosmosWallet.enableGasCheck) cosmosWallet.enableGasCheck(chainId);
-			const confirmedTx = await this.waitForPreparedTxInclusion(response.txHash, txTimeoutTimeInMilliSeconds, tx, inclusionWaiter);
+			const confirmedTx = await this.waitForPreparedTxInclusion({
+				tx,
+				inclusionWaiter,
+				responseTxHash: response.txHash,
+				timeout: txTimeoutTimeInMilliSeconds
+			});
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 			return confirmedTx;
 		} catch (e) {
@@ -1148,6 +1164,52 @@ var MsgBroadcaster = class {
 			latestHeight: latestBlock.header.height.toString()
 		};
 	}
+	resolveTimeoutInBlocks(override) {
+		return typeof override === "number" && Number.isInteger(override) && override > 0 ? override : this.txTimeout;
+	}
+	resolveTxInclusionOptions(tx) {
+		var _txInclusion$eventInc;
+		const txInclusion = (tx === null || tx === void 0 ? void 0 : tx.txInclusion) || this.txInclusion;
+		if (!txInclusion) return;
+		return {
+			...txInclusion,
+			eventInclusion: {
+				...txInclusion.eventInclusion,
+				rpcEndpoint: ((_txInclusion$eventInc = txInclusion.eventInclusion) === null || _txInclusion$eventInc === void 0 ? void 0 : _txInclusion$eventInc.rpcEndpoint) || this.endpoints.rpc
+			}
+		};
+	}
+	createTxGrpcApi() {
+		const client = new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(this.endpoints.grpc);
+		if (this.httpHeaders) client.setMetadata(this.httpHeaders);
+		return client;
+	}
+	async waitForTxInclusion({ tx, txHash, timeout }) {
+		return this.createTxGrpcApi().waitForTxInclusion({
+			txHash,
+			timeout,
+			options: this.resolveTxInclusionOptions(tx)
+		});
+	}
+	async prepareTxInclusionWaiter({ tx, timeout, txRawOrSignResponse }) {
+		const txRaw = (0, __injectivelabs_sdk_ts_core_tx.createTxRawFromSigResponse)(txRawOrSignResponse);
+		const txHash = __injectivelabs_sdk_ts_core_tx.TxClient.hash(txRaw);
+		return this.createTxGrpcApi().prepareTxInclusionWait({
+			txHash,
+			timeout,
+			options: this.resolveTxInclusionOptions(tx)
+		});
+	}
+	async waitForPreparedTxInclusion({ tx, timeout, responseTxHash, inclusionWaiter }) {
+		if (!inclusionWaiter) return this.waitForTxInclusion({
+			tx,
+			timeout,
+			txHash: responseTxHash
+		});
+		const confirmedTx = await inclusionWaiter.wait(responseTxHash);
+		if (!confirmedTx) throw new __injectivelabs_exceptions.TransactionException(/* @__PURE__ */ new Error(`The transaction with ${responseTxHash} is not found`));
+		return confirmedTx;
+	}
 };
 
 //#endregion

package/dist/cjs/index.d.cts

@@ -195,12 +195,6 @@ declare class MsgBroadcaster {
     txInclusion?: TxClientInclusionOptions;
     txTimeoutInBlocks?: number;
   }): Promise<TxResponse>;
-  private resolveTimeoutInBlocks;
-  private resolveTxInclusionOptions;
-  private createTxGrpcApi;
-  private waitForTxInclusion;
-  private prepareTxInclusionWaiter;
-  private waitForPreparedTxInclusion;
   /**
    * Prepare/sign/broadcast transaction using
    * Ethereum native wallets on the client side.
@@ -278,6 +272,12 @@ declare class MsgBroadcaster {
   private simulateTxWithSigners;
   private retryOnException;
   private fetchAccountAndBlockDetails;
+  private resolveTimeoutInBlocks;
+  private resolveTxInclusionOptions;
+  private createTxGrpcApi;
+  private waitForTxInclusion;
+  private prepareTxInclusionWaiter;
+  private waitForPreparedTxInclusion;
 }
 //#endregion
 //#region src/broadcaster/Web3Broadcaster.d.ts

package/dist/esm/index.d.ts

@@ -195,12 +195,6 @@ declare class MsgBroadcaster {
     txInclusion?: TxClientInclusionOptions;
     txTimeoutInBlocks?: number;
   }): Promise<TxResponse>;
-  private resolveTimeoutInBlocks;
-  private resolveTxInclusionOptions;
-  private createTxGrpcApi;
-  private waitForTxInclusion;
-  private prepareTxInclusionWaiter;
-  private waitForPreparedTxInclusion;
   /**
    * Prepare/sign/broadcast transaction using
    * Ethereum native wallets on the client side.
@@ -278,6 +272,12 @@ declare class MsgBroadcaster {
   private simulateTxWithSigners;
   private retryOnException;
   private fetchAccountAndBlockDetails;
+  private resolveTimeoutInBlocks;
+  private resolveTxInclusionOptions;
+  private createTxGrpcApi;
+  private waitForTxInclusion;
+  private prepareTxInclusionWaiter;
+  private waitForPreparedTxInclusion;
 }
 //#endregion
 //#region src/broadcaster/Web3Broadcaster.d.ts

package/dist/esm/index.js

@@ -396,9 +396,10 @@ var MsgBroadcaster = class {
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionPreparationEnd);
 			txRaw.signatures = [takerSig, feePayerSig.startsWith("0x") ? hexToUint8Array(feePayerSig.slice(2)) : base64ToUint8Array(feePayerSig)];
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastStart);
+			const txInclusionOptions = this.resolveTxInclusionOptions({ txInclusion });
 			const txResponse = await new TxGrpcApi(endpoints.grpc).broadcast(txRaw, {
 				txTimeout: txTimeoutInBlocks,
-				...this.resolveTxInclusionOptions({ txInclusion }),
+				...txInclusionOptions,
 				onBroadcast: () => {
 					walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
 				}
@@ -417,40 +418,6 @@ var MsgBroadcaster = class {
 			throw new TransactionException(new Error(error));
 		}
 	}
-	resolveTimeoutInBlocks(override) {
-		return typeof override === "number" && Number.isInteger(override) && override > 0 ? override : this.txTimeout;
-	}
-	resolveTxInclusionOptions(tx) {
-		var _txInclusion$eventInc;
-		const txInclusion = (tx === null || tx === void 0 ? void 0 : tx.txInclusion) || this.txInclusion;
-		if (!txInclusion) return;
-		return {
-			...txInclusion,
-			eventInclusion: {
-				...txInclusion.eventInclusion,
-				rpcEndpoint: ((_txInclusion$eventInc = txInclusion.eventInclusion) === null || _txInclusion$eventInc === void 0 ? void 0 : _txInclusion$eventInc.rpcEndpoint) || this.endpoints.rpc
-			}
-		};
-	}
-	createTxGrpcApi() {
-		const client = new TxGrpcApi(this.endpoints.grpc);
-		if (this.httpHeaders) client.setMetadata(this.httpHeaders);
-		return client;
-	}
-	async waitForTxInclusion(txHash, timeout, tx) {
-		return this.createTxGrpcApi().waitForTxInclusion(txHash, timeout, this.resolveTxInclusionOptions(tx));
-	}
-	async prepareTxInclusionWaiter(txRawOrSignResponse, timeout, tx) {
-		const txRaw = createTxRawFromSigResponse(txRawOrSignResponse);
-		const txHash = TxClient.hash(txRaw);
-		return this.createTxGrpcApi().prepareTxInclusionWait(txHash, timeout, this.resolveTxInclusionOptions(tx));
-	}
-	async waitForPreparedTxInclusion(responseTxHash, timeout, tx, inclusionWaiter) {
-		if (!inclusionWaiter) return this.waitForTxInclusion(responseTxHash, timeout, tx);
-		const confirmedTx = await inclusionWaiter.wait(responseTxHash);
-		if (!confirmedTx) throw new TransactionException(/* @__PURE__ */ new Error(`The transaction with ${responseTxHash} is not found`));
-		return confirmedTx;
-	}
 	/**
 	* Prepare/sign/broadcast transaction using
 	* Ethereum native wallets on the client side.
@@ -532,7 +499,11 @@ var MsgBroadcaster = class {
 		const txRawEip712 = createTxRawEIP712(txRaw, createWeb3Extension({ evmChainId }));
 		/** Append Signatures */
 		txRawEip712.signatures = [hexToBuff(signature)];
-		const inclusionWaiter = await this.prepareTxInclusionWaiter(txRawEip712, txTimeoutTimeInMilliSeconds, tx);
+		const inclusionWaiter = await this.prepareTxInclusionWaiter({
+			tx,
+			txRawOrSignResponse: txRawEip712,
+			timeout: txTimeoutTimeInMilliSeconds
+		});
 		let response;
 		try {
 			response = await walletStrategy.sendTransaction(txRawEip712, {
@@ -546,7 +517,12 @@ var MsgBroadcaster = class {
 			throw e;
 		}
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-		const confirmedTx = await this.waitForPreparedTxInclusion(response.txHash, txTimeoutTimeInMilliSeconds, tx, inclusionWaiter);
+		const confirmedTx = await this.waitForPreparedTxInclusion({
+			tx,
+			inclusionWaiter,
+			responseTxHash: response.txHash,
+			timeout: txTimeoutTimeInMilliSeconds
+		});
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 		return confirmedTx;
 	}
@@ -633,7 +609,11 @@ var MsgBroadcaster = class {
 		const txRawEip712 = createTxRawEIP712(txRaw, createWeb3Extension({ evmChainId }));
 		/** Append Signatures */
 		txRawEip712.signatures = [hexToBuff(signature)];
-		const inclusionWaiter = await this.prepareTxInclusionWaiter(txRawEip712, txTimeoutTimeInMilliSeconds, tx);
+		const inclusionWaiter = await this.prepareTxInclusionWaiter({
+			tx,
+			timeout: txTimeoutTimeInMilliSeconds,
+			txRawOrSignResponse: txRawEip712
+		});
 		let response;
 		try {
 			response = await walletStrategy.sendTransaction(txRawEip712, {
@@ -647,7 +627,12 @@ var MsgBroadcaster = class {
 			throw e;
 		}
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-		const confirmedTx = await this.waitForPreparedTxInclusion(response.txHash, txTimeoutTimeInMilliSeconds, tx, inclusionWaiter);
+		const confirmedTx = await this.waitForPreparedTxInclusion({
+			tx,
+			inclusionWaiter,
+			responseTxHash: response.txHash,
+			timeout: txTimeoutTimeInMilliSeconds
+		});
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 		return confirmedTx;
 	}
@@ -693,7 +678,11 @@ var MsgBroadcaster = class {
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastStart);
 			const response = await broadcast();
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-			const confirmedTx = await this.waitForTxInclusion(response.txHash, txTimeoutTimeInMilliSeconds, tx);
+			const confirmedTx = await this.waitForTxInclusion({
+				tx,
+				txHash: response.txHash,
+				timeout: txTimeoutTimeInMilliSeconds
+			});
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 			return confirmedTx;
 		} catch (e) {
@@ -775,7 +764,11 @@ var MsgBroadcaster = class {
 				address: tx.injectiveAddress
 			})).signature.signature)];
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastStart);
-			const inclusionWaiter$1 = await this.prepareTxInclusionWaiter(txRaw, txTimeoutTimeInMilliSeconds, tx);
+			const inclusionWaiter$1 = await this.prepareTxInclusionWaiter({
+				tx,
+				txRawOrSignResponse: txRaw,
+				timeout: txTimeoutTimeInMilliSeconds
+			});
 			let response$1;
 			try {
 				response$1 = await walletStrategy.sendTransaction(txRaw, {
@@ -789,7 +782,12 @@ var MsgBroadcaster = class {
 				throw e;
 			}
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-			const confirmedTx$1 = await this.waitForPreparedTxInclusion(response$1.txHash, txTimeoutTimeInMilliSeconds, tx, inclusionWaiter$1);
+			const confirmedTx$1 = await this.waitForPreparedTxInclusion({
+				tx,
+				inclusionWaiter: inclusionWaiter$1,
+				timeout: txTimeoutTimeInMilliSeconds,
+				responseTxHash: response$1.txHash
+			});
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 			return confirmedTx$1;
 		}
@@ -800,7 +798,11 @@ var MsgBroadcaster = class {
 			accountNumber: baseAccount.accountNumber
 		});
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastStart);
-		const inclusionWaiter = await this.prepareTxInclusionWaiter(directSignResponse, txTimeoutTimeInMilliSeconds, tx);
+		const inclusionWaiter = await this.prepareTxInclusionWaiter({
+			tx,
+			timeout: txTimeoutTimeInMilliSeconds,
+			txRawOrSignResponse: directSignResponse
+		});
 		let response;
 		try {
 			response = await walletStrategy.sendTransaction(directSignResponse, {
@@ -814,7 +816,12 @@ var MsgBroadcaster = class {
 			throw e;
 		}
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-		const confirmedTx = await this.waitForPreparedTxInclusion(response.txHash, txTimeoutTimeInMilliSeconds, tx, inclusionWaiter);
+		const confirmedTx = await this.waitForPreparedTxInclusion({
+			tx,
+			inclusionWaiter,
+			responseTxHash: response.txHash,
+			timeout: txTimeoutTimeInMilliSeconds
+		});
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 		return confirmedTx;
 	}
@@ -875,14 +882,14 @@ var MsgBroadcaster = class {
 		*/
 		const { txRaw } = createTransaction({
 			pubKey,
+			chainId,
 			message: msgs,
-			memo: aminoSignResponse.signed.memo,
 			signMode: SIGN_EIP712,
+			memo: aminoSignResponse.signed.memo,
 			fee: aminoSignResponse.signed.fee,
 			sequence: parseInt(aminoSignResponse.signed.sequence, 10),
-			timeoutHeight: parseInt(aminoSignResponse.signed.timeout_height, 10),
 			accountNumber: parseInt(aminoSignResponse.signed.account_number, 10),
-			chainId
+			timeoutHeight: parseInt(aminoSignResponse.signed.timeout_height, 10)
 		});
 		const txRawEip712 = createTxRawEIP712(txRaw, createWeb3Extension({ evmChainId }));
 		if (simulateTx) await this.simulateTxRaw(txRawEip712);
@@ -995,8 +1002,8 @@ var MsgBroadcaster = class {
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionPreparationEnd);
 		const signedTxRaw = createTxRawFromSigResponse(directSignResponse);
 		const broadcast = async () => await transactionApi.broadcastCosmosTxRequest({
-			address: tx.injectiveAddress,
 			txRaw: signedTxRaw,
+			address: tx.injectiveAddress,
 			signature: directSignResponse.signature.signature,
 			pubKey: directSignResponse.signature.pub_key || {
 				value: pubKey,
@@ -1005,7 +1012,11 @@ var MsgBroadcaster = class {
 		});
 		try {
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastStart);
-			const inclusionWaiter = await this.prepareTxInclusionWaiter(signedTxRaw, txTimeoutTimeInMilliSeconds, tx);
+			const inclusionWaiter = await this.prepareTxInclusionWaiter({
+				tx,
+				txRawOrSignResponse: signedTxRaw,
+				timeout: txTimeoutTimeInMilliSeconds
+			});
 			let response;
 			try {
 				response = await broadcast();
@@ -1015,7 +1026,12 @@ var MsgBroadcaster = class {
 			}
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
 			if (canDisableCosmosGasCheck && cosmosWallet.enableGasCheck) cosmosWallet.enableGasCheck(chainId);
-			const confirmedTx = await this.waitForPreparedTxInclusion(response.txHash, txTimeoutTimeInMilliSeconds, tx, inclusionWaiter);
+			const confirmedTx = await this.waitForPreparedTxInclusion({
+				tx,
+				inclusionWaiter,
+				responseTxHash: response.txHash,
+				timeout: txTimeoutTimeInMilliSeconds
+			});
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 			return confirmedTx;
 		} catch (e) {
@@ -1148,6 +1164,52 @@ var MsgBroadcaster = class {
 			latestHeight: latestBlock.header.height.toString()
 		};
 	}
+	resolveTimeoutInBlocks(override) {
+		return typeof override === "number" && Number.isInteger(override) && override > 0 ? override : this.txTimeout;
+	}
+	resolveTxInclusionOptions(tx) {
+		var _txInclusion$eventInc;
+		const txInclusion = (tx === null || tx === void 0 ? void 0 : tx.txInclusion) || this.txInclusion;
+		if (!txInclusion) return;
+		return {
+			...txInclusion,
+			eventInclusion: {
+				...txInclusion.eventInclusion,
+				rpcEndpoint: ((_txInclusion$eventInc = txInclusion.eventInclusion) === null || _txInclusion$eventInc === void 0 ? void 0 : _txInclusion$eventInc.rpcEndpoint) || this.endpoints.rpc
+			}
+		};
+	}
+	createTxGrpcApi() {
+		const client = new TxGrpcApi(this.endpoints.grpc);
+		if (this.httpHeaders) client.setMetadata(this.httpHeaders);
+		return client;
+	}
+	async waitForTxInclusion({ tx, txHash, timeout }) {
+		return this.createTxGrpcApi().waitForTxInclusion({
+			txHash,
+			timeout,
+			options: this.resolveTxInclusionOptions(tx)
+		});
+	}
+	async prepareTxInclusionWaiter({ tx, timeout, txRawOrSignResponse }) {
+		const txRaw = createTxRawFromSigResponse(txRawOrSignResponse);
+		const txHash = TxClient.hash(txRaw);
+		return this.createTxGrpcApi().prepareTxInclusionWait({
+			txHash,
+			timeout,
+			options: this.resolveTxInclusionOptions(tx)
+		});
+	}
+	async waitForPreparedTxInclusion({ tx, timeout, responseTxHash, inclusionWaiter }) {
+		if (!inclusionWaiter) return this.waitForTxInclusion({
+			tx,
+			timeout,
+			txHash: responseTxHash
+		});
+		const confirmedTx = await inclusionWaiter.wait(responseTxHash);
+		if (!confirmedTx) throw new TransactionException(/* @__PURE__ */ new Error(`The transaction with ${responseTxHash} is not found`));
+		return confirmedTx;
+	}
 };
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@injectivelabs/wallet-core",
-  "version": "1.19.27",
+  "version": "1.19.28",
   "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.27",
-    "@injectivelabs/networks": "1.19.27",
-    "@injectivelabs/sdk-ts": "1.19.27",
-    "@injectivelabs/ts-types": "1.19.27",
-    "@injectivelabs/utils": "1.19.27",
-    "@injectivelabs/wallet-base": "1.19.27"
+    "@injectivelabs/ts-types": "1.19.28",
+    "@injectivelabs/sdk-ts": "1.19.28",
+    "@injectivelabs/networks": "1.19.28",
+    "@injectivelabs/wallet-base": "1.19.28",
+    "@injectivelabs/exceptions": "1.19.28",
+    "@injectivelabs/utils": "1.19.28"
   },
   "publishConfig": {
     "access": "public"