@injectivelabs/wallet-core 1.19.26 → 1.19.28

package/dist/cjs/index.cjs

@@ -244,6 +244,7 @@ var MsgBroadcaster = class {
 		_defineProperty(this, "gasBufferCoefficient", 1.2);
 		_defineProperty(this, "retriesOnError", defaultRetriesConfig());
 		_defineProperty(this, "httpHeaders", void 0);
+		_defineProperty(this, "txInclusion", void 0);
 		const networkInfo = (0, __injectivelabs_networks.getNetworkInfo)(options.network);
 		this.options = options;
 		this.simulateTx = options.simulateTx !== void 0 ? options.simulateTx : true;
@@ -255,11 +256,13 @@ var MsgBroadcaster = class {
 		this.endpoints = options.endpoints || (0, __injectivelabs_networks.getNetworkEndpoints)(options.network);
 		this.walletStrategy = options.walletStrategy;
 		this.httpHeaders = options.httpHeaders;
+		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;
 	}
 	async getEvmChainId() {
 		const { walletStrategy } = this;
@@ -373,7 +376,7 @@ var MsgBroadcaster = class {
 	* @param privateKey Taker (autosign) private key — hex, with or without `0x`
 	* @returns transaction response with txHash
 	*/
-	async broadcastWithFeePayerSig({ tx, privateKey, feePayerSig, accountNumber, txTimeoutInBlocks: txTimeoutInBlocksParam }) {
+	async broadcastWithFeePayerSig({ tx, privateKey, feePayerSig, accountNumber, txInclusion, txTimeoutInBlocks: txTimeoutInBlocksParam }) {
 		const { chainId, endpoints, walletStrategy } = this;
 		const txTimeoutInBlocks = this.resolveTimeoutInBlocks(txTimeoutInBlocksParam);
 		const pk = __injectivelabs_sdk_ts_core_accounts.PrivateKey.fromHex(privateKey);
@@ -393,8 +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,
+				...txInclusionOptions,
 				onBroadcast: () => {
 					walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
 				}
@@ -413,9 +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;
-	}
 	/**
 	* Prepare/sign/broadcast transaction using
 	* Ethereum native wallets on the client side.
@@ -497,14 +499,30 @@ 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 response = await walletStrategy.sendTransaction(txRawEip712, {
-			chainId,
-			endpoints,
-			txTimeout: txTimeoutInBlocks,
-			address: tx.injectiveAddress
+		const inclusionWaiter = await this.prepareTxInclusionWaiter({
+			tx,
+			txRawOrSignResponse: txRawEip712,
+			timeout: txTimeoutTimeInMilliSeconds
 		});
+		let response;
+		try {
+			response = await walletStrategy.sendTransaction(txRawEip712, {
+				chainId,
+				endpoints,
+				txTimeout: txTimeoutInBlocks,
+				address: tx.injectiveAddress
+			});
+		} catch (e) {
+			inclusionWaiter.close();
+			throw e;
+		}
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-		const confirmedTx = await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+		const confirmedTx = await this.waitForPreparedTxInclusion({
+			tx,
+			inclusionWaiter,
+			responseTxHash: response.txHash,
+			timeout: txTimeoutTimeInMilliSeconds
+		});
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 		return confirmedTx;
 	}
@@ -591,14 +609,30 @@ 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 response = await walletStrategy.sendTransaction(txRawEip712, {
-			chainId,
-			endpoints,
-			txTimeout: txTimeoutInBlocks,
-			address: tx.injectiveAddress
+		const inclusionWaiter = await this.prepareTxInclusionWaiter({
+			tx,
+			timeout: txTimeoutTimeInMilliSeconds,
+			txRawOrSignResponse: txRawEip712
 		});
+		let response;
+		try {
+			response = await walletStrategy.sendTransaction(txRawEip712, {
+				chainId,
+				endpoints,
+				txTimeout: txTimeoutInBlocks,
+				address: tx.injectiveAddress
+			});
+		} catch (e) {
+			inclusionWaiter.close();
+			throw e;
+		}
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-		const confirmedTx = await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+		const confirmedTx = await this.waitForPreparedTxInclusion({
+			tx,
+			inclusionWaiter,
+			responseTxHash: response.txHash,
+			timeout: txTimeoutTimeInMilliSeconds
+		});
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 		return confirmedTx;
 	}
@@ -644,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 new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+			const confirmedTx = await this.waitForTxInclusion({
+				tx,
+				txHash: response.txHash,
+				timeout: txTimeoutTimeInMilliSeconds
+			});
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 			return confirmedTx;
 		} catch (e) {
@@ -726,14 +764,30 @@ var MsgBroadcaster = class {
 				address: tx.injectiveAddress
 			})).signature.signature)];
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastStart);
-			const response$1 = await walletStrategy.sendTransaction(txRaw, {
-				chainId,
-				endpoints,
-				address: tx.injectiveAddress,
-				txTimeout: txTimeoutInBlocks
+			const inclusionWaiter$1 = await this.prepareTxInclusionWaiter({
+				tx,
+				txRawOrSignResponse: txRaw,
+				timeout: txTimeoutTimeInMilliSeconds
 			});
+			let response$1;
+			try {
+				response$1 = await walletStrategy.sendTransaction(txRaw, {
+					chainId,
+					endpoints,
+					address: tx.injectiveAddress,
+					txTimeout: txTimeoutInBlocks
+				});
+			} catch (e) {
+				inclusionWaiter$1.close();
+				throw e;
+			}
 			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);
+			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;
 		}
@@ -744,14 +798,30 @@ var MsgBroadcaster = class {
 			accountNumber: baseAccount.accountNumber
 		});
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastStart);
-		const response = await walletStrategy.sendTransaction(directSignResponse, {
-			chainId,
-			endpoints,
-			txTimeout: txTimeoutInBlocks,
-			address: tx.injectiveAddress
+		const inclusionWaiter = await this.prepareTxInclusionWaiter({
+			tx,
+			timeout: txTimeoutTimeInMilliSeconds,
+			txRawOrSignResponse: directSignResponse
 		});
+		let response;
+		try {
+			response = await walletStrategy.sendTransaction(directSignResponse, {
+				chainId,
+				endpoints,
+				txTimeout: txTimeoutInBlocks,
+				address: tx.injectiveAddress
+			});
+		} catch (e) {
+			inclusionWaiter.close();
+			throw e;
+		}
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-		const confirmedTx = await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+		const confirmedTx = await this.waitForPreparedTxInclusion({
+			tx,
+			inclusionWaiter,
+			responseTxHash: response.txHash,
+			timeout: txTimeoutTimeInMilliSeconds
+		});
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 		return confirmedTx;
 	}
@@ -812,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);
@@ -827,6 +897,7 @@ var MsgBroadcaster = class {
 		/** Broadcast the transaction */
 		const response = await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).broadcast(txRawEip712, {
 			txTimeout: txTimeoutInBlocks,
+			...this.resolveTxInclusionOptions(tx),
 			onBroadcast: () => {
 				walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
 			}
@@ -929,9 +1000,10 @@ var MsgBroadcaster = class {
 			accountNumber: baseAccount.accountNumber
 		});
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionPreparationEnd);
+		const signedTxRaw = (0, __injectivelabs_sdk_ts_core_tx.createTxRawFromSigResponse)(directSignResponse);
 		const broadcast = async () => await transactionApi.broadcastCosmosTxRequest({
+			txRaw: signedTxRaw,
 			address: tx.injectiveAddress,
-			txRaw: (0, __injectivelabs_sdk_ts_core_tx.createTxRawFromSigResponse)(directSignResponse),
 			signature: directSignResponse.signature.signature,
 			pubKey: directSignResponse.signature.pub_key || {
 				value: pubKey,
@@ -940,10 +1012,26 @@ var MsgBroadcaster = class {
 		});
 		try {
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastStart);
-			const response = await broadcast();
+			const inclusionWaiter = await this.prepareTxInclusionWaiter({
+				tx,
+				txRawOrSignResponse: signedTxRaw,
+				timeout: txTimeoutTimeInMilliSeconds
+			});
+			let response;
+			try {
+				response = await broadcast();
+			} catch (e) {
+				inclusionWaiter.close();
+				throw e;
+			}
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastSynced);
 			if (canDisableCosmosGasCheck && cosmosWallet.enableGasCheck) cosmosWallet.enableGasCheck(chainId);
-			const confirmedTx = await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+			const confirmedTx = await this.waitForPreparedTxInclusion({
+				tx,
+				inclusionWaiter,
+				responseTxHash: response.txHash,
+				timeout: txTimeoutTimeInMilliSeconds
+			});
 			walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 			return confirmedTx;
 		} catch (e) {
@@ -1076,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

@@ -2,7 +2,7 @@ import { ConcreteStrategiesArg, ConcreteWalletStrategy, CosmosWalletAbstraction,
 import { StdSignDoc } from "@keplr-wallet/types";
 import { OfflineSigner } from "@cosmjs/proto-signing";
 import { AccountAddress, ChainId, EvmChainId } from "@injectivelabs/ts-types";
-import { TxResponse } from "@injectivelabs/sdk-ts/core/tx";
+import { TxClientInclusionOptions, TxResponse } from "@injectivelabs/sdk-ts/core/tx";
 import { AminoSignResponse, DirectSignResponse, TxRaw } from "@injectivelabs/sdk-ts/types";
 import { Msgs } from "@injectivelabs/sdk-ts/core/modules";
 import { Network, NetworkEndpoints } from "@injectivelabs/networks";
@@ -81,6 +81,7 @@ interface MsgBroadcasterTxOptions {
   injectiveAddress?: string;
   accountDetails?: AuthBaseAccount;
   txTimeoutInBlocks?: number;
+  txInclusion?: TxClientInclusionOptions;
   gas?: {
     gasPrice?: string;
     gas?: number; /** gas limit */
@@ -101,6 +102,7 @@ interface MsgBroadcasterOptions {
   simulateTx?: boolean;
   txTimeoutOnFeeDelegation?: boolean;
   txTimeout?: number;
+  txInclusion?: TxClientInclusionOptions;
   walletStrategy: BaseWalletStrategy;
   gasBufferCoefficient?: number;
   httpHeaders?: Record<string, string>;
@@ -132,6 +134,7 @@ declare class MsgBroadcaster {
     };
   };
   httpHeaders?: Record<string, string>;
+  txInclusion?: TxClientInclusionOptions;
   constructor(options: MsgBroadcasterOptions);
   setOptions(options: Partial<MsgBroadcasterOptions>): void;
   getEvmChainId(): Promise<EvmChainId | undefined>;
@@ -182,15 +185,16 @@ declare class MsgBroadcaster {
     privateKey,
     feePayerSig,
     accountNumber,
+    txInclusion,
     txTimeoutInBlocks: txTimeoutInBlocksParam
   }: {
     privateKey: string;
     feePayerSig: string;
     accountNumber: number;
     tx: Uint8Array | string;
+    txInclusion?: TxClientInclusionOptions;
     txTimeoutInBlocks?: number;
   }): Promise<TxResponse>;
-  private resolveTimeoutInBlocks;
   /**
    * Prepare/sign/broadcast transaction using
    * Ethereum native wallets on the client side.
@@ -268,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

@@ -2,7 +2,7 @@ import { ConcreteStrategiesArg, ConcreteWalletStrategy, CosmosWalletAbstraction,
 import { AccountAddress, ChainId, EvmChainId } from "@injectivelabs/ts-types";
 import { Network, NetworkEndpoints } from "@injectivelabs/networks";
 import { AuthBaseAccount } from "@injectivelabs/sdk-ts/client/chain";
-import { TxResponse } from "@injectivelabs/sdk-ts/core/tx";
+import { TxClientInclusionOptions, TxResponse } from "@injectivelabs/sdk-ts/core/tx";
 import { StdSignDoc } from "@keplr-wallet/types";
 import { OfflineSigner } from "@cosmjs/proto-signing";
 import { AminoSignResponse, DirectSignResponse, TxRaw } from "@injectivelabs/sdk-ts/types";
@@ -81,6 +81,7 @@ interface MsgBroadcasterTxOptions {
   injectiveAddress?: string;
   accountDetails?: AuthBaseAccount;
   txTimeoutInBlocks?: number;
+  txInclusion?: TxClientInclusionOptions;
   gas?: {
     gasPrice?: string;
     gas?: number; /** gas limit */
@@ -101,6 +102,7 @@ interface MsgBroadcasterOptions {
   simulateTx?: boolean;
   txTimeoutOnFeeDelegation?: boolean;
   txTimeout?: number;
+  txInclusion?: TxClientInclusionOptions;
   walletStrategy: BaseWalletStrategy;
   gasBufferCoefficient?: number;
   httpHeaders?: Record<string, string>;
@@ -132,6 +134,7 @@ declare class MsgBroadcaster {
     };
   };
   httpHeaders?: Record<string, string>;
+  txInclusion?: TxClientInclusionOptions;
   constructor(options: MsgBroadcasterOptions);
   setOptions(options: Partial<MsgBroadcasterOptions>): void;
   getEvmChainId(): Promise<EvmChainId | undefined>;
@@ -182,15 +185,16 @@ declare class MsgBroadcaster {
     privateKey,
     feePayerSig,
     accountNumber,
+    txInclusion,
     txTimeoutInBlocks: txTimeoutInBlocksParam
   }: {
     privateKey: string;
     feePayerSig: string;
     accountNumber: number;
     tx: Uint8Array | string;
+    txInclusion?: TxClientInclusionOptions;
     txTimeoutInBlocks?: number;
   }): Promise<TxResponse>;
-  private resolveTimeoutInBlocks;
   /**
    * Prepare/sign/broadcast transaction using
    * Ethereum native wallets on the client side.
@@ -268,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

@@ -8,7 +8,7 @@ import { IndexerGrpcWeb3GwApi } from "@injectivelabs/sdk-ts/client/indexer";
 import { getNetworkEndpoints, getNetworkInfo, isMainnet, isTestnet } from "@injectivelabs/networks";
 import { ChainGrpcAuthApi, ChainGrpcTendermintApi, ChainGrpcTxFeesApi } from "@injectivelabs/sdk-ts/client/chain";
 import { DEFAULT_BLOCK_TIMEOUT_HEIGHT, DEFAULT_BLOCK_TIME_IN_SECONDS, DEFAULT_GAS_PRICE, getStdFee, sleep, toBigNumber } from "@injectivelabs/utils";
-import { CosmosTxV1Beta1TxPb, SIGN_DIRECT, SIGN_EIP712, SIGN_EIP712_V2, TxGrpcApi, createTransaction, createTransactionWithSigners, createTxRawEIP712, createTxRawFromSigResponse, createWeb3Extension, getAminoStdSignDoc, getEip712TypedData, getEip712TypedDataV2 } from "@injectivelabs/sdk-ts/core/tx";
+import { CosmosTxV1Beta1TxPb, SIGN_DIRECT, SIGN_EIP712, SIGN_EIP712_V2, TxClient, TxGrpcApi, createTransaction, createTransactionWithSigners, createTxRawEIP712, createTxRawFromSigResponse, createWeb3Extension, getAminoStdSignDoc, getEip712TypedData, getEip712TypedDataV2 } from "@injectivelabs/sdk-ts/core/tx";
 
 //#region src/utils/tx.ts
 const checkIfTxRunOutOfGas = (e) => {
@@ -244,6 +244,7 @@ var MsgBroadcaster = class {
 		_defineProperty(this, "gasBufferCoefficient", 1.2);
 		_defineProperty(this, "retriesOnError", defaultRetriesConfig());
 		_defineProperty(this, "httpHeaders", void 0);
+		_defineProperty(this, "txInclusion", void 0);
 		const networkInfo = getNetworkInfo(options.network);
 		this.options = options;
 		this.simulateTx = options.simulateTx !== void 0 ? options.simulateTx : true;
@@ -255,11 +256,13 @@ var MsgBroadcaster = class {
 		this.endpoints = options.endpoints || getNetworkEndpoints(options.network);
 		this.walletStrategy = options.walletStrategy;
 		this.httpHeaders = options.httpHeaders;
+		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;
 	}
 	async getEvmChainId() {
 		const { walletStrategy } = this;
@@ -373,7 +376,7 @@ var MsgBroadcaster = class {
 	* @param privateKey Taker (autosign) private key — hex, with or without `0x`
 	* @returns transaction response with txHash
 	*/
-	async broadcastWithFeePayerSig({ tx, privateKey, feePayerSig, accountNumber, txTimeoutInBlocks: txTimeoutInBlocksParam }) {
+	async broadcastWithFeePayerSig({ tx, privateKey, feePayerSig, accountNumber, txInclusion, txTimeoutInBlocks: txTimeoutInBlocksParam }) {
 		const { chainId, endpoints, walletStrategy } = this;
 		const txTimeoutInBlocks = this.resolveTimeoutInBlocks(txTimeoutInBlocksParam);
 		const pk = PrivateKey.fromHex(privateKey);
@@ -393,8 +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,
+				...txInclusionOptions,
 				onBroadcast: () => {
 					walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
 				}
@@ -413,9 +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;
-	}
 	/**
 	* Prepare/sign/broadcast transaction using
 	* Ethereum native wallets on the client side.
@@ -497,14 +499,30 @@ var MsgBroadcaster = class {
 		const txRawEip712 = createTxRawEIP712(txRaw, createWeb3Extension({ evmChainId }));
 		/** Append Signatures */
 		txRawEip712.signatures = [hexToBuff(signature)];
-		const response = await walletStrategy.sendTransaction(txRawEip712, {
-			chainId,
-			endpoints,
-			txTimeout: txTimeoutInBlocks,
-			address: tx.injectiveAddress
+		const inclusionWaiter = await this.prepareTxInclusionWaiter({
+			tx,
+			txRawOrSignResponse: txRawEip712,
+			timeout: txTimeoutTimeInMilliSeconds
 		});
+		let response;
+		try {
+			response = await walletStrategy.sendTransaction(txRawEip712, {
+				chainId,
+				endpoints,
+				txTimeout: txTimeoutInBlocks,
+				address: tx.injectiveAddress
+			});
+		} catch (e) {
+			inclusionWaiter.close();
+			throw e;
+		}
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-		const confirmedTx = await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+		const confirmedTx = await this.waitForPreparedTxInclusion({
+			tx,
+			inclusionWaiter,
+			responseTxHash: response.txHash,
+			timeout: txTimeoutTimeInMilliSeconds
+		});
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 		return confirmedTx;
 	}
@@ -591,14 +609,30 @@ var MsgBroadcaster = class {
 		const txRawEip712 = createTxRawEIP712(txRaw, createWeb3Extension({ evmChainId }));
 		/** Append Signatures */
 		txRawEip712.signatures = [hexToBuff(signature)];
-		const response = await walletStrategy.sendTransaction(txRawEip712, {
-			chainId,
-			endpoints,
-			txTimeout: txTimeoutInBlocks,
-			address: tx.injectiveAddress
+		const inclusionWaiter = await this.prepareTxInclusionWaiter({
+			tx,
+			timeout: txTimeoutTimeInMilliSeconds,
+			txRawOrSignResponse: txRawEip712
 		});
+		let response;
+		try {
+			response = await walletStrategy.sendTransaction(txRawEip712, {
+				chainId,
+				endpoints,
+				txTimeout: txTimeoutInBlocks,
+				address: tx.injectiveAddress
+			});
+		} catch (e) {
+			inclusionWaiter.close();
+			throw e;
+		}
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-		const confirmedTx = await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+		const confirmedTx = await this.waitForPreparedTxInclusion({
+			tx,
+			inclusionWaiter,
+			responseTxHash: response.txHash,
+			timeout: txTimeoutTimeInMilliSeconds
+		});
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 		return confirmedTx;
 	}
@@ -644,7 +678,11 @@ var MsgBroadcaster = class {
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastStart);
 			const response = await broadcast();
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-			const confirmedTx = await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+			const confirmedTx = await this.waitForTxInclusion({
+				tx,
+				txHash: response.txHash,
+				timeout: txTimeoutTimeInMilliSeconds
+			});
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 			return confirmedTx;
 		} catch (e) {
@@ -726,14 +764,30 @@ var MsgBroadcaster = class {
 				address: tx.injectiveAddress
 			})).signature.signature)];
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastStart);
-			const response$1 = await walletStrategy.sendTransaction(txRaw, {
-				chainId,
-				endpoints,
-				address: tx.injectiveAddress,
-				txTimeout: txTimeoutInBlocks
+			const inclusionWaiter$1 = await this.prepareTxInclusionWaiter({
+				tx,
+				txRawOrSignResponse: txRaw,
+				timeout: txTimeoutTimeInMilliSeconds
 			});
+			let response$1;
+			try {
+				response$1 = await walletStrategy.sendTransaction(txRaw, {
+					chainId,
+					endpoints,
+					address: tx.injectiveAddress,
+					txTimeout: txTimeoutInBlocks
+				});
+			} catch (e) {
+				inclusionWaiter$1.close();
+				throw e;
+			}
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-			const confirmedTx$1 = await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response$1.txHash, txTimeoutTimeInMilliSeconds);
+			const confirmedTx$1 = await this.waitForPreparedTxInclusion({
+				tx,
+				inclusionWaiter: inclusionWaiter$1,
+				timeout: txTimeoutTimeInMilliSeconds,
+				responseTxHash: response$1.txHash
+			});
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 			return confirmedTx$1;
 		}
@@ -744,14 +798,30 @@ var MsgBroadcaster = class {
 			accountNumber: baseAccount.accountNumber
 		});
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastStart);
-		const response = await walletStrategy.sendTransaction(directSignResponse, {
-			chainId,
-			endpoints,
-			txTimeout: txTimeoutInBlocks,
-			address: tx.injectiveAddress
+		const inclusionWaiter = await this.prepareTxInclusionWaiter({
+			tx,
+			timeout: txTimeoutTimeInMilliSeconds,
+			txRawOrSignResponse: directSignResponse
 		});
+		let response;
+		try {
+			response = await walletStrategy.sendTransaction(directSignResponse, {
+				chainId,
+				endpoints,
+				txTimeout: txTimeoutInBlocks,
+				address: tx.injectiveAddress
+			});
+		} catch (e) {
+			inclusionWaiter.close();
+			throw e;
+		}
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
-		const confirmedTx = await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+		const confirmedTx = await this.waitForPreparedTxInclusion({
+			tx,
+			inclusionWaiter,
+			responseTxHash: response.txHash,
+			timeout: txTimeoutTimeInMilliSeconds
+		});
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 		return confirmedTx;
 	}
@@ -812,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);
@@ -827,6 +897,7 @@ var MsgBroadcaster = class {
 		/** Broadcast the transaction */
 		const response = await new TxGrpcApi(endpoints.grpc).broadcast(txRawEip712, {
 			txTimeout: txTimeoutInBlocks,
+			...this.resolveTxInclusionOptions(tx),
 			onBroadcast: () => {
 				walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
 			}
@@ -929,9 +1000,10 @@ var MsgBroadcaster = class {
 			accountNumber: baseAccount.accountNumber
 		});
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionPreparationEnd);
+		const signedTxRaw = createTxRawFromSigResponse(directSignResponse);
 		const broadcast = async () => await transactionApi.broadcastCosmosTxRequest({
+			txRaw: signedTxRaw,
 			address: tx.injectiveAddress,
-			txRaw: createTxRawFromSigResponse(directSignResponse),
 			signature: directSignResponse.signature.signature,
 			pubKey: directSignResponse.signature.pub_key || {
 				value: pubKey,
@@ -940,10 +1012,26 @@ var MsgBroadcaster = class {
 		});
 		try {
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastStart);
-			const response = await broadcast();
+			const inclusionWaiter = await this.prepareTxInclusionWaiter({
+				tx,
+				txRawOrSignResponse: signedTxRaw,
+				timeout: txTimeoutTimeInMilliSeconds
+			});
+			let response;
+			try {
+				response = await broadcast();
+			} catch (e) {
+				inclusionWaiter.close();
+				throw e;
+			}
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastSynced);
 			if (canDisableCosmosGasCheck && cosmosWallet.enableGasCheck) cosmosWallet.enableGasCheck(chainId);
-			const confirmedTx = await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+			const confirmedTx = await this.waitForPreparedTxInclusion({
+				tx,
+				inclusionWaiter,
+				responseTxHash: response.txHash,
+				timeout: txTimeoutTimeInMilliSeconds
+			});
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 			return confirmedTx;
 		} catch (e) {
@@ -1076,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.26",
+  "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.26",
-    "@injectivelabs/sdk-ts": "1.19.26",
-    "@injectivelabs/ts-types": "1.19.26",
-    "@injectivelabs/utils": "1.19.26",
-    "@injectivelabs/networks": "1.19.26",
-    "@injectivelabs/wallet-base": "1.19.26"
+    "@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"