Merge branch 'develop' into master

Author: lnbc1QWFyb24

.circleci/config.yml

@@ -40,6 +40,14 @@ jobs:
       - run: sudo npm i -g add npm-cli-login
       - run: NPM_USER=$NPM_USERNAME NPM_EMAIL=$NPM_EMAIL NPM_PASS=$NPM_PASSWORD npm-cli-login
       - run: npm publish
+  deploy_demo:
+    docker:
+      - image: circleci/node:8.15-browsers
+        user: root
+    steps:
+      - checkout
+      - run: sh ./trigger-demo-build.sh $CIRCLE_TOKEN
+
 workflows:
   version: 2
   test_build:
@@ -59,3 +67,8 @@ workflows:
             branches:
               only:
                 - master
+      - deploy_demo:
+          filters:
+            branches:
+              only:
+                - develop

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bnc-onboard",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "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",
@@ -61,6 +61,7 @@
   },
   "scripts": {
     "build": "rimraf dist && rollup -c && babel dist/cjs --out-dir dist/cjs && babel dist/esm --out-dir dist/esm",
-    "test": "echo \"TBD\" && exit 0"
+    "test": "echo \"TBD\" && exit 0",
+    "prepare": "npm run build"
   }
 }

src/interfaces.ts

@@ -5,6 +5,7 @@ export interface Initialization {
   walletSelect: WalletSelectModule
   walletCheck: Array<WalletCheckModule | WalletCheckInit>
   darkMode?: boolean
+  apiUrl?: string
 }
 
 export interface Subscriptions {
@@ -167,6 +168,10 @@ export interface SdkWalletOptions {
 
 export interface WalletConnectOptions {
   infuraKey: string
+  rpc: {
+    [key: string]: string
+  }
+  bridge: string
 }
 
 export interface TrezorOptions {

src/modules/check/connect.ts

@@ -21,9 +21,16 @@ function connect(
     if (address === null) {
       // wait for address sync if is still on initial value
       if (stateSyncStatus.address) {
-        try {
-          await stateSyncStatus.address
-        } catch (error) {}
+        await new Promise(resolve => {
+          stateSyncStatus.address && stateSyncStatus.address.then(resolve)
+
+          setTimeout(() => {
+            if (address === null) {
+              // if prom isn't resolving after 250ms, then stop waiting
+              resolve()
+            }
+          }, 250)
+        })
       }
     }
 

src/modules/check/network.ts

@@ -24,9 +24,16 @@ function network(
     if (network === null) {
       // wait for network sync if is still on initial value
       if (stateSyncStatus.network) {
-        try {
-          await stateSyncStatus.network
-        } catch (error) {}
+        await new Promise(resolve => {
+          stateSyncStatus.network && stateSyncStatus.network.then(resolve)
+
+          setTimeout(() => {
+            if (network === null) {
+              // if prom isn't resolving after 250ms, then stop waiting
+              resolve()
+            }
+          }, 250)
+        })
       }
     }
 

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

@@ -10,7 +10,7 @@ import walletConnectIcon from '../wallet-icons/icon-wallet-connect'
 function walletConnect(
   options: WalletConnectOptions & CommonWalletOptions
 ): WalletModule {
-  const { infuraKey, preferred, label, iconSrc, svg } = options
+  const { infuraKey, rpc, bridge, preferred, label, iconSrc, svg } = options
 
   return {
     name: label || 'WalletConnect',
@@ -24,7 +24,9 @@ function walletConnect(
       )
 
       const provider = new WalletConnectProvider({
-        infuraId: infuraKey
+        infuraId: infuraKey,
+        rpc,
+        bridge
       })
 
       provider.autoRefreshOnNetworkChange = false

src/onboard.ts

@@ -42,9 +42,9 @@ function init(initialization: Initialization): API {
 
   validateInit(initialization)
 
-  const { subscriptions, dappId, networkId, darkMode } = initialization
+  const { subscriptions, dappId, networkId, darkMode, apiUrl } = initialization
 
-  initializeBlocknative(dappId, networkId)
+  initializeBlocknative(dappId, networkId, apiUrl)
 
   const { os, isMobile } = getDeviceInfo()
 

src/services.ts

@@ -2,11 +2,16 @@ import BlocknativeApi from 'bnc-sdk'
 
 let blocknative: any
 
-export function initializeBlocknative(dappId: string, networkId: number): any {
+export function initializeBlocknative(
+  dappId: string,
+  networkId: number,
+  apiUrl?: string
+): any {
   blocknative = new BlocknativeApi({
     dappId,
     networkId,
-    name: 'Onboard'
+    name: 'Onboard',
+    apiUrl
   })
 
   return blocknative

src/validation.ts

@@ -62,6 +62,7 @@ export function validateInit(init: Initialization): never | void {
     walletSelect,
     walletCheck,
     darkMode,
+    apiUrl,
     ...otherParams
   } = init
 
@@ -73,7 +74,8 @@ export function validateInit(init: Initialization): never | void {
       'subscriptions',
       'walletSelect',
       'walletCheck',
-      'darkMode'
+      'darkMode',
+      'apiUrl'
     ],
     'init'
   )
@@ -86,6 +88,12 @@ export function validateInit(init: Initialization): never | void {
     type: 'boolean',
     optional: true
   })
+  validateType({
+    name: 'apiUrl',
+    value: apiUrl,
+    type: 'string',
+    optional: true
+  })
 
   validateType({
     name: 'subscriptions',
@@ -534,6 +542,8 @@ export function validateWalletInit(
     apiKey,
     networkId,
     infuraKey,
+    rpc,
+    bridge,
     preferred,
     label,
     iconSrc,
@@ -559,6 +569,8 @@ export function validateWalletInit(
       'apiKey',
       'networkId',
       'infuraKey',
+      'rpc',
+      'bridge',
       'preferred',
       'label',
       'iconSrc',
@@ -604,6 +616,20 @@ export function validateWalletInit(
     optional: true
   })
 
+  validateType({
+    name: 'walletInit.rpc',
+    value: rpc,
+    type: 'object',
+    optional: true
+  })
+
+  validateType({
+    name: 'walletInit.bridge',
+    value: bridge,
+    type: 'string',
+    optional: true
+  })
+
   validateType({
     name: 'walletInit.preferred',
     value: preferred,

trigger-demo-build.sh

@@ -0,0 +1 @@
+curl -X POST --header "Content-Type: application/json" -d '{"build_parameters": {"CIRCLE_JOB": "deploy_stage"}}' https://circleci.com/api/v1/project/blocknative/react-demo/tree/develop?circle-token=$1