Merge pull request #59 from LN-Zap/feature/package-binary

Feature/package binary

app/api/index.js

@@ -14,3 +14,14 @@ export function requestTickers(ids) {
   return axios.all(ids.map(id => requestTicker(id)))
     .then(axios.spread((btcTicker, ltcTicker) => ({ btcTicker: btcTicker[0], ltcTicker: ltcTicker[0] })))
 }
+
+
+export function requestBlockHeight(id) {
+  const BASE_URL = `https://testnet-api.smartbit.com.au/v1/blockchain/blocks?limit=1`
+  return axios({
+    method: 'get',
+    url: BASE_URL
+  })
+    .then(response => response.data)
+    .catch(error => error)
+}

app/components/LndSyncing/LndSyncing.js

@@ -0,0 +1,72 @@
+import React, { Component } from 'react'
+import styles from './LndSyncing.scss'
+
+class LndSyncing extends Component {
+  constructor(props) {
+  super(props);
+    this.state = {
+      facts: [
+        {
+          title: 'No2x',
+          description: 'Segwit2x is a hard fork proposal led by Barry Silbert and the NYA signers. The idea was drawn up and signed in a locked hotel room with select individuals and goes against everything that Bitcoin stands for. There is no favoritism in Bitcoin. There are no politicians. Hash power and business don\'t speak for us. Don\'t trust, verify.'
+        },
+        {
+          title: 'Gang',
+          description: 'Segwit2x is a hard fork proposal led by Barry Silbert and the NYA. It is bullshit. Fuck that shit.'
+        },
+        {
+          title: 'Yo',
+          description: 'Segwit2x is a hard fork proposal led by Barry Silbert and the NYA. It is bullshit. Fuck that shit.'
+        },
+        {
+          title: 'Liiiiit',
+          description: 'Segwit2x is a hard fork proposal led by Barry Silbert and the NYA. It is bullshit. Fuck that shit.'
+        }
+      ],
+      currentFact: 0
+    }
+  }
+
+  componentWillMount() {
+    this.props.fetchBlockHeight()
+  }
+
+  render() {
+    const { fetchingBlockHeight, syncPercentage } = this.props
+    const { facts, currentFact } = this.state
+    const renderCurrentFact = facts[currentFact]
+
+    return (
+      <div className={styles.container}>
+        <h3>zap</h3>
+        <div className={styles.loading}>
+          {!fetchingBlockHeight && <h4>{syncPercentage}%</h4>}
+          <div className={styles.spinner}>
+          </div>
+          <h1>syncing your lightning node to the blockchain</h1>
+        </div>
+        <div className={styles.facts}>
+          <div className={styles.fact}>
+            <h2>{renderCurrentFact.title}</h2>
+            <p>{renderCurrentFact.description}</p>
+          </div>
+          <ul>
+            {
+              facts.map((facts, index) => {
+                return (
+                  <li
+                    className={`${styles.factButton} ${currentFact === index && styles.active}`}
+                    key={index}
+                    onClick={() => this.setState({ currentFact: index })}
+                  />
+                )
+              })
+            }
+          </ul>
+        </div>
+      </div>
+    )
+  }
+}
+
+export default LndSyncing

app/components/LndSyncing/LndSyncing.scss

@@ -0,0 +1,109 @@
+@import '../../variables.scss';
+
+.container {
+  height: 100vh;
+  padding: 100px;
+
+  h3 {
+    font-size: 50px;
+  }
+
+  .loading {
+    text-align: center;
+    margin-top: 100px;
+    position: relative;
+
+    h4 {
+      position: absolute;
+      min-width: 100px;
+      top: calc(50% - 30px);
+      left: calc(50% - 48px);
+    }
+
+    h1 {
+      margin-top: 25px;
+    }
+  }
+
+  .facts {
+    position: absolute;
+    bottom: 10%;
+
+    .fact {
+      transition: all 0.25s;
+      width: 50%;
+      line-height: 1.5;
+      letter-spacing: 1.1px;
+      
+      h2 {
+        font-size: 50px;
+        margin-bottom: 10px;
+      }
+
+      p {
+        margin-bottom: 20px;
+      }
+    }
+  }
+
+  .factButton {
+    cursor: pointer;
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    background: $black;
+    opacity: 0.5;
+    border-radius: 50%;
+    margin: 0 5px;
+
+    &:hover {
+      opacity: 0.25;
+    }
+
+    &.active {
+      opacity: 0.25;
+    }
+  }
+}
+
+.spinner {
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  border-left-color: rgba(0, 0, 0, 0.4);
+  -webkit-border-radius: 999px;
+  -moz-border-radius: 999px;
+  border-radius: 999px;
+}
+
+.spinner {
+  margin: 0 auto;
+  height: 100px;
+  width: 100px;
+  -webkit-animation: animation-rotate 1000ms linear infinite;
+  -moz-animation: animation-rotate 1000ms linear infinite;
+  -o-animation: animation-rotate 1000ms linear infinite;
+  animation: animation-rotate 1000ms linear infinite;
+}
+
+@-webkit-keyframes animation-rotate {
+  100% {
+    -webkit-transform: rotate(360deg);
+  }
+}
+
+@-moz-keyframes animation-rotate {
+  100% {
+    -moz-transform: rotate(360deg);
+  }
+}
+
+@-o-keyframes animation-rotate {
+  100% {
+    -o-transform: rotate(360deg);
+  }
+}
+
+@keyframes animation-rotate {
+  100% {
+    transform: rotate(360deg);
+  }
+}

app/components/LndSyncing/index.js

@@ -0,0 +1,3 @@
+import LndSyncing from './LndSyncing'
+
+export default LndSyncing

app/darwin_generate_certs.sh

@@ -0,0 +1,13 @@
+echo "insert text here" > inner.txt
+
+# Generate Node.js compatible certs
+# If Lnd folder doesn't exist we have to create it
+if [ ! -d ~/Library/Application\ Support/Lnd ]; then
+  mkdir -p ~/Library/Application\ Support/Lnd;
+fi
+
+# Generate compatible certs
+openssl ecparam -genkey -name prime256v1 -out ~/Library/Application\ Support/Lnd/tls.key
+openssl req -new -sha256 -key ~/Library/Application\ Support/Lnd/tls.key -out ~/Library/Application\ Support/Lnd/csr.csr -subj '/CN=localhost/O=lnd'
+openssl req -x509 -sha256 -days 3650 -key ~/Library/Application\ Support/Lnd/tls.key -in ~/Library/Application\ Support/Lnd/csr.csr -out ~/Library/Application\ Support/Lnd/tls.cert
+rm ~/Library/Application\ Support/Lnd/csr.csr

app/lnd/index.js

@@ -3,12 +3,11 @@ import lightning from './lib/lightning'
 import subscribe from './subscribe'
 import methods from './methods'
 
-const lnd = lightning(config.lightningRpc, config.lightningHost)
+export default (callback) => {
+  const lnd = lightning(config.lightningRpc, config.lightningHost)
 
-const lndSubscribe = mainWindow => subscribe(mainWindow, lnd)
-const lndMethods = (event, msg, data) => methods(lnd, event, msg, data)
+  const lndSubscribe = mainWindow => subscribe(mainWindow, lnd)
+  const lndMethods = (event, msg, data) => methods(lnd, event, msg, data)
 
-export default {
-  lndMethods,
-  lndSubscribe
+  callback(lndSubscribe, lndMethods)
 }

app/lnd/lib/lightning.js

@@ -1,11 +1,12 @@
 import fs from 'fs'
+import path from 'path'
 import grpc from 'grpc'
 import config from '../config'
 
-module.exports = (path, host) => {
+module.exports = (rpcpath, host) => {
   process.env.GRPC_SSL_CIPHER_SUITES = 'HIGH+ECDSA'
-
-  const rpc = grpc.load(path)
+  console.log('RPC PATH: ', path.join(__dirname, 'rpc.proto'))
+  const rpc = grpc.load(path.join(__dirname, 'rpc.proto'))
 
   const lndCert = fs.readFileSync(config.cert)
   const credentials = grpc.credentials.createSsl(lndCert)

app/lnd/methods/index.js

@@ -1,4 +1,5 @@
 /* eslint no-console: 0 */ // --> OFF
+// import grpc from 'grpc'
 
 import * as invoicesController from './invoicesController'
 import * as channelController from './channelController'
@@ -17,6 +18,10 @@ import * as networkController from './networkController'
 // TODO - SendPayment
 // TODO - DeleteAllPayments
 
+// const metadata = new grpc.Metadata()
+// var macaroonHex = fs.readFileSync('~/Library/Application Support/Lnd/admin.macaroon').toString('hex')
+// metadata.add('macaroon', macaroonHex)
+
 
 export default function (lnd, event, msg, data) {
   switch (msg) {

app/main.dev.js

@@ -12,10 +12,19 @@
  * @flow
  */
 import { app, BrowserWindow, ipcMain } from 'electron'
+import fs from 'fs'
+import path from 'path'
+import { spawn, exec } from 'child_process'
+import { lookup } from 'ps-node'
+import { platform } from 'os'
 import MenuBuilder from './menu'
-import { lndSubscribe, lndMethods } from './lnd'
+import lnd from './lnd'
+
+const plat = platform()
+let mainWindow = null
+let neutrino = null
+let syncing = false
 
-let mainWindow = null;
 
 if (process.env.NODE_ENV === 'production') {
   const sourceMapSupport = require('source-map-support');
@@ -74,26 +83,101 @@ app.on('ready', async () => {
   //        https://github.com/electron/electron/blob/master/docs/api/browser-window.md#using-ready-to-show-event
   mainWindow.webContents.on('did-finish-load', () => {
     if (!mainWindow) {
-      throw new Error('"mainWindow" is not defined');
+      throw new Error('"mainWindow" is not defined')
     }
     
-    mainWindow.show();
-    mainWindow.focus();
-  });
+    mainWindow.show()
+    mainWindow.focus()
+
+    if (syncing) {
+      mainWindow.webContents.send('lndSyncing')
+    }
+  })
 
   mainWindow.on('closed', () => {
     mainWindow = null;
-  });
+  })
 
   const menuBuilder = new MenuBuilder(mainWindow);
-  menuBuilder.buildMenu();
-  
-  // Subscribe to LND events
-  lndSubscribe(mainWindow)
-
-  // LND CRUD methods
-  ipcMain.on('lnd', (event, { msg, data }) => {
-    lndMethods(event, msg, data)
+  menuBuilder.buildMenu()
+
+  // Check to see if and LND process is running
+  lookup({ command: 'lnd' }, (err, results) => {
+    // There was an error checking for the LND process
+    if (err) { throw new Error( err ) }
+
+    // No LND process was found
+    if (!results.length) {
+      // Let the front end know we have started syncing LND
+      syncing = true
+      // Run a bash script that checks for the LND folder and generates Node.js compatible certs
+      console.log('CHECKING/GENERATING CERTS')
+      exec(`sh ${path.join(__dirname, '..', 'resources', 'scripts', `${plat}_generate_certs.sh`)}`)
+      
+      // After the certs are generated, it's time to start LND
+      console.log('STARTING LND')
+      const lndPath = path.join(__dirname, '..', 'resources', 'bin', plat, plat === 'win32' ? 'lnd.exe' : 'lnd')
+
+      neutrino = spawn(lndPath,
+        [
+          '--bitcoin.active',
+          '--bitcoin.testnet',
+          '--neutrino.active',
+          '--neutrino.connect=faucet.lightning.community:18333',
+          '--autopilot.active',
+          '--debuglevel=debug',
+          '--no-macaroons'
+        ]
+      )
+        .on('error', error => console.log(`lnd error: ${error}`))
+        .on('close', code => console.log(`lnd shutting down ${code}`))
+
+      // Listen for when neutrino prints out data
+      neutrino.stdout.on('data', data => {
+        // Data stored in variable line, log line to the console
+        let line = data.toString('utf8')
+        console.log(line)
+
+        // Pass current clock height progress to front end for loading state UX
+        if (line.includes('Caught up to height')) {
+          const blockHeight = line.slice(line.indexOf('Caught up to height') + 'Caught up to height'.length).trim()
+          mainWindow.webContents.send('lndStdout', blockHeight)
+        }
+
+        // When LND is all caught up to the blockchain
+        if (line.includes('Done catching up block hashes')) {
+          // Log that LND is caught up to the current block height
+          console.log('DONE CATCHING UP BLOCK HASHES')
+          // Call lnd
+          lnd((lndSubscribe, lndMethods) => {
+            // Subscribe to bi-directional streams
+            lndSubscribe(mainWindow)
+
+            // Listen for all gRPC restful methods
+            ipcMain.on('lnd', (event, { msg, data }) => {
+              lndMethods(event, msg, data)
+            })
+
+            // Let the front end know we have stopped syncing LND
+            syncing = false
+            mainWindow.webContents.send('lndSynced')
+          })
+        }
+      })
+    } else {
+      // An LND process was found, no need to start our own
+      console.log('LND ALREADY RUNNING')
+      // Call lnd
+      lnd((lndSubscribe, lndMethods) => {
+        // Subscribe to bi-directional streams
+        lndSubscribe(mainWindow)
+
+        // Listen for all gRPC restful methods
+        ipcMain.on('lnd', (event, { msg, data }) => {
+          lndMethods(event, msg, data)
+        })
+      })
+    }
   })
 });
 

app/package.json

@@ -7,13 +7,19 @@
   "author": {
     "name": "Jack Mallers",
     "email": "jimmymowschess@gmail.com",
-    "url": "https://github.com/chentsulin"
+    "url": "https://github.com/LN-Zap/zap-desktop"
   },
   "scripts": {
-    "postinstall": "npm rebuild --runtime=electron --target=1.6.6 --disturl=https://atom.io/download/atom-shell --build-from-source"
+    "postinstall": "npm rebuild --runtime=electron --target=1.6.6 --disturl=https://atom.io/download/atom-shell --build-from-source",
+    "install-grpc": "cd node_modules/grpc && git submodule update --init && npm run electron-build -- --target=1.6.10"
   },
   "license": "MIT",
   "dependencies": {
+    "grpc": "^1.6.6",
+    "ps-node": "^0.1.6",
     "react-icons": "^2.2.5"
+  },
+  "devDependencies": {
+    "electron-rebuild": "^1.6.0"
   }
 }

app/reducers/index.js

@@ -1,6 +1,7 @@
 // @flow
 import { combineReducers } from 'redux'
 import { routerReducer as router } from 'react-router-redux'
+import lnd from './lnd'
 import ticker from './ticker'
 import info from './info'
 import balance from './balance'
@@ -20,6 +21,7 @@ import activity from './activity'
 
 const rootReducer = combineReducers({
   router,
+  lnd,
   ticker,
   info,
   balance,

app/reducers/ipc.js

@@ -1,4 +1,5 @@
 import createIpc from 'redux-electron-ipc'
+import { lndSyncing, lndSynced, lndStdout } from './lnd'
 import { receiveInfo } from './info'
 import { receiveAddress } from './address'
 import { receiveCryptocurrency } from './ticker'
@@ -32,6 +33,10 @@ import {
 
 // Import all receiving IPC event handlers and pass them into createIpc
 const ipc = createIpc({
+  lndSyncing,
+  lndSynced,
+  lndStdout,
+  
   receiveInfo,
 
   receivePeers,

app/reducers/lnd.js

@@ -0,0 +1,100 @@
+import { createSelector } from 'reselect'
+import { fetchTicker } from './ticker'
+import { fetchBalance } from './balance'
+import { fetchInfo } from './info'
+import { requestBlockHeight } from '../api'
+// ------------------------------------
+// Constants
+// ------------------------------------
+export const START_SYNCING = 'START_SYNCING'
+export const STOP_SYNCING = 'STOP_SYNCING'
+
+export const RECEIVE_LINE = 'RECEIVE_LINE'
+
+export const GET_BLOCK_HEIGHT = 'GET_BLOCK_HEIGHT'
+export const RECEIVE_BLOCK_HEIGHT = 'RECEIVE_BLOCK_HEIGHT'
+
+// ------------------------------------
+// Actions
+// ------------------------------------
+
+// Receive IPC event for LND starting its syncing process
+export const lndSyncing = () => dispatch => dispatch({ type: START_SYNCING })
+
+// Receive IPC event for LND stoping sync
+export const lndSynced = () => dispatch => {
+  // Fetch data now that we know LND is synced
+  dispatch(fetchTicker())
+  dispatch(fetchBalance())
+  dispatch(fetchInfo())
+
+  dispatch({ type: STOP_SYNCING })
+}
+
+// Receive IPC event for LND streaming a line
+export const lndStdout = (event, lndBlockHeight) => dispatch => dispatch({ type: RECEIVE_LINE, lndBlockHeight: lndBlockHeight.split(' ')[0].split(/(\r\n|\n|\r)/gm)[0] })
+
+export function getBlockHeight() {
+  return {
+    type: GET_BLOCK_HEIGHT
+  }
+}
+
+export function receiveBlockHeight(blockHeight) {
+  return {
+    type: RECEIVE_BLOCK_HEIGHT,
+    blockHeight
+  }
+}
+
+// Fetch current block height
+export const fetchBlockHeight = () => async (dispatch) => {
+  dispatch(getBlockHeight())
+  const blockData = await requestBlockHeight()
+  dispatch(receiveBlockHeight(blockData.blocks[0].height))
+}
+
+// ------------------------------------
+// Action Handlers
+// ------------------------------------
+const ACTION_HANDLERS = {
+  [START_SYNCING]: state => ({ ...state, syncing: true }),
+  [STOP_SYNCING]: state => ({ ...state, syncing: false }),
+  
+  [RECEIVE_LINE]: (state, { lndBlockHeight }) => ({ ...state, lndBlockHeight }),
+  
+  [GET_BLOCK_HEIGHT]: state => ({ ...state, fetchingBlockHeight: true }),
+  [RECEIVE_BLOCK_HEIGHT]: (state, { blockHeight }) => ({ ...state, blockHeight, fetchingBlockHeight: false }),
+}
+
+// ------------------------------------
+// Reducer
+// ------------------------------------
+const initialState = {
+  syncing: false,
+  fetchingBlockHeight: false,
+  lines: [],
+  blockHeight: 0,
+  lndBlockHeight: 0
+}
+
+// ------------------------------------
+// Reducer
+// ------------------------------------
+const lndSelectors = {}
+const blockHeightSelector = state => state.lnd.blockHeight
+const lndBlockHeightSelector = state => state.lnd.lndBlockHeight
+
+lndSelectors.syncPercentage = createSelector(
+  blockHeightSelector,
+  lndBlockHeightSelector,
+  (blockHeight, lndBlockHeight) => (Math.floor((lndBlockHeight / blockHeight) * 100))
+)
+
+export { lndSelectors }
+
+export default function lndReducer(state = initialState, action) {
+  const handler = ACTION_HANDLERS[action.type]
+
+  return handler ? handler(state, action) : state
+}

app/routes/app/components/App.js

@@ -1,5 +1,6 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
+import LndSyncing from 'components/LndSyncing'
 import LoadingBolt from 'components/LoadingBolt'
 import Form from 'components/Form'
 import ModalRoot from 'components/ModalRoot'
@@ -8,15 +9,25 @@ import styles from './App.scss'
 
 class App extends Component {
   componentWillMount() {
-    const { fetchTicker, fetchBalance, fetchInfo } = this.props
+    const { fetchTicker, fetchBalance, fetchInfo, lnd: { syncing } } = this.props
 
-    fetchTicker()
-    fetchBalance()
-    fetchInfo()
+    if (syncing) {
+      fetchBlockHeight()
+    }
+
+    if (!syncing) {
+      fetchTicker()
+      fetchBalance()
+      fetchInfo()
+    }
   }
 
   render() {
     const {
+      lnd,
+      syncPercentage,
+      fetchBlockHeight,
+
       modal: { modalType, modalProps },
       hideModal,
       ticker,
@@ -33,6 +44,16 @@ class App extends Component {
       children
     } = this.props
 
+    if (lnd.syncing) {
+      return (
+        <LndSyncing
+          fetchBlockHeight={fetchBlockHeight}
+          fetchingBlockHeight={lnd.fetchingBlockHeight}
+          syncPercentage={syncPercentage}
+        />
+      ) 
+    }
+
     if (!currentTicker) { return <LoadingBolt /> }
 
     return (

app/routes/app/containers/AppContainer.js

@@ -1,3 +1,4 @@
+import { withRouter } from 'react-router'
 import { connect } from 'react-redux'
 import { fetchTicker, setCurrency, tickerSelectors } from 'reducers/ticker'
 import { fetchBalance } from 'reducers/balance'
@@ -14,6 +15,8 @@ import { sendCoins } from 'reducers/transaction'
 import { payInvoice } from 'reducers/payment'
 import { createInvoice, fetchInvoice } from 'reducers/invoice'
 
+import { fetchBlockHeight, lndSelectors } from 'reducers/lnd'
+
 
 import App from '../components/App'
 
@@ -40,10 +43,14 @@ const mapDispatchToProps = {
   sendCoins,
   payInvoice,
   createInvoice,
-  fetchInvoice
+  fetchInvoice,
+
+  fetchBlockHeight
 }
 
 const mapStateToProps = state => ({
+  lnd: state.lnd,
+
   ticker: state.ticker,
   balance: state.balance,
   payment: state.payment,
@@ -62,7 +69,8 @@ const mapStateToProps = state => ({
   currentAmount: payFormSelectors.currentAmount(state),
   inputCaption: payFormSelectors.inputCaption(state),
   showPayLoadingScreen: payFormSelectors.showPayLoadingScreen(state),
-  payFormIsValid: payFormSelectors.payFormIsValid(state)
+  payFormIsValid: payFormSelectors.payFormIsValid(state),
+  syncPercentage: lndSelectors.syncPercentage(state)
 })
 
 const mergeProps = (stateProps, dispatchProps, ownProps) => {
@@ -175,4 +183,4 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
   }
 }
 
-export default connect(mapStateToProps, mapDispatchToProps, mergeProps)(App)
+export default withRouter(connect(mapStateToProps, mapDispatchToProps, mergeProps)(App))

app/store/configureStore.prod.js

@@ -1,15 +1,27 @@
-import { createStore, applyMiddleware } from 'redux'
+import { createStore, applyMiddleware, compose } from 'redux'
 import thunk from 'redux-thunk'
 import { createBrowserHistory } from 'history'
 import { routerMiddleware } from 'react-router-redux'
 import rootReducer from '../reducers'
+import ipc from '../reducers/ipc'
 
-const history = createBrowserHistory();
-const router = routerMiddleware(history);
-const enhancer = applyMiddleware(thunk, router);
+const middleware = []
+const enhancers = []
+
+middleware.push(thunk)
+
+const history = createBrowserHistory({ basename: window.location.pathname })
+const router = routerMiddleware(history)
+
+middleware.push(router)
+
+middleware.push(ipc)
+
+enhancers.push(applyMiddleware(...middleware))
+const enhancer = compose(...enhancers)
 
 function configureStore(initialState) {
-  return createStore(rootReducer, initialState, enhancer);
+  return createStore(rootReducer, initialState, enhancer)
 }
 
-export default { configureStore, history };
+export default { configureStore, history }

darwin_generate_certs.sh

@@ -0,0 +1,13 @@
+echo "insert text here" > outter.txt
+
+# Generate Node.js compatible certs
+# If Lnd folder doesn't exist we have to create it
+if [ ! -d ~/Library/Application\ Support/Lnd ]; then
+  mkdir -p ~/Library/Application\ Support/Lnd;
+fi
+
+# Generate compatible certs
+openssl ecparam -genkey -name prime256v1 -out ~/Library/Application\ Support/Lnd/tls.key
+openssl req -new -sha256 -key ~/Library/Application\ Support/Lnd/tls.key -out ~/Library/Application\ Support/Lnd/csr.csr -subj '/CN=localhost/O=lnd'
+openssl req -x509 -sha256 -days 3650 -key ~/Library/Application\ Support/Lnd/tls.key -in ~/Library/Application\ Support/Lnd/csr.csr -out ~/Library/Application\ Support/Lnd/tls.cert
+rm ~/Library/Application\ Support/Lnd/csr.csr

linux_generate_certs.sh

@@ -0,0 +1,11 @@
+# Generate Node.js compatible certs
+# If Lnd folder doesn't exist we have to create it
+if [ ! -d ~/Library/Application\ Support/Lnd ]; then
+  mkdir -p ~/.lnd;
+fi
+
+# Generate compatible certs
+openssl ecparam -genkey -name prime256v1 -out ~/Library/Application\ Support/Lnd/tls.key
+openssl req -new -sha256 -key ~/Library/Application\ Support/Lnd/tls.key -out ~/Library/Application\ Support/Lnd/csr.csr -subj '/CN=localhost/O=lnd'
+openssl req -x509 -sha256 -days 3650 -key ~/Library/Application\ Support/Lnd/tls.key -in ~/Library/Application\ Support/Lnd/csr.csr -out ~/Library/Application\ Support/Lnd/tls.cert
+rm ~/Library/Application\ Support/Lnd/csr.csr

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zap-desktop",
-  "productName": "zap-desktop",
+  "productName": "ZapDesktop",
   "version": "0.0.1",
   "description": "desktop application for the lightning network",
   "scripts": {
@@ -28,19 +28,21 @@
     "test-all": "npm run lint && npm run flow && npm run build && npm run test && npm run test-e2e",
     "test-e2e": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 node --trace-warnings ./test/runTests.js e2e",
     "test-watch": "npm test -- --watch",
-    "lnd": "lnd --bitcoin.active --bitcoin.testnet --debuglevel=debug --neutrino.active --neutrino.connect=faucet.lightning.community:18333 --no-macaroons"
+    "install-grpc": "cd app && npm run install-grpc"
   },
   "browserslist": "electron 1.6",
   "build": {
-    "productName": "Zap",
-    "appId": "org.develar.Zap",
+    "productName": "ZapDesktop",
+    "appId": "org.develar.ZapDesktop",
     "files": [
       "dist/",
+      "resources/",
       "node_modules/",
       "app.html",
       "main.prod.js",
       "main.prod.js.map",
-      "package.json"
+      "package.json",
+      "rpc.proto"
     ],
     "dmg": {
       "icon": "./resources/zap_2.icns",
@@ -72,13 +74,21 @@
     "directories": {
       "buildResources": "resources",
       "output": "release"
-    }
+    },
+    "extraResources": [
+      "**/resources/bin/darwin/lnd",
+      "**/resources/bin/linux/lnd",
+      "**/resources/bin/win32/lnd",
+      "**/resources/scripts/*",
+      "**/resources/zap_2.svg",
+      "**/resources/cloudbolt.svg"
+    ]
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/LN-Zap/zap-desktop"
   },
-  "author": "Jack Mallers <jimmymowschess@gmail.com> (https://github.com/chentsulin)",
+  "author": "Jack Mallers <jimmymowschess@gmail.com> (https://github.com/jackmallers)",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/LN-Zap/zap-desktop/issues"
@@ -141,7 +151,6 @@
     "electron": "^1.6.10",
     "electron-builder": "^19.8.0",
     "electron-devtools-installer": "^2.2.0",
-    "electron-rebuild": "^1.6.0",
     "enzyme": "^2.9.1",
     "enzyme-to-json": "^1.5.1",
     "eslint": "^4.4.1",
@@ -157,7 +166,7 @@
     "eslint-plugin-promise": "^3.5.0",
     "eslint-plugin-react": "^7.2.1",
     "express": "^4.15.3",
-    "extract-text-webpack-plugin": "^2.1.0",
+    "extract-text-webpack-plugin": "^3.0.1",
     "fbjs-scripts": "^0.8.0",
     "file-loader": "^0.11.1",
     "flow-bin": "^0.48.0",
@@ -181,7 +190,7 @@
     "stylelint": "^7.12.0",
     "stylelint-config-standard": "^16.0.0",
     "url-loader": "^0.5.8",
-    "webpack": "^3.0.0",
+    "webpack": "^3.7.1",
     "webpack-bundle-analyzer": "^2.8.2",
     "webpack-dev-server": "^2.5.0",
     "webpack-merge": "^4.1.0"
@@ -193,7 +202,6 @@
     "devtron": "^1.4.0",
     "electron-debug": "^1.2.0",
     "font-awesome": "^4.7.0",
-    "grpc": "^1.4.1",
     "history": "^4.6.3",
     "lodash": "^4.17.4",
     "moment-timezone": "^0.5.13",

resources/scripts/darwin_generate_certs.sh

@@ -0,0 +1,12 @@
+
+# Generate Node.js compatible certs
+# If Lnd folder doesn't exist we have to create it
+if [ ! -d ~/Library/Application\ Support/Lnd ]; then
+  mkdir -p ~/Library/Application\ Support/Lnd;
+fi
+
+# Generate compatible certs
+openssl ecparam -genkey -name prime256v1 -out ~/Library/Application\ Support/Lnd/tls.key
+openssl req -new -sha256 -key ~/Library/Application\ Support/Lnd/tls.key -out ~/Library/Application\ Support/Lnd/csr.csr -subj '/CN=localhost/O=lnd'
+openssl req -x509 -sha256 -days 3650 -key ~/Library/Application\ Support/Lnd/tls.key -in ~/Library/Application\ Support/Lnd/csr.csr -out ~/Library/Application\ Support/Lnd/tls.cert
+rm ~/Library/Application\ Support/Lnd/csr.csr

resources/scripts/linux_generate_certs.sh

@@ -0,0 +1,11 @@
+# Generate Node.js compatible certs
+# If Lnd folder doesn't exist we have to create it
+if [ ! -d ~/Library/Application\ Support/Lnd ]; then
+  mkdir -p ~/.lnd;
+fi
+
+# Generate compatible certs
+openssl ecparam -genkey -name prime256v1 -out ~/Library/Application\ Support/Lnd/tls.key
+openssl req -new -sha256 -key ~/Library/Application\ Support/Lnd/tls.key -out ~/Library/Application\ Support/Lnd/csr.csr -subj '/CN=localhost/O=lnd'
+openssl req -x509 -sha256 -days 3650 -key ~/Library/Application\ Support/Lnd/tls.key -in ~/Library/Application\ Support/Lnd/csr.csr -out ~/Library/Application\ Support/Lnd/tls.cert
+rm ~/Library/Application\ Support/Lnd/csr.csr

resources/scripts/win32_generate_certs.sh

@@ -0,0 +1,11 @@
+# Generate Node.js compatible certs
+# If Lnd folder doesn't exist we have to create it
+if [ ! -d ~/Library/Application\ Support/Lnd ]; then
+  mkdir -p ~/AppData/Local/Lnd;
+fi
+
+# Generate compatible certs
+openssl ecparam -genkey -name prime256v1 -out ~/Library/Application\ Support/Lnd/tls.key
+openssl req -new -sha256 -key ~/Library/Application\ Support/Lnd/tls.key -out ~/Library/Application\ Support/Lnd/csr.csr -subj '/CN=localhost/O=lnd'
+openssl req -x509 -sha256 -days 3650 -key ~/Library/Application\ Support/Lnd/tls.key -in ~/Library/Application\ Support/Lnd/csr.csr -out ~/Library/Application\ Support/Lnd/tls.cert
+rm ~/Library/Application\ Support/Lnd/csr.csr

webpack.config.renderer.dev.js

@@ -8,15 +8,15 @@
  * https://webpack.js.org/concepts/hot-module-replacement/
  */
 
-import path from 'path';
-import fs from 'fs';
-import webpack from 'webpack';
-import chalk from 'chalk';
-import merge from 'webpack-merge';
-import { spawn, execSync } from 'child_process';
-import ExtractTextPlugin from 'extract-text-webpack-plugin';
-import baseConfig from './webpack.config.base';
-import CheckNodeEnv from './internals/scripts/CheckNodeEnv';
+import path from 'path'
+import fs from 'fs'
+import webpack from 'webpack'
+import chalk from 'chalk'
+import merge from 'webpack-merge'
+import { spawn, execSync } from 'child_process'
+import ExtractTextPlugin from 'extract-text-webpack-plugin'
+import baseConfig from './webpack.config.base'
+import CheckNodeEnv from './internals/scripts/CheckNodeEnv'
 
 CheckNodeEnv('development');
 

win32_generate_certs.sh

@@ -0,0 +1,11 @@
+# Generate Node.js compatible certs
+# If Lnd folder doesn't exist we have to create it
+if [ ! -d ~/Library/Application\ Support/Lnd ]; then
+  mkdir -p ~/AppData/Local/Lnd;
+fi
+
+# Generate compatible certs
+openssl ecparam -genkey -name prime256v1 -out ~/Library/Application\ Support/Lnd/tls.key
+openssl req -new -sha256 -key ~/Library/Application\ Support/Lnd/tls.key -out ~/Library/Application\ Support/Lnd/csr.csr -subj '/CN=localhost/O=lnd'
+openssl req -x509 -sha256 -days 3650 -key ~/Library/Application\ Support/Lnd/tls.key -in ~/Library/Application\ Support/Lnd/csr.csr -out ~/Library/Application\ Support/Lnd/tls.cert
+rm ~/Library/Application\ Support/Lnd/csr.csr

yarn.lock

@@ -246,10 +246,6 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-arguejs@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/arguejs/-/arguejs-0.2.3.tgz#b6f939f5fe0e3cd1f3f93e2aa9262424bf312af7"
-
 aria-query@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-0.7.0.tgz#4af10a1e61573ddea0cf3b99b51c52c05b424d24"
@@ -326,13 +322,6 @@ asar-integrity@0.1.1:
     bluebird-lst "^1.0.2"
     fs-extra-p "^4.3.0"
 
-ascli@~1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ascli/-/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc"
-  dependencies:
-    colour "~0.7.1"
-    optjs "~3.2.2"
-
 asn1.js@^4.0.0:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
@@ -381,6 +370,12 @@ async@^2.0.0, async@^2.1.2, async@^2.1.4, async@^2.1.5:
   dependencies:
     lodash "^4.14.0"
 
+async@^2.4.1:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
+  dependencies:
+    lodash "^4.14.0"
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -1762,12 +1757,6 @@ builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
 
-bytebuffer@~5:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd"
-  dependencies:
-    long "~3"
-
 bytes@2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.3.0.tgz#d5b680a165b6201739acb611542aabc2d8ceb070"
@@ -1804,7 +1793,7 @@ camelcase@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
 
-camelcase@^2.0.0, camelcase@^2.0.1:
+camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
 
@@ -1919,7 +1908,7 @@ cheerio@^0.22.0:
     lodash.reject "^4.4.0"
     lodash.some "^4.4.0"
 
-chokidar@^1.4.3, chokidar@^1.6.0:
+chokidar@^1.6.0, chokidar@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -1974,10 +1963,6 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-spinners@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.0.0.tgz#ef987ed3d48391ac3dab9180b406a742180d6e6a"
-
 cli-width@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
@@ -1990,7 +1975,7 @@ cliui@^2.1.0:
     right-align "^0.1.1"
     wordwrap "0.0.2"
 
-cliui@^3.0.3, cliui@^3.2.0:
+cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
   dependencies:
@@ -2095,10 +2080,6 @@ colors@^1.1.2, colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
-colour@~0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778"
-
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
@@ -2189,6 +2170,10 @@ connect-history-api-fallback@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169"
 
+connected-domain@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/connected-domain/-/connected-domain-1.0.0.tgz#bfe77238c74be453a79f0cb6058deeb4f2358e93"
+
 console-browserify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
@@ -2585,7 +2570,7 @@ debug@2.6.7:
   dependencies:
     ms "2.0.0"
 
-debug@2.6.8, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.4.5, debug@^2.5.1, debug@^2.6.0, debug@^2.6.1, debug@^2.6.3, debug@^2.6.6, debug@^2.6.8:
+debug@2.6.8, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.4.5, debug@^2.6.0, debug@^2.6.1, debug@^2.6.3, debug@^2.6.6, debug@^2.6.8:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
@@ -3033,20 +3018,6 @@ electron-publish@19.8.0:
     fs-extra-p "^4.3.0"
     mime "^1.3.6"
 
-electron-rebuild@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.6.0.tgz#e8d26f4d8e9fe5388df35864b3658e5cfd4dcb7e"
-  dependencies:
-    colors "^1.1.2"
-    debug "^2.6.3"
-    fs-extra "^3.0.1"
-    node-abi "^2.0.0"
-    node-gyp "^3.6.0"
-    ora "^1.2.0"
-    rimraf "^2.6.1"
-    spawn-rx "^2.0.10"
-    yargs "^7.0.2"
-
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.11:
   version "1.3.14"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz#64af0f9efd3c3c6acd57d71f83b49ca7ee9c4b43"
@@ -3104,14 +3075,14 @@ end-of-stream@^1.0.0:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
+enhanced-resolve@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
     object-assign "^4.0.1"
-    tapable "^0.2.5"
+    tapable "^0.2.7"
 
 enhanced-resolve@~0.9.0:
   version "0.9.1"
@@ -3625,12 +3596,12 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extract-text-webpack-plugin@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz#756ef4efa8155c3681833fbc34da53b941746d6c"
+extract-text-webpack-plugin@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.1.tgz#605a8893faca1dd49bb0d2ca87493f33fd43d102"
   dependencies:
-    async "^2.1.2"
-    loader-utils "^1.0.2"
+    async "^2.4.1"
+    loader-utils "^1.1.0"
     schema-utils "^0.3.0"
     webpack-sources "^1.0.1"
 
@@ -4162,16 +4133,6 @@ growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
 
-grpc@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/grpc/-/grpc-1.4.1.tgz#3ee4a8346a613f2823928c9f8f99081b6368ec7c"
-  dependencies:
-    arguejs "^0.2.3"
-    lodash "^4.15.0"
-    nan "^2.0.0"
-    node-pre-gyp "^0.6.35"
-    protobufjs "^5.0.0"
-
 gulp-util@^3.0.4:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
@@ -5678,10 +5639,6 @@ lolex@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6"
 
-long@~3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
-
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -5957,7 +5914,7 @@ mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
 
-nan@^2.0.0, nan@^2.3.0, nan@^2.3.2:
+nan@^2.3.0, nan@^2.3.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
 
@@ -5989,10 +5946,6 @@ no-case@^2.2.0:
   dependencies:
     lower-case "^1.1.1"
 
-node-abi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.1.0.tgz#50ad834affcf17440e12bfc5f9ba0946f572d10c"
-
 node-emoji@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.5.1.tgz#fd918e412769bf8c448051238233840b2aff16a1"
@@ -6010,7 +5963,7 @@ node-forge@0.6.33:
   version "0.6.33"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz#463811879f573d45155ad6a9f43dc296e8e85ebc"
 
-node-gyp@^3.3.1, node-gyp@^3.6.0:
+node-gyp@^3.3.1:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60"
   dependencies:
@@ -6097,7 +6050,7 @@ node-notifier@^5.0.2:
     shellwords "^0.1.0"
     which "^1.2.12"
 
-node-pre-gyp@^0.6.29, node-pre-gyp@^0.6.35:
+node-pre-gyp@^0.6.29:
   version "0.6.36"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz#db604112cb74e0d477554e9b505b17abddfab786"
   dependencies:
@@ -6354,19 +6307,6 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
-optjs@~3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"
-
-ora@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-1.3.0.tgz#80078dd2b92a934af66a3ad72a5b910694ede51a"
-  dependencies:
-    chalk "^1.1.1"
-    cli-cursor "^2.1.0"
-    cli-spinners "^1.0.0"
-    log-symbols "^1.0.2"
-
 original@>=0.0.5:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.0.tgz#9147f93fa1696d04be61e01bd50baeaca656bd3b"
@@ -7013,15 +6953,6 @@ prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8:
     fbjs "^0.8.9"
     loose-envify "^1.3.1"
 
-protobufjs@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.2.tgz#59748d7dcf03d2db22c13da9feb024e16ab80c91"
-  dependencies:
-    ascli "~1"
-    bytebuffer "~5"
-    glob "^7.0.5"
-    yargs "^3.10.0"
-
 proxy-addr@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3"
@@ -7033,6 +6964,12 @@ prr@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
 
+ps-node@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/ps-node/-/ps-node-0.1.6.tgz#9af67a99d7b1d0132e51a503099d38a8d2ace2c3"
+  dependencies:
+    table-parser "^0.1.3"
+
 pseudomap@^1.0.1, pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
@@ -7690,12 +7627,6 @@ rx@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
 
-rxjs@^5.1.1:
-  version "5.4.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.4.3.tgz#0758cddee6033d68e0fd53676f0f3596ce3d483f"
-  dependencies:
-    symbol-observable "^1.0.1"
-
 safe-buffer@^5.0.1, safe-buffer@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.0.tgz#fe4c8460397f9eaaaa58e73be46273408a45e223"
@@ -8010,14 +7941,6 @@ spawn-command@^0.0.2-1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e"
 
-spawn-rx@^2.0.10:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/spawn-rx/-/spawn-rx-2.0.11.tgz#65451ad65662801daea75549832a782de0048dbf"
-  dependencies:
-    debug "^2.5.1"
-    lodash.assign "^4.2.0"
-    rxjs "^5.1.1"
-
 spdx-correct@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
@@ -8417,7 +8340,7 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.1.2, supports-color@^3.2.3, supports-color@~3.2.3:
+supports-color@^3.1.1, supports-color@^3.1.2, supports-color@^3.2.3, supports-color@~3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
@@ -8429,6 +8352,12 @@ supports-color@^4.0.0:
   dependencies:
     has-flag "^2.0.0"
 
+supports-color@^4.2.1:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
+  dependencies:
+    has-flag "^2.0.0"
+
 svg-injector@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/svg-injector/-/svg-injector-1.1.3.tgz#8fba18d7419e5f818e712c4f82d83ee357610e61"
@@ -8453,7 +8382,7 @@ svgpath@^2.1.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/svgpath/-/svgpath-2.2.1.tgz#0834bb67c89a76472b2bd06cc101fa7b517b222c"
 
-symbol-observable@^1.0.1, symbol-observable@^1.0.3:
+symbol-observable@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
 
@@ -8467,6 +8396,12 @@ synesthesia@^1.0.1:
   dependencies:
     css-color-names "0.0.3"
 
+table-parser@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/table-parser/-/table-parser-0.1.3.tgz#0441cfce16a59481684c27d1b5a67ff15a43c7b0"
+  dependencies:
+    connected-domain "^1.0.0"
+
 table@^3.7.8:
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
@@ -8493,9 +8428,9 @@ tapable@^0.1.8:
   version "0.1.10"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4"
 
-tapable@^0.2.5, tapable@~0.2.5:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d"
+tapable@^0.2.7:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
 
 tar-pack@^3.4.0:
   version "3.4.0"
@@ -8749,7 +8684,7 @@ uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
-uglifyjs-webpack-plugin@^0.4.4:
+uglifyjs-webpack-plugin@^0.4.6:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
   dependencies:
@@ -8980,12 +8915,12 @@ watch@~0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/watch/-/watch-0.10.0.tgz#77798b2da0f9910d595f1ace5b0c2258521f21dc"
 
-watchpack@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87"
+watchpack@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
   dependencies:
     async "^2.1.2"
-    chokidar "^1.4.3"
+    chokidar "^1.7.0"
     graceful-fs "^4.1.2"
 
 wbuf@^1.1.0, wbuf@^1.7.2:
@@ -9097,16 +9032,16 @@ webpack-sources@^1.0.1:
     source-list-map "^2.0.0"
     source-map "~0.5.3"
 
-webpack@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.0.0.tgz#ee9bcebf21247f7153cb410168cab45e3a59d4d7"
+webpack@^3.7.1:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.7.1.tgz#6046b5c415ff7df7a0dc54c5b6b86098e8b952da"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
     ajv "^5.1.5"
     ajv-keywords "^2.0.0"
     async "^2.1.2"
-    enhanced-resolve "^3.0.0"
+    enhanced-resolve "^3.4.0"
     escope "^3.6.0"
     interpret "^1.0.0"
     json-loader "^0.5.4"
@@ -9117,12 +9052,12 @@ webpack@^3.0.0:
     mkdirp "~0.5.0"
     node-libs-browser "^2.0.0"
     source-map "^0.5.3"
-    supports-color "^3.1.0"
-    tapable "~0.2.5"
-    uglifyjs-webpack-plugin "^0.4.4"
-    watchpack "^1.3.1"
+    supports-color "^4.2.1"
+    tapable "^0.2.7"
+    uglifyjs-webpack-plugin "^0.4.6"
+    watchpack "^1.4.0"
     webpack-sources "^1.0.1"
-    yargs "^6.0.0"
+    yargs "^8.0.2"
 
 websocket-driver@>=0.5.1:
   version "0.6.5"
@@ -9195,10 +9130,6 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
-window-size@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
-
 window-size@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
@@ -9292,7 +9223,7 @@ xtend@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a"
 
-y18n@^3.2.0, y18n@^3.2.1:
+y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
@@ -9329,18 +9260,6 @@ yargs@^1.2.6:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.3.3.tgz#054de8b61f22eefdb7207059eaef9d6b83fb931a"
 
-yargs@^3.10.0:
-  version "3.32.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
-  dependencies:
-    camelcase "^2.0.1"
-    cliui "^3.0.3"
-    decamelize "^1.1.1"
-    os-locale "^1.4.0"
-    string-width "^1.0.1"
-    window-size "^0.1.4"
-    y18n "^3.2.0"
-
 yargs@^3.5.4, yargs@~3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"