@injectivelabs/wallet-core 1.16.3 → 1.16.4

package/dist/cjs/broadcaster/MsgBroadcaster.d.ts

@@ -30,6 +30,7 @@ export declare class MsgBroadcaster {
     httpHeaders?: Record<string, string>;
     constructor(options: MsgBroadcasterOptions);
     setOptions(options: Partial<MsgBroadcasterOptions>): void;
+    getEvmChainId(): Promise<EthereumChainId | undefined>;
     /**
      * Broadcasting the transaction using the client
      * side approach for both cosmos and ethereum native wallets

package/dist/cjs/broadcaster/MsgBroadcaster.js

@@ -5,6 +5,7 @@ const sdk_ts_1 = require("@injectivelabs/sdk-ts");
 const utils_1 = require("@injectivelabs/utils");
 const exceptions_1 = require("@injectivelabs/exceptions");
 const networks_1 = require("@injectivelabs/networks");
+const ts_types_1 = require("@injectivelabs/ts-types");
 const types_js_1 = require("./types.js");
 const index_js_1 = require("../utils/index.js");
 const wallet_base_1 = require("@injectivelabs/wallet-base");
@@ -64,6 +65,38 @@ class MsgBroadcaster {
         this.txTimeoutOnFeeDelegation =
             options.txTimeoutOnFeeDelegation || this.txTimeoutOnFeeDelegation;
     }
+    async getEvmChainId() {
+        const { walletStrategy } = this;
+        if (!(0, wallet_base_1.isEvmBrowserWallet)(walletStrategy.wallet)) {
+            return this.ethereumChainId;
+        }
+        const mainnetEvmIds = [ts_types_1.EthereumChainId.Mainnet, ts_types_1.EthereumChainId.MainnetEvm];
+        const testnetEvmIds = [ts_types_1.EthereumChainId.Sepolia, ts_types_1.EthereumChainId.TestnetEvm];
+        const devnetEvmIds = [ts_types_1.EthereumChainId.Sepolia, ts_types_1.EthereumChainId.DevnetEvm];
+        try {
+            const chainId = await walletStrategy.getEthereumChainId();
+            if (!chainId) {
+                return this.ethereumChainId;
+            }
+            const evmChainId = parseInt(chainId, 16);
+            if (isNaN(evmChainId)) {
+                return this.ethereumChainId;
+            }
+            if (((0, networks_1.isMainnet)(this.options.network) &&
+                !mainnetEvmIds.includes(evmChainId)) ||
+                ((0, networks_1.isTestnet)(this.options.network) &&
+                    !testnetEvmIds.includes(evmChainId)) ||
+                (!(0, networks_1.isMainnet)(this.options.network) &&
+                    !(0, networks_1.isTestnet)(this.options.network) &&
+                    !devnetEvmIds.includes(evmChainId))) {
+                throw new exceptions_1.WalletException(new Error('Your selected network is incorrect'));
+            }
+            return evmChainId;
+        }
+        catch (e) {
+            throw new exceptions_1.WalletException(e);
+        }
+    }
     /**
      * Broadcasting the transaction using the client
      * side approach for both cosmos and ethereum native wallets
@@ -170,8 +203,9 @@ class MsgBroadcaster {
      * @returns transaction hash
      */
     async broadcastEip712(tx) {
-        const { chainId, txTimeout, endpoints, ethereumChainId, walletStrategy } = this;
+        const { chainId, txTimeout, endpoints, walletStrategy } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
+        const ethereumChainId = await this.getEvmChainId();
         if (!ethereumChainId) {
             throw new exceptions_1.GeneralException(new Error('Please provide ethereumChainId'));
         }
@@ -261,8 +295,9 @@ class MsgBroadcaster {
      * @returns transaction hash
      */
     async broadcastEip712V2(tx) {
-        const { chainId, endpoints, txTimeout, walletStrategy, ethereumChainId } = this;
+        const { chainId, endpoints, txTimeout, walletStrategy } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
+        const ethereumChainId = await this.getEvmChainId();
         if (!ethereumChainId) {
             throw new exceptions_1.GeneralException(new Error('Please provide ethereumChainId'));
         }
@@ -352,9 +387,10 @@ class MsgBroadcaster {
      * @returns transaction hash
      */
     async broadcastEip712WithFeeDelegation(tx) {
-        const { txTimeout, endpoints, simulateTx, httpHeaders, walletStrategy, ethereumChainId, txTimeoutOnFeeDelegation, } = this;
+        const { txTimeout, endpoints, simulateTx, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation, } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
         const web3Msgs = msgs.map((msg) => msg.toWeb3());
+        const ethereumChainId = await this.getEvmChainId();
         if (!ethereumChainId) {
             throw new exceptions_1.GeneralException(new Error('Please provide ethereumChainId'));
         }

package/dist/esm/broadcaster/MsgBroadcaster.d.ts

@@ -30,6 +30,7 @@ export declare class MsgBroadcaster {
     httpHeaders?: Record<string, string>;
     constructor(options: MsgBroadcasterOptions);
     setOptions(options: Partial<MsgBroadcasterOptions>): void;
+    getEvmChainId(): Promise<EthereumChainId | undefined>;
     /**
      * Broadcasting the transaction using the client
      * side approach for both cosmos and ethereum native wallets

package/dist/esm/broadcaster/MsgBroadcaster.js

@@ -1,10 +1,11 @@
 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';
 import { sleep, getStdFee, BigNumberInBase, DEFAULT_GAS_PRICE, DEFAULT_BLOCK_TIMEOUT_HEIGHT, } from '@injectivelabs/utils';
-import { GeneralException, isThrownException, UnspecifiedErrorCode, ChainCosmosErrorCode, TransactionException, TransactionChainErrorModule, } from '@injectivelabs/exceptions';
-import { getNetworkInfo, getNetworkEndpoints, } from '@injectivelabs/networks';
+import { WalletException, GeneralException, isThrownException, UnspecifiedErrorCode, ChainCosmosErrorCode, TransactionException, TransactionChainErrorModule, } from '@injectivelabs/exceptions';
+import { isTestnet, isMainnet, getNetworkInfo, getNetworkEndpoints, } from '@injectivelabs/networks';
+import { EthereumChainId } from '@injectivelabs/ts-types';
 import { WalletStrategyEmitterEventType, } from './types.js';
 import { checkIfTxRunOutOfGas } from '../utils/index.js';
-import { Wallet, isCosmosWallet, WalletDeviceType, isEip712V2OnlyWallet, createEip712StdSignDoc, isCosmosAminoOnlyWallet, getEthereumSignerAddress, getInjectiveSignerAddress, } from '@injectivelabs/wallet-base';
+import { Wallet, isCosmosWallet, WalletDeviceType, isEvmBrowserWallet, isEip712V2OnlyWallet, createEip712StdSignDoc, isCosmosAminoOnlyWallet, getEthereumSignerAddress, getInjectiveSignerAddress, } from '@injectivelabs/wallet-base';
 const getEthereumWalletPubKey = ({ pubKey, eip712TypedData, signature, }) => {
     if (pubKey) {
         return pubKey;
@@ -61,6 +62,38 @@ export class MsgBroadcaster {
         this.txTimeoutOnFeeDelegation =
             options.txTimeoutOnFeeDelegation || this.txTimeoutOnFeeDelegation;
     }
+    async getEvmChainId() {
+        const { walletStrategy } = this;
+        if (!isEvmBrowserWallet(walletStrategy.wallet)) {
+            return this.ethereumChainId;
+        }
+        const mainnetEvmIds = [EthereumChainId.Mainnet, EthereumChainId.MainnetEvm];
+        const testnetEvmIds = [EthereumChainId.Sepolia, EthereumChainId.TestnetEvm];
+        const devnetEvmIds = [EthereumChainId.Sepolia, EthereumChainId.DevnetEvm];
+        try {
+            const chainId = await walletStrategy.getEthereumChainId();
+            if (!chainId) {
+                return this.ethereumChainId;
+            }
+            const evmChainId = parseInt(chainId, 16);
+            if (isNaN(evmChainId)) {
+                return this.ethereumChainId;
+            }
+            if ((isMainnet(this.options.network) &&
+                !mainnetEvmIds.includes(evmChainId)) ||
+                (isTestnet(this.options.network) &&
+                    !testnetEvmIds.includes(evmChainId)) ||
+                (!isMainnet(this.options.network) &&
+                    !isTestnet(this.options.network) &&
+                    !devnetEvmIds.includes(evmChainId))) {
+                throw new WalletException(new Error('Your selected network is incorrect'));
+            }
+            return evmChainId;
+        }
+        catch (e) {
+            throw new WalletException(e);
+        }
+    }
     /**
      * Broadcasting the transaction using the client
      * side approach for both cosmos and ethereum native wallets
@@ -167,8 +200,9 @@ export class MsgBroadcaster {
      * @returns transaction hash
      */
     async broadcastEip712(tx) {
-        const { chainId, txTimeout, endpoints, ethereumChainId, walletStrategy } = this;
+        const { chainId, txTimeout, endpoints, walletStrategy } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
+        const ethereumChainId = await this.getEvmChainId();
         if (!ethereumChainId) {
             throw new GeneralException(new Error('Please provide ethereumChainId'));
         }
@@ -258,8 +292,9 @@ export class MsgBroadcaster {
      * @returns transaction hash
      */
     async broadcastEip712V2(tx) {
-        const { chainId, endpoints, txTimeout, walletStrategy, ethereumChainId } = this;
+        const { chainId, endpoints, txTimeout, walletStrategy } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
+        const ethereumChainId = await this.getEvmChainId();
         if (!ethereumChainId) {
             throw new GeneralException(new Error('Please provide ethereumChainId'));
         }
@@ -349,9 +384,10 @@ export class MsgBroadcaster {
      * @returns transaction hash
      */
     async broadcastEip712WithFeeDelegation(tx) {
-        const { txTimeout, endpoints, simulateTx, httpHeaders, walletStrategy, ethereumChainId, txTimeoutOnFeeDelegation, } = this;
+        const { txTimeout, endpoints, simulateTx, httpHeaders, walletStrategy, txTimeoutOnFeeDelegation, } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
         const web3Msgs = msgs.map((msg) => msg.toWeb3());
+        const ethereumChainId = await this.getEvmChainId();
         if (!ethereumChainId) {
             throw new GeneralException(new Error('Please provide ethereumChainId'));
         }

package/package.json

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