fix(chain): implement request builder exts for any checkpoint data

ci/pin-msrv.sh

@@ -14,4 +14,3 @@ cargo update -p idna_adapter --precise "1.2.1"
 cargo update -p icu_normalizer --precise "2.1.1"
 cargo update -p icu_provider --precise "2.1.1"
 cargo update -p icu_locale_core --precise "2.1.1"
-cargo update -p yoke-derive --precise "0.8.2"

crates/chain/src/indexer/keychain_txout.rs

@@ -1129,7 +1129,9 @@ pub trait SyncRequestBuilderExt<K> {
     fn unused_spks_from_indexer(self, indexer: &KeychainTxOutIndex<K>) -> Self;
 }
 
-impl<K: Clone + Ord + core::fmt::Debug> SyncRequestBuilderExt<K> for SyncRequestBuilder<(K, u32)> {
+impl<K: Clone + Ord + core::fmt::Debug, D> SyncRequestBuilderExt<K>
+    for SyncRequestBuilder<(K, u32), D>
+{
     fn revealed_spks_from_indexer<R>(self, indexer: &KeychainTxOutIndex<K>, spk_range: R) -> Self
     where
         R: core::ops::RangeBounds<K>,
@@ -1148,7 +1150,9 @@ pub trait FullScanRequestBuilderExt<K> {
     fn spks_from_indexer(self, indexer: &KeychainTxOutIndex<K>) -> Self;
 }
 
-impl<K: Clone + Ord + core::fmt::Debug> FullScanRequestBuilderExt<K> for FullScanRequestBuilder<K> {
+impl<K: Clone + Ord + core::fmt::Debug, D> FullScanRequestBuilderExt<K>
+    for FullScanRequestBuilder<K, D>
+{
     fn spks_from_indexer(mut self, indexer: &KeychainTxOutIndex<K>) -> Self {
         for (keychain, spks) in indexer.all_unbounded_spk_iters() {
             let last_revealed = indexer.last_revealed_index(keychain.clone());

crates/chain/tests/test_keychain_txout_index.rs

@@ -761,3 +761,37 @@ fn overlapping_descriptor_does_not_panic_in_release() {
     let _ = index.insert_descriptor(1, single);
     assert!(index.reveal_next_spk(1).is_none());
 }
+
+#[test]
+fn request_builder_ext_works_with_any_checkpoint_data() {
+    use bdk_chain::{
+        bitcoin::{block::Header, constants::genesis_block, Network},
+        indexer::keychain_txout::{FullScanRequestBuilderExt, SyncRequestBuilderExt},
+        spk_client::{FullScanRequest, SyncRequest},
+        CheckPoint,
+    };
+
+    let mut indexer = init_txout_index(
+        parse_descriptor(DESCRIPTORS[0]),
+        parse_descriptor(DESCRIPTORS[1]),
+        0,
+        false,
+    );
+    let _ = indexer.reveal_to_target(TestKeychain::External, 2);
+    let tip = CheckPoint::<Header>::new(0, genesis_block(Network::Regtest).header);
+
+    let sync_request = SyncRequest::builder_at(0)
+        .chain_tip(tip.clone())
+        .revealed_spks_from_indexer(&indexer, ..)
+        .build();
+    assert_eq!(sync_request.spks().len(), 3);
+
+    let full_scan_request = FullScanRequest::builder_at(0)
+        .chain_tip(tip)
+        .spks_from_indexer(&indexer)
+        .build();
+    assert_eq!(
+        full_scan_request.last_revealed(&TestKeychain::External),
+        Some(2)
+    );
+}