diff --git a/app/lnd/config/index.js b/app/lnd/config/index.js index ba33ff9a..dd732c9e 100644 --- a/app/lnd/config/index.js +++ b/app/lnd/config/index.js @@ -60,6 +60,7 @@ if (process.env.NODE_ENV === 'development') { export default { lnd: () => ({ lndPath, + configPath: join(appRootPath, 'resources', 'lnd.conf'), lightningRpc: join(appRootPath, 'resources', 'rpc.proto'), lightningHost: store.get('host') || 'localhost:10009', cert: store.get('cert') || join(userInfo().homedir, loc), diff --git a/app/main.dev.js b/app/main.dev.js index daed4379..96413d0a 100644 --- a/app/main.dev.js +++ b/app/main.dev.js @@ -154,16 +154,7 @@ const startLnd = (alias, autopilot) => { mainLog.debug(' > cert:', lndConfig.cert) mainLog.debug(' > macaroon:', lndConfig.macaroon) - const neutrinoArgs = [ - '--bitcoin.active', - '--bitcoin.testnet', - '--bitcoin.node=neutrino', - '--neutrino.connect=188.166.148.62', - '--neutrino.connect=127.0.0.1:18333', - '--debuglevel=debug', - `${autopilot ? '--autopilot.active' : ''}`, - `${alias ? `--alias=${alias}` : ''}` - ] + const neutrinoArgs = [`--configfile=${lndConfig.configPath}`, `${autopilot ? '--autopilot.active' : ''}`, `${alias ? `--alias=${alias}` : ''}`] const neutrino = spawn(lndConfig.lndPath, neutrinoArgs) .on('error', error => { diff --git a/package.json b/package.json index c3c4a058..e7e81276 100644 --- a/package.json +++ b/package.json @@ -88,6 +88,7 @@ "output": "release" }, "extraResources": [ + "resources/lnd.conf", "resources/rpc.proto", { "from": "resources/bin/${platform}", diff --git a/resources/lnd.conf b/resources/lnd.conf index 46256820..b13b97f8 100644 --- a/resources/lnd.conf +++ b/resources/lnd.conf @@ -1,4 +1,6 @@ ; Imported from https://github.com/lightningnetwork/lnd/blob/v0.4.2-beta/sample-lnd.conf +; updated to include default Zap settings + [Application Options] ; The directory that lnd stores all wallet, chain, and channel related data @@ -85,7 +87,7 @@ ; You may also specify =,=,... to set ; log level for individual subsystems. Use btcd --debuglevel=show to list ; available subsystems. -; debuglevel=info +debuglevel=debug ; Write CPU profile to the specified file. ; cpuprofile= @@ -123,22 +125,22 @@ bitcoin.active=1 ; Use Bitcoin's test network. -; bitcoin.testnet=1 -; +bitcoin.testnet=1 + ; Use Bitcoin's simulation test network -bitcoin.simnet=1 +; bitcoin.simnet=1 ; Use Bitcoin's regression test network ; bitcoin.regtest=false ; Use the btcd back-end -bitcoin.node=btcd +; bitcoin.node=btcd ; Use the bitcoind back-end ; bitcoin.node=bitcoind ; Use the neutrino (light client) back-end -; bitcoin.node=neutrino +bitcoin.node=neutrino ; The default number of confirmations a channel must have before it's considered ; open. We'll require any incoming channel requests to wait this many @@ -207,6 +209,8 @@ bitcoin.node=btcd ; Add a peer to connect with at startup. ; neutrino.addpeer= +neutrino.connect=188.166.148.62 +neutrino.connect=127.0.0.1:18333 [Litecoin]