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

package/README.md

@@ -13,7 +13,7 @@ _Package to use Wallets on Injective via the wallet strategy._
 ## 📚 Installation
 
 ```bash
-yarn add @injectivelabs/wallet-core
+pnpm add @injectivelabs/wallet-core
 ```
 
 ---
@@ -30,13 +30,13 @@ import { PrivateKeyWalletStrategy } from '@injectivelabs/wallet-private-key'
 const strategyArgs: WalletStrategyArguments = {} /** define the args */
 const strategyEthArgs: ConcreteEthereumWalletStrategyArgs = {} /** if the wallet is an Ethereum wallet */
 const strategies = {
-  [Wallet.PrivateKey]: new PrivateKeyWalletStrategy(strategyEthArgs)
+  [Wallet.PrivateKey]: new PrivateKeyWalletStrategy(strategyEthArgs),
 }
 
-export const walletStrategy = new BaseWalletStrategy({...strategyArgs, strategies})
+export const walletStrategy = new BaseWalletStrategy({ ...strategyArgs, strategies })
 
 const broadcasterArgs: MsgBroadcasterOptions = {} /** define the broadcaster args */
-export const msgBroadcaster = new MsgBroadcaster({...broadcasterArgs, walletStrategy})
+export const msgBroadcaster = new MsgBroadcaster({ ...broadcasterArgs, walletStrategy })
 ```
 
 Read more and find example usages on our [WalletStrategy Docs](https://docs.ts.injective.network/wallet/wallet-wallet-strategy)

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

@@ -1,6 +1,6 @@
 import { TxResponse } from '@injectivelabs/sdk-ts';
 import { NetworkEndpoints } from '@injectivelabs/networks';
-import { ChainId, EthereumChainId } from '@injectivelabs/ts-types';
+import { ChainId, EvmChainId } from '@injectivelabs/ts-types';
 import { MsgBroadcasterOptions, MsgBroadcasterTxOptions } from './types.js';
 import BaseWalletStrategy from '../strategy/BaseWalletStrategy.js';
 /**
@@ -18,7 +18,7 @@ export declare class MsgBroadcaster {
     txTimeout: number;
     simulateTx: boolean;
     txTimeoutOnFeeDelegation: boolean;
-    ethereumChainId?: EthereumChainId;
+    evmChainId?: EvmChainId;
     gasBufferCoefficient: number;
     retriesOnError: {
         "sdk-20": {
@@ -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<EvmChainId | undefined>;
     /**
      * Broadcasting the transaction using the client
      * side approach for both cosmos and ethereum native wallets

package/dist/cjs/broadcaster/MsgBroadcaster.js

@@ -37,7 +37,7 @@ class MsgBroadcaster {
     txTimeout = utils_1.DEFAULT_BLOCK_TIMEOUT_HEIGHT;
     simulateTx = true;
     txTimeoutOnFeeDelegation = false;
-    ethereumChainId;
+    evmChainId;
     gasBufferCoefficient = 1.2;
     retriesOnError = defaultRetriesConfig();
     httpHeaders;
@@ -53,8 +53,7 @@ class MsgBroadcaster {
                 : true;
         this.gasBufferCoefficient = options.gasBufferCoefficient || 1.2;
         this.chainId = options.chainId || networkInfo.chainId;
-        this.ethereumChainId =
-            options.ethereumChainId || networkInfo.ethereumChainId;
+        this.evmChainId = options.evmChainId || networkInfo.evmChainId;
         this.endpoints = options.endpoints || (0, networks_1.getNetworkEndpoints)(options.network);
         this.walletStrategy = options.walletStrategy;
         this.httpHeaders = options.httpHeaders;
@@ -65,17 +64,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.evmChainId;
         }
-        const mainnetEvmIds = [ts_types_1.EthereumChainId.Mainnet];
-        const testnetEvmIds = [ts_types_1.EthereumChainId.Sepolia, ts_types_1.EthereumChainId.TestnetEvm];
-        const devnetEvmIds = [ts_types_1.EthereumChainId.Sepolia, ts_types_1.EthereumChainId.DevnetEvm];
+        const mainnetEvmIds = [ts_types_1.EvmChainId.Mainnet, ts_types_1.EvmChainId.MainnetEvm];
+        const testnetEvmIds = [ts_types_1.EvmChainId.Sepolia, ts_types_1.EvmChainId.TestnetEvm];
+        const devnetEvmIds = [ts_types_1.EvmChainId.Sepolia, ts_types_1.EvmChainId.DevnetEvm];
         try {
             const chainId = await walletStrategy.getEthereumChainId();
+            if (!chainId) {
+                return this.evmChainId;
+            }
             const evmChainId = parseInt(chainId, 16);
+            if (isNaN(evmChainId)) {
+                return this.evmChainId;
+            }
             if (((0, networks_1.isMainnet)(this.options.network) &&
                 !mainnetEvmIds.includes(evmChainId)) ||
                 ((0, networks_1.isTestnet)(this.options.network) &&
@@ -85,11 +90,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 +202,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];
-        if (!ethereumChainId) {
-            throw new exceptions_1.GeneralException(new Error('Please provide ethereumChainId'));
+        const evmChainId = await this.getEvmChainId();
+        if (!evmChainId) {
+            throw new exceptions_1.GeneralException(new Error('Please provide evmChainId'));
         }
-        await this.verifyEvmChainId();
         /** Account Details * */
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
         const timeoutHeight = new utils_1.BigNumberInBase(latestHeight).plus(txTimeout);
@@ -243,7 +248,7 @@ class MsgBroadcaster {
                 timeoutHeight: timeoutHeight.toFixed(),
                 chainId,
             },
-            ethereumChainId,
+            evmChainId,
         });
         /** Signing on Ethereum */
         const signature = await walletStrategy.signEip712TypedData(JSON.stringify(eip712TypedData), tx.ethereumAddress);
@@ -265,7 +270,7 @@ class MsgBroadcaster {
             chainId,
         });
         const web3Extension = (0, sdk_ts_1.createWeb3Extension)({
-            ethereumChainId,
+            evmChainId,
         });
         const txRawEip712 = (0, sdk_ts_1.createTxRawEIP712)(txRaw, web3Extension);
         /** Append Signatures */
@@ -289,12 +294,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];
-        if (!ethereumChainId) {
-            throw new exceptions_1.GeneralException(new Error('Please provide ethereumChainId'));
+        const evmChainId = await this.getEvmChainId();
+        if (!evmChainId) {
+            throw new exceptions_1.GeneralException(new Error('Please provide evmChainId'));
         }
-        await this.verifyEvmChainId();
         /** Account Details * */
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
         const timeoutHeight = new utils_1.BigNumberInBase(latestHeight).plus(txTimeout);
@@ -336,7 +341,7 @@ class MsgBroadcaster {
                 timeoutHeight: timeoutHeight.toFixed(),
                 chainId,
             },
-            ethereumChainId,
+            evmChainId,
         });
         walletStrategy.emit(types_js_1.WalletStrategyEmitterEventType.TransactionPreparationEnd);
         /** Signing on Ethereum */
@@ -359,7 +364,7 @@ class MsgBroadcaster {
             chainId,
         });
         const web3Extension = (0, sdk_ts_1.createWeb3Extension)({
-            ethereumChainId,
+            evmChainId,
         });
         const txRawEip712 = (0, sdk_ts_1.createTxRawEIP712)(txRaw, web3Extension);
         /** Append Signatures */
@@ -381,13 +386,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());
-        if (!ethereumChainId) {
-            throw new exceptions_1.GeneralException(new Error('Please provide ethereumChainId'));
+        const evmChainId = await this.getEvmChainId();
+        if (!evmChainId) {
+            throw new exceptions_1.GeneralException(new Error('Please provide evmChainId'));
         }
-        await this.verifyEvmChainId();
         const transactionApi = new sdk_ts_1.IndexerGrpcWeb3GwApi(endpoints.web3gw || endpoints.indexer);
         if (httpHeaders) {
             transactionApi.setMetadata(httpHeaders);
@@ -406,7 +411,7 @@ class MsgBroadcaster {
             memo: tx.memo,
             message: web3Msgs,
             address: tx.ethereumAddress,
-            chainId: ethereumChainId,
+            chainId: evmChainId,
             gasLimit: (0, sdk_ts_1.getGasPriceBasedOnMessage)(msgs),
             estimateGas: simulateTx,
         });
@@ -416,7 +421,7 @@ class MsgBroadcaster {
             signature,
             message: web3Msgs,
             txResponse: prepareTxResponse,
-            chainId: ethereumChainId,
+            chainId: evmChainId,
         });
         try {
             walletStrategy.emit(types_js_1.WalletStrategyEmitterEventType.TransactionBroadcastStart);
@@ -543,7 +548,7 @@ class MsgBroadcaster {
      * @param tx the transaction that needs to be broadcasted
      */
     async experimentalBroadcastWalletThroughLedger(tx) {
-        const { chainId, txTimeout, endpoints, simulateTx, walletStrategy, ethereumChainId, } = this;
+        const { chainId, txTimeout, endpoints, evmChainId, simulateTx, walletStrategy, } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
         /**
          * We can only use this method
@@ -556,8 +561,8 @@ class MsgBroadcaster {
                 throw new exceptions_1.GeneralException(new Error(`This method can only be used when Ledger is connected through ${walletStrategy.getWallet()}`));
             }
         }
-        if (!ethereumChainId) {
-            throw new exceptions_1.GeneralException(new Error('Please provide ethereumChainId'));
+        if (!evmChainId) {
+            throw new exceptions_1.GeneralException(new Error('Please provide evmChainId'));
         }
         const cosmosWallet = walletStrategy.getCosmosWallet(chainId);
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
@@ -575,7 +580,7 @@ class MsgBroadcaster {
                 sequence: baseAccount.sequence.toString(),
                 accountNumber: baseAccount.accountNumber.toString(),
             },
-            ethereumChainId,
+            evmChainId,
         });
         const aminoSignResponse = await cosmosWallet.signEIP712CosmosTx({
             eip712: eip712TypedData,
@@ -606,7 +611,7 @@ class MsgBroadcaster {
         });
         /** Preparing the transaction for client broadcasting */
         const web3Extension = (0, sdk_ts_1.createWeb3Extension)({
-            ethereumChainId,
+            evmChainId,
         });
         const txRawEip712 = (0, sdk_ts_1.createTxRawEIP712)(txRaw, web3Extension);
         if (simulateTx) {

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

@@ -1,5 +1,5 @@
-import { EthereumChainId } from '@injectivelabs/ts-types';
 import { Network } from '@injectivelabs/networks';
+import { EvmChainId } from '@injectivelabs/ts-types';
 import BaseWalletStrategy from '../strategy/BaseWalletStrategy.js';
 interface SendTransactionOptions {
     tx: {
@@ -11,7 +11,7 @@ interface SendTransactionOptions {
         data: any;
     };
     address: string;
-    ethereumChainId?: EthereumChainId;
+    evmChainId?: EvmChainId;
 }
 /**
  * Preparing and broadcasting
@@ -19,10 +19,10 @@ interface SendTransactionOptions {
  */
 export declare class Web3Broadcaster {
     private walletStrategy;
-    private ethereumChainId;
-    constructor({ walletStrategy, ethereumChainId, }: {
+    private evmChainId;
+    constructor({ walletStrategy, evmChainId, }: {
         walletStrategy: BaseWalletStrategy;
-        ethereumChainId: EthereumChainId;
+        evmChainId: EvmChainId;
         network: Network;
     });
     sendTransaction(args: SendTransactionOptions): Promise<string>;

package/dist/cjs/broadcaster/Web3Broadcaster.js

@@ -8,18 +8,18 @@ const exceptions_1 = require("@injectivelabs/exceptions");
  */
 class Web3Broadcaster {
     walletStrategy;
-    ethereumChainId;
-    constructor({ walletStrategy, ethereumChainId, }) {
+    evmChainId;
+    constructor({ walletStrategy, evmChainId, }) {
+        this.evmChainId = evmChainId;
         this.walletStrategy = walletStrategy;
-        this.ethereumChainId = ethereumChainId;
     }
     async sendTransaction(args) {
-        const { walletStrategy, ethereumChainId } = this;
+        const { evmChainId, walletStrategy } = this;
         try {
-            const chainId = args.ethereumChainId || ethereumChainId;
+            const chainId = args.evmChainId || evmChainId;
             const txHash = await walletStrategy.sendEvmTransaction(args.tx, {
+                evmChainId: chainId,
                 address: args.address,
-                ethereumChainId: chainId,
             });
             await walletStrategy.getEvmTransactionReceipt(txHash, chainId);
             return txHash;

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

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'eventemitter3';
 import { Msgs } from '@injectivelabs/sdk-ts';
-import { ChainId, EthereumChainId } from '@injectivelabs/ts-types';
+import { ChainId, EvmChainId } from '@injectivelabs/ts-types';
 import { Network, NetworkEndpoints } from '@injectivelabs/networks';
 import BaseWalletStrategy from '../strategy/BaseWalletStrategy.js';
 export interface MsgBroadcasterTxOptions {
@@ -23,7 +23,7 @@ export interface MsgBroadcasterOptions {
     network: Network;
     endpoints?: NetworkEndpoints;
     chainId?: ChainId;
-    ethereumChainId?: EthereumChainId;
+    evmChainId?: EvmChainId;
     feePayerPubKey?: string;
     simulateTx?: boolean;
     txTimeoutOnFeeDelegation?: boolean;

package/dist/cjs/strategy/BaseWalletStrategy.d.ts

@@ -1,6 +1,6 @@
 import { TxRaw, TxResponse, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk-ts';
-import { ChainId, AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
 import { Wallet, WalletDeviceType, type WalletMetadata, ConcreteStrategiesArg, SendTransactionOptions, ConcreteWalletStrategy, onAccountChangeCallback, onChainIdChangeCallback, WalletStrategyArguments, CosmosWalletAbstraction, WalletStrategy as WalletStrategyInterface } from '@injectivelabs/wallet-base';
+import { ChainId, EvmChainId, AccountAddress } from '@injectivelabs/ts-types';
 import { StdSignDoc } from '@keplr-wallet/types';
 import { WalletStrategyEmitter } from '../broadcaster/types.js';
 export default class BaseWalletStrategy implements WalletStrategyInterface {
@@ -24,13 +24,13 @@ export default class BaseWalletStrategy implements WalletStrategyInterface {
     enable(args?: unknown): Promise<boolean>;
     enableAndGetAddresses(args?: unknown): Promise<AccountAddress[]>;
     getEthereumChainId(): Promise<string>;
-    getEvmTransactionReceipt(txHash: string, ethereumChainId?: EthereumChainId): Promise<void>;
+    getEvmTransactionReceipt(txHash: string, evmChainId?: EvmChainId): Promise<void>;
     getSessionOrConfirm(address?: AccountAddress): Promise<string>;
     getWalletClient<T>(): Promise<T>;
     sendTransaction(tx: DirectSignResponse | TxRaw, options: SendTransactionOptions): Promise<TxResponse>;
     sendEvmTransaction(tx: any, options: {
+        evmChainId: EvmChainId;
         address: AccountAddress;
-        ethereumChainId: EthereumChainId;
     }): Promise<string>;
     signEip712TypedData(eip712TypedData: string, address: AccountAddress): Promise<string>;
     signAminoCosmosTransaction(transaction: {

package/dist/cjs/strategy/BaseWalletStrategy.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const eventemitter3_1 = require("eventemitter3");
-const exceptions_1 = require("@injectivelabs/exceptions");
 const wallet_base_1 = require("@injectivelabs/wallet-base");
+const exceptions_1 = require("@injectivelabs/exceptions");
 const types_js_1 = require("../broadcaster/types.js");
 const getInitialWallet = (args) => {
     if (args.wallet) {
@@ -10,12 +10,12 @@ const getInitialWallet = (args) => {
     }
     const keys = Object.keys(args.strategies || {});
     if (keys.length === 0) {
-        throw new exceptions_1.GeneralException(new Error('No strategies provided to BaseWalletStrategy'));
+        return wallet_base_1.Wallet.Metamask;
     }
-    if (keys.includes(wallet_base_1.Wallet.Metamask) && args.ethereumOptions) {
+    if (keys.includes(wallet_base_1.Wallet.Metamask) && args.evmOptions) {
         return wallet_base_1.Wallet.Metamask;
     }
-    if (keys.includes(wallet_base_1.Wallet.Keplr) && !args.ethereumOptions) {
+    if (keys.includes(wallet_base_1.Wallet.Keplr) && !args.evmOptions) {
         return wallet_base_1.Wallet.Keplr;
     }
     return keys[0];
@@ -45,8 +45,10 @@ class BaseWalletStrategy {
     }
     setWallet(wallet) {
         this.wallet = wallet;
+        this.getStrategy();
     }
     setMetadata(metadata) {
+        console.log('Setting metadata', metadata);
         this.metadata = metadata;
         this.getStrategy().setMetadata?.(metadata);
     }
@@ -75,8 +77,8 @@ class BaseWalletStrategy {
     getEthereumChainId() {
         return this.getStrategy().getEthereumChainId();
     }
-    async getEvmTransactionReceipt(txHash, ethereumChainId) {
-        return this.getStrategy().getEvmTransactionReceipt(txHash, ethereumChainId);
+    async getEvmTransactionReceipt(txHash, evmChainId) {
+        return this.getStrategy().getEvmTransactionReceipt(txHash, evmChainId);
     }
     async getSessionOrConfirm(address) {
         return this.getStrategy().getSessionOrConfirm(address);

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

@@ -1,6 +1,6 @@
 import { TxResponse } from '@injectivelabs/sdk-ts';
 import { NetworkEndpoints } from '@injectivelabs/networks';
-import { ChainId, EthereumChainId } from '@injectivelabs/ts-types';
+import { ChainId, EvmChainId } from '@injectivelabs/ts-types';
 import { MsgBroadcasterOptions, MsgBroadcasterTxOptions } from './types.js';
 import BaseWalletStrategy from '../strategy/BaseWalletStrategy.js';
 /**
@@ -18,7 +18,7 @@ export declare class MsgBroadcaster {
     txTimeout: number;
     simulateTx: boolean;
     txTimeoutOnFeeDelegation: boolean;
-    ethereumChainId?: EthereumChainId;
+    evmChainId?: EvmChainId;
     gasBufferCoefficient: number;
     retriesOnError: {
         "sdk-20": {
@@ -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<EvmChainId | undefined>;
     /**
      * Broadcasting the transaction using the client
      * side approach for both cosmos and ethereum native wallets

package/dist/esm/broadcaster/MsgBroadcaster.js

@@ -2,7 +2,7 @@ import { TxGrpcApi, hexToBuff, PublicKey, SIGN_DIRECT, hexToBase64, ofacWallets,
 import { sleep, getStdFee, BigNumberInBase, DEFAULT_GAS_PRICE, DEFAULT_BLOCK_TIMEOUT_HEIGHT, } from '@injectivelabs/utils';
 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 { EvmChainId } from '@injectivelabs/ts-types';
 import { WalletStrategyEmitterEventType, } from './types.js';
 import { checkIfTxRunOutOfGas } from '../utils/index.js';
 import { Wallet, isCosmosWallet, WalletDeviceType, isEvmBrowserWallet, isEip712V2OnlyWallet, createEip712StdSignDoc, isCosmosAminoOnlyWallet, getEthereumSignerAddress, getInjectiveSignerAddress, } from '@injectivelabs/wallet-base';
@@ -34,7 +34,7 @@ export class MsgBroadcaster {
     txTimeout = DEFAULT_BLOCK_TIMEOUT_HEIGHT;
     simulateTx = true;
     txTimeoutOnFeeDelegation = false;
-    ethereumChainId;
+    evmChainId;
     gasBufferCoefficient = 1.2;
     retriesOnError = defaultRetriesConfig();
     httpHeaders;
@@ -50,8 +50,7 @@ export class MsgBroadcaster {
                 : true;
         this.gasBufferCoefficient = options.gasBufferCoefficient || 1.2;
         this.chainId = options.chainId || networkInfo.chainId;
-        this.ethereumChainId =
-            options.ethereumChainId || networkInfo.ethereumChainId;
+        this.evmChainId = options.evmChainId || networkInfo.evmChainId;
         this.endpoints = options.endpoints || getNetworkEndpoints(options.network);
         this.walletStrategy = options.walletStrategy;
         this.httpHeaders = options.httpHeaders;
@@ -62,17 +61,23 @@ export class MsgBroadcaster {
         this.txTimeoutOnFeeDelegation =
             options.txTimeoutOnFeeDelegation || this.txTimeoutOnFeeDelegation;
     }
-    async verifyEvmChainId() {
+    async getEvmChainId() {
         const { walletStrategy } = this;
         if (!isEvmBrowserWallet(walletStrategy.wallet)) {
-            return;
+            return this.evmChainId;
         }
-        const mainnetEvmIds = [EthereumChainId.Mainnet];
-        const testnetEvmIds = [EthereumChainId.Sepolia, EthereumChainId.TestnetEvm];
-        const devnetEvmIds = [EthereumChainId.Sepolia, EthereumChainId.DevnetEvm];
+        const mainnetEvmIds = [EvmChainId.Mainnet, EvmChainId.MainnetEvm];
+        const testnetEvmIds = [EvmChainId.Sepolia, EvmChainId.TestnetEvm];
+        const devnetEvmIds = [EvmChainId.Sepolia, EvmChainId.DevnetEvm];
         try {
             const chainId = await walletStrategy.getEthereumChainId();
+            if (!chainId) {
+                return this.evmChainId;
+            }
             const evmChainId = parseInt(chainId, 16);
+            if (isNaN(evmChainId)) {
+                return this.evmChainId;
+            }
             if ((isMainnet(this.options.network) &&
                 !mainnetEvmIds.includes(evmChainId)) ||
                 (isTestnet(this.options.network) &&
@@ -82,11 +87,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 +199,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];
-        if (!ethereumChainId) {
-            throw new GeneralException(new Error('Please provide ethereumChainId'));
+        const evmChainId = await this.getEvmChainId();
+        if (!evmChainId) {
+            throw new GeneralException(new Error('Please provide evmChainId'));
         }
-        await this.verifyEvmChainId();
         /** Account Details * */
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
         const timeoutHeight = new BigNumberInBase(latestHeight).plus(txTimeout);
@@ -240,7 +245,7 @@ export class MsgBroadcaster {
                 timeoutHeight: timeoutHeight.toFixed(),
                 chainId,
             },
-            ethereumChainId,
+            evmChainId,
         });
         /** Signing on Ethereum */
         const signature = await walletStrategy.signEip712TypedData(JSON.stringify(eip712TypedData), tx.ethereumAddress);
@@ -262,7 +267,7 @@ export class MsgBroadcaster {
             chainId,
         });
         const web3Extension = createWeb3Extension({
-            ethereumChainId,
+            evmChainId,
         });
         const txRawEip712 = createTxRawEIP712(txRaw, web3Extension);
         /** Append Signatures */
@@ -286,12 +291,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];
-        if (!ethereumChainId) {
-            throw new GeneralException(new Error('Please provide ethereumChainId'));
+        const evmChainId = await this.getEvmChainId();
+        if (!evmChainId) {
+            throw new GeneralException(new Error('Please provide evmChainId'));
         }
-        await this.verifyEvmChainId();
         /** Account Details * */
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
         const timeoutHeight = new BigNumberInBase(latestHeight).plus(txTimeout);
@@ -333,7 +338,7 @@ export class MsgBroadcaster {
                 timeoutHeight: timeoutHeight.toFixed(),
                 chainId,
             },
-            ethereumChainId,
+            evmChainId,
         });
         walletStrategy.emit(WalletStrategyEmitterEventType.TransactionPreparationEnd);
         /** Signing on Ethereum */
@@ -356,7 +361,7 @@ export class MsgBroadcaster {
             chainId,
         });
         const web3Extension = createWeb3Extension({
-            ethereumChainId,
+            evmChainId,
         });
         const txRawEip712 = createTxRawEIP712(txRaw, web3Extension);
         /** Append Signatures */
@@ -378,13 +383,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());
-        if (!ethereumChainId) {
-            throw new GeneralException(new Error('Please provide ethereumChainId'));
+        const evmChainId = await this.getEvmChainId();
+        if (!evmChainId) {
+            throw new GeneralException(new Error('Please provide evmChainId'));
         }
-        await this.verifyEvmChainId();
         const transactionApi = new IndexerGrpcWeb3GwApi(endpoints.web3gw || endpoints.indexer);
         if (httpHeaders) {
             transactionApi.setMetadata(httpHeaders);
@@ -403,7 +408,7 @@ export class MsgBroadcaster {
             memo: tx.memo,
             message: web3Msgs,
             address: tx.ethereumAddress,
-            chainId: ethereumChainId,
+            chainId: evmChainId,
             gasLimit: getGasPriceBasedOnMessage(msgs),
             estimateGas: simulateTx,
         });
@@ -413,7 +418,7 @@ export class MsgBroadcaster {
             signature,
             message: web3Msgs,
             txResponse: prepareTxResponse,
-            chainId: ethereumChainId,
+            chainId: evmChainId,
         });
         try {
             walletStrategy.emit(WalletStrategyEmitterEventType.TransactionBroadcastStart);
@@ -540,7 +545,7 @@ export class MsgBroadcaster {
      * @param tx the transaction that needs to be broadcasted
      */
     async experimentalBroadcastWalletThroughLedger(tx) {
-        const { chainId, txTimeout, endpoints, simulateTx, walletStrategy, ethereumChainId, } = this;
+        const { chainId, txTimeout, endpoints, evmChainId, simulateTx, walletStrategy, } = this;
         const msgs = Array.isArray(tx.msgs) ? tx.msgs : [tx.msgs];
         /**
          * We can only use this method
@@ -553,8 +558,8 @@ export class MsgBroadcaster {
                 throw new GeneralException(new Error(`This method can only be used when Ledger is connected through ${walletStrategy.getWallet()}`));
             }
         }
-        if (!ethereumChainId) {
-            throw new GeneralException(new Error('Please provide ethereumChainId'));
+        if (!evmChainId) {
+            throw new GeneralException(new Error('Please provide evmChainId'));
         }
         const cosmosWallet = walletStrategy.getCosmosWallet(chainId);
         const { baseAccount, latestHeight } = await this.fetchAccountAndBlockDetails(tx.injectiveAddress);
@@ -572,7 +577,7 @@ export class MsgBroadcaster {
                 sequence: baseAccount.sequence.toString(),
                 accountNumber: baseAccount.accountNumber.toString(),
             },
-            ethereumChainId,
+            evmChainId,
         });
         const aminoSignResponse = await cosmosWallet.signEIP712CosmosTx({
             eip712: eip712TypedData,
@@ -603,7 +608,7 @@ export class MsgBroadcaster {
         });
         /** Preparing the transaction for client broadcasting */
         const web3Extension = createWeb3Extension({
-            ethereumChainId,
+            evmChainId,
         });
         const txRawEip712 = createTxRawEIP712(txRaw, web3Extension);
         if (simulateTx) {

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

@@ -1,5 +1,5 @@
-import { EthereumChainId } from '@injectivelabs/ts-types';
 import { Network } from '@injectivelabs/networks';
+import { EvmChainId } from '@injectivelabs/ts-types';
 import BaseWalletStrategy from '../strategy/BaseWalletStrategy.js';
 interface SendTransactionOptions {
     tx: {
@@ -11,7 +11,7 @@ interface SendTransactionOptions {
         data: any;
     };
     address: string;
-    ethereumChainId?: EthereumChainId;
+    evmChainId?: EvmChainId;
 }
 /**
  * Preparing and broadcasting
@@ -19,10 +19,10 @@ interface SendTransactionOptions {
  */
 export declare class Web3Broadcaster {
     private walletStrategy;
-    private ethereumChainId;
-    constructor({ walletStrategy, ethereumChainId, }: {
+    private evmChainId;
+    constructor({ walletStrategy, evmChainId, }: {
         walletStrategy: BaseWalletStrategy;
-        ethereumChainId: EthereumChainId;
+        evmChainId: EvmChainId;
         network: Network;
     });
     sendTransaction(args: SendTransactionOptions): Promise<string>;

package/dist/esm/broadcaster/Web3Broadcaster.js

@@ -5,18 +5,18 @@ import { Web3Exception } from '@injectivelabs/exceptions';
  */
 export class Web3Broadcaster {
     walletStrategy;
-    ethereumChainId;
-    constructor({ walletStrategy, ethereumChainId, }) {
+    evmChainId;
+    constructor({ walletStrategy, evmChainId, }) {
+        this.evmChainId = evmChainId;
         this.walletStrategy = walletStrategy;
-        this.ethereumChainId = ethereumChainId;
     }
     async sendTransaction(args) {
-        const { walletStrategy, ethereumChainId } = this;
+        const { evmChainId, walletStrategy } = this;
         try {
-            const chainId = args.ethereumChainId || ethereumChainId;
+            const chainId = args.evmChainId || evmChainId;
             const txHash = await walletStrategy.sendEvmTransaction(args.tx, {
+                evmChainId: chainId,
                 address: args.address,
-                ethereumChainId: chainId,
             });
             await walletStrategy.getEvmTransactionReceipt(txHash, chainId);
             return txHash;

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

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'eventemitter3';
 import { Msgs } from '@injectivelabs/sdk-ts';
-import { ChainId, EthereumChainId } from '@injectivelabs/ts-types';
+import { ChainId, EvmChainId } from '@injectivelabs/ts-types';
 import { Network, NetworkEndpoints } from '@injectivelabs/networks';
 import BaseWalletStrategy from '../strategy/BaseWalletStrategy.js';
 export interface MsgBroadcasterTxOptions {
@@ -23,7 +23,7 @@ export interface MsgBroadcasterOptions {
     network: Network;
     endpoints?: NetworkEndpoints;
     chainId?: ChainId;
-    ethereumChainId?: EthereumChainId;
+    evmChainId?: EvmChainId;
     feePayerPubKey?: string;
     simulateTx?: boolean;
     txTimeoutOnFeeDelegation?: boolean;

package/dist/esm/strategy/BaseWalletStrategy.d.ts

@@ -1,6 +1,6 @@
 import { TxRaw, TxResponse, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk-ts';
-import { ChainId, AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
 import { Wallet, WalletDeviceType, type WalletMetadata, ConcreteStrategiesArg, SendTransactionOptions, ConcreteWalletStrategy, onAccountChangeCallback, onChainIdChangeCallback, WalletStrategyArguments, CosmosWalletAbstraction, WalletStrategy as WalletStrategyInterface } from '@injectivelabs/wallet-base';
+import { ChainId, EvmChainId, AccountAddress } from '@injectivelabs/ts-types';
 import { StdSignDoc } from '@keplr-wallet/types';
 import { WalletStrategyEmitter } from '../broadcaster/types.js';
 export default class BaseWalletStrategy implements WalletStrategyInterface {
@@ -24,13 +24,13 @@ export default class BaseWalletStrategy implements WalletStrategyInterface {
     enable(args?: unknown): Promise<boolean>;
     enableAndGetAddresses(args?: unknown): Promise<AccountAddress[]>;
     getEthereumChainId(): Promise<string>;
-    getEvmTransactionReceipt(txHash: string, ethereumChainId?: EthereumChainId): Promise<void>;
+    getEvmTransactionReceipt(txHash: string, evmChainId?: EvmChainId): Promise<void>;
     getSessionOrConfirm(address?: AccountAddress): Promise<string>;
     getWalletClient<T>(): Promise<T>;
     sendTransaction(tx: DirectSignResponse | TxRaw, options: SendTransactionOptions): Promise<TxResponse>;
     sendEvmTransaction(tx: any, options: {
+        evmChainId: EvmChainId;
         address: AccountAddress;
-        ethereumChainId: EthereumChainId;
     }): Promise<string>;
     signEip712TypedData(eip712TypedData: string, address: AccountAddress): Promise<string>;
     signAminoCosmosTransaction(transaction: {

package/dist/esm/strategy/BaseWalletStrategy.js

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'eventemitter3';
-import { GeneralException, WalletException } from '@injectivelabs/exceptions';
 import { Wallet, isEvmWallet, isCosmosWallet, } from '@injectivelabs/wallet-base';
+import { GeneralException, WalletException } from '@injectivelabs/exceptions';
 import { WalletStrategyEmitterEventType, } from '../broadcaster/types.js';
 const getInitialWallet = (args) => {
     if (args.wallet) {
@@ -8,12 +8,12 @@ const getInitialWallet = (args) => {
     }
     const keys = Object.keys(args.strategies || {});
     if (keys.length === 0) {
-        throw new GeneralException(new Error('No strategies provided to BaseWalletStrategy'));
+        return Wallet.Metamask;
     }
-    if (keys.includes(Wallet.Metamask) && args.ethereumOptions) {
+    if (keys.includes(Wallet.Metamask) && args.evmOptions) {
         return Wallet.Metamask;
     }
-    if (keys.includes(Wallet.Keplr) && !args.ethereumOptions) {
+    if (keys.includes(Wallet.Keplr) && !args.evmOptions) {
         return Wallet.Keplr;
     }
     return keys[0];
@@ -43,8 +43,10 @@ export default class BaseWalletStrategy {
     }
     setWallet(wallet) {
         this.wallet = wallet;
+        this.getStrategy();
     }
     setMetadata(metadata) {
+        console.log('Setting metadata', metadata);
         this.metadata = metadata;
         this.getStrategy().setMetadata?.(metadata);
     }
@@ -73,8 +75,8 @@ export default class BaseWalletStrategy {
     getEthereumChainId() {
         return this.getStrategy().getEthereumChainId();
     }
-    async getEvmTransactionReceipt(txHash, ethereumChainId) {
-        return this.getStrategy().getEvmTransactionReceipt(txHash, ethereumChainId);
+    async getEvmTransactionReceipt(txHash, evmChainId) {
+        return this.getStrategy().getEvmTransactionReceipt(txHash, evmChainId);
     }
     async getSessionOrConfirm(address) {
         return this.getStrategy().getSessionOrConfirm(address);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-core",
   "description": "Core wallet strategy",
-  "version": "1.16.4-alpha.0",
+  "version": "1.16.5-alpha.0",
   "sideEffects": false,
   "type": "module",
   "author": {
@@ -41,10 +41,10 @@
     }
   },
   "scripts": {
-    "build": "yarn build:cjs && yarn build:esm && yarn build:post",
+    "build": "pnpm build:cjs && pnpm build:esm && pnpm build:post",
     "build:cjs": "tsc --build --force tsconfig.build.json",
     "build:esm": "tsc --build --force tsconfig.build.esm.json",
-    "build:watch": "tsc --build -w tsconfig.build.json && tsc -w --build tsconfig.build.esm.json && yarn build:post",
+    "build:watch": "tsc --build -w tsconfig.build.json && tsc -w --build tsconfig.build.esm.json && pnpm build:post",
     "build:post": "shx cp ../../../etc/stub/package.json.stub dist/cjs/package.json && shx cp ../../../etc/stub/package.esm.json.stub dist/esm/package.json",
     "clean": "tsc --build tsconfig.build.json --clean && tsc --build tsconfig.build.esm.json --clean && shx rm -rf coverage *.log junit.xml dist && jest --clearCache && shx mkdir -p dist",
     "test": "jest",
@@ -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.5-alpha.0",
+    "@injectivelabs/networks": "1.16.5-alpha.0",
+    "@injectivelabs/sdk-ts": "1.16.5-alpha.0",
+    "@injectivelabs/ts-types": "1.16.5-alpha.0",
+    "@injectivelabs/utils": "1.16.5-alpha.0",
+    "@injectivelabs/wallet-base": "1.16.5-alpha.0",
     "@keplr-wallet/types": "^0.12.159",
     "eventemitter3": "^5.0.1"
   },
   "devDependencies": {
     "shx": "^0.3.3"
   },
-  "gitHead": "5022bb7556b861f334ed66d0a72d93dbaf24ad6b"
+  "gitHead": "d3684b59ca82800bc469f0b5c2796c9491b8b2cd"
 }