Merge pull request #386 from blocknative/develop

Release 1.10.0

Author: lnbc1QWFyb24

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "1.9.6",
+  "version": "1.10.0",
   "description": "Onboard users to web3 by allowing them to select a wallet, get that wallet ready to transact and have access to synced wallet state.",
   "keywords": [
     "ethereum",
@@ -50,10 +50,10 @@
     "@portis/web3": "^2.0.0-beta.42",
     "@toruslabs/torus-embed": "^1.3.0",
     "@unilogin/provider": "^0.5.21",
-    "@walletconnect/web3-provider": "^1.0.0-beta.47",
+    "@walletconnect/web3-provider": "^1.0.5",
     "authereum": "^0.0.4-beta.157",
     "bignumber.js": "^9.0.0",
-    "bnc-sdk": "^2.1.3",
+    "bnc-sdk": "^2.1.4",
     "bowser": "^2.5.2",
     "ethereumjs-tx": "^2.1.2",
     "ethereumjs-util": "^6.2.0",

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

src/modules/select/wallets/wallet-connect.ts

@@ -109,6 +109,7 @@ function walletConnect(
     },
     type: 'sdk',
     desktop: true,
+    mobile: true,
     preferred
   }
 }

src/onboard.ts

@@ -130,9 +130,9 @@ function init(initialization: Initialization): API {
 
     if (subscriptions.wallet) {
       wallet.subscribe((wallet: Wallet) => {
-        wallet.provider !== null &&
-          subscriptions.wallet &&
-          subscriptions.wallet(wallet)
+        if (wallet.provider !== null) {
+          subscriptions.wallet && subscriptions.wallet(wallet)
+        }
       })
     }
   }

src/stores.ts

@@ -165,11 +165,11 @@ export function resetWalletState(options?: {
     // if walletName is the same as the current interface name then do a full reset (checking if to do a disconnect)
     if (currentInterface.name === walletName) {
       wallet.update(() => ({
-        name: null,
-        provider: null,
-        connect: null,
-        instance: null,
-        dashboard: null
+        name: undefined,
+        provider: undefined,
+        connect: undefined,
+        instance: undefined,
+        dashboard: undefined
       }))
 
       !disconnected &&

src/utilities.ts

@@ -228,6 +228,8 @@ export function networkName(id: number): string {
       return 'goerli'
     case 42:
       return 'kovan'
+    case 100:
+      return 'xdai'
     default:
       return 'local'
   }
@@ -245,6 +247,8 @@ export function networkToId(network: string): number {
       return 5
     case 'kovan':
       return 42
+    case 'xdai':
+      return 100
     default:
       return 0
   }