Merge pull request #588 from blocknative/release/1.28.0

Release: 1.28.0

Author: taylorjdawson

.eslintrc.js

@@ -6,8 +6,7 @@ module.exports = {
   },
   extends: [
     'plugin:@typescript-eslint/recommended',
-    'prettier/@typescript-eslint',
-    'plugin:prettier/recommended'
+    'prettier'
   ],
 
   rules: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "1.27.0",
+  "version": "1.28.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",
@@ -41,24 +41,27 @@
     "@typescript-eslint/parser": "^2.30.0",
     "babel-plugin-external-helpers": "^6.18.0",
     "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-prettier": "^3.1.3",
+    "eslint-config-prettier": "^8.3.0",
     "prettier": "^2.0.5",
     "rimraf": "^3.0.0",
     "rollup": "^1.27.5",
-    "rollup-plugin-svelte": "^5.0.3",
+    "rollup-plugin-svelte": "^6.1.1",
     "rollup-plugin-typescript2": "0.21.0",
     "svelte": "^3.12.1",
     "svelte-i18n": "^1.1.2-beta",
     "typescript": "^3.6.4"
   },
   "dependencies": {
     "@cvbb/eth-keyring": "^1.1.0",
-    "@gnosis.pm/safe-apps-provider": "^0.3.0",
-    "@gnosis.pm/safe-apps-sdk": "^2.3.0",
+    "@gnosis.pm/safe-apps-provider": "^0.5.0",
+    "@gnosis.pm/safe-apps-sdk": "^3.0.0",
     "@ledgerhq/hw-app-eth": "^5.49.0",
     "@ledgerhq/hw-transport-u2f": "^5.21.0",
+    "@ledgerhq/hw-transport-webusb": "5.53.0",
     "@portis/web3": "^4.0.0",
+    "@shapeshiftoss/hdwallet-core": "^1.15.2",
+    "@shapeshiftoss/hdwallet-keepkey": "^1.15.2",
+    "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.15.2",
     "@toruslabs/torus-embed": "^1.10.11",
     "@walletconnect/web3-provider": "^1.4.1",
     "authereum": "^0.1.12",

rollup.config.js

@@ -73,6 +73,7 @@ export default {
     '@cvbb/eth-keyring',
     'hdkey',
     '@ledgerhq/hw-transport-u2f',
+    '@ledgerhq/hw-transport-webusb',
     '@ledgerhq/hw-app-eth',
     'util',
     'assert',
@@ -84,6 +85,9 @@ export default {
     'web3-provider-engine/subproviders/subscriptions',
     'web3-provider-engine/subproviders/filters',
     'eth-provider',
+    '@shapeshiftoss/hdwallet-keepkey',
+    '@shapeshiftoss/hdwallet-keepkey-webusb',
+    '@shapeshiftoss/hdwallet-core',
     '@gnosis.pm/safe-apps-sdk',
     '@gnosis.pm/safe-apps-provider'
   ]

src/@types/index.d.ts

@@ -14,7 +14,11 @@ declare module 'ethereumjs-util'
 declare module 'hdkey'
 declare module '@ledgerhq/hw-app-eth'
 declare module '@ledgerhq/hw-transport-u2f'
+declare module '@ledgerhq/hw-transport-webusb'
 declare module 'eth-provider'
 
+declare module '@shapeshiftoss/hdwallet-core'
+declare module '@shapeshiftoss/hdwallet-keepkey-webusb'
+
 declare module '*.png'
 declare module '*.svg'

src/interfaces.ts

@@ -113,9 +113,7 @@ export interface WalletModule {
   iconSrc?: string
   iconSrcSet?: string
   svg?: string
-  wallet: (
-    helpers: Helpers
-  ) => Promise<{
+  wallet: (helpers: Helpers) => Promise<{
     provider: any | undefined
     interface: WalletInterface | null
     instance?: any

src/modules/check/accounts.ts

@@ -53,8 +53,9 @@ function accountSelect(
       }
 
       const accountSelect = () => {
-        const accountIndex = (document as any).getElementById('account-select')
-          .selectedIndex
+        const accountIndex = (document as any).getElementById(
+          'account-select'
+        ).selectedIndex
 
         provider.setPrimaryAccount(accountsAndBalances[accountIndex].address)
       }

src/modules/check/connect.ts

@@ -22,7 +22,7 @@ function connect(options: WalletCheckCustomOptions = {}): WalletCheckModule {
           setTimeout(() => {
             if (address === null) {
               // if prom isn't resolving after 500ms, then stop waiting
-              resolve()
+              resolve(undefined)
             }
           }, 500)
         })

src/modules/check/derivation-path.ts

@@ -11,7 +11,8 @@ const derivationPaths: DerivationPaths = {
     { path: `m/44'/60'`, label: 'Ethereum Ledger Live' }
   ],
   Trezor: [{ path: `m/44'/60'/0'/0`, label: 'Ethereum' }],
-  Lattice: [{ path: `m/44'/60'/0'/0`, label: 'Ethereum' }]
+  Lattice: [{ path: `m/44'/60'/0'/0`, label: 'Ethereum' }],
+  KeepKey: [{ path: `m/44'/60'/0'/0/0`, label: 'Ethereum' }]
 }
 
 const styles = `

src/modules/select/index.ts

@@ -68,9 +68,7 @@ function select(
   )
 }
 
-function getModule(
-  name: string
-): Promise<{
+function getModule(name: string): Promise<{
   default: (options: AllWalletInitOptions) => WalletModule
 }> {
   switch (name) {
@@ -142,6 +140,8 @@ function getModule(
       return import('./wallets/alphawallet')
     case 'ownbit':
       return import('./wallets/ownbit')
+    case 'keepkey':
+      return import('./wallets/keepkey/')
     case 'bitpie':
       return import('./wallets/bitpie')
     case 'gnosis':