Merge pull request #383 from blocknative/fix/hardware-wallet-reset

Fix: Hardware Wallet Reset

Author: lnbc1QWFyb24

src/modules/select/wallets/ledger.ts

@@ -21,14 +21,15 @@ function ledger(options: LedgerOptions & { networkId: number }): WalletModule {
     svg: svg || ledgerIcon,
     iconSrc,
     wallet: async (helpers: Helpers) => {
-      const { BigNumber, networkName } = helpers
+      const { BigNumber, networkName, resetWalletState } = helpers
 
       const provider = await ledgerProvider({
         rpcUrl,
         networkId,
         LedgerTransport,
         BigNumber,
-        networkName
+        networkName,
+        resetWalletState
       })
 
       return {
@@ -66,6 +67,10 @@ async function ledgerProvider(options: {
   LedgerTransport: any
   BigNumber: any
   networkName: (id: number) => string
+  resetWalletState: (options?: {
+    disconnected: boolean
+    walletName: string
+  }) => void
 }) {
   const { default: createProvider } = await import('./providerEngine')
   const { generateAddresses, isValidPath } = await import('./hd-wallet')
@@ -76,7 +81,14 @@ async function ledgerProvider(options: {
   const ethUtil = await import('ethereumjs-util')
   const buffer = await import('buffer')
 
-  const { networkId, rpcUrl, LedgerTransport, BigNumber, networkName } = options
+  const {
+    networkId,
+    rpcUrl,
+    LedgerTransport,
+    BigNumber,
+    networkName,
+    resetWalletState
+  } = options
 
   let dPath = ''
   let addressToPath = new Map()
@@ -139,10 +151,8 @@ async function ledgerProvider(options: {
 
   function disconnect() {
     transport && transport.close()
-    dPath = ''
-    addressToPath = new Map()
-    enabled = false
     provider.stop()
+    resetWalletState({ disconnected: true, walletName: 'Ledger' })
   }
 
   async function setPath(path: string, custom?: boolean) {

src/modules/select/wallets/trezor.ts

@@ -23,15 +23,16 @@ function trezor(options: TrezorOptions & { networkId: number }): WalletModule {
     svg: svg || trezorIcon,
     iconSrc,
     wallet: async (helpers: Helpers) => {
-      const { BigNumber, networkName } = helpers
+      const { BigNumber, networkName, resetWalletState } = helpers
 
       const provider = await trezorProvider({
         rpcUrl,
         networkId,
         email,
         appUrl,
         BigNumber,
-        networkName
+        networkName,
+        resetWalletState
       })
 
       return {
@@ -70,14 +71,27 @@ async function trezorProvider(options: {
   rpcUrl: string
   BigNumber: any
   networkName: (id: number) => string
+  resetWalletState: (options?: {
+    disconnected: boolean
+    walletName: string
+  }) => void
 }) {
   const TrezorConnectLibrary = await import('trezor-connect')
   const EthereumTx = await import('ethereumjs-tx')
   const ethUtil = await import('ethereumjs-util')
 
   const { default: TrezorConnect, DEVICE_EVENT, DEVICE } = TrezorConnectLibrary
 
-  const { networkId, email, appUrl, rpcUrl, BigNumber, networkName } = options
+  const {
+    networkId,
+    email,
+    appUrl,
+    rpcUrl,
+    BigNumber,
+    networkName,
+    resetWalletState
+  } = options
+
   let dPath = ''
 
   let addressToPath = new Map()
@@ -93,13 +107,6 @@ async function trezorProvider(options: {
     appUrl
   })
 
-  TrezorConnect.on(DEVICE_EVENT, (event: any) => {
-    if (event.type === DEVICE.DISCONNECT) {
-      enabled = false
-      addressToPath = new Map()
-    }
-  })
-
   const provider = createProvider({
     getAccounts: (callback: any) => {
       getAccounts()
@@ -134,6 +141,13 @@ async function trezorProvider(options: {
     rpcUrl
   })
 
+  TrezorConnect.on(DEVICE_EVENT, (event: any) => {
+    if (event.type === DEVICE.DISCONNECT) {
+      provider.stop()
+      resetWalletState({ disconnected: true, walletName: 'Trezor' })
+    }
+  })
+
   provider.setPath = setPath
   provider.dPath = dPath
   provider.enable = enable