@injectivelabs/wallet-trezor 1.16.25-alpha.0 → 1.16.25-alpha.2

package/dist/cjs/index.cjs

@@ -15,13 +15,11 @@ const TrezorDerivationPathType = {
 
 //#endregion
 //#region src/strategy/lib.ts
-let TrezorConnect;
 async function loadTrezorConnect() {
-	if (!TrezorConnect) {
-		const module$1 = await import("@bangjelkoski/trezor-connect-web");
-		TrezorConnect = module$1.TrezorConnect || module$1.default.TrezorConnect;
-	}
-	return TrezorConnect;
+	console.log("🪵Loading TrezorConnect...");
+	const module$1 = await import("@trezor/connect-web");
+	console.log("🪵Module:", module$1);
+	return module$1.default;
 }
 
 //#endregion
@@ -128,7 +126,7 @@ var AccountManager = class {
 		return this.wallets.slice(start, end);
 	}
 	async getWalletsBasedOnIndex({ start, end, baseDerivationPath, derivationPathType }) {
-		const TrezorConnect$1 = await loadTrezorConnect();
+		const TrezorConnect = await loadTrezorConnect();
 		const pathsToFetch = [];
 		for (let index = start; index < end; index += 1) {
 			const path = this.getTrezorDerivationPathBasedOnType({
@@ -141,7 +139,7 @@ var AccountManager = class {
 				showOnTrezor: false
 			});
 		}
-		const result = await TrezorConnect$1.ethereumGetPublicKey({ bundle: pathsToFetch });
+		const result = await TrezorConnect.ethereumGetPublicKey({ bundle: pathsToFetch });
 		if (!result.success) throw new __injectivelabs_exceptions.TrezorException(new Error(result.payload && result.payload.error || "Please make sure your Trezor is connected and unlocked"));
 		for (const item of result.payload) {
 			const hdKey = {
@@ -184,18 +182,24 @@ var AccountManager = class {
 //#region src/strategy/hw/transport/base.ts
 const TREZOR_CONNECT_MANIFEST = {
 	email: "contact@injectivelabs.org",
-	appUrl: "https://injectivelabs.org"
+	appUrl: "https://injectivelabs.org",
+	appName: "Injective Labs"
 };
 var BaseTrezorTransport = class {
 	constructor() {
 		_defineProperty(this, "accountManager", null);
 	}
 	async connect() {
-		const TrezorConnect$1 = await loadTrezorConnect();
-		if (!(await TrezorConnect$1.getSettings()).success) TrezorConnect$1.init({
-			lazyLoad: true,
-			manifest: TREZOR_CONNECT_MANIFEST
-		});
+		const TrezorConnect = await loadTrezorConnect();
+		if (!(await TrezorConnect.getSettings()).success) {
+			console.log("🪵Initializing TrezorConnect...");
+			await TrezorConnect.init({
+				lazyLoad: true,
+				manifest: TREZOR_CONNECT_MANIFEST,
+				debug: true,
+				coreMode: "popup"
+			});
+		}
 		return Promise.resolve();
 	}
 	async getAccountManager() {
@@ -268,7 +272,8 @@ var TrezorBase = class extends __injectivelabs_wallet_base.BaseConcreteStrategy
 		return response;
 	}
 	async signEip712TypedData(eip712json, address) {
-		const TrezorConnect$1 = await loadTrezorConnect();
+		const TrezorConnect = await loadTrezorConnect();
+		console.log("🪵Address:", address);
 		const object = JSON.parse(eip712json);
 		const { types: { EIP712Domain = [],...otherTypes } = {}, message = {}, domain = {}, primaryType, domain_separator_hash, message_hash } = transformTypedData({
 			...object,
@@ -279,9 +284,13 @@ var TrezorBase = class extends __injectivelabs_wallet_base.BaseConcreteStrategy
 			}
 		});
 		try {
+			console.log("🪵Signing EIP-712 typed data with Trezor...");
 			await this.trezor.connect();
-			const { derivationPath } = await this.getWalletForAddress(address);
-			const response = await TrezorConnect$1.ethereumSignTypedData({
+			console.log("🪵Connected to Trezor...");
+			const derivationPath = "m/44'/60'/0'/0/0";
+			console.log("🪵Derivation path:", derivationPath);
+			console.log("Signing EIP-712 typed data with Trezor...");
+			const response = await TrezorConnect.ethereumSignTypedData({
 				path: derivationPath,
 				data: {
 					types: {
@@ -296,6 +305,7 @@ var TrezorBase = class extends __injectivelabs_wallet_base.BaseConcreteStrategy
 				domain_separator_hash,
 				metamask_v4_compat: true
 			});
+			console.log("🪵response", response);
 			if (!response.success) throw new Error(response.payload && response.payload.error || "Unknown error");
 			return response.payload.signature;
 		} catch (e) {
@@ -321,11 +331,11 @@ var TrezorBase = class extends __injectivelabs_wallet_base.BaseConcreteStrategy
 		});
 	}
 	async signArbitrary(signer, data) {
-		const TrezorConnect$1 = await loadTrezorConnect();
+		const TrezorConnect = await loadTrezorConnect();
 		try {
 			await this.trezor.connect();
 			const { derivationPath } = await this.getWalletForAddress(signer);
-			const response = await TrezorConnect$1.ethereumSignMessage({
+			const response = await TrezorConnect.ethereumSignMessage({
 				path: derivationPath,
 				message: (0, __injectivelabs_sdk_ts.toUtf8)(data)
 			});
@@ -360,7 +370,7 @@ var TrezorBase = class extends __injectivelabs_wallet_base.BaseConcreteStrategy
 		throw new __injectivelabs_exceptions.WalletException(/* @__PURE__ */ new Error("You can only fetch PubKey from Cosmos native wallets"));
 	}
 	async signEvmTransaction(txData, args) {
-		const TrezorConnect$1 = await loadTrezorConnect();
+		const TrezorConnect = await loadTrezorConnect();
 		const chainId = parseInt(args.evmChainId.toString(), 10);
 		const nonce = await (await this.getAlchemy(args.evmChainId)).core.getTransactionCount(args.address);
 		const parseHexValue = (value) => {
@@ -387,7 +397,7 @@ var TrezorBase = class extends __injectivelabs_wallet_base.BaseConcreteStrategy
 		try {
 			await this.trezor.connect();
 			const { derivationPath } = await this.getWalletForAddress(args.address);
-			const response = await TrezorConnect$1.ethereumSignTransaction({
+			const response = await TrezorConnect.ethereumSignTransaction({
 				path: derivationPath,
 				transaction: trezorTxData
 			});

package/dist/esm/index.js

@@ -15,13 +15,11 @@ const TrezorDerivationPathType = {
 
 //#endregion
 //#region src/strategy/lib.ts
-let TrezorConnect;
 async function loadTrezorConnect() {
-	if (!TrezorConnect) {
-		const module = await import("@bangjelkoski/trezor-connect-web");
-		TrezorConnect = module.TrezorConnect || module.default.TrezorConnect;
-	}
-	return TrezorConnect;
+	console.log("🪵Loading TrezorConnect...");
+	const module = await import("@trezor/connect-web");
+	console.log("🪵Module:", module);
+	return module.default;
 }
 
 //#endregion
@@ -128,7 +126,7 @@ var AccountManager = class {
 		return this.wallets.slice(start, end);
 	}
 	async getWalletsBasedOnIndex({ start, end, baseDerivationPath, derivationPathType }) {
-		const TrezorConnect$1 = await loadTrezorConnect();
+		const TrezorConnect = await loadTrezorConnect();
 		const pathsToFetch = [];
 		for (let index = start; index < end; index += 1) {
 			const path = this.getTrezorDerivationPathBasedOnType({
@@ -141,7 +139,7 @@ var AccountManager = class {
 				showOnTrezor: false
 			});
 		}
-		const result = await TrezorConnect$1.ethereumGetPublicKey({ bundle: pathsToFetch });
+		const result = await TrezorConnect.ethereumGetPublicKey({ bundle: pathsToFetch });
 		if (!result.success) throw new TrezorException(new Error(result.payload && result.payload.error || "Please make sure your Trezor is connected and unlocked"));
 		for (const item of result.payload) {
 			const hdKey = {
@@ -184,18 +182,24 @@ var AccountManager = class {
 //#region src/strategy/hw/transport/base.ts
 const TREZOR_CONNECT_MANIFEST = {
 	email: "contact@injectivelabs.org",
-	appUrl: "https://injectivelabs.org"
+	appUrl: "https://injectivelabs.org",
+	appName: "Injective Labs"
 };
 var BaseTrezorTransport = class {
 	constructor() {
 		_defineProperty(this, "accountManager", null);
 	}
 	async connect() {
-		const TrezorConnect$1 = await loadTrezorConnect();
-		if (!(await TrezorConnect$1.getSettings()).success) TrezorConnect$1.init({
-			lazyLoad: true,
-			manifest: TREZOR_CONNECT_MANIFEST
-		});
+		const TrezorConnect = await loadTrezorConnect();
+		if (!(await TrezorConnect.getSettings()).success) {
+			console.log("🪵Initializing TrezorConnect...");
+			await TrezorConnect.init({
+				lazyLoad: true,
+				manifest: TREZOR_CONNECT_MANIFEST,
+				debug: true,
+				coreMode: "popup"
+			});
+		}
 		return Promise.resolve();
 	}
 	async getAccountManager() {
@@ -268,7 +272,8 @@ var TrezorBase = class extends BaseConcreteStrategy {
 		return response;
 	}
 	async signEip712TypedData(eip712json, address) {
-		const TrezorConnect$1 = await loadTrezorConnect();
+		const TrezorConnect = await loadTrezorConnect();
+		console.log("🪵Address:", address);
 		const object = JSON.parse(eip712json);
 		const { types: { EIP712Domain = [],...otherTypes } = {}, message = {}, domain = {}, primaryType, domain_separator_hash, message_hash } = transformTypedData({
 			...object,
@@ -279,9 +284,13 @@ var TrezorBase = class extends BaseConcreteStrategy {
 			}
 		});
 		try {
+			console.log("🪵Signing EIP-712 typed data with Trezor...");
 			await this.trezor.connect();
-			const { derivationPath } = await this.getWalletForAddress(address);
-			const response = await TrezorConnect$1.ethereumSignTypedData({
+			console.log("🪵Connected to Trezor...");
+			const derivationPath = "m/44'/60'/0'/0/0";
+			console.log("🪵Derivation path:", derivationPath);
+			console.log("Signing EIP-712 typed data with Trezor...");
+			const response = await TrezorConnect.ethereumSignTypedData({
 				path: derivationPath,
 				data: {
 					types: {
@@ -296,6 +305,7 @@ var TrezorBase = class extends BaseConcreteStrategy {
 				domain_separator_hash,
 				metamask_v4_compat: true
 			});
+			console.log("🪵response", response);
 			if (!response.success) throw new Error(response.payload && response.payload.error || "Unknown error");
 			return response.payload.signature;
 		} catch (e) {
@@ -321,11 +331,11 @@ var TrezorBase = class extends BaseConcreteStrategy {
 		});
 	}
 	async signArbitrary(signer, data) {
-		const TrezorConnect$1 = await loadTrezorConnect();
+		const TrezorConnect = await loadTrezorConnect();
 		try {
 			await this.trezor.connect();
 			const { derivationPath } = await this.getWalletForAddress(signer);
-			const response = await TrezorConnect$1.ethereumSignMessage({
+			const response = await TrezorConnect.ethereumSignMessage({
 				path: derivationPath,
 				message: toUtf8(data)
 			});
@@ -360,7 +370,7 @@ var TrezorBase = class extends BaseConcreteStrategy {
 		throw new WalletException(/* @__PURE__ */ new Error("You can only fetch PubKey from Cosmos native wallets"));
 	}
 	async signEvmTransaction(txData, args) {
-		const TrezorConnect$1 = await loadTrezorConnect();
+		const TrezorConnect = await loadTrezorConnect();
 		const chainId = parseInt(args.evmChainId.toString(), 10);
 		const nonce = await (await this.getAlchemy(args.evmChainId)).core.getTransactionCount(args.address);
 		const parseHexValue = (value) => {
@@ -387,7 +397,7 @@ var TrezorBase = class extends BaseConcreteStrategy {
 		try {
 			await this.trezor.connect();
 			const { derivationPath } = await this.getWalletForAddress(args.address);
-			const response = await TrezorConnect$1.ethereumSignTransaction({
+			const response = await TrezorConnect.ethereumSignTransaction({
 				path: derivationPath,
 				transaction: trezorTxData
 			});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-trezor",
   "description": "Trezor wallet strategy for use with @injectivelabs/wallet-core.",
-  "version": "1.16.25-alpha.0",
+  "version": "1.16.25-alpha.2",
   "sideEffects": false,
   "type": "module",
   "author": {
@@ -56,16 +56,17 @@
     "lint": "eslint . --ext .ts,.js"
   },
   "dependencies": {
-    "@bangjelkoski/trezor-connect-web": "^9.4.7-beta.1",
-    "@injectivelabs/exceptions": "1.16.25-alpha.0",
-    "@injectivelabs/sdk-ts": "1.16.25-alpha.0",
-    "@injectivelabs/ts-types": "1.16.25-alpha.0",
-    "@injectivelabs/wallet-base": "1.16.25-alpha.0",
+    "@injectivelabs/exceptions": "1.16.25-alpha.2",
+    "@injectivelabs/sdk-ts": "1.16.25-alpha.2",
+    "@injectivelabs/ts-types": "1.16.25-alpha.2",
+    "@injectivelabs/wallet-base": "1.16.25-alpha.2",
+    "@trezor/connect": "^9.6.4",
+    "@trezor/connect-web": "^9.6.4",
     "alchemy-sdk": "^3.4.7",
     "viem": "^2.33.2"
   },
   "devDependencies": {
     "shx": "^0.3.3"
   },
-  "gitHead": "8766fbe2bf8e2b54c7ee70430dd02b2a5da8e924"
+  "gitHead": "bfa4ecff376de6cb71007524bde7de4f5a8e9de0"
 }