Browse Source

enhance(lnd config): Move LND settings Zap uses into the local lnd.conf

This enables easy access to all lnd settings for development, and is a step
toward relying on an external configuration file that will be accessible to
users for whom the code is not.
renovate/lint-staged-8.x
Ben Woosley 7 years ago
parent
commit
d5211076fd
No known key found for this signature in database GPG Key ID: 6EE5F3785F78B345
  1. 1
      app/lnd/config/index.js
  2. 11
      app/main.dev.js
  3. 1
      package.json
  4. 16
      resources/lnd.conf

1
app/lnd/config/index.js

@ -60,6 +60,7 @@ if (process.env.NODE_ENV === 'development') {
export default { export default {
lnd: () => ({ lnd: () => ({
lndPath, lndPath,
configPath: join(appRootPath, 'resources', 'lnd.conf'),
lightningRpc: join(appRootPath, 'resources', 'rpc.proto'), lightningRpc: join(appRootPath, 'resources', 'rpc.proto'),
lightningHost: store.get('host') || 'localhost:10009', lightningHost: store.get('host') || 'localhost:10009',
cert: store.get('cert') || join(userInfo().homedir, loc), cert: store.get('cert') || join(userInfo().homedir, loc),

11
app/main.dev.js

@ -154,16 +154,7 @@ const startLnd = (alias, autopilot) => {
mainLog.debug(' > cert:', lndConfig.cert) mainLog.debug(' > cert:', lndConfig.cert)
mainLog.debug(' > macaroon:', lndConfig.macaroon) mainLog.debug(' > macaroon:', lndConfig.macaroon)
const neutrinoArgs = [ const neutrinoArgs = [`--configfile=${lndConfig.configPath}`, `${autopilot ? '--autopilot.active' : ''}`, `${alias ? `--alias=${alias}` : ''}`]
'--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 neutrino = spawn(lndConfig.lndPath, neutrinoArgs) const neutrino = spawn(lndConfig.lndPath, neutrinoArgs)
.on('error', error => { .on('error', error => {

1
package.json

@ -88,6 +88,7 @@
"output": "release" "output": "release"
}, },
"extraResources": [ "extraResources": [
"resources/lnd.conf",
"resources/rpc.proto", "resources/rpc.proto",
{ {
"from": "resources/bin/${platform}", "from": "resources/bin/${platform}",

16
resources/lnd.conf

@ -1,4 +1,6 @@
; Imported from https://github.com/lightningnetwork/lnd/blob/v0.4.2-beta/sample-lnd.conf ; Imported from https://github.com/lightningnetwork/lnd/blob/v0.4.2-beta/sample-lnd.conf
; updated to include default Zap settings
[Application Options] [Application Options]
; The directory that lnd stores all wallet, chain, and channel related data ; The directory that lnd stores all wallet, chain, and channel related data
@ -85,7 +87,7 @@
; You may also specify <subsystem>=<level>,<subsystem2>=<level>,... to set ; You may also specify <subsystem>=<level>,<subsystem2>=<level>,... to set
; log level for individual subsystems. Use btcd --debuglevel=show to list ; log level for individual subsystems. Use btcd --debuglevel=show to list
; available subsystems. ; available subsystems.
; debuglevel=info debuglevel=debug
; Write CPU profile to the specified file. ; Write CPU profile to the specified file.
; cpuprofile= ; cpuprofile=
@ -123,22 +125,22 @@
bitcoin.active=1 bitcoin.active=1
; Use Bitcoin's test network. ; Use Bitcoin's test network.
; bitcoin.testnet=1 bitcoin.testnet=1
;
; Use Bitcoin's simulation test network ; Use Bitcoin's simulation test network
bitcoin.simnet=1 ; bitcoin.simnet=1
; Use Bitcoin's regression test network ; Use Bitcoin's regression test network
; bitcoin.regtest=false ; bitcoin.regtest=false
; Use the btcd back-end ; Use the btcd back-end
bitcoin.node=btcd ; bitcoin.node=btcd
; Use the bitcoind back-end ; Use the bitcoind back-end
; bitcoin.node=bitcoind ; bitcoin.node=bitcoind
; Use the neutrino (light client) back-end ; 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 ; 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 ; 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. ; Add a peer to connect with at startup.
; neutrino.addpeer= ; neutrino.addpeer=
neutrino.connect=188.166.148.62
neutrino.connect=127.0.0.1:18333
[Litecoin] [Litecoin]

Loading…
Cancel
Save