@injectivelabs/wallet-trezor 1.16.6 → 1.16.8-alpha.0

package/README.md

@@ -13,7 +13,7 @@ _Package to use Trezor Wallets on Injective via the wallet strategy._
 ## 📚 Installation
 
 ```bash
-yarn add @injectivelabs/wallet-trezor
+pnpm add @injectivelabs/wallet-trezor
 ```
 
 ---
@@ -30,10 +30,9 @@ dependencies and implementations for their specific wallets.
 Here's a brief example of how to use this package to send 1 INJ.:
 
 ```typescript
-import { Wallet } from '@injectivelabs/wallet-base';
-import { BaseWalletStrategy, MsgBroadcaster } from '@injectivelabs/wallet-core';
-import { TrezorWalletStrategy } from '@injectivelabs/wallet-trezor';
-
+import { Wallet } from '@injectivelabs/wallet-base'
+import { BaseWalletStrategy, MsgBroadcaster } from '@injectivelabs/wallet-core'
+import { TrezorWalletStrategy } from '@injectivelabs/wallet-trezor'
 
 const strategyArgs: WalletStrategyArguments = {
   chainId: ChainId.Mainnet,
@@ -56,21 +55,21 @@ const msgBroadcaster = new MsgBroadcaster({
 })
 
 const sendTX = async () => {
-    const injectiveAddress = 'someInjectiveAddress'
-
-    const message = MsgSend.fromJSON({
-      srcInjectiveAddress: injectiveAddress,
-      dstInjectiveAddress: injectiveAddress,
-      amount: {
-        amount: '1',
-        denom: 'inj',
-      },
-    })
-
-    return await msgBroadcaster.broadcast({ msgs: message })
-  }
+  const injectiveAddress = 'someInjectiveAddress'
+
+  const message = MsgSend.fromJSON({
+    srcInjectiveAddress: injectiveAddress,
+    dstInjectiveAddress: injectiveAddress,
+    amount: {
+      amount: '1',
+      denom: 'inj',
+    },
+  })
+
+  return await msgBroadcaster.broadcast({ msgs: message })
+}
 
-  const result = await sendTX()
+const result = await sendTX()
 ```
 
 Read more and find example usages on our [WalletStrategy Docs](https://docs.ts.injective.network/wallet/wallet-wallet-strategy)

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

@@ -1,14 +1,14 @@
-import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
-import { TxRaw, TxResponse, DirectSignResponse, AminoSignResponse } from '@injectivelabs/sdk-ts';
-import { StdSignDoc, WalletDeviceType, BaseConcreteStrategy, ConcreteWalletStrategy, SendTransactionOptions, ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { TxRaw, TxResponse, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk-ts';
+import { StdSignDoc, WalletDeviceType, BaseConcreteStrategy, SendTransactionOptions, ConcreteWalletStrategy, ConcreteEvmWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { AccountAddress, EvmChainId } from '@injectivelabs/ts-types';
 import { TrezorDerivationPathType } from '../types.js';
 export default class TrezorBase extends BaseConcreteStrategy implements ConcreteWalletStrategy {
     private baseDerivationPath;
     private trezor;
-    private ethereumOptions;
+    private evmOptions;
     private alchemy;
     private derivationPathType;
-    constructor(args: ConcreteEthereumWalletStrategyArgs & {
+    constructor(args: ConcreteEvmWalletStrategyArgs & {
         derivationPathType: TrezorDerivationPathType;
     });
     getWalletDeviceType(): Promise<WalletDeviceType>;
@@ -18,7 +18,7 @@ export default class TrezorBase extends BaseConcreteStrategy implements Concrete
     getSessionOrConfirm(address: AccountAddress): Promise<string>;
     sendEvmTransaction(txData: any, args: {
         address: string;
-        ethereumChainId: EthereumChainId;
+        evmChainId: EvmChainId;
     }): Promise<string>;
     sendTransaction(transaction: TxRaw, options: SendTransactionOptions): Promise<TxResponse>;
     signEip712TypedData(eip712json: string, address: AccountAddress): Promise<string>;

package/dist/cjs/strategy/Base.js

@@ -2,25 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable camelcase */
 /* eslint-disable class-methods-use-this */
-const ts_types_1 = require("@injectivelabs/ts-types");
-const alchemy_sdk_1 = require("alchemy-sdk");
+const sdk_ts_1 = require("@injectivelabs/sdk-ts");
+const exceptions_1 = require("@injectivelabs/exceptions");
+const wallet_base_1 = require("@injectivelabs/wallet-base");
 const ethereumjs_util_1 = require("ethereumjs-util");
 const tx_1 = require("@ethereumjs/tx");
 const common_1 = require("@ethereumjs/common");
-const trezor_connect_web_1 = require("@bangjelkoski/trezor-connect-web");
-const exceptions_1 = require("@injectivelabs/exceptions");
-const sdk_ts_1 = require("@injectivelabs/sdk-ts");
-const wallet_base_1 = require("@injectivelabs/wallet-base");
-const index_js_1 = require("./hw/index.js");
+const alchemy_sdk_1 = require("alchemy-sdk");
+const ts_types_1 = require("@injectivelabs/ts-types");
+const lib_js_1 = require("./lib.js");
 const utils_js_1 = require("../utils.js");
+const index_js_1 = require("./hw/index.js");
 const getNetworkFromChainId = (chainId) => {
-    if (chainId === ts_types_1.EthereumChainId.Goerli) {
+    if (chainId === ts_types_1.EvmChainId.Goerli) {
         return common_1.Chain.Goerli;
     }
-    if (chainId === ts_types_1.EthereumChainId.Sepolia) {
+    if (chainId === ts_types_1.EvmChainId.Sepolia) {
         return common_1.Chain.Sepolia;
     }
-    if (chainId === ts_types_1.EthereumChainId.Kovan) {
+    if (chainId === ts_types_1.EvmChainId.Kovan) {
         return common_1.Chain.Goerli;
     }
     return common_1.Chain.Mainnet;
@@ -28,15 +28,15 @@ const getNetworkFromChainId = (chainId) => {
 class TrezorBase extends wallet_base_1.BaseConcreteStrategy {
     baseDerivationPath;
     trezor;
-    ethereumOptions;
+    evmOptions;
     alchemy;
     derivationPathType;
     constructor(args) {
         super(args);
-        this.baseDerivationPath = wallet_base_1.DEFAULT_BASE_DERIVATION_PATH;
+        this.evmOptions = args.evmOptions;
+        this.trezor = new index_js_1.BaseTrezorTransport();
         this.derivationPathType = args.derivationPathType;
-        this.trezor = new index_js_1.TrezorTransportInit();
-        this.ethereumOptions = args.ethereumOptions;
+        this.baseDerivationPath = wallet_base_1.DEFAULT_BASE_DERIVATION_PATH;
     }
     async getWalletDeviceType() {
         return Promise.resolve(wallet_base_1.WalletDeviceType.Hardware);
@@ -69,7 +69,7 @@ class TrezorBase extends wallet_base_1.BaseConcreteStrategy {
     async sendEvmTransaction(txData, args) {
         const signedTransaction = await this.signEvmTransaction(txData, args);
         try {
-            const alchemy = await this.getAlchemy(args.ethereumChainId);
+            const alchemy = await this.getAlchemy(args.evmChainId);
             const txReceipt = await alchemy.core.sendTransaction((0, ethereumjs_util_1.addHexPrefix)(signedTransaction.serialize().toString('hex')));
             return txReceipt.hash;
         }
@@ -98,6 +98,7 @@ class TrezorBase extends wallet_base_1.BaseConcreteStrategy {
         return response;
     }
     async signEip712TypedData(eip712json, address) {
+        const TrezorConnect = await (0, lib_js_1.loadTrezorConnect)();
         const object = JSON.parse(eip712json);
         const compatibleObject = {
             ...object,
@@ -112,7 +113,7 @@ class TrezorBase extends wallet_base_1.BaseConcreteStrategy {
         try {
             await this.trezor.connect();
             const { derivationPath } = await this.getWalletForAddress(address);
-            const response = await trezor_connect_web_1.TrezorConnect.ethereumSignTypedData({
+            const response = await TrezorConnect.ethereumSignTypedData({
                 path: derivationPath,
                 data: {
                     types: { EIP712Domain, ...otherTypes },
@@ -154,10 +155,11 @@ class TrezorBase extends wallet_base_1.BaseConcreteStrategy {
         });
     }
     async signArbitrary(signer, data) {
+        const TrezorConnect = await (0, lib_js_1.loadTrezorConnect)();
         try {
             await this.trezor.connect();
             const { derivationPath } = await this.getWalletForAddress(signer);
-            const response = await trezor_connect_web_1.TrezorConnect.ethereumSignMessage({
+            const response = await TrezorConnect.ethereumSignMessage({
                 path: derivationPath,
                 message: (0, sdk_ts_1.toUtf8)(data),
             });
@@ -187,8 +189,9 @@ class TrezorBase extends wallet_base_1.BaseConcreteStrategy {
         throw new exceptions_1.WalletException(new Error('You can only fetch PubKey from Cosmos native wallets'));
     }
     async signEvmTransaction(txData, args) {
-        const chainId = parseInt(args.ethereumChainId.toString(), 10);
-        const alchemy = await this.getAlchemy(args.ethereumChainId);
+        const TrezorConnect = await (0, lib_js_1.loadTrezorConnect)();
+        const chainId = parseInt(args.evmChainId.toString(), 10);
+        const alchemy = await this.getAlchemy(args.evmChainId);
         const nonce = await alchemy.core.getTransactionCount(args.address);
         const common = new common_1.Common({
             chain: getNetworkFromChainId(chainId),
@@ -214,7 +217,7 @@ class TrezorBase extends wallet_base_1.BaseConcreteStrategy {
         try {
             await this.trezor.connect();
             const { derivationPath } = await this.getWalletForAddress(args.address);
-            const response = await trezor_connect_web_1.TrezorConnect.ethereumSignTransaction({
+            const response = await TrezorConnect.ethereumSignTransaction({
                 path: derivationPath,
                 transaction,
             });
@@ -260,19 +263,19 @@ class TrezorBase extends wallet_base_1.BaseConcreteStrategy {
         }
         return (await accountManager.getWalletForAddress(address));
     }
-    async getAlchemy(ethereumChainId) {
+    async getAlchemy(evmChainId) {
         if (this.alchemy) {
             return this.alchemy;
         }
-        const options = this.ethereumOptions;
-        const chainId = ethereumChainId || options.ethereumChainId;
+        const options = this.evmOptions;
+        const chainId = evmChainId || options.evmChainId;
         const url = options.rpcUrl || options.rpcUrls?.[chainId];
         if (!url) {
             throw new exceptions_1.GeneralException(new Error('Please pass rpcUrl within the ethereumOptions'));
         }
         this.alchemy = new alchemy_sdk_1.Alchemy({
             apiKey: (0, wallet_base_1.getKeyFromRpcUrl)(url),
-            network: chainId === ts_types_1.EthereumChainId.Mainnet
+            network: chainId === ts_types_1.EvmChainId.Mainnet
                 ? alchemy_sdk_1.Network.ETH_MAINNET
                 : alchemy_sdk_1.Network.ETH_SEPOLIA,
         });

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

@@ -1,5 +1,5 @@
-import { ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { ConcreteEvmWalletStrategyArgs } from '@injectivelabs/wallet-base';
 import TrezorBase from './Base.js';
 export declare class TrezorBip32 extends TrezorBase {
-    constructor(args: ConcreteEthereumWalletStrategyArgs);
+    constructor(args: ConcreteEvmWalletStrategyArgs);
 }

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

@@ -1,5 +1,5 @@
-import { ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { ConcreteEvmWalletStrategyArgs } from '@injectivelabs/wallet-base';
 import TrezorBase from './Base.js';
 export declare class TrezorBip44 extends TrezorBase {
-    constructor(args: ConcreteEthereumWalletStrategyArgs);
+    constructor(args: ConcreteEvmWalletStrategyArgs);
 }

package/dist/cjs/strategy/hw/AccountManager.js

@@ -3,12 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable class-methods-use-this */
 const hdkey_1 = __importDefault(require("hdkey"));
 const exceptions_1 = require("@injectivelabs/exceptions");
-const types_js_1 = require("../../types.js");
 const sdk_ts_1 = require("@injectivelabs/sdk-ts");
 const wallet_base_1 = require("@injectivelabs/wallet-base");
-const trezor_connect_web_1 = require("@bangjelkoski/trezor-connect-web");
+const lib_js_1 = require("./../lib.js");
+const types_js_1 = require("../../types.js");
 const addressOfHDKey = (hdKey) => {
     const shouldSanitizePublicKey = true;
     const derivedPublicKey = hdKey.publicKey;
@@ -47,6 +48,7 @@ class AccountManager {
         return `${fullBaseDerivationPath}/0'/0/${index}`;
     };
     async getWalletsBasedOnIndex({ start, end, baseDerivationPath, derivationPathType, }) {
+        const TrezorConnect = await (0, lib_js_1.loadTrezorConnect)();
         const pathsToFetch = [];
         for (let index = start; index < end; index += 1) {
             const path = this.getTrezorDerivationPathBasedOnType({
@@ -59,7 +61,7 @@ class AccountManager {
                 showOnTrezor: false,
             });
         }
-        const result = await trezor_connect_web_1.TrezorConnect.ethereumGetPublicKey({
+        const result = await TrezorConnect.ethereumGetPublicKey({
             bundle: pathsToFetch,
         });
         if (!result.success) {

package/dist/cjs/strategy/hw/index.d.ts

@@ -1,4 +1,3 @@
-import TrezorTransportInit from './transport/transport-init.js';
 import TrezorTransportNoInit from './transport/transport-no-init.js';
 import BaseTrezorTransport from './transport/base.js';
-export { TrezorTransportInit, TrezorTransportNoInit, BaseTrezorTransport };
+export { TrezorTransportNoInit, BaseTrezorTransport };

package/dist/cjs/strategy/hw/index.js

@@ -3,9 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseTrezorTransport = exports.TrezorTransportNoInit = exports.TrezorTransportInit = void 0;
-const transport_init_js_1 = __importDefault(require("./transport/transport-init.js"));
-exports.TrezorTransportInit = transport_init_js_1.default;
+exports.BaseTrezorTransport = exports.TrezorTransportNoInit = void 0;
 const transport_no_init_js_1 = __importDefault(require("./transport/transport-no-init.js"));
 exports.TrezorTransportNoInit = transport_no_init_js_1.default;
 const base_js_1 = __importDefault(require("./transport/base.js"));

package/dist/cjs/strategy/hw/transport/base.js

@@ -4,9 +4,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const AccountManager_js_1 = __importDefault(require("./../AccountManager.js"));
+const lib_js_1 = require("../../lib.js");
+const TREZOR_CONNECT_MANIFEST = {
+    email: 'contact@injectivelabs.org',
+    appUrl: 'https://injectivelabs.org',
+};
 class BaseTrezorTransport {
     accountManager = null;
     async connect() {
+        const TrezorConnect = await (0, lib_js_1.loadTrezorConnect)();
+        const settings = await TrezorConnect.getSettings();
+        if (!settings.success) {
+            TrezorConnect.init({
+                lazyLoad: true,
+                manifest: TREZOR_CONNECT_MANIFEST,
+            });
+        }
         return Promise.resolve();
     }
     async getAccountManager() {

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

@@ -0,0 +1,3 @@
+type TrezorConnectType = typeof import('@bangjelkoski/trezor-connect-web').TrezorConnect;
+export declare function loadTrezorConnect(): Promise<TrezorConnectType>;
+export {};

package/dist/cjs/strategy/lib.js

@@ -0,0 +1,45 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadTrezorConnect = loadTrezorConnect;
+let TrezorConnect;
+async function loadTrezorConnect() {
+    if (!TrezorConnect) {
+        const module = await Promise.resolve().then(() => __importStar(require('@bangjelkoski/trezor-connect-web')));
+        TrezorConnect = (module.TrezorConnect ||
+            module.default.TrezorConnect);
+    }
+    return TrezorConnect;
+}

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

@@ -1,14 +1,14 @@
-import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
-import { TxRaw, TxResponse, DirectSignResponse, AminoSignResponse } from '@injectivelabs/sdk-ts';
-import { StdSignDoc, WalletDeviceType, BaseConcreteStrategy, ConcreteWalletStrategy, SendTransactionOptions, ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { TxRaw, TxResponse, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk-ts';
+import { StdSignDoc, WalletDeviceType, BaseConcreteStrategy, SendTransactionOptions, ConcreteWalletStrategy, ConcreteEvmWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { AccountAddress, EvmChainId } from '@injectivelabs/ts-types';
 import { TrezorDerivationPathType } from '../types.js';
 export default class TrezorBase extends BaseConcreteStrategy implements ConcreteWalletStrategy {
     private baseDerivationPath;
     private trezor;
-    private ethereumOptions;
+    private evmOptions;
     private alchemy;
     private derivationPathType;
-    constructor(args: ConcreteEthereumWalletStrategyArgs & {
+    constructor(args: ConcreteEvmWalletStrategyArgs & {
         derivationPathType: TrezorDerivationPathType;
     });
     getWalletDeviceType(): Promise<WalletDeviceType>;
@@ -18,7 +18,7 @@ export default class TrezorBase extends BaseConcreteStrategy implements Concrete
     getSessionOrConfirm(address: AccountAddress): Promise<string>;
     sendEvmTransaction(txData: any, args: {
         address: string;
-        ethereumChainId: EthereumChainId;
+        evmChainId: EvmChainId;
     }): Promise<string>;
     sendTransaction(transaction: TxRaw, options: SendTransactionOptions): Promise<TxResponse>;
     signEip712TypedData(eip712json: string, address: AccountAddress): Promise<string>;

package/dist/esm/strategy/Base.js

@@ -1,24 +1,24 @@
 /* eslint-disable camelcase */
 /* eslint-disable class-methods-use-this */
-import { EthereumChainId } from '@injectivelabs/ts-types';
-import { Alchemy, Network as AlchemyNetwork } from 'alchemy-sdk';
+import { toUtf8, TxGrpcApi, } from '@injectivelabs/sdk-ts';
+import { ErrorType, WalletException, TrezorException, GeneralException, UnspecifiedErrorCode, TransactionException, } from '@injectivelabs/exceptions';
+import { TIP_IN_GWEI, WalletAction, getKeyFromRpcUrl, WalletDeviceType, BaseConcreteStrategy, DEFAULT_BASE_DERIVATION_PATH, DEFAULT_ADDRESS_SEARCH_LIMIT, DEFAULT_NUM_ADDRESSES_TO_FETCH, } from '@injectivelabs/wallet-base';
 import { addHexPrefix } from 'ethereumjs-util';
 import { FeeMarketEIP1559Transaction } from '@ethereumjs/tx';
 import { Common, Chain, Hardfork } from '@ethereumjs/common';
-import { TrezorConnect } from '@bangjelkoski/trezor-connect-web';
-import { ErrorType, WalletException, TrezorException, GeneralException, TransactionException, UnspecifiedErrorCode, } from '@injectivelabs/exceptions';
-import { toUtf8, TxGrpcApi, } from '@injectivelabs/sdk-ts';
-import { TIP_IN_GWEI, WalletAction, getKeyFromRpcUrl, WalletDeviceType, BaseConcreteStrategy, DEFAULT_BASE_DERIVATION_PATH, DEFAULT_ADDRESS_SEARCH_LIMIT, DEFAULT_NUM_ADDRESSES_TO_FETCH, } from '@injectivelabs/wallet-base';
-import { TrezorTransportInit } from './hw/index.js';
+import { Alchemy, Network as AlchemyNetwork } from 'alchemy-sdk';
+import { EvmChainId } from '@injectivelabs/ts-types';
+import { loadTrezorConnect } from './lib.js';
 import { transformTypedData } from '../utils.js';
+import { BaseTrezorTransport } from './hw/index.js';
 const getNetworkFromChainId = (chainId) => {
-    if (chainId === EthereumChainId.Goerli) {
+    if (chainId === EvmChainId.Goerli) {
         return Chain.Goerli;
     }
-    if (chainId === EthereumChainId.Sepolia) {
+    if (chainId === EvmChainId.Sepolia) {
         return Chain.Sepolia;
     }
-    if (chainId === EthereumChainId.Kovan) {
+    if (chainId === EvmChainId.Kovan) {
         return Chain.Goerli;
     }
     return Chain.Mainnet;
@@ -26,15 +26,15 @@ const getNetworkFromChainId = (chainId) => {
 export default class TrezorBase extends BaseConcreteStrategy {
     baseDerivationPath;
     trezor;
-    ethereumOptions;
+    evmOptions;
     alchemy;
     derivationPathType;
     constructor(args) {
         super(args);
-        this.baseDerivationPath = DEFAULT_BASE_DERIVATION_PATH;
+        this.evmOptions = args.evmOptions;
+        this.trezor = new BaseTrezorTransport();
         this.derivationPathType = args.derivationPathType;
-        this.trezor = new TrezorTransportInit();
-        this.ethereumOptions = args.ethereumOptions;
+        this.baseDerivationPath = DEFAULT_BASE_DERIVATION_PATH;
     }
     async getWalletDeviceType() {
         return Promise.resolve(WalletDeviceType.Hardware);
@@ -67,7 +67,7 @@ export default class TrezorBase extends BaseConcreteStrategy {
     async sendEvmTransaction(txData, args) {
         const signedTransaction = await this.signEvmTransaction(txData, args);
         try {
-            const alchemy = await this.getAlchemy(args.ethereumChainId);
+            const alchemy = await this.getAlchemy(args.evmChainId);
             const txReceipt = await alchemy.core.sendTransaction(addHexPrefix(signedTransaction.serialize().toString('hex')));
             return txReceipt.hash;
         }
@@ -96,6 +96,7 @@ export default class TrezorBase extends BaseConcreteStrategy {
         return response;
     }
     async signEip712TypedData(eip712json, address) {
+        const TrezorConnect = await loadTrezorConnect();
         const object = JSON.parse(eip712json);
         const compatibleObject = {
             ...object,
@@ -152,6 +153,7 @@ export default class TrezorBase extends BaseConcreteStrategy {
         });
     }
     async signArbitrary(signer, data) {
+        const TrezorConnect = await loadTrezorConnect();
         try {
             await this.trezor.connect();
             const { derivationPath } = await this.getWalletForAddress(signer);
@@ -185,8 +187,9 @@ export default class TrezorBase extends BaseConcreteStrategy {
         throw new WalletException(new Error('You can only fetch PubKey from Cosmos native wallets'));
     }
     async signEvmTransaction(txData, args) {
-        const chainId = parseInt(args.ethereumChainId.toString(), 10);
-        const alchemy = await this.getAlchemy(args.ethereumChainId);
+        const TrezorConnect = await loadTrezorConnect();
+        const chainId = parseInt(args.evmChainId.toString(), 10);
+        const alchemy = await this.getAlchemy(args.evmChainId);
         const nonce = await alchemy.core.getTransactionCount(args.address);
         const common = new Common({
             chain: getNetworkFromChainId(chainId),
@@ -258,19 +261,19 @@ export default class TrezorBase extends BaseConcreteStrategy {
         }
         return (await accountManager.getWalletForAddress(address));
     }
-    async getAlchemy(ethereumChainId) {
+    async getAlchemy(evmChainId) {
         if (this.alchemy) {
             return this.alchemy;
         }
-        const options = this.ethereumOptions;
-        const chainId = ethereumChainId || options.ethereumChainId;
+        const options = this.evmOptions;
+        const chainId = evmChainId || options.evmChainId;
         const url = options.rpcUrl || options.rpcUrls?.[chainId];
         if (!url) {
             throw new GeneralException(new Error('Please pass rpcUrl within the ethereumOptions'));
         }
         this.alchemy = new Alchemy({
             apiKey: getKeyFromRpcUrl(url),
-            network: chainId === EthereumChainId.Mainnet
+            network: chainId === EvmChainId.Mainnet
                 ? AlchemyNetwork.ETH_MAINNET
                 : AlchemyNetwork.ETH_SEPOLIA,
         });

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

@@ -1,5 +1,5 @@
-import { ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { ConcreteEvmWalletStrategyArgs } from '@injectivelabs/wallet-base';
 import TrezorBase from './Base.js';
 export declare class TrezorBip32 extends TrezorBase {
-    constructor(args: ConcreteEthereumWalletStrategyArgs);
+    constructor(args: ConcreteEvmWalletStrategyArgs);
 }

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

@@ -1,5 +1,5 @@
-import { ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { ConcreteEvmWalletStrategyArgs } from '@injectivelabs/wallet-base';
 import TrezorBase from './Base.js';
 export declare class TrezorBip44 extends TrezorBase {
-    constructor(args: ConcreteEthereumWalletStrategyArgs);
+    constructor(args: ConcreteEvmWalletStrategyArgs);
 }

package/dist/esm/strategy/hw/AccountManager.js

@@ -1,9 +1,10 @@
+/* eslint-disable class-methods-use-this */
 import HDNode from 'hdkey';
 import { TrezorException } from '@injectivelabs/exceptions';
-import { TrezorDerivationPathType } from '../../types.js';
 import { addHexPrefix, publicKeyToAddress } from '@injectivelabs/sdk-ts';
 import { DEFAULT_NUM_ADDRESSES_TO_FETCH } from '@injectivelabs/wallet-base';
-import { TrezorConnect } from '@bangjelkoski/trezor-connect-web';
+import { loadTrezorConnect } from './../lib.js';
+import { TrezorDerivationPathType } from '../../types.js';
 const addressOfHDKey = (hdKey) => {
     const shouldSanitizePublicKey = true;
     const derivedPublicKey = hdKey.publicKey;
@@ -42,6 +43,7 @@ export default class AccountManager {
         return `${fullBaseDerivationPath}/0'/0/${index}`;
     };
     async getWalletsBasedOnIndex({ start, end, baseDerivationPath, derivationPathType, }) {
+        const TrezorConnect = await loadTrezorConnect();
         const pathsToFetch = [];
         for (let index = start; index < end; index += 1) {
             const path = this.getTrezorDerivationPathBasedOnType({

package/dist/esm/strategy/hw/index.d.ts

@@ -1,4 +1,3 @@
-import TrezorTransportInit from './transport/transport-init.js';
 import TrezorTransportNoInit from './transport/transport-no-init.js';
 import BaseTrezorTransport from './transport/base.js';
-export { TrezorTransportInit, TrezorTransportNoInit, BaseTrezorTransport };
+export { TrezorTransportNoInit, BaseTrezorTransport };

package/dist/esm/strategy/hw/index.js

@@ -1,4 +1,3 @@
-import TrezorTransportInit from './transport/transport-init.js';
 import TrezorTransportNoInit from './transport/transport-no-init.js';
 import BaseTrezorTransport from './transport/base.js';
-export { TrezorTransportInit, TrezorTransportNoInit, BaseTrezorTransport };
+export { TrezorTransportNoInit, BaseTrezorTransport };

package/dist/esm/strategy/hw/transport/base.js

@@ -1,7 +1,20 @@
 import AccountManager from './../AccountManager.js';
+import { loadTrezorConnect } from '../../lib.js';
+const TREZOR_CONNECT_MANIFEST = {
+    email: 'contact@injectivelabs.org',
+    appUrl: 'https://injectivelabs.org',
+};
 export default class BaseTrezorTransport {
     accountManager = null;
     async connect() {
+        const TrezorConnect = await loadTrezorConnect();
+        const settings = await TrezorConnect.getSettings();
+        if (!settings.success) {
+            TrezorConnect.init({
+                lazyLoad: true,
+                manifest: TREZOR_CONNECT_MANIFEST,
+            });
+        }
         return Promise.resolve();
     }
     async getAccountManager() {

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

@@ -0,0 +1,3 @@
+type TrezorConnectType = typeof import('@bangjelkoski/trezor-connect-web').TrezorConnect;
+export declare function loadTrezorConnect(): Promise<TrezorConnectType>;
+export {};

package/dist/esm/strategy/lib.js

@@ -0,0 +1,9 @@
+let TrezorConnect;
+export async function loadTrezorConnect() {
+    if (!TrezorConnect) {
+        const module = await import('@bangjelkoski/trezor-connect-web');
+        TrezorConnect = (module.TrezorConnect ||
+            module.default.TrezorConnect);
+    }
+    return TrezorConnect;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-trezor",
   "description": "Trezor wallet strategy for use with @injectivelabs/wallet-core.",
-  "version": "1.16.6",
+  "version": "1.16.8-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",
@@ -57,20 +57,17 @@
   },
   "dependencies": {
     "@bangjelkoski/trezor-connect-web": "^9.4.7-beta.1",
-    "@ethereumjs/common": "3.1.1",
+    "@ethereumjs/common": "3.2.0",
     "@ethereumjs/tx": "^4.1.1",
-    "@injectivelabs/exceptions": "^1.16.6",
-    "@injectivelabs/sdk-ts": "^1.16.6",
-    "@injectivelabs/ts-types": "^1.16.6",
-    "@injectivelabs/wallet-base": "^1.16.6",
+    "@injectivelabs/exceptions": "1.16.6-alpha.1",
+    "@injectivelabs/sdk-ts": "1.16.8-alpha.0",
+    "@injectivelabs/ts-types": "1.16.8-alpha.0",
+    "@injectivelabs/wallet-base": "1.16.8-alpha.0",
     "alchemy-sdk": "^3.4.7",
     "hdkey": "^2.1.0"
   },
   "devDependencies": {
     "shx": "^0.3.3"
   },
-  "resolutions": {
-    "@ethereumjs/common": "3.1.1"
-  },
-  "gitHead": "41794b09a1047a01dbb1d0e0a473a2f26305752d"
+  "gitHead": "8b14637d4e2373c1e753718ffd5a0db67fee6201"
 }

package/dist/cjs/strategy/hw/transport/transport-init.d.ts

@@ -1,4 +0,0 @@
-import BaseTrezorTransport from './base.js';
-export default class TrezorTransportInit extends BaseTrezorTransport {
-    constructor();
-}

package/dist/cjs/strategy/hw/transport/transport-init.js

@@ -1,27 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const trezor_connect_web_1 = require("@bangjelkoski/trezor-connect-web");
-const exceptions_1 = require("@injectivelabs/exceptions");
-const base_js_1 = __importDefault(require("./base.js"));
-const TREZOR_CONNECT_MANIFEST = {
-    email: 'contact@injectivelabs.org',
-    appUrl: 'https://injectivelabs.org',
-};
-class TrezorTransportInit extends base_js_1.default {
-    constructor() {
-        super();
-        try {
-            trezor_connect_web_1.TrezorConnect.init({
-                lazyLoad: true,
-                manifest: TREZOR_CONNECT_MANIFEST,
-            });
-        }
-        catch (e) {
-            throw new exceptions_1.WalletException(e);
-        }
-    }
-}
-exports.default = TrezorTransportInit;

package/dist/esm/strategy/hw/transport/transport-init.d.ts

@@ -1,4 +0,0 @@
-import BaseTrezorTransport from './base.js';
-export default class TrezorTransportInit extends BaseTrezorTransport {
-    constructor();
-}

package/dist/esm/strategy/hw/transport/transport-init.js

@@ -1,21 +0,0 @@
-import { TrezorConnect } from '@bangjelkoski/trezor-connect-web';
-import { WalletException } from '@injectivelabs/exceptions';
-import BaseTrezorTransport from './base.js';
-const TREZOR_CONNECT_MANIFEST = {
-    email: 'contact@injectivelabs.org',
-    appUrl: 'https://injectivelabs.org',
-};
-export default class TrezorTransportInit extends BaseTrezorTransport {
-    constructor() {
-        super();
-        try {
-            TrezorConnect.init({
-                lazyLoad: true,
-                manifest: TREZOR_CONNECT_MANIFEST,
-            });
-        }
-        catch (e) {
-            throw new WalletException(e);
-        }
-    }
-}