Merge pull request #463 from blocknative/develop

Release 1.17.0

Author: lnbc1QWFyb24

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "1.16.1",
+  "version": "1.17.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",
@@ -48,10 +48,10 @@
     "@ledgerhq/hw-app-eth": "^5.21.0",
     "@ledgerhq/hw-transport-u2f": "^5.21.0",
     "@portis/web3": "^2.0.0-beta.57",
-    "@toruslabs/torus-embed": "^1.8.2",
+    "@toruslabs/torus-embed": "1.8.2",
     "@unilogin/provider": "^0.6.1",
     "@walletconnect/web3-provider": "^1.3.1",
-    "authereum": "^0.0.4-beta.157",
+    "authereum": "^0.1.12",
     "bignumber.js": "^9.0.0",
     "bnc-sdk": "^2.1.4",
     "bowser": "^2.10.0",

src/interfaces.ts

@@ -7,6 +7,7 @@ export interface Initialization {
   darkMode?: boolean
   apiUrl?: string
   hideBranding?: boolean
+  blockPollingInterval?: number
 }
 
 export interface Subscriptions {

src/modules/select/index.ts

@@ -16,7 +16,8 @@ const defaultWalletNames = [
   'hyperpay',
   'unilogin',
   'tokenpocket',
-  'dcent'
+  'dcent',
+  'atoken'
 ]
 
 function select(
@@ -109,6 +110,8 @@ function getModule(name: string): Promise<any> | undefined {
       return import('./wallets/tokenpocket')
     case 'dcent':
       return import('./wallets/dcent')
+    case 'atoken':
+      return import('./wallets/atoken')
     default:
       return
   }

src/modules/select/wallet-icons/icon-atoken.png

@@ -0,0 +1,38 @@
+import { mobileWalletInstallMessage } from '../content'
+import { WalletModule, Helpers, CommonWalletOptions } from '../../../interfaces'
+
+import atokenIcon from '../wallet-icons/icon-atoken.png'
+import atokenIcon2x from '../wallet-icons/icon-atoken@2x.png'
+
+function atoken(options: CommonWalletOptions): WalletModule {
+    const { preferred, label, iconSrc, svg } = options
+
+    return {
+        name: label || 'AToken',
+        iconSrc: iconSrc || atokenIcon,
+        iconSrcSet: iconSrc || atokenIcon2x,
+        svg,
+        wallet: async (helpers: Helpers) => {
+            const { getProviderName, createModernProviderInterface } = helpers
+
+            const provider =
+                (window as any).ethereum ||
+                ((window as any).web3 && (window as any).web3.currentProvider)
+
+            return {
+                provider,
+                interface:
+                    (getProviderName(provider) === 'AToken' &&
+                        createModernProviderInterface(provider)) ||
+                    null
+            }
+        },
+        type: 'injected',
+        link: 'https://www.atoken.com',
+        installMessage: mobileWalletInstallMessage,
+        mobile: true,
+        preferred
+    }
+}
+
+export default atoken

src/modules/select/wallet-icons/icon-atoken@2x.png

@@ -4,6 +4,10 @@ import HookedWalletSubprovider from 'web3-provider-engine/subproviders/hooked-wa
 import SubscriptionSubprovider from 'web3-provider-engine/subproviders/subscriptions'
 import FilterSubprovider from 'web3-provider-engine/subproviders/filters'
 
+import { get } from 'svelte/store'
+
+import { app } from '../../../stores'
+
 function createProvider(config: any) {
   const {
     getAccounts,
@@ -12,9 +16,11 @@ function createProvider(config: any) {
     processMessage,
     processPersonalMessage,
     signMessage,
-    signPersonalMessage
+    signPersonalMessage,
   } = config
 
+  const pollingInterval = get(app).blockPollingInterval
+
   const idMgmt =
     getAccounts &&
     new HookedWalletSubprovider({
@@ -30,7 +36,7 @@ function createProvider(config: any) {
     rpcUrl: rpcUrl.includes('http') ? rpcUrl : `https://${rpcUrl}`
   })
 
-  const provider = new Web3ProviderEngine()
+  const provider = new Web3ProviderEngine({pollingInterval})
 
   provider.addProvider(new SubscriptionSubprovider())
   provider.addProvider(new FilterSubprovider())

src/modules/select/wallets/atoken.ts

@@ -6,6 +6,12 @@ import {
 
 import walletConnectIcon from '../wallet-icons/icon-wallet-connect'
 
+import { get } from 'svelte/store'
+
+import {
+  app,
+} from '../../../stores'
+
 function walletConnect(
   options: WalletConnectOptions & { networkId: number }
 ): WalletModule {
@@ -20,6 +26,8 @@ function walletConnect(
     networkId
   } = options
 
+  const pollingInterval = get(app).blockPollingInterval
+
   if (!infuraKey) {
     if (!rpc || !rpc[networkId]) {
       throw new Error(
@@ -50,7 +58,8 @@ function walletConnect(
       const provider = new WalletConnectProvider({
         infuraId: infuraKey,
         rpc,
-        bridge
+        bridge,
+        pollingInterval
       })
 
       provider.autoRefreshOnNetworkChange = false

src/modules/select/wallets/providerEngine.ts

@@ -49,7 +49,8 @@ function init(initialization: Initialization): API {
     networkId,
     darkMode,
     apiUrl,
-    hideBranding
+    hideBranding,
+    blockPollingInterval = 4000
   } = initialization
 
   const { os, browser, isMobile } = getDeviceInfo()
@@ -86,7 +87,8 @@ function init(initialization: Initialization): API {
     browser,
     darkMode,
     displayBranding,
-    checkModules: initializedModules.walletCheck
+    checkModules: initializedModules.walletCheck,
+    blockPollingInterval
   }))
 
   initializeStores()

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

@@ -30,7 +30,8 @@ export const app: WritableStore = writable({
   checkModules: [],
   walletSelectDisplayedUI: false,
   walletCheckDisplayedUI: false,
-  displayBranding: false
+  displayBranding: false,
+  blockPollingInterval: 4000,
 })
 
 export const stateSyncStatus: {

src/onboard.ts

@@ -258,6 +258,10 @@ export function getProviderName(provider: any): string | undefined {
     return 'HyperPay'
   }
 
+  if (provider.isAToken) {
+    return 'AToken'
+  }
+
   if (provider.host && provider.host.indexOf('localhost') !== -1) {
     return 'localhost'
   }

src/stores.ts

@@ -64,6 +64,7 @@ export function validateInit(init: Initialization): never | void {
     darkMode,
     apiUrl,
     hideBranding,
+    blockPollingInterval,
     ...otherParams
   } = init
 
@@ -77,7 +78,8 @@ export function validateInit(init: Initialization): never | void {
       'walletCheck',
       'darkMode',
       'apiUrl',
-      'hideBranding'
+      'hideBranding',
+      'blockPollingInterval'
     ],
     'init'
   )
@@ -107,6 +109,12 @@ export function validateInit(init: Initialization): never | void {
     type: 'boolean',
     optional: true
   })
+  validateType({
+    name: 'blockPollingInterval',
+    value: blockPollingInterval,
+    type: 'number',
+    optional: true
+  })
 
   validateType({
     name: 'subscriptions',
@@ -640,7 +648,7 @@ export function validateWalletInit(
       'rpcUri',
       'webUri',
       'xsUri',
-      'blockedPopupRedirect'
+      'blockedPopupRedirect',
     ],
     'walletInitObject'
   )