@@ -437,7 +437,12 @@ impl Wallet {
437
437
None => ( None , Arc :: new ( SignersContainer :: new ( ) ) ) ,
438
438
} ;
439
439
440
- let index = create_indexer ( descriptor, change_descriptor, params. lookahead ) ?;
440
+ let index = create_indexer (
441
+ descriptor,
442
+ change_descriptor,
443
+ params. lookahead ,
444
+ params. use_spk_cache ,
445
+ ) ?;
441
446
442
447
let descriptor = index. get_descriptor ( KeychainKind :: External ) . cloned ( ) ;
443
448
let change_descriptor = index. get_descriptor ( KeychainKind :: Internal ) . cloned ( ) ;
@@ -636,8 +641,13 @@ impl Wallet {
636
641
None => Arc :: new ( SignersContainer :: new ( ) ) ,
637
642
} ;
638
643
639
- let index = create_indexer ( descriptor, change_descriptor, params. lookahead )
640
- . map_err ( LoadError :: Descriptor ) ?;
644
+ let index = create_indexer (
645
+ descriptor,
646
+ change_descriptor,
647
+ params. lookahead ,
648
+ params. use_spk_cache ,
649
+ )
650
+ . map_err ( LoadError :: Descriptor ) ?;
641
651
642
652
let mut indexed_graph = IndexedTxGraph :: new ( index) ;
643
653
indexed_graph. apply_changeset ( changeset. indexer . into ( ) ) ;
@@ -1090,9 +1100,9 @@ impl Wallet {
1090
1100
/// "tx is an ancestor of a tx anchored in {}:{}",
1091
1101
/// anchor.block_id.height, anchor.block_id.hash,
1092
1102
/// ),
1093
- /// ChainPosition::Unconfirmed { last_seen } => println!(
1094
- /// "tx is last seen at {:?}, it is unconfirmed as it is not anchored in the best chain",
1095
- /// last_seen,
1103
+ /// ChainPosition::Unconfirmed { first_seen, last_seen } => println!(
1104
+ /// "tx is first seen at {:?}, last seen at {:?}, it is unconfirmed as it is not anchored in the best chain",
1105
+ /// first_seen, last_seen
1096
1106
/// ),
1097
1107
/// }
1098
1108
/// ```
@@ -2591,17 +2601,14 @@ fn create_indexer(
2591
2601
descriptor : ExtendedDescriptor ,
2592
2602
change_descriptor : Option < ExtendedDescriptor > ,
2593
2603
lookahead : u32 ,
2604
+ use_spk_cache : bool ,
2594
2605
) -> Result < KeychainTxOutIndex < KeychainKind > , DescriptorError > {
2595
- let mut indexer = KeychainTxOutIndex :: < KeychainKind > :: new ( lookahead) ;
2606
+ let mut indexer = KeychainTxOutIndex :: < KeychainKind > :: new ( lookahead, use_spk_cache ) ;
2596
2607
2597
- // let (descriptor, keymap) = descriptor;
2598
- // let signers = Arc::new(SignersContainer::build(keymap, &descriptor, secp));
2599
2608
assert ! ( indexer
2600
2609
. insert_descriptor( KeychainKind :: External , descriptor)
2601
2610
. expect( "first descriptor introduced must succeed" ) ) ;
2602
2611
2603
- // let (descriptor, keymap) = change_descriptor;
2604
- // let change_signers = Arc::new(SignersContainer::build(keymap, &descriptor, secp));
2605
2612
if let Some ( change_descriptor) = change_descriptor {
2606
2613
assert ! ( indexer
2607
2614
. insert_descriptor( KeychainKind :: Internal , change_descriptor)
0 commit comments