From 376c2ff201373c9358d19abbdcea25a9a8a1f097 Mon Sep 17 00:00:00 2001 From: Valentine Wallace Date: Fri, 7 Sep 2018 19:32:22 -0700 Subject: [PATCH 1/2] Use different ports for lnd/grpc in case a user already has an lnd node running on localhost --- public/electron.js | 2 ++ src/config.js | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/public/electron.js b/public/electron.js index 85dcb8cd4..76a93caea 100644 --- a/public/electron.js +++ b/public/electron.js @@ -12,6 +12,7 @@ const { NETWORK, LND_PORT, LND_PEER_PORT, + LND_REST_PORT, LND_INIT_DELAY, BTCD_MINING_ADDRESS, } = require('../src/config'); @@ -140,6 +141,7 @@ const startLnd = async () => { lndSettingsDir, lndPort: LND_PORT, lndPeerPort: LND_PEER_PORT, + lndRestPort: LND_REST_PORT, logger: Logger, lndArgs, }); diff --git a/src/config.js b/src/config.js index f80868f5c..a9f7176ca 100644 --- a/src/config.js +++ b/src/config.js @@ -7,8 +7,10 @@ module.exports.LND_INIT_DELAY = 5000; module.exports.NOTIFICATION_DELAY = 5000; module.exports.RATE_DELAY = 15 * 60 * 1000; -module.exports.LND_PORT = 10009; -module.exports.LND_PEER_PORT = 10019; +module.exports.LND_PORT = 10006; +module.exports.LND_PEER_PORT = 10016; +module.exports.LND_REST_PORT = 8086; + module.exports.NETWORK = 'testnet'; module.exports.BTCD_MINING_ADDRESS = 'rfu4i1Mo2NF7TQsN9bMVLFSojSzcyQCEH5'; From cf2928954e801c9da72a6633d31b191da48948c5 Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Mon, 10 Sep 2018 11:30:01 +0200 Subject: [PATCH 2/2] Update docs --- assets/script/setup_local_cluster.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/assets/script/setup_local_cluster.md b/assets/script/setup_local_cluster.md index e4b556733..5169ec44e 100644 --- a/assets/script/setup_local_cluster.md +++ b/assets/script/setup_local_cluster.md @@ -11,9 +11,9 @@ After initiating the wallet and setting your password close the app again. ``` btcd --txindex --simnet --rpcuser=kek --rpcpass=kek --datadir=data/btcd/data --logdir=data/btcd/logs -lnd --rpclisten=localhost:10009 --listen=localhost:10019 --restlisten=localhost:8009 --lnddir=data/lnd --debuglevel=info --bitcoin.simnet --bitcoin.active --bitcoin.node=btcd --btcd.rpcuser=kek --btcd.rpcpass=kek +lnd --rpclisten=localhost:10006 --listen=localhost:10016 --restlisten=localhost:8086 --lnddir=data/lnd --debuglevel=info --bitcoin.simnet --bitcoin.active --bitcoin.node=btcd --btcd.rpcuser=kek --btcd.rpcpass=kek -lncli --network=simnet --rpcserver=localhost:10009 --lnddir=data/lnd unlock +lncli --network=simnet --rpcserver=localhost:10006 --lnddir=data/lnd unlock lnd --rpclisten=localhost:10002 --listen=localhost:10012 --restlisten=localhost:8002 --lnddir=data/lnd2 --debuglevel=info --bitcoin.simnet --bitcoin.active --bitcoin.node=btcd --btcd.rpcuser=kek --btcd.rpcpass=kek --noencryptwallet ``` @@ -21,7 +21,7 @@ lnd --rpclisten=localhost:10002 --listen=localhost:10012 --restlisten=localhost: ## Fund wallets addresses ``` -lncli --network=simnet --rpcserver=localhost:10009 --lnddir=data/lnd newaddress np2wkh +lncli --network=simnet --rpcserver=localhost:10006 --lnddir=data/lnd newaddress np2wkh lncli --network=simnet --rpcserver=localhost:10002 --lnddir=data/lnd2 newaddress np2wkh @@ -33,19 +33,19 @@ btcctl --simnet --rpcuser=kek --rpcpass=kek generate 400 ## Open channel and send payment ``` -lncli --network=simnet --rpcserver=localhost:10009 --lnddir=data/lnd getinfo +lncli --network=simnet --rpcserver=localhost:10006 --lnddir=data/lnd getinfo lncli --network=simnet --rpcserver=localhost:10002 --lnddir=data/lnd2 getinfo -lncli --network=simnet --rpcserver=localhost:10009 --lnddir=data/lnd connect PUB_KEY@localhost:10012 +lncli --network=simnet --rpcserver=localhost:10006 --lnddir=data/lnd connect PUB_KEY@localhost:10012 -lncli --network=simnet --rpcserver=localhost:10009 --lnddir=data/lnd openchannel --node_key=PUB_KEY --local_amt=16000000 +lncli --network=simnet --rpcserver=localhost:10006 --lnddir=data/lnd openchannel --node_key=PUB_KEY --local_amt=16000000 btcctl --simnet --rpcuser=kek --rpcpass=kek generate 6 -lncli --network=simnet --rpcserver=localhost:10009 --lnddir=data/lnd listchannels +lncli --network=simnet --rpcserver=localhost:10006 --lnddir=data/lnd listchannels lncli --network=simnet --rpcserver=localhost:10002 --lnddir=data/lnd2 addinvoice --amt=10000 -lncli --network=simnet --rpcserver=localhost:10009 --lnddir=data/lnd sendpayment --pay_req=ENCODED_INVOICE +lncli --network=simnet --rpcserver=localhost:10006 --lnddir=data/lnd sendpayment --pay_req=ENCODED_INVOICE ```