Merge branch 'develop' into linting-2

Author: goosewobbler

main/chains/blocks/index.ts

@@ -57,11 +57,13 @@ class BlockMonitor extends EventEmitter {
 
     this.latestBlock = '0x0'
 
-    this.connection.once('connect', this.start)
-    this.connection.once('close', this.stop)
+    this.connection.on('connect', this.start)
+    this.connection.on('close', this.stop)
   }
 
   start() {
+    log.verbose(`Starting block updates for chain ${parseInt(this.connection.chainId)}`)
+
     this.connection.on('message', this.handleMessage)
 
     // load the latest block first on connect, then start checking for new blocks
@@ -79,9 +81,9 @@ class BlockMonitor extends EventEmitter {
   }
 
   stop() {
+    log.verbose(`Stopping block updates for chain ${parseInt(this.connection.chainId)}`)
+
     this.removeAllListeners()
-    this.connection.off('connect', this.start)
-    this.connection.off('close', this.stop)
 
     if (this.subscriptionId) {
       this.clearSubscription()
@@ -116,6 +118,10 @@ class BlockMonitor extends EventEmitter {
   }
 
   private handleBlock(block: Block) {
+    log.debug(`Handling block ${parseInt(block.number)} for chain ${parseInt(this.connection.chainId)}`, {
+      latestBlock: this.latestBlock
+    })
+
     if (!block) return this.handleError('handleBlock received undefined block')
 
     if (block.number !== this.latestBlock) {

main/chains/index.js

@@ -67,9 +67,11 @@ class ChainConnection extends EventEmitter {
 
     this[priority].provider = provider(target, {
       name: priority,
+      origin: 'frame',
       infuraId: '786ade30f36244469480aa5c2bf0743b',
       alchemyId: 'NBms1eV9i16RFHpFqQxod56OLdlucIq0'
     })
+
     this[priority].blockMonitor = this._createBlockMonitor(this[priority].provider, priority)
   }
 

main/index.ts

@@ -31,7 +31,13 @@ app.commandLine.appendSwitch('force-color-profile', 'srgb')
 
 const isDev = process.env.NODE_ENV === 'development'
 log.transports.console.level = process.env.LOG_LEVEL || (isDev ? 'verbose' : 'info')
-log.transports.file.level = ['development', 'test'].includes(process.env.NODE_ENV) ? false : 'verbose'
+
+if (process.env.LOG_LEVEL === 'debug') {
+  log.transports.file.level = 'debug'
+  log.transports.file.resolvePath = () => path.join(app.getPath('userData'), 'logs/debug.log')
+} else {
+  log.transports.file.level = ['development', 'test'].includes(process.env.NODE_ENV) ? false : 'verbose'
+}
 
 const hasInstanceLock = app.requestSingleInstanceLock()
 

main/signers/trezor/Trezor/index.ts

@@ -2,7 +2,7 @@ import log from 'electron-log'
 import { hexToInt } from '../../../../resources/utils'
 import { padToEven, stripHexPrefix, addHexPrefix } from '@ethereumjs/util'
 import { SignTypedDataVersion, TypedDataUtils } from '@metamask/eth-sig-util'
-import type { Device as TrezorDevice } from 'trezor-connect'
+import type { Device as TrezorDevice } from '@trezor/connect'
 import { TypedTransaction } from '@ethereumjs/tx'
 
 import { v5 as uuid } from 'uuid'
@@ -32,11 +32,11 @@ export const Status = {
   ENTERING_PASSPHRASE: 'waiting for input on device'
 }
 
-function createErrorMessage(message: string, cause: string = '') {
+function createError(message: string, code: string, cause: string = '') {
   // the cause may need to be transformed into a more informative message
   return cause.toLowerCase().match(/forbidden key path/)
-    ? 'derivation path failed strict safety checks on trezor device'
-    : message
+    ? new DeviceError('derivation path failed strict safety checks on trezor device', 'SAFETY_CHECKS')
+    : new DeviceError(message, code)
 }
 
 export default class Trezor extends Signer {
@@ -82,10 +82,12 @@ export default class Trezor extends Signer {
       // this prompts a login of pin and/or passphrase
       await TrezorBridge.getAccountInfo(device, this.getPath(0))
     } catch (e) {
-      const err = e as DeviceError
-      this.handleError(
-        new DeviceError(createErrorMessage(Status.NEEDS_RECONNECTION, err.message), 'ACCOUNT_ACCESS_FAILURE')
+      const deviceError = createError(
+        Status.NEEDS_RECONNECTION,
+        'ACCOUNT_ACCESS_FAILURE',
+        (e as DeviceError).message
       )
+      this.handleError(deviceError)
 
       throw e
     }
@@ -130,8 +132,10 @@ export default class Trezor extends Signer {
       ADDRESS_NO_MATCH_DEVICE: Status.NEEDS_RECONNECTION,
       UNRECOVERABLE: Status.NEEDS_RECONNECTION,
       ADDRESS_VERIFICATION_FAILURE: Status.NEEDS_RECONNECTION,
-      ACCOUNT_ACCESS_FAILURE: Status.NEEDS_RECONNECTION
+      ACCOUNT_ACCESS_FAILURE: Status.NEEDS_RECONNECTION,
+      SAFETY_CHECKS: 'derivation path failed strict safety checks on trezor device'
     }
+
     const newStatus = errorStatusMap[error.code as keyof typeof errorStatusMap]
     if (newStatus) {
       this.status = newStatus
@@ -177,12 +181,13 @@ export default class Trezor extends Signer {
       const err = e as DeviceError
 
       log.error('error verifying Trezor address', err)
-      this.handleError(
-        new DeviceError(
-          createErrorMessage('could not verify address, reconnect your Trezor', err.message),
-          'ADDRESS_VERIFICATION_FAILURE'
-        )
+
+      const deviceError = createError(
+        'could not verify address, reconnect your Trezor',
+        'ADDRESS_VERIFICATION_FAILURE',
+        err.message
       )
+      this.handleError(deviceError)
 
       cb(new Error(err.message))
     }
@@ -258,28 +263,30 @@ export default class Trezor extends Signer {
       if (this.isTrezorOne()) {
         // Trezor One requires hashed input
         const { types, primaryType, domain, message } = TypedDataUtils.sanitizeData(typedMessage.data)
+
         const domainSeparatorHash = TypedDataUtils.hashStruct(
           'EIP712Domain',
           domain,
           types,
           SignTypedDataVersion.V4
-        ).toString('hex')
+        )
+
         const messageHash = TypedDataUtils.hashStruct(
           primaryType as any,
           message,
           types,
           SignTypedDataVersion.V4
-        ).toString('hex')
+        )
 
         signature = await TrezorBridge.signTypedHash(
           this.device,
           path,
-          typedMessage,
-          domainSeparatorHash,
-          messageHash
+          typedMessage.data,
+          domainSeparatorHash.toString('hex'),
+          messageHash.toString('hex')
         )
       } else {
-        signature = await TrezorBridge.signTypedData(this.device, path, typedMessage)
+        signature = await TrezorBridge.signTypedData(this.device, path, typedMessage.data)
       }
 
       cb(null, addHexPrefix(signature))

main/signers/trezor/adapter.ts

@@ -1,6 +1,6 @@
 import log from 'electron-log'
 
-import type { Device as TrezorDevice } from 'trezor-connect'
+import type { Device as TrezorDevice } from '@trezor/connect'
 
 import { SignerAdapter } from '../adapters'
 import Trezor, { Status } from './Trezor'

main/signers/trezor/bridge.ts

@@ -10,7 +10,7 @@ import TrezorConnect, {
   DEVICE_EVENT,
   UI,
   UI_EVENT
-} from 'trezor-connect'
+} from '@trezor/connect'
 
 export class DeviceError extends Error {
   readonly code