Merge pull request #724 from blocknative/release/1.35.2

Release 1.35.2

Author: lnbc1QWFyb24

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "1.35.1",
+  "version": "1.35.2",
   "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",
@@ -59,7 +59,7 @@
     "@ethereumjs/tx": "^3.0.0",
     "@gnosis.pm/safe-apps-provider": "^0.5.0",
     "@gnosis.pm/safe-apps-sdk": "^3.0.0",
-    "@keystonehq/eth-keyring": "0.7.7",
+    "@keystonehq/eth-keyring": "0.9.0",
     "@ledgerhq/hw-app-eth": "6.8.1",
     "@ledgerhq/hw-transport-u2f": "^5.21.0",
     "@ledgerhq/hw-transport-webusb": "6.7.0",
@@ -85,9 +85,6 @@
     "walletlink": "^2.1.11",
     "web3-provider-engine": "^15.0.4"
   },
-  "optionalDependencies": {
-    "@myetherwallet/mewconnect-web-client": "^2.2.0-beta.11"
-  },
   "resolutions": {
     "authereum/web3-utils/underscore": "^1.12.1",
     "authereum/ethereum-private-key-to-address/meow/trim-newlines": "^3.0.1",

rollup.config.js

@@ -55,7 +55,7 @@ export default {
     })
   ],
   external: [
-    '@myetherwallet/mewconnect-web-client',
+    // '@myetherwallet/mewconnect-web-client',
     'bowser',
     'bnc-sdk',
     'bignumber.js',

src/@types/index.d.ts

@@ -23,5 +23,7 @@ declare module '@keystonehq/eth-keyring'
 declare module '@shapeshiftoss/hdwallet-core'
 declare module '@shapeshiftoss/hdwallet-keepkey-webusb'
 
+// declare module '@myetherwallet/mewconnect-web-client'
+
 declare module '*.png'
 declare module '*.svg'

src/modules/select/index.ts

@@ -91,8 +91,13 @@ function select(
               setOfWallets.add(walletName)
               return module
             } catch (error) {
-              if (error.name === 'DeprecatedWalletError') {
-                console.warn(error.message)
+              const { type, message } = error as {
+                type: string
+                message: string
+              }
+
+              if (type === 'DeprecatedWalletError') {
+                console.warn(message)
               } else {
                 throw error
               }
@@ -132,7 +137,7 @@ function getModule(name: string): Promise<{
     case 'squarelink':
     case 'unilogin':
       throw {
-        name: 'DeprecatedWalletError',
+        type: 'DeprecatedWalletError',
         message: `${name} wallet has been deprecated`
       }
     case 'meetone':
@@ -209,8 +214,8 @@ function getModule(name: string): Promise<{
       return import('./wallets/detectedwallet')
     case 'tp':
       return import('./wallets/tp')
-    case 'mewwallet':
-      return import('./wallets/mewwallet')
+    // case 'mewwallet':
+    //   return import('./wallets/mewwallet')
     default:
       throw new Error(`${name} is not a valid walletName.`)
   }

src/modules/select/wallets/keystone.ts

@@ -225,9 +225,7 @@ async function keystoneProvider(options: {
     }
 
     try {
-      const accounts = await keyring.addAccounts(
-        keyring.getAccounts().length + 5
-      )
+      const accounts = await keyring.addAccounts(5)
       addressToIndex = generateAccountsMap(accounts)
       const currentPrimary = getPrimaryAddress()
       setPrimaryAccount(currentPrimary)

src/modules/select/wallets/mewwallet.ts

@@ -1,67 +1,73 @@
-import { MewConnectOptions, WalletModule, Helpers } from '../../../interfaces'
-// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-// @ts-ignore
-import MEWWallet from '@myetherwallet/mewconnect-web-client'
-import mewWalletIcon from '../wallet-icons/icon-mew-wallet'
+// import { MewConnectOptions, WalletModule, Helpers } from '../../../interfaces'
+// import mewWalletIcon from '../wallet-icons/icon-mew-wallet'
 
-function mewConnect(options: MewConnectOptions): WalletModule {
-  const { rpcUrl, iconSrc, networkId, preferred } = options
+// async function mewConnect(options: MewConnectOptions): Promise<WalletModule> {
+//   const { rpcUrl, iconSrc, networkId, preferred } = options
 
-  return {
-    name: 'MEW Wallet',
-    svg: mewWalletIcon,
-    iconSrc: iconSrc || mewWalletIcon,
-    wallet: async (helpers: Helpers) => {
-      const { resetWalletState, getBalance, getAddress, getNetwork } = helpers
-      const mewConnect = new MEWWallet.Provider({
-        windowClosedError: true,
-        chainId: networkId,
-        rpcUrl
-      })
-      const provider = mewConnect.makeWeb3Provider()
-      if (mewConnect.isConnected) {
-        mewConnect.disconnect()
-        resetWalletState({ disconnected: true, walletName: 'MEW Wallet' })
-      }
-      mewConnect.on('popupWindowClosed', () => {
-        resetWalletState({ disconnected: true, walletName: 'MEW Wallet' })
-      })
-      return {
-        provider,
-        interface: {
-          name: 'MEW Wallet',
-          connect: () =>
-            new Promise((resolve, reject) => {
-              provider
-                .enable()
-                .then(resolve)
-                .catch(() => {
-                  reject({
-                    message:
-                      'This dapp needs access to your account information.'
-                  })
-                })
-            }),
-          address: {
-            get: () => getAddress(provider)
-          },
-          network: {
-            get: () => getNetwork(provider)
-          },
-          balance: {
-            get: () => getBalance(provider)
-          },
-          disconnect: () => {
-            mewConnect.disconnect()
-            resetWalletState({ disconnected: true, walletName: 'MEW Wallet' })
-          }
-        }
-      }
-    },
-    type: 'injected',
-    desktop: true,
-    preferred
-  }
-}
+//   return {
+//     name: 'MEW Wallet',
+//     svg: mewWalletIcon,
+//     iconSrc: iconSrc || mewWalletIcon,
+//     wallet: async (helpers: Helpers) => {
+//       const { resetWalletState, getBalance, getAddress, getNetwork } = helpers
 
-export default mewConnect
+//       const { default: MEWWallet } = await import(
+//         '@myetherwallet/mewconnect-web-client'
+//       )
+
+//       const mewConnect = new MEWWallet.Provider({
+//         windowClosedError: true,
+//         chainId: networkId,
+//         rpcUrl
+//       })
+
+//       const provider = mewConnect.makeWeb3Provider()
+
+//       if (mewConnect.isConnected) {
+//         mewConnect.disconnect()
+//         resetWalletState({ disconnected: true, walletName: 'MEW Wallet' })
+//       }
+
+//       mewConnect.on('popupWindowClosed', () => {
+//         resetWalletState({ disconnected: true, walletName: 'MEW Wallet' })
+//       })
+
+//       return {
+//         provider,
+//         interface: {
+//           name: 'MEW Wallet',
+//           connect: () =>
+//             new Promise((resolve, reject) => {
+//               provider
+//                 .enable()
+//                 .then(resolve)
+//                 .catch(() => {
+//                   reject({
+//                     message:
+//                       'This dapp needs access to your account information.'
+//                   })
+//                 })
+//             }),
+//           address: {
+//             get: () => getAddress(provider)
+//           },
+//           network: {
+//             get: () => getNetwork(provider)
+//           },
+//           balance: {
+//             get: () => getBalance(provider)
+//           },
+//           disconnect: () => {
+//             mewConnect.disconnect()
+//             resetWalletState({ disconnected: true, walletName: 'MEW Wallet' })
+//           }
+//         }
+//       }
+//     },
+//     type: 'injected',
+//     desktop: true,
+//     preferred
+//   }
+// }
+
+// export default mewConnect