Skip to content

Commit 04fb034

Browse files
authored
Merge pull request #6535 from ErikEk/config-rpccookie-path
config: fix path to bitcoind/litecoind rpccookie and config
2 parents 6b57e92 + b6f56d3 commit 04fb034

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

config.go

+10
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,17 @@ func ValidateConfig(cfg Config, interceptor signal.Interceptor, fileParser,
859859
cfg.BtcdMode.Dir = CleanAndExpandPath(cfg.BtcdMode.Dir)
860860
cfg.LtcdMode.Dir = CleanAndExpandPath(cfg.LtcdMode.Dir)
861861
cfg.BitcoindMode.Dir = CleanAndExpandPath(cfg.BitcoindMode.Dir)
862+
cfg.BitcoindMode.ConfigPath = CleanAndExpandPath(
863+
cfg.BitcoindMode.ConfigPath,
864+
)
865+
cfg.BitcoindMode.RPCCookie = CleanAndExpandPath(cfg.BitcoindMode.RPCCookie)
862866
cfg.LitecoindMode.Dir = CleanAndExpandPath(cfg.LitecoindMode.Dir)
867+
cfg.LitecoindMode.ConfigPath = CleanAndExpandPath(
868+
cfg.LitecoindMode.ConfigPath,
869+
)
870+
cfg.LitecoindMode.RPCCookie = CleanAndExpandPath(
871+
cfg.LitecoindMode.RPCCookie,
872+
)
863873
cfg.Tor.PrivateKeyPath = CleanAndExpandPath(cfg.Tor.PrivateKeyPath)
864874
cfg.Tor.WatchtowerKeyPath = CleanAndExpandPath(cfg.Tor.WatchtowerKeyPath)
865875
cfg.Watchtower.TowerDir = CleanAndExpandPath(cfg.Watchtower.TowerDir)

docs/release-notes/release-notes-0.15.0.md

+3
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,9 @@ from occurring that would result in an erroneous force close.](https://github.co
265265

266266
* [Clarify error msg when bitcoind cookie file is missing](https://github.com/lightningnetwork/lnd/pull/6536).
267267

268+
* [Minor fix](https://github.com/lightningnetwork/lnd/pull/6535) to
269+
how bitcoind.rpccookie and bitocind.config are parsed from config file.
270+
268271
## RPC Server
269272

270273
* [Add value to the field

0 commit comments

Comments
 (0)