@injectivelabs/wallet-core 1.19.14 → 1.19.16

package/dist/cjs/index.cjs

@@ -420,10 +420,8 @@ var MsgBroadcaster = class {
 		var _tx$gas, _baseAccount$pubKey;
 		const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks } = this;
 		const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
-		const evmChainId = await this.getEvmChainId();
+		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"));
-		/** Account Details * */
-		const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
 		const timeoutHeight = (0, __injectivelabs_utils.toBigNumber)(latestHeight.toString()).plus(txTimeoutInBlocks);
 		const txTimeoutTimeInSeconds = txTimeoutInBlocks * __injectivelabs_utils.DEFAULT_BLOCK_TIME_IN_SECONDS;
 		const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1e3;
@@ -511,10 +509,8 @@ var MsgBroadcaster = class {
 		var _tx$gas2, _baseAccount$pubKey2;
 		const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks } = this;
 		const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
-		const evmChainId = await this.getEvmChainId();
+		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"));
-		/** Account Details * */
-		const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
 		const timeoutHeight = (0, __injectivelabs_utils.toBigNumber)(latestHeight).plus(txTimeoutInBlocks);
 		const txTimeoutTimeInSeconds = txTimeoutInBlocks * __injectivelabs_utils.DEFAULT_BLOCK_TIME_IN_SECONDS;
 		const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1e3;
@@ -671,11 +667,10 @@ var MsgBroadcaster = class {
 		if ([__injectivelabs_wallet_base.Wallet.Keplr, __injectivelabs_wallet_base.Wallet.Leap].includes(walletStrategy.getWallet())) {
 			if (await walletStrategy.getWalletDeviceType() === __injectivelabs_wallet_base.WalletDeviceType.Hardware) return this.experimentalBroadcastWalletThroughLedger(tx);
 		}
-		const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
+		const [{ baseAccount, latestHeight }, pubKey] = await Promise.all([this.fetchAccountAndBlockDetails(tx.injectiveAddress, tx.accountDetails), walletStrategy.getPubKey(tx.injectiveAddress)]);
 		const timeoutHeight = (0, __injectivelabs_utils.toBigNumber)(latestHeight).plus(txTimeoutInBlocks);
 		const txTimeoutTimeInMilliSeconds = txTimeoutInBlocks * __injectivelabs_utils.DEFAULT_BLOCK_TIME_IN_SECONDS * 1e3;
 		const signMode = (0, __injectivelabs_wallet_base.isCosmosAminoOnlyWallet)(walletStrategy.wallet) ? __injectivelabs_sdk_ts_core_tx.SIGN_EIP712 : __injectivelabs_sdk_ts_core_tx.SIGN_DIRECT;
-		const pubKey = await walletStrategy.getPubKey(tx.injectiveAddress);
 		const gas = (((_tx$gas3 = tx.gas) === null || _tx$gas3 === void 0 ? void 0 : _tx$gas3.gas) || (0, __injectivelabs_sdk_ts_utils.getGasPriceBasedOnMessage)(msgs)).toString();
 		walletStrategy.emit(__injectivelabs_wallet_base.WalletStrategyEmitterEventType.TransactionPreparationStart);
 		/** Prepare the Transaction * */
@@ -756,9 +751,8 @@ var MsgBroadcaster = class {
 		}
 		if (!evmChainId) throw new __injectivelabs_exceptions.GeneralException(/* @__PURE__ */ new Error("Please provide evmChainId"));
 		const cosmosWallet = walletStrategy.getCosmosWallet(chainId);
-		const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
+		const [{ baseAccount, latestHeight }, pubKey] = await Promise.all([this.fetchAccountAndBlockDetails(tx.injectiveAddress, tx.accountDetails), walletStrategy.getPubKey()]);
 		const timeoutHeight = (0, __injectivelabs_utils.toBigNumber)(latestHeight).plus(txTimeoutInBlocks);
-		const pubKey = await walletStrategy.getPubKey();
 		const gas = (((_tx$gas5 = tx.gas) === null || _tx$gas5 === void 0 ? void 0 : _tx$gas5.gas) || (0, __injectivelabs_sdk_ts_utils.getGasPriceBasedOnMessage)(msgs)).toString();
 		/** EIP712 for signing on Ethereum wallets */
 		const eip712TypedData = (0, __injectivelabs_sdk_ts_core_tx.getEip712TypedData)({
@@ -842,7 +836,7 @@ var MsgBroadcaster = class {
 		if (httpHeaders) transactionApi.setMetadata(httpHeaders);
 		const fetchAccountBlockDetails = async () => {
 			try {
-				const { baseAccount: baseAccount$1, latestHeight: latestHeight$1 } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
+				const { baseAccount: baseAccount$1, latestHeight: latestHeight$1 } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress, tx.accountDetails);
 				return {
 					baseAccount: baseAccount$1,
 					latestHeight: latestHeight$1
@@ -1032,20 +1026,21 @@ var MsgBroadcaster = class {
 			throw e;
 		}
 	}
-	async fetchAccountAndBlockDetails(address) {
+	async fetchAccountAndBlockDetails(address, existingAccountDetails) {
 		const { endpoints, httpHeaders } = this;
-		const chainClient = new __injectivelabs_sdk_ts_client_chain.ChainGrpcAuthApi(endpoints.grpc);
 		const tendermintClient = new __injectivelabs_sdk_ts_client_chain.ChainGrpcTendermintApi(endpoints.grpc);
-		if (httpHeaders) {
-			chainClient.setMetadata(httpHeaders);
-			tendermintClient.setMetadata(httpHeaders);
-		}
-		const accountDetails = await chainClient.fetchAccount(address);
+		if (httpHeaders) tendermintClient.setMetadata(httpHeaders);
+		if (existingAccountDetails) return {
+			baseAccount: existingAccountDetails,
+			latestHeight: (await tendermintClient.fetchLatestBlock()).header.height.toString()
+		};
+		const chainClient = new __injectivelabs_sdk_ts_client_chain.ChainGrpcAuthApi(endpoints.grpc);
+		if (httpHeaders) chainClient.setMetadata(httpHeaders);
+		const [accountDetails, latestBlock] = await Promise.all([chainClient.fetchAccount(address), tendermintClient.fetchLatestBlock()]);
 		const { baseAccount } = accountDetails;
 		return {
 			baseAccount,
-			latestHeight: (await tendermintClient.fetchLatestBlock()).header.height.toString(),
-			accountDetails
+			latestHeight: latestBlock.header.height.toString()
 		};
 	}
 };

package/dist/cjs/index.d.cts

@@ -6,6 +6,7 @@ import { 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";
+import { AuthBaseAccount } from "@injectivelabs/sdk-ts/client/chain";
 
 //#region src/utils/tx.d.ts
 declare const checkIfTxRunOutOfGas: (e: unknown) => boolean;
@@ -78,6 +79,7 @@ interface MsgBroadcasterTxOptions {
   ethereumAddress?: string;
   injectiveAddress?: string;
   msgs: Msgs | Msgs[];
+  accountDetails?: AuthBaseAccount;
   gas?: {
     gasPrice?: string;
     gas?: number; /** gas limit */

package/dist/esm/index.d.ts

@@ -1,6 +1,7 @@
 import { ConcreteStrategiesArg, ConcreteWalletStrategy, CosmosWalletAbstraction, Eip1193Provider, SendTransactionOptions, Wallet, WalletDeviceType, WalletMetadata, WalletStrategy, WalletStrategyArguments, WalletStrategyEmitter, onAccountChangeCallback, onChainIdChangeCallback } from "@injectivelabs/wallet-base";
 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 { StdSignDoc } from "@keplr-wallet/types";
 import { OfflineSigner } from "@cosmjs/proto-signing";
@@ -78,6 +79,7 @@ interface MsgBroadcasterTxOptions {
   ethereumAddress?: string;
   injectiveAddress?: string;
   msgs: Msgs | Msgs[];
+  accountDetails?: AuthBaseAccount;
   gas?: {
     gasPrice?: string;
     gas?: number; /** gas limit */

package/dist/esm/index.js

@@ -420,10 +420,8 @@ var MsgBroadcaster = class {
 		var _tx$gas, _baseAccount$pubKey;
 		const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks } = this;
 		const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
-		const evmChainId = await this.getEvmChainId();
+		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"));
-		/** Account Details * */
-		const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
 		const timeoutHeight = toBigNumber(latestHeight.toString()).plus(txTimeoutInBlocks);
 		const txTimeoutTimeInSeconds = txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS;
 		const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1e3;
@@ -511,10 +509,8 @@ var MsgBroadcaster = class {
 		var _tx$gas2, _baseAccount$pubKey2;
 		const { chainId, endpoints, walletStrategy, txTimeout: txTimeoutInBlocks } = this;
 		const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
-		const evmChainId = await this.getEvmChainId();
+		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"));
-		/** 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 * 1e3;
@@ -671,11 +667,10 @@ var MsgBroadcaster = class {
 		if ([Wallet.Keplr, Wallet.Leap].includes(walletStrategy.getWallet())) {
 			if (await walletStrategy.getWalletDeviceType() === WalletDeviceType.Hardware) return this.experimentalBroadcastWalletThroughLedger(tx);
 		}
-		const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
+		const [{ baseAccount, latestHeight }, pubKey] = await Promise.all([this.fetchAccountAndBlockDetails(tx.injectiveAddress, tx.accountDetails), walletStrategy.getPubKey(tx.injectiveAddress)]);
 		const timeoutHeight = toBigNumber(latestHeight).plus(txTimeoutInBlocks);
 		const txTimeoutTimeInMilliSeconds = txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS * 1e3;
 		const signMode = isCosmosAminoOnlyWallet(walletStrategy.wallet) ? SIGN_EIP712 : SIGN_DIRECT;
-		const pubKey = await walletStrategy.getPubKey(tx.injectiveAddress);
 		const gas = (((_tx$gas3 = tx.gas) === null || _tx$gas3 === void 0 ? void 0 : _tx$gas3.gas) || getGasPriceBasedOnMessage(msgs)).toString();
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionPreparationStart);
 		/** Prepare the Transaction * */
@@ -756,9 +751,8 @@ var MsgBroadcaster = class {
 		}
 		if (!evmChainId) throw new GeneralException(/* @__PURE__ */ new Error("Please provide evmChainId"));
 		const cosmosWallet = walletStrategy.getCosmosWallet(chainId);
-		const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
+		const [{ baseAccount, latestHeight }, pubKey] = await Promise.all([this.fetchAccountAndBlockDetails(tx.injectiveAddress, tx.accountDetails), walletStrategy.getPubKey()]);
 		const timeoutHeight = toBigNumber(latestHeight).plus(txTimeoutInBlocks);
-		const pubKey = await walletStrategy.getPubKey();
 		const gas = (((_tx$gas5 = tx.gas) === null || _tx$gas5 === void 0 ? void 0 : _tx$gas5.gas) || getGasPriceBasedOnMessage(msgs)).toString();
 		/** EIP712 for signing on Ethereum wallets */
 		const eip712TypedData = getEip712TypedData({
@@ -842,7 +836,7 @@ var MsgBroadcaster = class {
 		if (httpHeaders) transactionApi.setMetadata(httpHeaders);
 		const fetchAccountBlockDetails = async () => {
 			try {
-				const { baseAccount: baseAccount$1, latestHeight: latestHeight$1 } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
+				const { baseAccount: baseAccount$1, latestHeight: latestHeight$1 } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress, tx.accountDetails);
 				return {
 					baseAccount: baseAccount$1,
 					latestHeight: latestHeight$1
@@ -1032,20 +1026,21 @@ var MsgBroadcaster = class {
 			throw e;
 		}
 	}
-	async fetchAccountAndBlockDetails(address) {
+	async fetchAccountAndBlockDetails(address, existingAccountDetails) {
 		const { endpoints, httpHeaders } = this;
-		const chainClient = new ChainGrpcAuthApi(endpoints.grpc);
 		const tendermintClient = new ChainGrpcTendermintApi(endpoints.grpc);
-		if (httpHeaders) {
-			chainClient.setMetadata(httpHeaders);
-			tendermintClient.setMetadata(httpHeaders);
-		}
-		const accountDetails = await chainClient.fetchAccount(address);
+		if (httpHeaders) tendermintClient.setMetadata(httpHeaders);
+		if (existingAccountDetails) return {
+			baseAccount: existingAccountDetails,
+			latestHeight: (await tendermintClient.fetchLatestBlock()).header.height.toString()
+		};
+		const chainClient = new ChainGrpcAuthApi(endpoints.grpc);
+		if (httpHeaders) chainClient.setMetadata(httpHeaders);
+		const [accountDetails, latestBlock] = await Promise.all([chainClient.fetchAccount(address), tendermintClient.fetchLatestBlock()]);
 		const { baseAccount } = accountDetails;
 		return {
 			baseAccount,
-			latestHeight: (await tendermintClient.fetchLatestBlock()).header.height.toString(),
-			accountDetails
+			latestHeight: latestBlock.header.height.toString()
 		};
 	}
 };

package/package.json

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