From b6f56d3398f4a0203e9abc952197f6e63c8b97d0 Mon Sep 17 00:00:00 2001 From: ErikEk Date: Fri, 13 May 2022 17:54:09 +0200 Subject: [PATCH] config: fix path to bitcoind.rpccookie and bitcoind.config --- config.go | 10 ++++++++++ docs/release-notes/release-notes-0.15.0.md | 3 +++ 2 files changed, 13 insertions(+) diff --git a/config.go b/config.go index dc3925183..d313033a6 100644 --- a/config.go +++ b/config.go @@ -859,7 +859,17 @@ func ValidateConfig(cfg Config, interceptor signal.Interceptor, fileParser, cfg.BtcdMode.Dir = CleanAndExpandPath(cfg.BtcdMode.Dir) cfg.LtcdMode.Dir = CleanAndExpandPath(cfg.LtcdMode.Dir) cfg.BitcoindMode.Dir = CleanAndExpandPath(cfg.BitcoindMode.Dir) + cfg.BitcoindMode.ConfigPath = CleanAndExpandPath( + cfg.BitcoindMode.ConfigPath, + ) + cfg.BitcoindMode.RPCCookie = CleanAndExpandPath(cfg.BitcoindMode.RPCCookie) cfg.LitecoindMode.Dir = CleanAndExpandPath(cfg.LitecoindMode.Dir) + cfg.LitecoindMode.ConfigPath = CleanAndExpandPath( + cfg.LitecoindMode.ConfigPath, + ) + cfg.LitecoindMode.RPCCookie = CleanAndExpandPath( + cfg.LitecoindMode.RPCCookie, + ) cfg.Tor.PrivateKeyPath = CleanAndExpandPath(cfg.Tor.PrivateKeyPath) cfg.Tor.WatchtowerKeyPath = CleanAndExpandPath(cfg.Tor.WatchtowerKeyPath) cfg.Watchtower.TowerDir = CleanAndExpandPath(cfg.Watchtower.TowerDir) diff --git a/docs/release-notes/release-notes-0.15.0.md b/docs/release-notes/release-notes-0.15.0.md index 450d30951..8f68c2b88 100644 --- a/docs/release-notes/release-notes-0.15.0.md +++ b/docs/release-notes/release-notes-0.15.0.md @@ -260,6 +260,9 @@ from occurring that would result in an erroneous force close.](https://github.co * [Clarify error msg when bitcoind cookie file is missing](https://github.com/lightningnetwork/lnd/pull/6536). +* [Minor fix](https://github.com/lightningnetwork/lnd/pull/6535) to + how bitcoind.rpccookie and bitocind.config are parsed from config file. + ## RPC Server * [Add value to the field