@injectivelabs/wallet-core 1.16.38-alpha.2 → 1.16.38-alpha.3

package/dist/cjs/index.cjs

@@ -1,10 +1,15 @@
 let __injectivelabs_exceptions = require("@injectivelabs/exceptions");
 let eventemitter3 = require("eventemitter3");
 let __injectivelabs_wallet_base = require("@injectivelabs/wallet-base");
+let __injectivelabs_sdk_ts = require("@injectivelabs/sdk-ts");
 let __injectivelabs_ts_types = require("@injectivelabs/ts-types");
+let __injectivelabs_sdk_ts_core_accounts = require("@injectivelabs/sdk-ts/core/accounts");
+let __injectivelabs_sdk_ts_client_indexer = require("@injectivelabs/sdk-ts/client/indexer");
 let __injectivelabs_networks = require("@injectivelabs/networks");
+let __injectivelabs_sdk_ts_client_chain = require("@injectivelabs/sdk-ts/client/chain");
 let __injectivelabs_utils = require("@injectivelabs/utils");
-let __injectivelabs_sdk_ts = require("@injectivelabs/sdk-ts");
+let __injectivelabs_sdk_ts_utils = require("@injectivelabs/sdk-ts/utils");
+let __injectivelabs_sdk_ts_core_tx = require("@injectivelabs/sdk-ts/core/tx");
 
 //#region src/utils/tx.ts
 const checkIfTxRunOutOfGas = (e) => {
@@ -99,7 +104,7 @@ var BaseWalletStrategy = class {
 	getWallet() {
 		return this.wallet;
 	}
-	setWallet(wallet) {
+	async setWallet(wallet) {
 		this.wallet = wallet;
 		this.getStrategy();
 	}
@@ -215,7 +220,7 @@ var BaseWalletStrategy = class {
 //#region src/broadcaster/MsgBroadcaster.ts
 const getEthereumWalletPubKey = async ({ pubKey, eip712TypedData, signature }) => {
 	if (pubKey) return pubKey;
-	return (0, __injectivelabs_sdk_ts.hexToBase64)(await (0, __injectivelabs_sdk_ts.recoverTypedSignaturePubKey)(eip712TypedData, signature));
+	return (0, __injectivelabs_sdk_ts_utils.hexToBase64)(await (0, __injectivelabs_sdk_ts_utils.recoverTypedSignaturePubKey)(eip712TypedData, signature));
 };
 const defaultRetriesConfig = () => ({ [`${__injectivelabs_exceptions.TransactionChainErrorModule.CosmosSdk}-${__injectivelabs_exceptions.ChainCosmosErrorCode.ErrMempoolIsFull}`]: {
 	retries: 0,
@@ -374,7 +379,7 @@ var MsgBroadcaster = class {
 		const timeoutHeight = (0, __injectivelabs_utils.toBigNumber)(latestHeight.toString()).plus(txTimeoutInBlocks);
 		const txTimeoutTimeInSeconds = txTimeoutInBlocks * __injectivelabs_utils.DEFAULT_BLOCK_TIME_IN_SECONDS;
 		const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1e3;
-		const gas = (((_tx$gas = tx.gas) === null || _tx$gas === void 0 ? void 0 : _tx$gas.gas) || (0, __injectivelabs_sdk_ts.getGasPriceBasedOnMessage)(msgs)).toString();
+		const gas = (((_tx$gas = tx.gas) === null || _tx$gas === void 0 ? void 0 : _tx$gas.gas) || (0, __injectivelabs_sdk_ts_utils.getGasPriceBasedOnMessage)(msgs)).toString();
 		let stdFee = (0, __injectivelabs_utils.getStdFee)({
 			...tx.gas,
 			gas
@@ -388,7 +393,7 @@ var MsgBroadcaster = class {
 		else {
 			const { stdFee: simulatedStdFee } = await this.getTxWithSignersAndStdFee({
 				chainId,
-				signMode: __injectivelabs_sdk_ts.SIGN_EIP712,
+				signMode: __injectivelabs_sdk_ts_core_tx.SIGN_EIP712,
 				memo: tx.memo,
 				message: msgs,
 				timeoutHeight: timeoutHeight.toNumber(),
@@ -402,7 +407,7 @@ var MsgBroadcaster = class {
 			stdFee = simulatedStdFee;
 		}
 		/** EIP712 for signing on Ethereum wallets */
-		const eip712TypedData = (0, __injectivelabs_sdk_ts.getEip712TypedData)({
+		const eip712TypedData = (0, __injectivelabs_sdk_ts_core_tx.getEip712TypedData)({
 			msgs,
 			fee: stdFee,
 			tx: {
@@ -422,10 +427,10 @@ var MsgBroadcaster = class {
 			signature
 		});
 		/** Preparing the transaction for client broadcasting */
-		const { txRaw } = (0, __injectivelabs_sdk_ts.createTransaction)({
+		const { txRaw } = (0, __injectivelabs_sdk_ts_core_tx.createTransaction)({
 			message: msgs,
 			memo: tx.memo,
-			signMode: __injectivelabs_sdk_ts.SIGN_EIP712,
+			signMode: __injectivelabs_sdk_ts_core_tx.SIGN_EIP712,
 			fee: stdFee,
 			pubKey: pubKeyOrSignatureDerivedPubKey,
 			sequence: baseAccount.sequence,
@@ -433,9 +438,9 @@ var MsgBroadcaster = class {
 			accountNumber: baseAccount.accountNumber,
 			chainId
 		});
-		const txRawEip712 = (0, __injectivelabs_sdk_ts.createTxRawEIP712)(txRaw, (0, __injectivelabs_sdk_ts.createWeb3Extension)({ evmChainId }));
+		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.hexToBuff)(signature)];
+		txRawEip712.signatures = [(0, __injectivelabs_sdk_ts_utils.hexToBuff)(signature)];
 		const response = await walletStrategy.sendTransaction(txRawEip712, {
 			chainId,
 			endpoints,
@@ -443,7 +448,7 @@ var MsgBroadcaster = class {
 			address: tx.injectiveAddress
 		});
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-		return await new __injectivelabs_sdk_ts.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+		return await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
 	}
 	/**
 	* Prepare/sign/broadcast transaction using
@@ -465,7 +470,7 @@ var MsgBroadcaster = class {
 		const timeoutHeight = (0, __injectivelabs_utils.toBigNumber)(latestHeight).plus(txTimeoutInBlocks);
 		const txTimeoutTimeInSeconds = txTimeoutInBlocks * __injectivelabs_utils.DEFAULT_BLOCK_TIME_IN_SECONDS;
 		const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1e3;
-		const gas = (((_tx$gas2 = tx.gas) === null || _tx$gas2 === void 0 ? void 0 : _tx$gas2.gas) || (0, __injectivelabs_sdk_ts.getGasPriceBasedOnMessage)(msgs)).toString();
+		const gas = (((_tx$gas2 = tx.gas) === null || _tx$gas2 === void 0 ? void 0 : _tx$gas2.gas) || (0, __injectivelabs_sdk_ts_utils.getGasPriceBasedOnMessage)(msgs)).toString();
 		let stdFee = (0, __injectivelabs_utils.getStdFee)({
 			...tx.gas,
 			gas
@@ -479,7 +484,7 @@ var MsgBroadcaster = class {
 		else {
 			const { stdFee: simulatedStdFee } = await this.getTxWithSignersAndStdFee({
 				chainId,
-				signMode: __injectivelabs_sdk_ts.SIGN_EIP712_V2,
+				signMode: __injectivelabs_sdk_ts_core_tx.SIGN_EIP712_V2,
 				memo: tx.memo,
 				message: msgs,
 				timeoutHeight: timeoutHeight.toNumber(),
@@ -494,7 +499,7 @@ var MsgBroadcaster = class {
 		}
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionPreparationStart);
 		/** EIP712 for signing on Ethereum wallets */
-		const eip712TypedData = (0, __injectivelabs_sdk_ts.getEip712TypedDataV2)({
+		const eip712TypedData = (0, __injectivelabs_sdk_ts_core_tx.getEip712TypedDataV2)({
 			msgs,
 			fee: stdFee,
 			tx: {
@@ -515,10 +520,10 @@ var MsgBroadcaster = class {
 			signature
 		});
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastStart);
-		const { txRaw } = (0, __injectivelabs_sdk_ts.createTransaction)({
+		const { txRaw } = (0, __injectivelabs_sdk_ts_core_tx.createTransaction)({
 			message: msgs,
 			memo: tx.memo,
-			signMode: __injectivelabs_sdk_ts.SIGN_EIP712_V2,
+			signMode: __injectivelabs_sdk_ts_core_tx.SIGN_EIP712_V2,
 			fee: stdFee,
 			pubKey: pubKeyOrSignatureDerivedPubKey,
 			sequence: baseAccount.sequence,
@@ -526,9 +531,9 @@ var MsgBroadcaster = class {
 			accountNumber: baseAccount.accountNumber,
 			chainId
 		});
-		const txRawEip712 = (0, __injectivelabs_sdk_ts.createTxRawEIP712)(txRaw, (0, __injectivelabs_sdk_ts.createWeb3Extension)({ evmChainId }));
+		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.hexToBuff)(signature)];
+		txRawEip712.signatures = [(0, __injectivelabs_sdk_ts_utils.hexToBuff)(signature)];
 		const response = await walletStrategy.sendTransaction(txRawEip712, {
 			chainId,
 			endpoints,
@@ -536,7 +541,7 @@ var MsgBroadcaster = class {
 			address: tx.injectiveAddress
 		});
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-		return await new __injectivelabs_sdk_ts.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+		return await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
 	}
 	/**
 	* Prepare/sign/broadcast transaction using
@@ -551,12 +556,12 @@ var MsgBroadcaster = class {
 		const web3Msgs = msgs.map((msg) => msg.toWeb3());
 		const evmChainId = await this.getEvmChainId();
 		if (!evmChainId) throw new __injectivelabs_exceptions.GeneralException(/* @__PURE__ */ new Error("Please provide evmChainId"));
-		const transactionApi = new __injectivelabs_sdk_ts.IndexerGrpcWeb3GwApi(endpoints.web3gw || endpoints.indexer);
+		const transactionApi = new __injectivelabs_sdk_ts_client_indexer.IndexerGrpcWeb3GwApi(endpoints.web3gw || endpoints.indexer);
 		if (httpHeaders) transactionApi.setMetadata(httpHeaders);
 		const txTimeoutTimeInSeconds = txTimeoutInBlocks * __injectivelabs_utils.DEFAULT_BLOCK_TIME_IN_SECONDS;
 		const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1e3;
 		let timeoutHeight = void 0;
-		if (txTimeoutOnFeeDelegation) timeoutHeight = (0, __injectivelabs_utils.toBigNumber)((await new __injectivelabs_sdk_ts.ChainGrpcTendermintApi(endpoints.grpc).fetchLatestBlock()).header.height.toString()).plus(txTimeoutInBlocks).toNumber();
+		if (txTimeoutOnFeeDelegation) timeoutHeight = (0, __injectivelabs_utils.toBigNumber)((await new __injectivelabs_sdk_ts_client_chain.ChainGrpcTendermintApi(endpoints.grpc).fetchLatestBlock()).header.height.toString()).plus(txTimeoutInBlocks).toNumber();
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionPreparationStart);
 		const prepareTxResponse = await transactionApi.prepareTxRequest({
 			timeoutHeight,
@@ -564,7 +569,7 @@ var MsgBroadcaster = class {
 			message: web3Msgs,
 			address: tx.ethereumAddress,
 			chainId: evmChainId,
-			gasLimit: (0, __injectivelabs_sdk_ts.getGasPriceBasedOnMessage)(msgs),
+			gasLimit: (0, __injectivelabs_sdk_ts_utils.getGasPriceBasedOnMessage)(msgs),
 			estimateGas: simulateTx
 		});
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionPreparationEnd);
@@ -579,7 +584,7 @@ var MsgBroadcaster = class {
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastStart);
 			const response = await broadcast();
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-			return await new __injectivelabs_sdk_ts.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+			return await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
 		} catch (e) {
 			const error = e;
 			if ((0, __injectivelabs_exceptions.isThrownException)(error)) {
@@ -590,7 +595,7 @@ var MsgBroadcaster = class {
 				* to just broadcast the transaction twice
 				**/
 				if (walletStrategy.wallet === __injectivelabs_wallet_base.Wallet.PrivateKey && checkIfTxRunOutOfGas(exception)) {
-					const { baseAccount } = await new __injectivelabs_sdk_ts.ChainGrpcAuthApi(endpoints.grpc).fetchAccount(tx.injectiveAddress);
+					const { baseAccount } = await new __injectivelabs_sdk_ts_client_chain.ChainGrpcAuthApi(endpoints.grpc).fetchAccount(tx.injectiveAddress);
 					/** We only do it on the first account tx fail */
 					if (baseAccount.sequence > 1) throw e;
 					return await this.broadcastEip712WithFeeDelegation(tx);
@@ -621,9 +626,9 @@ var MsgBroadcaster = class {
 		const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(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.SIGN_EIP712 : __injectivelabs_sdk_ts.SIGN_DIRECT;
+		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.getGasPriceBasedOnMessage)(msgs)).toString();
+		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(WalletStrategyEmitterEventType.TransactionPreparationStart);
 		/** Prepare the Transaction * */
 		const { txRaw } = await this.getTxWithSignersAndStdFee({
@@ -646,7 +651,7 @@ var MsgBroadcaster = class {
 		/** Ledger using Cosmos app only allows signing amino docs */
 		if ((0, __injectivelabs_wallet_base.isCosmosAminoOnlyWallet)(walletStrategy.wallet)) {
 			var _tx$gas4;
-			const aminoSignDoc = (0, __injectivelabs_sdk_ts.getAminoStdSignDoc)({
+			const aminoSignDoc = (0, __injectivelabs_sdk_ts_core_tx.getAminoStdSignDoc)({
 				...tx,
 				...baseAccount,
 				msgs,
@@ -654,7 +659,7 @@ var MsgBroadcaster = class {
 				gas: gas || ((_tx$gas4 = tx.gas) === null || _tx$gas4 === void 0 || (_tx$gas4 = _tx$gas4.gas) === null || _tx$gas4 === void 0 ? void 0 : _tx$gas4.toString()),
 				timeoutHeight: timeoutHeight.toFixed()
 			});
-			txRaw.signatures = [(0, __injectivelabs_sdk_ts.base64ToUint8Array)((await walletStrategy.signAminoCosmosTransaction({
+			txRaw.signatures = [(0, __injectivelabs_sdk_ts_utils.base64ToUint8Array)((await walletStrategy.signAminoCosmosTransaction({
 				signDoc: aminoSignDoc,
 				address: tx.injectiveAddress
 			})).signature.signature)];
@@ -666,7 +671,7 @@ var MsgBroadcaster = class {
 				txTimeout: txTimeoutInBlocks
 			});
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-			return await new __injectivelabs_sdk_ts.TxGrpcApi(endpoints.grpc).fetchTxPoll(response$1.txHash, txTimeoutTimeInMilliSeconds);
+			return await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response$1.txHash, txTimeoutTimeInMilliSeconds);
 		}
 		const directSignResponse = await walletStrategy.signCosmosTransaction({
 			txRaw,
@@ -682,7 +687,7 @@ var MsgBroadcaster = class {
 			address: tx.injectiveAddress
 		});
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
-		return await new __injectivelabs_sdk_ts.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+		return await new __injectivelabs_sdk_ts_core_tx.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
@@ -706,9 +711,9 @@ var MsgBroadcaster = class {
 		const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
 		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.getGasPriceBasedOnMessage)(msgs)).toString();
+		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.getEip712TypedData)({
+		const eip712TypedData = (0, __injectivelabs_sdk_ts_core_tx.getEip712TypedData)({
 			msgs,
 			fee: await this.getStdFeeWithDynamicBaseFee({
 				...tx.gas,
@@ -739,22 +744,22 @@ var MsgBroadcaster = class {
 		* get as a response in case the user changed the fee/memo
 		* on the Keplr popup
 		*/
-		const { txRaw } = (0, __injectivelabs_sdk_ts.createTransaction)({
+		const { txRaw } = (0, __injectivelabs_sdk_ts_core_tx.createTransaction)({
 			pubKey,
 			message: msgs,
 			memo: aminoSignResponse.signed.memo,
-			signMode: __injectivelabs_sdk_ts.SIGN_EIP712,
+			signMode: __injectivelabs_sdk_ts_core_tx.SIGN_EIP712,
 			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
 		});
-		const txRawEip712 = (0, __injectivelabs_sdk_ts.createTxRawEIP712)(txRaw, (0, __injectivelabs_sdk_ts.createWeb3Extension)({ evmChainId }));
+		const txRawEip712 = (0, __injectivelabs_sdk_ts_core_tx.createTxRawEIP712)(txRaw, (0, __injectivelabs_sdk_ts_core_tx.createWeb3Extension)({ evmChainId }));
 		if (simulateTx) await this.simulateTxRaw(txRawEip712);
-		txRawEip712.signatures = [(0, __injectivelabs_sdk_ts.base64ToUint8Array)(aminoSignResponse.signature.signature)];
+		txRawEip712.signatures = [(0, __injectivelabs_sdk_ts_utils.base64ToUint8Array)(aminoSignResponse.signature.signature)];
 		/** Broadcast the transaction */
-		const response = await new __injectivelabs_sdk_ts.TxGrpcApi(endpoints.grpc).broadcast(txRawEip712, { txTimeout: txTimeoutInBlocks });
+		const response = await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).broadcast(txRawEip712, { txTimeout: txTimeoutInBlocks });
 		if (response.code !== 0) throw new __injectivelabs_exceptions.TransactionException(new Error(response.rawLog), {
 			code: __injectivelabs_exceptions.UnspecifiedErrorCode,
 			contextCode: response.code,
@@ -783,17 +788,17 @@ var MsgBroadcaster = class {
 		const cosmosWallet = walletStrategy.getCosmosWallet(chainId);
 		const canDisableCosmosGasCheck = [__injectivelabs_wallet_base.Wallet.Keplr, __injectivelabs_wallet_base.Wallet.OWallet].includes(walletStrategy.wallet);
 		const feePayerPubKey = await this.fetchFeePayerPubKey(options.feePayerPubKey);
-		const feePayerPublicKey = __injectivelabs_sdk_ts.PublicKey.fromBase64(feePayerPubKey);
+		const feePayerPublicKey = __injectivelabs_sdk_ts_core_accounts.PublicKey.fromBase64(feePayerPubKey);
 		const feePayer = feePayerPublicKey.toAddress().address;
 		/** Account Details * */
 		const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
-		const chainGrpcAuthApi = new __injectivelabs_sdk_ts.ChainGrpcAuthApi(endpoints.grpc);
+		const chainGrpcAuthApi = new __injectivelabs_sdk_ts_client_chain.ChainGrpcAuthApi(endpoints.grpc);
 		if (httpHeaders) chainGrpcAuthApi.setMetadata(httpHeaders);
 		const { baseAccount: feePayerBaseAccount } = await chainGrpcAuthApi.fetchAccount(feePayer);
 		const timeoutHeight = (0, __injectivelabs_utils.toBigNumber)(latestHeight).plus(txTimeoutOnFeeDelegation ? txTimeoutInBlocks : __injectivelabs_utils.DEFAULT_BLOCK_TIMEOUT_HEIGHT);
 		const txTimeoutTimeInMilliSeconds = txTimeoutInBlocks * __injectivelabs_utils.DEFAULT_BLOCK_TIME_IN_SECONDS * 1e3;
 		const pubKey = await walletStrategy.getPubKey();
-		const gas = (((_tx$gas7 = tx.gas) === null || _tx$gas7 === void 0 ? void 0 : _tx$gas7.gas) || (0, __injectivelabs_sdk_ts.getGasPriceBasedOnMessage)(msgs)).toString();
+		const gas = (((_tx$gas7 = tx.gas) === null || _tx$gas7 === void 0 ? void 0 : _tx$gas7.gas) || (0, __injectivelabs_sdk_ts_utils.getGasPriceBasedOnMessage)(msgs)).toString();
 		/** Prepare the Transaction * */
 		const { txRaw } = await this.getTxWithSignersAndStdFee({
 			chainId,
@@ -824,11 +829,11 @@ var MsgBroadcaster = class {
 			accountNumber: baseAccount.accountNumber
 		});
 		walletStrategy.emit(WalletStrategyEmitterEventType.TransactionPreparationEnd);
-		const transactionApi = new __injectivelabs_sdk_ts.IndexerGrpcWeb3GwApi(endpoints.web3gw || endpoints.indexer);
+		const transactionApi = new __injectivelabs_sdk_ts_client_indexer.IndexerGrpcWeb3GwApi(endpoints.web3gw || endpoints.indexer);
 		if (httpHeaders) transactionApi.setMetadata(httpHeaders);
 		const broadcast = async () => await transactionApi.broadcastCosmosTxRequest({
 			address: tx.injectiveAddress,
-			txRaw: (0, __injectivelabs_sdk_ts.createTxRawFromSigResponse)(directSignResponse),
+			txRaw: (0, __injectivelabs_sdk_ts_core_tx.createTxRawFromSigResponse)(directSignResponse),
 			signature: directSignResponse.signature.signature,
 			pubKey: directSignResponse.signature.pub_key || {
 				value: pubKey,
@@ -840,7 +845,7 @@ var MsgBroadcaster = class {
 			const response = await broadcast();
 			walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastEnd);
 			if (canDisableCosmosGasCheck && cosmosWallet.enableGasCheck) cosmosWallet.enableGasCheck(chainId);
-			return await new __injectivelabs_sdk_ts.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
+			return await new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc).fetchTxPoll(response.txHash, txTimeoutTimeInMilliSeconds);
 		} catch (e) {
 			const error = e;
 			if ((0, __injectivelabs_exceptions.isThrownException)(error)) {
@@ -858,15 +863,15 @@ var MsgBroadcaster = class {
 	async fetchFeePayerPubKey(existingFeePayerPubKey) {
 		if (existingFeePayerPubKey) return existingFeePayerPubKey;
 		const { endpoints, httpHeaders } = this;
-		const transactionApi = new __injectivelabs_sdk_ts.IndexerGrpcWeb3GwApi(endpoints.web3gw || endpoints.indexer);
+		const transactionApi = new __injectivelabs_sdk_ts_client_indexer.IndexerGrpcWeb3GwApi(endpoints.web3gw || endpoints.indexer);
 		if (httpHeaders) transactionApi.setMetadata(httpHeaders);
 		const response = await transactionApi.fetchFeePayer();
 		if (!response.feePayerPubKey) throw new __injectivelabs_exceptions.GeneralException(/* @__PURE__ */ new Error("Please provide a feePayerPubKey"));
-		if (response.feePayerPubKey.key.startsWith("0x") || response.feePayerPubKey.key.length === 66) return (0, __injectivelabs_sdk_ts.uint8ArrayToBase64)((0, __injectivelabs_sdk_ts.hexToUint8Array)(response.feePayerPubKey.key));
+		if (response.feePayerPubKey.key.startsWith("0x") || response.feePayerPubKey.key.length === 66) return (0, __injectivelabs_sdk_ts_utils.uint8ArrayToBase64)((0, __injectivelabs_sdk_ts_utils.hexToUint8Array)(response.feePayerPubKey.key));
 		return response.feePayerPubKey.key;
 	}
 	async getStdFeeWithDynamicBaseFee(args) {
-		const client = new __injectivelabs_sdk_ts.ChainGrpcTxFeesApi(this.endpoints.grpc);
+		const client = new __injectivelabs_sdk_ts_client_chain.ChainGrpcTxFeesApi(this.endpoints.grpc);
 		let baseFee = __injectivelabs_utils.DEFAULT_GAS_PRICE;
 		try {
 			const response = await client.fetchEipBaseFee();
@@ -894,12 +899,12 @@ var MsgBroadcaster = class {
 		var _result$gasInfo;
 		const { simulateTx } = this;
 		if (!simulateTx) return {
-			...(0, __injectivelabs_sdk_ts.createTransactionWithSigners)(args),
+			...(0, __injectivelabs_sdk_ts_core_tx.createTransactionWithSigners)(args),
 			stdFee: await this.getStdFeeWithDynamicBaseFee(args.fee)
 		};
 		const result = await this.simulateTxWithSigners(args);
 		if (!((_result$gasInfo = result.gasInfo) === null || _result$gasInfo === void 0 ? void 0 : _result$gasInfo.gasUsed)) return {
-			...(0, __injectivelabs_sdk_ts.createTransactionWithSigners)(args),
+			...(0, __injectivelabs_sdk_ts_core_tx.createTransactionWithSigners)(args),
 			stdFee: await this.getStdFeeWithDynamicBaseFee(args.fee)
 		};
 		const stdGasFee = { ...await this.getStdFeeWithDynamicBaseFee({
@@ -907,7 +912,7 @@ var MsgBroadcaster = class {
 			gas: (0, __injectivelabs_utils.toBigNumber)(result.gasInfo.gasUsed).times(this.gasBufferCoefficient).toFixed()
 		}) };
 		return {
-			...(0, __injectivelabs_sdk_ts.createTransactionWithSigners)({
+			...(0, __injectivelabs_sdk_ts_core_tx.createTransactionWithSigners)({
 				...args,
 				fee: stdGasFee
 			}),
@@ -920,7 +925,7 @@ var MsgBroadcaster = class {
 	async simulateTxRaw(txRaw) {
 		const { endpoints, httpHeaders } = this;
 		txRaw.signatures = [new Uint8Array(0)];
-		const client = new __injectivelabs_sdk_ts.TxGrpcApi(endpoints.grpc);
+		const client = new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc);
 		if (httpHeaders) client.setMetadata(httpHeaders);
 		return await client.simulate(txRaw);
 	}
@@ -929,9 +934,9 @@ var MsgBroadcaster = class {
 	*/
 	async simulateTxWithSigners(args) {
 		const { endpoints, httpHeaders } = this;
-		const { txRaw } = (0, __injectivelabs_sdk_ts.createTransactionWithSigners)(args);
+		const { txRaw } = (0, __injectivelabs_sdk_ts_core_tx.createTransactionWithSigners)(args);
 		txRaw.signatures = Array(Array.isArray(args.signers) ? args.signers.length : 1).fill(new Uint8Array(0));
-		const client = new __injectivelabs_sdk_ts.TxGrpcApi(endpoints.grpc);
+		const client = new __injectivelabs_sdk_ts_core_tx.TxGrpcApi(endpoints.grpc);
 		if (httpHeaders) client.setMetadata(httpHeaders);
 		return await client.simulate(txRaw);
 	}
@@ -956,8 +961,8 @@ var MsgBroadcaster = class {
 	}
 	async fetchAccountAndBlockDetails(address) {
 		const { endpoints, httpHeaders } = this;
-		const chainClient = new __injectivelabs_sdk_ts.ChainGrpcAuthApi(endpoints.grpc);
-		const tendermintClient = new __injectivelabs_sdk_ts.ChainGrpcTendermintApi(endpoints.grpc);
+		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);

package/dist/cjs/index.d.cts

@@ -2,8 +2,10 @@ 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 { AminoSignResponse, DirectSignResponse, Msgs, TxRaw, TxResponse } from "@injectivelabs/sdk-ts";
+import { TxResponse } from "@injectivelabs/sdk-ts/core/tx";
+import { AminoSignResponse, DirectSignResponse, TxRaw } from "@injectivelabs/sdk-ts/types";
 import { EventEmitter } from "eventemitter3";
+import { Msgs } from "@injectivelabs/sdk-ts/core/modules";
 import { Network, NetworkEndpoints } from "@injectivelabs/networks";
 
 //#region src/utils/tx.d.ts
@@ -75,7 +77,7 @@ declare class BaseWalletStrategy implements WalletStrategy {
   emit: WalletStrategyEmitter['emit'];
   constructor(args: WalletStrategyArguments);
   getWallet(): Wallet;
-  setWallet(wallet: Wallet): void;
+  setWallet(wallet: Wallet): Promise<void>;
   setMetadata(metadata?: WalletMetadata): void;
   getStrategy(): ConcreteWalletStrategy;
   getAddresses(args?: unknown): Promise<AccountAddress[]>;

package/dist/esm/index.d.ts

@@ -2,9 +2,11 @@ import { EventEmitter } from "eventemitter3";
 import { ConcreteStrategiesArg, ConcreteWalletStrategy, CosmosWalletAbstraction, Eip1193Provider, SendTransactionOptions, Wallet, WalletDeviceType, WalletMetadata, WalletStrategy, WalletStrategyArguments, onAccountChangeCallback, onChainIdChangeCallback } from "@injectivelabs/wallet-base";
 import { AccountAddress, ChainId, EvmChainId } from "@injectivelabs/ts-types";
 import { Network, NetworkEndpoints } from "@injectivelabs/networks";
-import { AminoSignResponse, DirectSignResponse, Msgs, TxRaw, TxResponse } from "@injectivelabs/sdk-ts";
+import { 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";
+import { Msgs } from "@injectivelabs/sdk-ts/core/modules";
 
 //#region src/utils/tx.d.ts
 declare const checkIfTxRunOutOfGas: (e: unknown) => boolean;
@@ -75,7 +77,7 @@ declare class BaseWalletStrategy implements WalletStrategy {
   emit: WalletStrategyEmitter['emit'];
   constructor(args: WalletStrategyArguments);
   getWallet(): Wallet;
-  setWallet(wallet: Wallet): void;
+  setWallet(wallet: Wallet): Promise<void>;
   setMetadata(metadata?: WalletMetadata): void;
   getStrategy(): ConcreteWalletStrategy;
   getAddresses(args?: unknown): Promise<AccountAddress[]>;

package/dist/esm/index.js

@@ -1,10 +1,15 @@
 import { ChainCosmosErrorCode, GeneralException, TransactionChainErrorModule, TransactionException, UnspecifiedErrorCode, WalletException, Web3Exception, isThrownException } from "@injectivelabs/exceptions";
 import { EventEmitter } from "eventemitter3";
 import { Wallet, WalletDeviceType, createEip712StdSignDoc, getEthereumSignerAddress, getInjectiveSignerAddress, isCosmosAminoOnlyWallet, isCosmosWallet, isEip712V2OnlyWallet, isEvmBrowserWallet, isEvmWallet } from "@injectivelabs/wallet-base";
+import { ofacWallets } from "@injectivelabs/sdk-ts";
 import { EvmChainId } from "@injectivelabs/ts-types";
+import { PublicKey } from "@injectivelabs/sdk-ts/core/accounts";
+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 { ChainGrpcAuthApi, ChainGrpcTendermintApi, ChainGrpcTxFeesApi, IndexerGrpcWeb3GwApi, PublicKey, SIGN_DIRECT, SIGN_EIP712, SIGN_EIP712_V2, TxGrpcApi, base64ToUint8Array, createTransaction, createTransactionWithSigners, createTxRawEIP712, createTxRawFromSigResponse, createWeb3Extension, getAminoStdSignDoc, getEip712TypedData, getEip712TypedDataV2, getGasPriceBasedOnMessage, hexToBase64, hexToBuff, hexToUint8Array, ofacWallets, recoverTypedSignaturePubKey, uint8ArrayToBase64 } from "@injectivelabs/sdk-ts";
+import { base64ToUint8Array, getGasPriceBasedOnMessage, hexToBase64, hexToBuff, hexToUint8Array, recoverTypedSignaturePubKey, uint8ArrayToBase64 } from "@injectivelabs/sdk-ts/utils";
+import { SIGN_DIRECT, SIGN_EIP712, SIGN_EIP712_V2, TxGrpcApi, createTransaction, createTransactionWithSigners, createTxRawEIP712, createTxRawFromSigResponse, createWeb3Extension, getAminoStdSignDoc, getEip712TypedData, getEip712TypedDataV2 } from "@injectivelabs/sdk-ts/core/tx";
 
 //#region src/utils/tx.ts
 const checkIfTxRunOutOfGas = (e) => {
@@ -99,7 +104,7 @@ var BaseWalletStrategy = class {
 	getWallet() {
 		return this.wallet;
 	}
-	setWallet(wallet) {
+	async setWallet(wallet) {
 		this.wallet = wallet;
 		this.getStrategy();
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@injectivelabs/wallet-core",
-  "version": "1.16.38-alpha.2",
+  "version": "1.16.38-alpha.3",
   "description": "Core wallet strategy",
   "license": "Apache-2.0",
   "author": {
@@ -40,12 +40,12 @@
   "dependencies": {
     "@keplr-wallet/types": "^0.12.159",
     "eventemitter3": "^5.0.1",
-    "@injectivelabs/exceptions": "1.16.38-alpha.1",
     "@injectivelabs/networks": "1.16.38-alpha.1",
-    "@injectivelabs/sdk-ts": "1.16.38-alpha.2",
-    "@injectivelabs/wallet-base": "1.16.38-alpha.2",
+    "@injectivelabs/exceptions": "1.16.38-alpha.2",
     "@injectivelabs/ts-types": "1.16.38-alpha.1",
-    "@injectivelabs/utils": "1.16.38-alpha.1"
+    "@injectivelabs/sdk-ts": "1.16.38-alpha.3",
+    "@injectivelabs/utils": "1.16.38-alpha.2",
+    "@injectivelabs/wallet-base": "1.16.38-alpha.3"
   },
   "publishConfig": {
     "access": "public"