Merge pull request #441 from lightninglabs/rpc

Rpc

Author: tanx

README.md

@@ -23,7 +23,7 @@ To build the UI style guide
 npm run storybook
 ```
 
-To start start the app:
+To start start the app in development mode (simnet):
 ```
 npm run electron-dev
 ```
@@ -32,13 +32,34 @@ Running in development mode can allow you to run in full node mode instead of th
 
 ### Building the Packaged App
 
-To build the packaged version of the app for your current platform, run:
+To build the packaged version of the app e.g. for macOS run:
 ```
+cp $GOPATH/bin/lnd ./assets/bin/darwin
 npm run electron-pack
 ```
 
 The packaged app will then be available in the lightning-app/dist directory. The packaged version of the app will run on Bitcoin testnet. To debug a packaged app, go to localhost:9997 in your browser.
 
+### Starting the Packaged App (light client)
+
+To run the packaged version of the app e.g. for macOS run:
+```
+./dist/mac/Lightning.app/Contents/MacOS/Lightning
+```
+
+### Starting the Packaged App (full node)
+
+Start btcd in a seperate terminal session and wait until it's fully synced (can take over a day)
+```
+mkdir $HOME/Library/Application\ Support/Btcd && touch $HOME/Library/Application\ Support/Btcd/btcd.conf
+btcd --testnet --txindex --rpcuser=kek --rpcpass=kek
+```
+
+To run the packaged version of the app e.g. for macOS run:
+```
+./dist/mac/Lightning.app/Contents/MacOS/Lightning --rpcuser=kek --rpcpass=kek
+```
+
 
 ### Logs
 Logs are written to the following locations:

public/electron.js

@@ -46,6 +46,9 @@ ipcMain.on('log-error', (event, arg) => log.error(...arg));
 let logQueue = [];
 let logsReady = false;
 
+const getArgv = arg =>
+  (process.argv.find(a => a.includes(`--${arg}=`)) || '').split('=')[1];
+
 const sendLog = log => {
   if (win && logsReady) {
     win.webContents.send('logs', log);
@@ -131,6 +134,8 @@ const startLnd = async () => {
     });
     lndProcess = await startLndProcess({
       isDev,
+      rpcUser: getArgv('rpcuser'),
+      rpcPass: getArgv('rpcpass'),
       lndSettingsDir,
       macaroonsEnabled: MACAROONS_ENABLED,
       lndPort: LND_PORT,

public/lnd-child-process.js

@@ -47,6 +47,8 @@ function startBlockingProcess(name, args, logger) {
 
 module.exports.startLndProcess = async function({
   isDev,
+  rpcUser,
+  rpcPass,
   macaroonsEnabled,
   lndSettingsDir,
   lndPort,
@@ -55,16 +57,17 @@ module.exports.startLndProcess = async function({
   lndRestPort,
 }) {
   if (!lndSettingsDir) throw new Error('lndSettingsDir not set!');
+  const rpc = !!rpcUser;
   const processName = 'lnd';
   const args = [
     '--bitcoin.active',
     isDev ? '--bitcoin.simnet' : '--bitcoin.testnet',
-    isDev ? '--btcd.rpcuser=kek' : '',
-    isDev ? '--btcd.rpcpass=kek' : '',
-    isDev ? '--bitcoin.node=btcd' : '--bitcoin.node=neutrino',
-    isDev ? '' : `--configfile=${path.join(lndSettingsDir, 'lnd.conf')}`,
-    isDev ? '' : '--neutrino.connect=btcd0.lightning.engineering',
-    isDev ? '' : '--neutrino.connect=127.0.0.1:18333',
+    isDev || rpc ? `--btcd.rpcuser=${rpcUser || 'kek'}` : '',
+    isDev || rpc ? `--btcd.rpcpass=${rpcPass || 'kek'}` : '',
+    isDev || rpc ? '--bitcoin.node=btcd' : '--bitcoin.node=neutrino',
+    isDev || rpc ? '' : `--configfile=${path.join(lndSettingsDir, 'lnd.conf')}`,
+    isDev || rpc ? '' : '--neutrino.connect=btcd0.lightning.engineering',
+    isDev || rpc ? '' : '--neutrino.connect=127.0.0.1:18333',
     isDev ? '' : '--autopilot.active',
 
     macaroonsEnabled ? '' : '--no-macaroons',