@injectivelabs/wallet-core 1.16.18 → 1.16.20

package/dist/cjs/broadcaster/MsgBroadcaster.js

@@ -214,7 +214,7 @@ class MsgBroadcaster {
      * @returns transaction hash
      */
     async broadcastEip712(tx) {
-        const { chainId, txTimeout, endpoints, walletStrategy } = this;
+        const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks, } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
         const evmChainId = await this.getEvmChainId();
         if (!evmChainId) {
@@ -222,7 +222,9 @@ class MsgBroadcaster {
         }
         /** Account Details * */
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
-        const timeoutHeight = (0, utils_1.toBigNumber)(latestHeight).plus(txTimeout);
+        const timeoutHeight = (0, utils_1.toBigNumber)(latestHeight).plus(txTimeoutInBlocks);
+        const txTimeoutTimeInSeconds = txTimeoutInBlocks * utils_1.DEFAULT_BLOCK_TIME_IN_SECONDS;
+        const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1000;
         const gas = (tx.gas?.gas || (0, sdk_ts_1.getGasPriceBasedOnMessage)(msgs)).toString();
         let stdFee = (0, utils_1.getStdFee)({ ...tx.gas, gas });
         /**
@@ -263,7 +265,7 @@ class MsgBroadcaster {
             evmChainId,
         });
         /** Signing on Ethereum */
-        const signature = await walletStrategy.signEip712TypedData(JSON.stringify(eip712TypedData), tx.ethereumAddress);
+        const signature = await walletStrategy.signEip712TypedData(JSON.stringify(eip712TypedData), tx.ethereumAddress, { txTimeout: txTimeoutTimeInSeconds });
         const pubKeyOrSignatureDerivedPubKey = await getEthereumWalletPubKey({
             pubKey: baseAccount.pubKey?.key,
             eip712TypedData,
@@ -290,11 +292,11 @@ class MsgBroadcaster {
         const response = await walletStrategy.sendTransaction(txRawEip712, {
             chainId,
             endpoints,
-            txTimeout,
+            txTimeout: txTimeoutInBlocks,
             address: tx.injectiveAddress,
         });
         walletStrategy.emit(types_js_1.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-        return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash);
+        return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
     }
     /**
      * Prepare/sign/broadcast transaction using
@@ -306,7 +308,7 @@ class MsgBroadcaster {
      * @returns transaction hash
      */
     async broadcastEip712V2(tx) {
-        const { chainId, endpoints, txTimeout, walletStrategy } = this;
+        const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks, } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
         const evmChainId = await this.getEvmChainId();
         if (!evmChainId) {
@@ -314,7 +316,9 @@ class MsgBroadcaster {
         }
         /** Account Details * */
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
-        const timeoutHeight = (0, utils_1.toBigNumber)(latestHeight).plus(txTimeout);
+        const timeoutHeight = (0, utils_1.toBigNumber)(latestHeight).plus(txTimeoutInBlocks);
+        const txTimeoutTimeInSeconds = txTimeoutInBlocks * utils_1.DEFAULT_BLOCK_TIME_IN_SECONDS;
+        const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1000;
         const gas = (tx.gas?.gas || (0, sdk_ts_1.getGasPriceBasedOnMessage)(msgs)).toString();
         let stdFee = (0, utils_1.getStdFee)({ ...tx.gas, gas });
         /**
@@ -357,7 +361,7 @@ class MsgBroadcaster {
         });
         walletStrategy.emit(types_js_1.WalletStrategyEmitterEventType.TransactionPreparationEnd);
         /** Signing on Ethereum */
-        const signature = await walletStrategy.signEip712TypedData(JSON.stringify(eip712TypedData), tx.ethereumAddress);
+        const signature = await walletStrategy.signEip712TypedData(JSON.stringify(eip712TypedData), tx.ethereumAddress, { txTimeout: txTimeoutTimeInSeconds });
         const pubKeyOrSignatureDerivedPubKey = await getEthereumWalletPubKey({
             pubKey: baseAccount.pubKey?.key,
             eip712TypedData,
@@ -384,11 +388,11 @@ class MsgBroadcaster {
         const response = await walletStrategy.sendTransaction(txRawEip712, {
             chainId,
             endpoints,
-            txTimeout,
+            txTimeout: txTimeoutInBlocks,
             address: tx.injectiveAddress,
         });
         walletStrategy.emit(types_js_1.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-        return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash);
+        return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
     }
     /**
      * Prepare/sign/broadcast transaction using
@@ -398,7 +402,7 @@ class MsgBroadcaster {
      * @returns transaction hash
      */
     async broadcastEip712WithFeeDelegation(tx) {
-        const { txTimeout, endpoints, simulateTx, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation, } = this;
+        const { endpoints, simulateTx, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation, txTimeout: txTimeoutInBlocks, } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
         const web3Msgs = msgs.map((msg) => msg.toWeb3());
         const evmChainId = await this.getEvmChainId();
@@ -409,11 +413,15 @@ class MsgBroadcaster {
         if (httpHeaders) {
             transactionApi.setMetadata(httpHeaders);
         }
+        const txTimeoutTimeInSeconds = txTimeoutInBlocks * utils_1.DEFAULT_BLOCK_TIME_IN_SECONDS;
+        const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1000;
         let timeoutHeight = undefined;
         if (txTimeoutOnFeeDelegation) {
             const latestBlock = await new sdk_ts_1.ChainGrpcTendermintApi(endpoints.grpc).fetchLatestBlock();
             const latestHeight = latestBlock.header.height;
-            timeoutHeight = (0, utils_1.toBigNumber)(latestHeight).plus(txTimeout).toNumber();
+            timeoutHeight = (0, utils_1.toBigNumber)(latestHeight)
+                .plus(txTimeoutInBlocks)
+                .toNumber();
         }
         walletStrategy.emit(types_js_1.WalletStrategyEmitterEventType.TransactionPreparationStart);
         const prepareTxResponse = await transactionApi.prepareTxRequest({
@@ -426,7 +434,7 @@ class MsgBroadcaster {
             estimateGas: simulateTx,
         });
         walletStrategy.emit(types_js_1.WalletStrategyEmitterEventType.TransactionPreparationEnd);
-        const signature = await walletStrategy.signEip712TypedData(prepareTxResponse.data, tx.ethereumAddress);
+        const signature = await walletStrategy.signEip712TypedData(prepareTxResponse.data, tx.ethereumAddress, { txTimeout: txTimeoutTimeInSeconds });
         const broadcast = async () => await transactionApi.broadcastTxRequest({
             signature,
             message: web3Msgs,
@@ -437,7 +445,7 @@ class MsgBroadcaster {
             walletStrategy.emit(types_js_1.WalletStrategyEmitterEventType.TransactionBroadcastStart);
             const response = await broadcast();
             walletStrategy.emit(types_js_1.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-            return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash);
+            return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
         }
         catch (e) {
             const error = e;
@@ -472,7 +480,7 @@ class MsgBroadcaster {
      * @returns transaction hash
      */
     async broadcastDirectSign(tx) {
-        const { walletStrategy, txTimeout, endpoints, chainId } = this;
+        const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks, } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
         /**
          * When using Ledger with Keplr/Leap we have
@@ -486,7 +494,9 @@ class MsgBroadcaster {
             }
         }
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
-        const timeoutHeight = (0, utils_1.toBigNumber)(latestHeight).plus(txTimeout);
+        const timeoutHeight = (0, utils_1.toBigNumber)(latestHeight).plus(txTimeoutInBlocks);
+        const txTimeoutTimeInSeconds = txTimeoutInBlocks * utils_1.DEFAULT_BLOCK_TIME_IN_SECONDS;
+        const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1000;
         const signMode = (0, wallet_base_1.isCosmosAminoOnlyWallet)(walletStrategy.wallet)
             ? sdk_ts_1.SIGN_EIP712
             : sdk_ts_1.SIGN_DIRECT;
@@ -529,11 +539,11 @@ class MsgBroadcaster {
             const response = await walletStrategy.sendTransaction(txRaw, {
                 chainId,
                 endpoints,
-                txTimeout,
                 address: tx.injectiveAddress,
+                txTimeout: txTimeoutInBlocks,
             });
             walletStrategy.emit(types_js_1.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-            return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash);
+            return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
         }
         const directSignResponse = (await walletStrategy.signCosmosTransaction({
             txRaw,
@@ -545,11 +555,11 @@ class MsgBroadcaster {
         const response = await walletStrategy.sendTransaction(directSignResponse, {
             chainId,
             endpoints,
-            txTimeout,
+            txTimeout: txTimeoutInBlocks,
             address: tx.injectiveAddress,
         });
         walletStrategy.emit(types_js_1.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-        return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash);
+        return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
     }
     /**
      * We use this method only when we want to broadcast a transaction using Ledger on Keplr/Leap for Injective
@@ -558,7 +568,7 @@ class MsgBroadcaster {
      * @param tx the transaction that needs to be broadcasted
      */
     async experimentalBroadcastWalletThroughLedger(tx) {
-        const { chainId, txTimeout, endpoints, evmChainId, simulateTx, walletStrategy, } = this;
+        const { chainId, endpoints, evmChainId, simulateTx, walletStrategy, txTimeout: txTimeoutInBlocks, } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
         /**
          * We can only use this method
@@ -576,7 +586,7 @@ class MsgBroadcaster {
         }
         const cosmosWallet = walletStrategy.getCosmosWallet(chainId);
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
-        const timeoutHeight = (0, utils_1.toBigNumber)(latestHeight).plus(txTimeout);
+        const timeoutHeight = (0, utils_1.toBigNumber)(latestHeight).plus(txTimeoutInBlocks);
         const pubKey = await walletStrategy.getPubKey();
         const gas = (tx.gas?.gas || (0, sdk_ts_1.getGasPriceBasedOnMessage)(msgs)).toString();
         /** EIP712 for signing on Ethereum wallets */
@@ -631,7 +641,7 @@ class MsgBroadcaster {
         const signatureBuff = Buffer.from(aminoSignResponse.signature.signature, 'base64');
         txRawEip712.signatures = [signatureBuff];
         /** Broadcast the transaction */
-        const response = await new sdk_ts_1.TxGrpcApi(endpoints.grpc).broadcast(txRawEip712, { txTimeout });
+        const response = await new sdk_ts_1.TxGrpcApi(endpoints.grpc).broadcast(txRawEip712, { txTimeout: txTimeoutInBlocks });
         if (response.code !== 0) {
             throw new exceptions_1.TransactionException(new Error(response.rawLog), {
                 code: exceptions_1.UnspecifiedErrorCode,
@@ -649,7 +659,7 @@ class MsgBroadcaster {
      * @returns transaction hash
      */
     async broadcastDirectSignWithFeeDelegation(tx) {
-        const { options, chainId, txTimeout, endpoints, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation, } = this;
+        const { options, chainId, endpoints, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation, txTimeout: txTimeoutInBlocks, } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
         /**
          * We can only use this method when Keplr is connected
@@ -675,7 +685,11 @@ class MsgBroadcaster {
         }
         const feePayerAccountDetails = await chainGrpcAuthApi.fetchAccount(feePayer);
         const { baseAccount: feePayerBaseAccount } = feePayerAccountDetails;
-        const timeoutHeight = (0, utils_1.toBigNumber)(latestHeight).plus(txTimeoutOnFeeDelegation ? txTimeout : utils_1.DEFAULT_BLOCK_TIMEOUT_HEIGHT);
+        const timeoutHeight = (0, utils_1.toBigNumber)(latestHeight).plus(txTimeoutOnFeeDelegation
+            ? txTimeoutInBlocks
+            : utils_1.DEFAULT_BLOCK_TIMEOUT_HEIGHT);
+        const txTimeoutTimeInSeconds = txTimeoutInBlocks * utils_1.DEFAULT_BLOCK_TIME_IN_SECONDS;
+        const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1000;
         const pubKey = await walletStrategy.getPubKey();
         const gas = (tx.gas?.gas || (0, sdk_ts_1.getGasPriceBasedOnMessage)(msgs)).toString();
         /** Prepare the Transaction * */
@@ -731,7 +745,7 @@ class MsgBroadcaster {
             if (canDisableCosmosGasCheck && cosmosWallet.enableGasCheck) {
                 cosmosWallet.enableGasCheck(chainId);
             }
-            return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash);
+            return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
         }
         catch (e) {
             const error = e;

package/dist/cjs/strategy/BaseWalletStrategy.d.ts

@@ -35,7 +35,9 @@ export default class BaseWalletStrategy implements WalletStrategyInterface {
         evmChainId: EvmChainId;
         address: AccountAddress;
     }): Promise<string>;
-    signEip712TypedData(eip712TypedData: string, address: AccountAddress): Promise<string>;
+    signEip712TypedData(eip712TypedData: string, address: AccountAddress, options?: {
+        txTimeout?: number;
+    }): Promise<string>;
     signAminoCosmosTransaction(transaction: {
         signDoc: StdSignDoc;
         address: string;

package/dist/cjs/strategy/BaseWalletStrategy.js

@@ -98,7 +98,7 @@ class BaseWalletStrategy {
     async sendEvmTransaction(tx /* TODO */, options) {
         return this.getStrategy().sendEvmTransaction(tx, options);
     }
-    async signEip712TypedData(eip712TypedData, address) {
+    async signEip712TypedData(eip712TypedData, address, options = {}) {
         if ((0, wallet_base_1.isCosmosWallet)(this.wallet)) {
             throw new exceptions_1.WalletException(new Error(`You can't sign Ethereum Transaction using ${this.wallet}`));
         }
@@ -107,7 +107,7 @@ class BaseWalletStrategy {
             await this.enable();
         }
         this.emit(types_js_1.WalletStrategyEmitterEventType.TransactionSignStart);
-        const response = await this.getStrategy().signEip712TypedData(eip712TypedData, address);
+        const response = await this.getStrategy().signEip712TypedData(eip712TypedData, address, options);
         this.emit(types_js_1.WalletStrategyEmitterEventType.TransactionSigned);
         return response;
     }

package/dist/esm/broadcaster/MsgBroadcaster.js

@@ -1,6 +1,6 @@
 import { EvmChainId } from '@injectivelabs/ts-types';
 import { isTestnet, isMainnet, getNetworkInfo, getNetworkEndpoints, } from '@injectivelabs/networks';
-import { sleep, getStdFee, toBigNumber, DEFAULT_GAS_PRICE, DEFAULT_BLOCK_TIMEOUT_HEIGHT, } from '@injectivelabs/utils';
+import { sleep, getStdFee, toBigNumber, DEFAULT_GAS_PRICE, DEFAULT_BLOCK_TIMEOUT_HEIGHT, DEFAULT_BLOCK_TIME_IN_SECONDS, } from '@injectivelabs/utils';
 import { WalletException, GeneralException, isThrownException, UnspecifiedErrorCode, ChainCosmosErrorCode, TransactionException, TransactionChainErrorModule, } from '@injectivelabs/exceptions';
 import { Wallet, isCosmosWallet, WalletDeviceType, isEvmBrowserWallet, isEip712V2OnlyWallet, createEip712StdSignDoc, isCosmosAminoOnlyWallet, getEthereumSignerAddress, getInjectiveSignerAddress, } from '@injectivelabs/wallet-base';
 import { TxGrpcApi, hexToBuff, PublicKey, SIGN_DIRECT, hexToBase64, ofacWallets, SIGN_EIP712, SIGN_EIP712_V2, ChainGrpcAuthApi, createTxRawEIP712, createTransaction, ChainGrpcTxFeesApi, getAminoStdSignDoc, getEip712TypedData, createWeb3Extension, getEip712TypedDataV2, IndexerGrpcWeb3GwApi, ChainGrpcTendermintApi, getGasPriceBasedOnMessage, createTxRawFromSigResponse, recoverTypedSignaturePubKey, createTransactionWithSigners, } from '@injectivelabs/sdk-ts';
@@ -211,7 +211,7 @@ export class MsgBroadcaster {
      * @returns transaction hash
      */
     async broadcastEip712(tx) {
-        const { chainId, txTimeout, endpoints, walletStrategy } = this;
+        const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks, } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
         const evmChainId = await this.getEvmChainId();
         if (!evmChainId) {
@@ -219,7 +219,9 @@ export class MsgBroadcaster {
         }
         /** Account Details * */
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
-        const timeoutHeight = toBigNumber(latestHeight).plus(txTimeout);
+        const timeoutHeight = toBigNumber(latestHeight).plus(txTimeoutInBlocks);
+        const txTimeoutTimeInSeconds = txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS;
+        const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1000;
         const gas = (tx.gas?.gas || getGasPriceBasedOnMessage(msgs)).toString();
         let stdFee = getStdFee({ ...tx.gas, gas });
         /**
@@ -260,7 +262,7 @@ export class MsgBroadcaster {
             evmChainId,
         });
         /** Signing on Ethereum */
-        const signature = await walletStrategy.signEip712TypedData(JSON.stringify(eip712TypedData), tx.ethereumAddress);
+        const signature = await walletStrategy.signEip712TypedData(JSON.stringify(eip712TypedData), tx.ethereumAddress, { txTimeout: txTimeoutTimeInSeconds });
         const pubKeyOrSignatureDerivedPubKey = await getEthereumWalletPubKey({
             pubKey: baseAccount.pubKey?.key,
             eip712TypedData,
@@ -287,11 +289,11 @@ export class MsgBroadcaster {
         const response = await walletStrategy.sendTransaction(txRawEip712, {
             chainId,
             endpoints,
-            txTimeout,
+            txTimeout: txTimeoutInBlocks,
             address: tx.injectiveAddress,
         });
         walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-        return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash);
+        return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
     }
     /**
      * Prepare/sign/broadcast transaction using
@@ -303,7 +305,7 @@ export class MsgBroadcaster {
      * @returns transaction hash
      */
     async broadcastEip712V2(tx) {
-        const { chainId, endpoints, txTimeout, walletStrategy } = this;
+        const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks, } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
         const evmChainId = await this.getEvmChainId();
         if (!evmChainId) {
@@ -311,7 +313,9 @@ export class MsgBroadcaster {
         }
         /** Account Details * */
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
-        const timeoutHeight = toBigNumber(latestHeight).plus(txTimeout);
+        const timeoutHeight = toBigNumber(latestHeight).plus(txTimeoutInBlocks);
+        const txTimeoutTimeInSeconds = txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS;
+        const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1000;
         const gas = (tx.gas?.gas || getGasPriceBasedOnMessage(msgs)).toString();
         let stdFee = getStdFee({ ...tx.gas, gas });
         /**
@@ -354,7 +358,7 @@ export class MsgBroadcaster {
         });
         walletStrategy.emit(WalletStrategyEmitterEventType.TransactionPreparationEnd);
         /** Signing on Ethereum */
-        const signature = await walletStrategy.signEip712TypedData(JSON.stringify(eip712TypedData), tx.ethereumAddress);
+        const signature = await walletStrategy.signEip712TypedData(JSON.stringify(eip712TypedData), tx.ethereumAddress, { txTimeout: txTimeoutTimeInSeconds });
         const pubKeyOrSignatureDerivedPubKey = await getEthereumWalletPubKey({
             pubKey: baseAccount.pubKey?.key,
             eip712TypedData,
@@ -381,11 +385,11 @@ export class MsgBroadcaster {
         const response = await walletStrategy.sendTransaction(txRawEip712, {
             chainId,
             endpoints,
-            txTimeout,
+            txTimeout: txTimeoutInBlocks,
             address: tx.injectiveAddress,
         });
         walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-        return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash);
+        return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
     }
     /**
      * Prepare/sign/broadcast transaction using
@@ -395,7 +399,7 @@ export class MsgBroadcaster {
      * @returns transaction hash
      */
     async broadcastEip712WithFeeDelegation(tx) {
-        const { txTimeout, endpoints, simulateTx, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation, } = this;
+        const { endpoints, simulateTx, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation, txTimeout: txTimeoutInBlocks, } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
         const web3Msgs = msgs.map((msg) => msg.toWeb3());
         const evmChainId = await this.getEvmChainId();
@@ -406,11 +410,15 @@ export class MsgBroadcaster {
         if (httpHeaders) {
             transactionApi.setMetadata(httpHeaders);
         }
+        const txTimeoutTimeInSeconds = txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS;
+        const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1000;
         let timeoutHeight = undefined;
         if (txTimeoutOnFeeDelegation) {
             const latestBlock = await new ChainGrpcTendermintApi(endpoints.grpc).fetchLatestBlock();
             const latestHeight = latestBlock.header.height;
-            timeoutHeight = toBigNumber(latestHeight).plus(txTimeout).toNumber();
+            timeoutHeight = toBigNumber(latestHeight)
+                .plus(txTimeoutInBlocks)
+                .toNumber();
         }
         walletStrategy.emit(WalletStrategyEmitterEventType.TransactionPreparationStart);
         const prepareTxResponse = await transactionApi.prepareTxRequest({
@@ -423,7 +431,7 @@ export class MsgBroadcaster {
             estimateGas: simulateTx,
         });
         walletStrategy.emit(WalletStrategyEmitterEventType.TransactionPreparationEnd);
-        const signature = await walletStrategy.signEip712TypedData(prepareTxResponse.data, tx.ethereumAddress);
+        const signature = await walletStrategy.signEip712TypedData(prepareTxResponse.data, tx.ethereumAddress, { txTimeout: txTimeoutTimeInSeconds });
         const broadcast = async () => await transactionApi.broadcastTxRequest({
             signature,
             message: web3Msgs,
@@ -434,7 +442,7 @@ export class MsgBroadcaster {
             walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastStart);
             const response = await broadcast();
             walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-            return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash);
+            return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
         }
         catch (e) {
             const error = e;
@@ -469,7 +477,7 @@ export class MsgBroadcaster {
      * @returns transaction hash
      */
     async broadcastDirectSign(tx) {
-        const { walletStrategy, txTimeout, endpoints, chainId } = this;
+        const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks, } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
         /**
          * When using Ledger with Keplr/Leap we have
@@ -483,7 +491,9 @@ export class MsgBroadcaster {
             }
         }
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
-        const timeoutHeight = toBigNumber(latestHeight).plus(txTimeout);
+        const timeoutHeight = toBigNumber(latestHeight).plus(txTimeoutInBlocks);
+        const txTimeoutTimeInSeconds = txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS;
+        const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1000;
         const signMode = isCosmosAminoOnlyWallet(walletStrategy.wallet)
             ? SIGN_EIP712
             : SIGN_DIRECT;
@@ -526,11 +536,11 @@ export class MsgBroadcaster {
             const response = await walletStrategy.sendTransaction(txRaw, {
                 chainId,
                 endpoints,
-                txTimeout,
                 address: tx.injectiveAddress,
+                txTimeout: txTimeoutInBlocks,
             });
             walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-            return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash);
+            return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
         }
         const directSignResponse = (await walletStrategy.signCosmosTransaction({
             txRaw,
@@ -542,11 +552,11 @@ export class MsgBroadcaster {
         const response = await walletStrategy.sendTransaction(directSignResponse, {
             chainId,
             endpoints,
-            txTimeout,
+            txTimeout: txTimeoutInBlocks,
             address: tx.injectiveAddress,
         });
         walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-        return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash);
+        return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
     }
     /**
      * We use this method only when we want to broadcast a transaction using Ledger on Keplr/Leap for Injective
@@ -555,7 +565,7 @@ export class MsgBroadcaster {
      * @param tx the transaction that needs to be broadcasted
      */
     async experimentalBroadcastWalletThroughLedger(tx) {
-        const { chainId, txTimeout, endpoints, evmChainId, simulateTx, walletStrategy, } = this;
+        const { chainId, endpoints, evmChainId, simulateTx, walletStrategy, txTimeout: txTimeoutInBlocks, } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
         /**
          * We can only use this method
@@ -573,7 +583,7 @@ export class MsgBroadcaster {
         }
         const cosmosWallet = walletStrategy.getCosmosWallet(chainId);
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
-        const timeoutHeight = toBigNumber(latestHeight).plus(txTimeout);
+        const timeoutHeight = toBigNumber(latestHeight).plus(txTimeoutInBlocks);
         const pubKey = await walletStrategy.getPubKey();
         const gas = (tx.gas?.gas || getGasPriceBasedOnMessage(msgs)).toString();
         /** EIP712 for signing on Ethereum wallets */
@@ -628,7 +638,7 @@ export class MsgBroadcaster {
         const signatureBuff = Buffer.from(aminoSignResponse.signature.signature, 'base64');
         txRawEip712.signatures = [signatureBuff];
         /** Broadcast the transaction */
-        const response = await new TxGrpcApi(endpoints.grpc).broadcast(txRawEip712, { txTimeout });
+        const response = await new TxGrpcApi(endpoints.grpc).broadcast(txRawEip712, { txTimeout: txTimeoutInBlocks });
         if (response.code !== 0) {
             throw new TransactionException(new Error(response.rawLog), {
                 code: UnspecifiedErrorCode,
@@ -646,7 +656,7 @@ export class MsgBroadcaster {
      * @returns transaction hash
      */
     async broadcastDirectSignWithFeeDelegation(tx) {
-        const { options, chainId, txTimeout, endpoints, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation, } = this;
+        const { options, chainId, endpoints, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation, txTimeout: txTimeoutInBlocks, } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
         /**
          * We can only use this method when Keplr is connected
@@ -672,7 +682,11 @@ export class MsgBroadcaster {
         }
         const feePayerAccountDetails = await chainGrpcAuthApi.fetchAccount(feePayer);
         const { baseAccount: feePayerBaseAccount } = feePayerAccountDetails;
-        const timeoutHeight = toBigNumber(latestHeight).plus(txTimeoutOnFeeDelegation ? txTimeout : DEFAULT_BLOCK_TIMEOUT_HEIGHT);
+        const timeoutHeight = toBigNumber(latestHeight).plus(txTimeoutOnFeeDelegation
+            ? txTimeoutInBlocks
+            : DEFAULT_BLOCK_TIMEOUT_HEIGHT);
+        const txTimeoutTimeInSeconds = txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS;
+        const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1000;
         const pubKey = await walletStrategy.getPubKey();
         const gas = (tx.gas?.gas || getGasPriceBasedOnMessage(msgs)).toString();
         /** Prepare the Transaction * */
@@ -728,7 +742,7 @@ export class MsgBroadcaster {
             if (canDisableCosmosGasCheck && cosmosWallet.enableGasCheck) {
                 cosmosWallet.enableGasCheck(chainId);
             }
-            return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash);
+            return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
         }
         catch (e) {
             const error = e;

package/dist/esm/strategy/BaseWalletStrategy.d.ts

@@ -35,7 +35,9 @@ export default class BaseWalletStrategy implements WalletStrategyInterface {
         evmChainId: EvmChainId;
         address: AccountAddress;
     }): Promise<string>;
-    signEip712TypedData(eip712TypedData: string, address: AccountAddress): Promise<string>;
+    signEip712TypedData(eip712TypedData: string, address: AccountAddress, options?: {
+        txTimeout?: number;
+    }): Promise<string>;
     signAminoCosmosTransaction(transaction: {
         signDoc: StdSignDoc;
         address: string;

package/dist/esm/strategy/BaseWalletStrategy.js

@@ -96,7 +96,7 @@ export default class BaseWalletStrategy {
     async sendEvmTransaction(tx /* TODO */, options) {
         return this.getStrategy().sendEvmTransaction(tx, options);
     }
-    async signEip712TypedData(eip712TypedData, address) {
+    async signEip712TypedData(eip712TypedData, address, options = {}) {
         if (isCosmosWallet(this.wallet)) {
             throw new WalletException(new Error(`You can't sign Ethereum Transaction using ${this.wallet}`));
         }
@@ -105,7 +105,7 @@ export default class BaseWalletStrategy {
             await this.enable();
         }
         this.emit(WalletStrategyEmitterEventType.TransactionSignStart);
-        const response = await this.getStrategy().signEip712TypedData(eip712TypedData, address);
+        const response = await this.getStrategy().signEip712TypedData(eip712TypedData, address, options);
         this.emit(WalletStrategyEmitterEventType.TransactionSigned);
         return response;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-core",
   "description": "Core wallet strategy",
-  "version": "1.16.18",
+  "version": "1.16.20",
   "sideEffects": false,
   "type": "module",
   "author": {
@@ -56,17 +56,17 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
-    "@injectivelabs/exceptions": "1.16.18",
-    "@injectivelabs/networks": "1.16.18",
-    "@injectivelabs/sdk-ts": "1.16.18",
-    "@injectivelabs/ts-types": "1.16.18",
-    "@injectivelabs/utils": "1.16.18",
-    "@injectivelabs/wallet-base": "1.16.18",
+    "@injectivelabs/exceptions": "1.16.20",
+    "@injectivelabs/networks": "1.16.20",
+    "@injectivelabs/sdk-ts": "1.16.20",
+    "@injectivelabs/ts-types": "1.16.20",
+    "@injectivelabs/utils": "1.16.20",
+    "@injectivelabs/wallet-base": "1.16.20",
     "@keplr-wallet/types": "^0.12.159",
     "eventemitter3": "^5.0.1"
   },
   "devDependencies": {
     "shx": "^0.3.3"
   },
-  "gitHead": "c3bd5cd1b67e53b3bf6a17fc31cb9cd2ff7151d9"
+  "gitHead": "8c378352fe865570437048d0d11110eb417bbc78"
 }