@injectivelabs/wallet-core 1.16.19 → 1.16.20

package/dist/cjs/broadcaster/MsgBroadcaster.js

@@ -223,6 +223,8 @@ class MsgBroadcaster {
         /** Account Details * */
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
         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,
@@ -294,7 +296,7 @@ class MsgBroadcaster {
             address: tx.injectiveAddress,
         });
         walletStrategy.emit(types_js_1.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-        return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutInBlocks * utils_1.DEFAULT_BLOCK_TIME_IN_SECONDS * 1000);
+        return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
     }
     /**
      * Prepare/sign/broadcast transaction using
@@ -315,6 +317,8 @@ class MsgBroadcaster {
         /** Account Details * */
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
         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,
@@ -388,7 +392,7 @@ class MsgBroadcaster {
             address: tx.injectiveAddress,
         });
         walletStrategy.emit(types_js_1.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-        return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutInBlocks * utils_1.DEFAULT_BLOCK_TIME_IN_SECONDS * 1000);
+        return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
     }
     /**
      * Prepare/sign/broadcast transaction using
@@ -409,6 +413,8 @@ 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();
@@ -428,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,
@@ -439,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, txTimeoutInBlocks * utils_1.DEFAULT_BLOCK_TIME_IN_SECONDS * 1000);
+            return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
         }
         catch (e) {
             const error = e;
@@ -489,6 +495,8 @@ class MsgBroadcaster {
         }
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
         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;
@@ -535,7 +543,7 @@ class MsgBroadcaster {
                 txTimeout: txTimeoutInBlocks,
             });
             walletStrategy.emit(types_js_1.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-            return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutInBlocks * utils_1.DEFAULT_BLOCK_TIME_IN_SECONDS * 1000);
+            return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
         }
         const directSignResponse = (await walletStrategy.signCosmosTransaction({
             txRaw,
@@ -551,7 +559,7 @@ class MsgBroadcaster {
             address: tx.injectiveAddress,
         });
         walletStrategy.emit(types_js_1.WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-        return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutInBlocks * utils_1.DEFAULT_BLOCK_TIME_IN_SECONDS * 1000);
+        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
@@ -680,6 +688,8 @@ class MsgBroadcaster {
         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 * */
@@ -735,7 +745,7 @@ class MsgBroadcaster {
             if (canDisableCosmosGasCheck && cosmosWallet.enableGasCheck) {
                 cosmosWallet.enableGasCheck(chainId);
             }
-            return await new sdk_ts_1.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutInBlocks * utils_1.DEFAULT_BLOCK_TIME_IN_SECONDS * 1000);
+            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

@@ -220,6 +220,8 @@ export class MsgBroadcaster {
         /** Account Details * */
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
         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,
@@ -291,7 +293,7 @@ export class MsgBroadcaster {
             address: tx.injectiveAddress,
         });
         walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-        return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS * 1000);
+        return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
     }
     /**
      * Prepare/sign/broadcast transaction using
@@ -312,6 +314,8 @@ export class MsgBroadcaster {
         /** Account Details * */
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
         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,
@@ -385,7 +389,7 @@ export class MsgBroadcaster {
             address: tx.injectiveAddress,
         });
         walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-        return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS * 1000);
+        return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
     }
     /**
      * Prepare/sign/broadcast transaction using
@@ -406,6 +410,8 @@ 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();
@@ -425,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,
@@ -436,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, txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS * 1000);
+            return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
         }
         catch (e) {
             const error = e;
@@ -486,6 +492,8 @@ export class MsgBroadcaster {
         }
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
         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;
@@ -532,7 +540,7 @@ export class MsgBroadcaster {
                 txTimeout: txTimeoutInBlocks,
             });
             walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-            return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS * 1000);
+            return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
         }
         const directSignResponse = (await walletStrategy.signCosmosTransaction({
             txRaw,
@@ -548,7 +556,7 @@ export class MsgBroadcaster {
             address: tx.injectiveAddress,
         });
         walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-        return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS * 1000);
+        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
@@ -677,6 +685,8 @@ export class MsgBroadcaster {
         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 * */
@@ -732,7 +742,7 @@ export class MsgBroadcaster {
             if (canDisableCosmosGasCheck && cosmosWallet.enableGasCheck) {
                 cosmosWallet.enableGasCheck(chainId);
             }
-            return await new TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS * 1000);
+            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.19",
+  "version": "1.16.20",
   "sideEffects": false,
   "type": "module",
   "author": {
@@ -56,17 +56,17 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
-    "@injectivelabs/exceptions": "1.16.19",
-    "@injectivelabs/networks": "1.16.19",
-    "@injectivelabs/sdk-ts": "1.16.19",
-    "@injectivelabs/ts-types": "1.16.19",
-    "@injectivelabs/utils": "1.16.19",
-    "@injectivelabs/wallet-base": "1.16.19",
+    "@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": "48a6522a9317958b108a4373c4b8412b10136859"
+  "gitHead": "8c378352fe865570437048d0d11110eb417bbc78"
 }