@injectivelabs/wallet-core 1.19.19 → 1.19.21

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, 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;
@@ -412,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.
@@ -423,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"));
@@ -514,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"));
@@ -604,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();
@@ -669,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
@@ -755,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
@@ -839,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

package/dist/cjs/index.d.cts

@@ -76,10 +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;
+  txTimeoutInBlocks?: number;
   gas?: {
     gasPrice?: string;
     gas?: number; /** gas limit */
@@ -180,13 +181,16 @@ declare class MsgBroadcaster {
     tx,
     privateKey,
     feePayerSig,
-    accountNumber
+    accountNumber,
+    txTimeoutInBlocks: txTimeoutInBlocksParam
   }: {
     privateKey: string;
     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,10 +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;
+  txTimeoutInBlocks?: number;
   gas?: {
     gasPrice?: string;
     gas?: number; /** gas limit */
@@ -180,13 +181,16 @@ declare class MsgBroadcaster {
     tx,
     privateKey,
     feePayerSig,
-    accountNumber
+    accountNumber,
+    txTimeoutInBlocks: txTimeoutInBlocksParam
   }: {
     privateKey: string;
     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, 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;
@@ -412,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.
@@ -423,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"));
@@ -514,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"));
@@ -604,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();
@@ -669,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
@@ -755,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
@@ -839,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

package/package.json

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