From: LLFourn <lloyd.fourn@gmail.com>
Date: Sun, 21 Jul 2024 17:01:52 +0000 (+1000)
Subject: chore(wallet): Fix ChangeSet::merge
X-Git-Tag: v1.0.0-beta.1~2^2
X-Git-Url: http://internal-gitweb-vhost/script/%22https:/database/struct.EncoderStringWriter.html?a=commitdiff_plain;h=64eb5763487df3c6cbb626e51f96ab6e47c5de22;p=bdk

chore(wallet): Fix ChangeSet::merge

h/t @ValuedMammal
---

diff --git a/crates/wallet/src/wallet/changeset.rs b/crates/wallet/src/wallet/changeset.rs
index d499ee6f..d1006003 100644
--- a/crates/wallet/src/wallet/changeset.rs
+++ b/crates/wallet/src/wallet/changeset.rs
@@ -40,6 +40,7 @@ impl Merge for ChangeSet {
                     || self.change_descriptor == other.change_descriptor,
                 "change descriptor must never change"
             );
+            self.change_descriptor = other.change_descriptor;
         }
         if other.network.is_some() {
             debug_assert!(