Merge pull request #600 from InjectiveLabs/chore/update-trezor

Chore/update trezor

Author: ThomasRalee

packages/wallets/wallet-trezor/package.json

@@ -56,7 +56,8 @@
     "lint": "eslint . --ext .ts,.js"
   },
   "dependencies": {
-    "@bangjelkoski/trezor-connect-web": "^9.4.7-beta.1",
+    "@trezor/connect-web": "^9.6.4",
+    "@trezor/connect": "^9.6.4",
     "@injectivelabs/exceptions": "workspace:*",
     "@injectivelabs/sdk-ts": "workspace:*",
     "@injectivelabs/ts-types": "workspace:*",

packages/wallets/wallet-trezor/src/strategy/Base.ts

@@ -185,6 +185,7 @@ export default class TrezorBase
     address: AccountAddress,
   ): Promise<string> {
     const TrezorConnect = await loadTrezorConnect()
+    console.log('🪵Address:', address)
 
     const object = JSON.parse(eip712json)
     const compatibleObject = {
@@ -206,8 +207,14 @@ export default class TrezorBase
     } = dataWithHashes
 
     try {
+      console.log('🪵Signing EIP-712 typed data with Trezor...')
       await this.trezor.connect()
-      const { derivationPath } = await this.getWalletForAddress(address)
+      console.log('🪵Connected to Trezor...')
+      // const { derivationPath } = await this.getWalletForAddress(address)
+      // Hardcoded for testint purposes, otherwise use above
+      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: {
@@ -221,6 +228,8 @@ export default class TrezorBase
         metamask_v4_compat: true,
       })
 
+      console.log('🪵response', response)
+
       if (!response.success) {
         // noinspection ExceptionCaughtLocallyJS
         throw new Error(

packages/wallets/wallet-trezor/src/strategy/hw/transport/base.ts

@@ -1,23 +1,27 @@
-import { loadTrezorConnect } from '../../lib.js'
 import AccountManager from '../AccountManager.js'
+import { loadTrezorConnect, type Manifest } from '../../lib.js'
 
 const TREZOR_CONNECT_MANIFEST = {
   email: 'contact@injectivelabs.org',
   appUrl: 'https://injectivelabs.org',
-}
+  appName: 'Injective Labs',
+} as Manifest
 
 export default class BaseTrezorTransport {
   private accountManager: AccountManager | null = null
 
   async connect() {
     const TrezorConnect = await loadTrezorConnect()
-
     const settings = await TrezorConnect.getSettings()
 
     if (!settings.success) {
-      TrezorConnect.init({
+      console.log('🪵Initializing TrezorConnect...')
+      await TrezorConnect.init({
         lazyLoad: true,
         manifest: TREZOR_CONNECT_MANIFEST,
+        debug: true,
+        // 'auto', 'popup', 'iframe'
+        coreMode: 'popup',
       })
     }
 

packages/wallets/wallet-trezor/src/strategy/lib.ts

@@ -1,15 +1,61 @@
-type TrezorConnectType =
-  typeof import('@bangjelkoski/trezor-connect-web').TrezorConnect
+// We avoid importing types from @trezor/connect because it triggers a syntax error
+// in the underlying @trezor/connect type definitions (there's a typo: comma instead of space).
+// Instead, we define the minimal types we need inline.
 
-let TrezorConnect: TrezorConnectType
+type Manifest = {
+  appName: string
+  appIcon?: string
+  appUrl: string
+  email: string
+}
 
-export async function loadTrezorConnect(): Promise<TrezorConnectType> {
-  if (!TrezorConnect) {
-    const module = await import('@bangjelkoski/trezor-connect-web')
+type ConnectSettingsWeb = {
+  hostLabel?: string
+  coreMode?: 'auto' | 'popup' | 'iframe'
+}
 
-    TrezorConnect = (module.TrezorConnect ||
-      (module as any).default.TrezorConnect) as TrezorConnectType
+type ConnectSettingsPublic = {
+  manifest?: Manifest
+  connectSrc?: string
+  debug?: boolean
+  popup?: boolean
+  transportReconnect?: boolean
+  transports?: Array<'BridgeTransport' | 'WebUsbTransport' | 'NodeUsbTransport'>
+  pendingTransportEvent?: boolean
+  lazyLoad?: boolean
+  interactionTimeout?: number
+  trustedHost: boolean
+  binFilesBaseUrl?: string
+  enableFirmwareHashCheck?: boolean
+  firmwareHashCheckTimeouts?: Record<string, number>
+  thp?: {
+    hostName?: string
+    appName?: string
+    staticKey?: string
+    knownCredentials?: unknown[]
+    pairingMethods: unknown[]
   }
+}
+
+// Reconstruct the init settings type without importing from @trezor/connect
+type InitSettingsWithWeb = {
+  manifest: Manifest
+} & Partial<Omit<ConnectSettingsPublic, 'manifest'> & ConnectSettingsWeb>
+
+// Export Manifest type so it can be used in other files
+export type { Manifest }
+
+// Define the return type without referencing TrezorConnectType to avoid triggering
+// TypeScript to parse the broken type definition in @trezor/connect
+export type TrezorConnectWithWebSettings = {
+  init: (settings: InitSettingsWithWeb) => Promise<void>
+  // Add other methods as needed, or use a more permissive type
+  [key: string]: any
+}
+
+export async function loadTrezorConnect(): Promise<TrezorConnectWithWebSettings> {
+  const module = await import('@trezor/connect-web')
 
-  return TrezorConnect
+  return (module as any).default
+    .default as unknown as TrezorConnectWithWebSettings
 }