@injectivelabs/wallet-core 1.16.4-alpha.0 → 1.16.4

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

@@ -30,7 +30,7 @@ export declare class MsgBroadcaster {
     httpHeaders?: Record<string, string>;
     constructor(options: MsgBroadcasterOptions);
     setOptions(options: Partial<MsgBroadcasterOptions>): void;
-    verifyEvmChainId(): Promise<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

@@ -65,17 +65,23 @@ class MsgBroadcaster {
         this.txTimeoutOnFeeDelegation =
             options.txTimeoutOnFeeDelegation || this.txTimeoutOnFeeDelegation;
     }
-    async verifyEvmChainId() {
+    async getEvmChainId() {
         const { walletStrategy } = this;
         if (!(0, wallet_base_1.isEvmBrowserWallet)(walletStrategy.wallet)) {
-            return;
+            return this.ethereumChainId;
         }
-        const mainnetEvmIds = [ts_types_1.EthereumChainId.Mainnet];
+        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) &&
@@ -85,11 +91,11 @@ class MsgBroadcaster {
                     !devnetEvmIds.includes(evmChainId))) {
                 throw new exceptions_1.WalletException(new Error('Your selected network is incorrect'));
             }
-            if (this.ethereumChainId !== evmChainId) {
-                this.ethereumChainId = evmChainId;
-            }
+            return evmChainId;
+        }
+        catch (e) {
+            throw new exceptions_1.WalletException(e);
         }
-        catch { }
     }
     /**
      * Broadcasting the transaction using the client
@@ -197,12 +203,12 @@ 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'));
         }
-        await this.verifyEvmChainId();
         /** Account Details * */
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
         const timeoutHeight = new utils_1.BigNumberInBase(latestHeight).plus(txTimeout);
@@ -289,12 +295,12 @@ 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'));
         }
-        await this.verifyEvmChainId();
         /** Account Details * */
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
         const timeoutHeight = new utils_1.BigNumberInBase(latestHeight).plus(txTimeout);
@@ -381,13 +387,13 @@ 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'));
         }
-        await this.verifyEvmChainId();
         const transactionApi = new sdk_ts_1.IndexerGrpcWeb3GwApi(endpoints.web3gw || endpoints.indexer);
         if (httpHeaders) {
             transactionApi.setMetadata(httpHeaders);

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

@@ -30,7 +30,7 @@ export declare class MsgBroadcaster {
     httpHeaders?: Record<string, string>;
     constructor(options: MsgBroadcasterOptions);
     setOptions(options: Partial<MsgBroadcasterOptions>): void;
-    verifyEvmChainId(): Promise<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

@@ -62,17 +62,23 @@ export class MsgBroadcaster {
         this.txTimeoutOnFeeDelegation =
             options.txTimeoutOnFeeDelegation || this.txTimeoutOnFeeDelegation;
     }
-    async verifyEvmChainId() {
+    async getEvmChainId() {
         const { walletStrategy } = this;
         if (!isEvmBrowserWallet(walletStrategy.wallet)) {
-            return;
+            return this.ethereumChainId;
         }
-        const mainnetEvmIds = [EthereumChainId.Mainnet];
+        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) &&
@@ -82,11 +88,11 @@ export class MsgBroadcaster {
                     !devnetEvmIds.includes(evmChainId))) {
                 throw new WalletException(new Error('Your selected network is incorrect'));
             }
-            if (this.ethereumChainId !== evmChainId) {
-                this.ethereumChainId = evmChainId;
-            }
+            return evmChainId;
+        }
+        catch (e) {
+            throw new WalletException(e);
         }
-        catch { }
     }
     /**
      * Broadcasting the transaction using the client
@@ -194,12 +200,12 @@ 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'));
         }
-        await this.verifyEvmChainId();
         /** Account Details * */
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
         const timeoutHeight = new BigNumberInBase(latestHeight).plus(txTimeout);
@@ -286,12 +292,12 @@ 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'));
         }
-        await this.verifyEvmChainId();
         /** Account Details * */
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
         const timeoutHeight = new BigNumberInBase(latestHeight).plus(txTimeout);
@@ -378,13 +384,13 @@ 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'));
         }
-        await this.verifyEvmChainId();
         const transactionApi = new IndexerGrpcWeb3GwApi(endpoints.web3gw || endpoints.indexer);
         if (httpHeaders) {
             transactionApi.setMetadata(httpHeaders);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-core",
   "description": "Core wallet strategy",
-  "version": "1.16.4-alpha.0",
+  "version": "1.16.4",
   "sideEffects": false,
   "type": "module",
   "author": {
@@ -56,17 +56,17 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
-    "@injectivelabs/exceptions": "^1.16.4-alpha.0",
-    "@injectivelabs/networks": "^1.16.4-alpha.0",
-    "@injectivelabs/sdk-ts": "^1.16.4-alpha.0",
-    "@injectivelabs/ts-types": "^1.16.4-alpha.0",
-    "@injectivelabs/utils": "^1.16.4-alpha.0",
-    "@injectivelabs/wallet-base": "^1.16.4-alpha.0",
+    "@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": "5022bb7556b861f334ed66d0a72d93dbaf24ad6b"
+  "gitHead": "e997ae9a7255ecfd294fc0633e9da385f900fdda"
 }