Merge branch 'develop' into feature/custom-derivation-path

Author: lnbc1QWFyb24

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "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",

src/interfaces.ts

@@ -154,6 +154,7 @@ export interface TrezorOptions {
 
 export interface LedgerOptions {
   rpcUrl: string
+  LedgerTransport?: any
 }
 
 export interface TorusOptions {
@@ -165,13 +166,12 @@ export interface TorusOptions {
   enabledVerifiers: TorusVerifierStatus
 }
 
-
 interface TorusVerifierStatus {
-  google?: boolean;
-  facebook?: boolean;
-  reddit?: boolean;
-  twitch?: boolean;
-  discord?: boolean;
+  google?: boolean
+  facebook?: boolean
+  reddit?: boolean
+  twitch?: boolean
+  discord?: boolean
 }
 
 export interface AuthereumOptions {

src/modules/select/wallets/fortmatic.ts

@@ -25,7 +25,6 @@ function fortmatic(
         networkId === 1 ? undefined : networkName(networkId)
       )
       const provider = instance.getProvider()
-
       const { BigNumber } = helpers
 
       return {
@@ -34,6 +33,7 @@ function fortmatic(
         interface: {
           name: 'Fortmatic',
           connect: instance.user.login,
+          disconnect: instance.user.logout,
           address: {
             get: () => Promise.resolve(provider.account)
           },

src/modules/select/wallets/ledger.ts

@@ -19,7 +19,15 @@ const LEDGER_LIVE_PATH = `m/44'/60'`
 const ACCOUNTS_TO_GET = 5
 
 function ledger(options: LedgerOptions & CommonWalletOptions): WalletModule {
-  const { rpcUrl, networkId, preferred, label, iconSrc, svg } = options
+  const {
+    rpcUrl,
+    LedgerTransport,
+    networkId,
+    preferred,
+    label,
+    iconSrc,
+    svg
+  } = options
 
   return {
     name: label || 'Ledger',
@@ -31,6 +39,7 @@ function ledger(options: LedgerOptions & CommonWalletOptions): WalletModule {
       const provider = await ledgerProvider({
         rpcUrl,
         networkId,
+        LedgerTransport,
         BigNumber,
         networkName
       })
@@ -65,10 +74,11 @@ function ledger(options: LedgerOptions & CommonWalletOptions): WalletModule {
 async function ledgerProvider(options: {
   networkId: number
   rpcUrl: string
+  LedgerTransport: any
   BigNumber: any
   networkName: (id: number) => string
 }) {
-  const { networkId, rpcUrl, BigNumber, networkName } = options
+  const { networkId, rpcUrl, LedgerTransport, BigNumber, networkName } = options
 
   let dPath = ''
   let addressToPath = new Map()
@@ -106,17 +116,21 @@ async function ledgerProvider(options: {
   provider.disconnect = disconnect
   provider.isCustomPath = isCustomPath
 
-  let transport
+  let transport: any
   let eth: any
 
   try {
-    transport = await TransportU2F.create()
+    transport = LedgerTransport
+      ? await LedgerTransport.create()
+      : await TransportU2F.create()
+
     eth = new Eth(transport)
   } catch (error) {
     throw new Error('Error connecting to Ledger wallet')
   }
 
   function disconnect() {
+    transport.close()
     dPath = ''
     addressToPath = new Map()
     enabled = false
@@ -290,15 +304,6 @@ async function ledgerProvider(options: {
 
   async function signTransaction(transactionData: any) {
     const path = [...addressToPath.values()][0]
-    let transport
-    let eth
-
-    try {
-      transport = await TransportU2F.create()
-      eth = new Eth(transport)
-    } catch (error) {
-      throw new Error('Error connecting to Ledger wallet')
-    }
 
     try {
       const transaction = new EthereumTx.Transaction(transactionData, {

src/modules/select/wallets/portis.ts

@@ -19,7 +19,6 @@ function portis(options: SdkWalletOptions & CommonWalletOptions): WalletModule {
       const { default: Portis } = await import('@portis/web3')
       const instance = new Portis(apiKey, networkName(networkId))
       const provider = instance.provider
-
       const { BigNumber } = helpers
 
       return {
@@ -28,6 +27,10 @@ function portis(options: SdkWalletOptions & CommonWalletOptions): WalletModule {
         interface: {
           name: 'Portis',
           connect: provider.enable,
+          disconnect: () => {
+            instance.logout()
+            provider.stop()
+          },
           address: {
             onChange: func => {
               instance.onLogin((address: string) => {

src/modules/select/wallets/squarelink.ts

@@ -25,7 +25,6 @@ function squarelink(
       })
 
       const provider = instance.getProviderSync()
-
       const { BigNumber } = helpers
 
       return {
@@ -34,6 +33,7 @@ function squarelink(
         interface: {
           name: 'Squarelink',
           connect: provider.enable,
+          disconnect: () => provider.stop(),
           address: {
             get: () => Promise.resolve(instance.accounts[0])
           },

src/validation.ts

@@ -527,6 +527,7 @@ export function validateWalletInit(
     appUrl,
     email,
     rpcUrl,
+    LedgerTransport,
     buildEnv,
     buttonPosition,
     enableLogging,
@@ -551,6 +552,7 @@ export function validateWalletInit(
       'appUrl',
       'email',
       'rpcUrl',
+      'LedgerTransport',
       'buildEnv',
       'buttonPosition',
       'enableLogging',
@@ -619,11 +621,17 @@ export function validateWalletInit(
   validateType({
     name: 'walletInit.appUrl',
     value: appUrl,
-
     type: 'string',
     optional: true
   })
 
+  validateType({
+    name: 'walletInit.LedgerTransport',
+    value: LedgerTransport,
+    type: 'function',
+    optional: true
+  })
+
   validateType({
     name: 'walletInit.email',
     value: email,
@@ -660,7 +668,6 @@ export function validateWalletInit(
     optional: true
   })
 
-
   validateType({
     name: 'walletInit.enabledVerifiers',
     value: enabledVerifiers,

src/views/WalletCheck.svelte

@@ -58,7 +58,7 @@
     window.scrollTo(0, 0)
   }
 
-  let originalOverflowValue
+  let originalOverflowValue: string
 
   onMount(() => {
     originalOverflowValue = window.document.body.style.overflow

src/views/WalletSelect.svelte

@@ -61,7 +61,7 @@
     window.scrollTo(0, 0)
   }
 
-  let originalOverflowValue
+  let originalOverflowValue: string
 
   onMount(() => {
     originalOverflowValue = window.document.body.style.overflow