From: valued mammal <valuedmammal@protonmail.com>
Date: Sat, 12 Jul 2025 14:44:46 +0000 (-0400)
Subject: refactor(keychain_txout): `apply_changeset` restores spk cache before last revealed
X-Git-Tag: bitcoind_rpc-0.21.0~10^2
X-Git-Url: http://internal-gitweb-vhost/?a=commitdiff_plain;h=6ddecc983ab3fb163303af4902bd10cf7e4a1fdf;p=bdk

refactor(keychain_txout): `apply_changeset` restores spk cache before last revealed

This change improves readability and maintains logical consistency with
the use of `spk_cache` throughout the `keychain_txout` module.
---

diff --git a/crates/chain/src/indexer/keychain_txout.rs b/crates/chain/src/indexer/keychain_txout.rs
index dceb25a9..c4668cbe 100644
--- a/crates/chain/src/indexer/keychain_txout.rs
+++ b/crates/chain/src/indexer/keychain_txout.rs
@@ -938,16 +938,16 @@ impl<K: Clone + Ord + Debug> KeychainTxOutIndex<K> {
 
     /// Applies the `ChangeSet<K>` to the [`KeychainTxOutIndex<K>`]
     pub fn apply_changeset(&mut self, changeset: ChangeSet) {
-        for (did, index) in changeset.last_revealed {
-            let v = self.last_revealed.entry(did).or_default();
-            *v = index.max(*v);
-            self.replenish_inner_index_did(did, self.lookahead);
-        }
         if self.persist_spks {
             for (did, spks) in changeset.spk_cache {
                 self.spk_cache.entry(did).or_default().extend(spks);
             }
         }
+        for (did, index) in changeset.last_revealed {
+            let v = self.last_revealed.entry(did).or_default();
+            *v = index.max(*v);
+            self.replenish_inner_index_did(did, self.lookahead);
+        }
     }
 }