From 333fc6eb1d2fd9fa1df033bff501e1d81e34a9c3 Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Mon, 8 Apr 2024 11:03:26 +0200 Subject: [PATCH 1/2] mod: bump btcwallet to latest version Fixes #8626. This commit updates btcwallet to the latest version that correctly includes the MasterKeyFingerprint for all generated addresses, including change addresses derived from imported watch-only accounts. --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6995e40b11..e8ca223aea 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/btcsuite/btcd/btcutil/psbt v1.1.8 github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f - github.com/btcsuite/btcwallet v0.16.10-0.20240318155207-9a7dd2416f4d + github.com/btcsuite/btcwallet v0.16.10-0.20240410030101-6fe19a472a62 github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4 github.com/btcsuite/btcwallet/wallet/txrules v1.2.1 github.com/btcsuite/btcwallet/walletdb v1.4.2 diff --git a/go.sum b/go.sum index 550bbb84b2..abf731ae49 100644 --- a/go.sum +++ b/go.sum @@ -92,8 +92,8 @@ github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtyd github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= -github.com/btcsuite/btcwallet v0.16.10-0.20240318155207-9a7dd2416f4d h1:ikEYkMZEEOwOEpp3DR3EwV6DbZRDPshNw0uJn7W8v7I= -github.com/btcsuite/btcwallet v0.16.10-0.20240318155207-9a7dd2416f4d/go.mod h1:2C3Q/MhYAKmk7F+Tey6LfKtKRTdQsrCf8AAAzzDPmH4= +github.com/btcsuite/btcwallet v0.16.10-0.20240410030101-6fe19a472a62 h1:MtcTVTcDbGdTJhfDc7LLikojyl0PYtSRNLwoRaLVbWI= +github.com/btcsuite/btcwallet v0.16.10-0.20240410030101-6fe19a472a62/go.mod h1:2C3Q/MhYAKmk7F+Tey6LfKtKRTdQsrCf8AAAzzDPmH4= github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4 h1:poyHFf7+5+RdxNp5r2T6IBRD7RyraUsYARYbp/7t4D8= github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4/go.mod h1:GETGDQuyq+VFfH1S/+/7slLM/9aNa4l7P4ejX6dJfb0= github.com/btcsuite/btcwallet/wallet/txrules v1.2.1 h1:UZo7YRzdHbwhK7Rhv3PO9bXgTxiOH45edK5qdsdiatk= From f35ce0981d00cd95c1f9a19b9f87b8c9e4ccaf51 Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Mon, 8 Apr 2024 11:06:53 +0200 Subject: [PATCH 2/2] docs: update release notes --- docs/release-notes/release-notes-0.18.0.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/release-notes/release-notes-0.18.0.md b/docs/release-notes/release-notes-0.18.0.md index aafbc076fa..7e1be6ba78 100644 --- a/docs/release-notes/release-notes-0.18.0.md +++ b/docs/release-notes/release-notes-0.18.0.md @@ -109,8 +109,12 @@ * [Removed](https://github.com/lightningnetwork/lnd/pull/8577) some unreachable code -[Fixed](https://github.com/lightningnetwork/lnd/pull/8609) fixed a function -call where arguments were swapped. +* [Fixed](https://github.com/lightningnetwork/lnd/pull/8609) a function + call where arguments were swapped. + +* [Addresses derived from imported watch-only accounts now correctly include + their master key's + fingerprint](https://github.com/lightningnetwork/lnd/pull/8630). # New Features ## Functional Enhancements