alternate approach using try_get_chain_position

Author: ValuedMammal

crates/chain/src/tx_graph.rs

@@ -794,7 +794,15 @@ impl<A: Anchor> TxGraph<A> {
         txid: Txid,
     ) -> Result<Option<ChainPosition<&A>>, C::Error> {
         let (tx_node, anchors, last_seen) = match self.txs.get(&txid) {
-            Some(v) => v,
+            Some(val) => {
+                let (_, anchors, last_seen) = val;
+                if anchors.is_empty() && last_seen.is_none() {
+                    // We don't consider unanchored, unseen transactions
+                    // to have a chain position.
+                    return Ok(None);
+                }
+                val
+            }
             None => return Ok(None),
         };
 
@@ -992,18 +1000,16 @@ impl<A: Anchor> TxGraph<A> {
         chain: &'a C,
         chain_tip: BlockId,
     ) -> impl Iterator<Item = Result<CanonicalTx<'a, Arc<Transaction>, A>, C::Error>> {
-        self.full_txs()
-            .filter(|tx| !tx.anchors.is_empty() || tx.last_seen_unconfirmed.is_some())
-            .filter_map(move |tx| {
-                self.try_get_chain_position(chain, chain_tip, tx.txid)
-                    .map(|v| {
-                        v.map(|observed_in| CanonicalTx {
-                            chain_position: observed_in,
-                            tx_node: tx,
-                        })
+        self.full_txs().filter_map(move |tx| {
+            self.try_get_chain_position(chain, chain_tip, tx.txid)
+                .map(|v| {
+                    v.map(|observed_in| CanonicalTx {
+                        chain_position: observed_in,
+                        tx_node: tx,
                     })
-                    .transpose()
-            })
+                })
+                .transpose()
+        })
     }
 
     /// List graph transactions that are in `chain` with `chain_tip`.

crates/chain/tests/test_tx_graph.rs

@@ -961,11 +961,10 @@ fn test_chain_spends() {
         }))
     );
 
-    // Even if unconfirmed tx has a last_seen of None, it can still be part of a chain spend.
-    assert_eq!(
-        graph.get_chain_spend(&local_chain, tip.block_id(), OutPoint::new(tx_0.txid(), 1)),
-        Some((ChainPosition::Unconfirmed(None), tx_2.txid())),
-    );
+    // An unconfirmed and unseen tx cannot be part of a chain spend.
+    assert!(graph
+        .get_chain_spend(&local_chain, tip.block_id(), OutPoint::new(tx_0.txid(), 1))
+        .is_none());
 
     // Mark the unconfirmed as seen and check correct ObservedAs status is returned.
     let _ = graph.insert_seen_at(tx_2.txid(), 1234567);

crates/wallet/tests/wallet.rs

@@ -51,7 +51,7 @@ fn receive_output_in_latest_block(wallet: &mut Wallet, value: u64) -> OutPoint {
     let latest_cp = wallet.latest_checkpoint();
     let height = latest_cp.height();
     let anchor = if height == 0 {
-        ConfirmationTime::Unconfirmed { last_seen: None }
+        ConfirmationTime::Unconfirmed { last_seen: Some(1) }
     } else {
         ConfirmationTime::Confirmed { height, time: 0 }
     };
@@ -1066,7 +1066,7 @@ fn test_create_tx_add_utxo() {
     wallet
         .insert_tx(
             small_output_tx.clone(),
-            ConfirmationTime::Unconfirmed { last_seen: None },
+            ConfirmationTime::Unconfirmed { last_seen: Some(1) },
         )
         .unwrap();
 
@@ -1117,7 +1117,7 @@ fn test_create_tx_manually_selected_insufficient() {
     wallet
         .insert_tx(
             small_output_tx.clone(),
-            ConfirmationTime::Unconfirmed { last_seen: None },
+            ConfirmationTime::Unconfirmed { last_seen: Some(1) },
         )
         .unwrap();
 
@@ -1167,7 +1167,7 @@ fn test_create_tx_policy_path_no_csv() {
         }],
     };
     wallet
-        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: None })
+        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: Some(1) })
         .unwrap();
 
     let external_policy = wallet.policies(KeychainKind::External).unwrap().unwrap();
@@ -1541,7 +1541,7 @@ fn test_bump_fee_irreplaceable_tx() {
     let tx = psbt.extract_tx().expect("failed to extract tx");
     let txid = tx.txid();
     wallet
-        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: None })
+        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: Some(1) })
         .unwrap();
     wallet.build_fee_bump(txid).unwrap().finish().unwrap();
 }
@@ -1586,7 +1586,7 @@ fn test_bump_fee_low_fee_rate() {
     let txid = tx.txid();
 
     wallet
-        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: None })
+        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: Some(1) })
         .unwrap();
 
     let mut builder = wallet.build_fee_bump(txid).unwrap();
@@ -1619,7 +1619,7 @@ fn test_bump_fee_low_abs() {
     let txid = tx.txid();
 
     wallet
-        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: None })
+        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: Some(1) })
         .unwrap();
 
     let mut builder = wallet.build_fee_bump(txid).unwrap();
@@ -1641,7 +1641,7 @@ fn test_bump_fee_zero_abs() {
     let tx = psbt.extract_tx().expect("failed to extract tx");
     let txid = tx.txid();
     wallet
-        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: None })
+        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: Some(1) })
         .unwrap();
 
     let mut builder = wallet.build_fee_bump(txid).unwrap();
@@ -1667,7 +1667,7 @@ fn test_bump_fee_reduce_change() {
     let tx = psbt.extract_tx().expect("failed to extract tx");
     let txid = tx.txid();
     wallet
-        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: None })
+        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: Some(1) })
         .unwrap();
 
     let feerate = FeeRate::from_sat_per_kwu(625); // 2.5 sat/vb
@@ -1765,7 +1765,7 @@ fn test_bump_fee_reduce_single_recipient() {
     let original_fee = check_fee!(wallet, psbt);
     let txid = tx.txid();
     wallet
-        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: None })
+        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: Some(1) })
         .unwrap();
 
     let feerate = FeeRate::from_sat_per_kwu(625); // 2.5 sat/vb
@@ -1809,7 +1809,7 @@ fn test_bump_fee_absolute_reduce_single_recipient() {
     let original_sent_received = wallet.sent_and_received(&tx);
     let txid = tx.txid();
     wallet
-        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: None })
+        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: Some(1) })
         .unwrap();
 
     let mut builder = wallet.build_fee_bump(txid).unwrap();
@@ -1879,7 +1879,7 @@ fn test_bump_fee_drain_wallet() {
 
     let txid = tx.txid();
     wallet
-        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: None })
+        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: Some(1) })
         .unwrap();
     assert_eq!(original_sent_received.0, Amount::from_sat(25_000));
 
@@ -1949,7 +1949,7 @@ fn test_bump_fee_remove_output_manually_selected_only() {
     let original_sent_received = wallet.sent_and_received(&tx);
     let txid = tx.txid();
     wallet
-        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: None })
+        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: Some(1) })
         .unwrap();
     assert_eq!(original_sent_received.0, Amount::from_sat(25_000));
 
@@ -1996,7 +1996,7 @@ fn test_bump_fee_add_input() {
     let original_details = wallet.sent_and_received(&tx);
     let txid = tx.txid();
     wallet
-        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: None })
+        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: Some(1) })
         .unwrap();
 
     let mut builder = wallet.build_fee_bump(txid).unwrap();
@@ -2053,7 +2053,7 @@ fn test_bump_fee_absolute_add_input() {
     let original_sent_received = wallet.sent_and_received(&tx);
     let txid = tx.txid();
     wallet
-        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: None })
+        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: Some(1) })
         .unwrap();
 
     let mut builder = wallet.build_fee_bump(txid).unwrap();
@@ -2119,7 +2119,7 @@ fn test_bump_fee_no_change_add_input_and_change() {
     let tx = psbt.extract_tx().expect("failed to extract tx");
     let txid = tx.txid();
     wallet
-        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: None })
+        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: Some(1) })
         .unwrap();
 
     // now bump the fees without using `allow_shrinking`. the wallet should add an
@@ -2190,7 +2190,7 @@ fn test_bump_fee_add_input_change_dust() {
     assert_eq!(tx.output.len(), 2);
     let txid = tx.txid();
     wallet
-        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: None })
+        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: Some(1) })
         .unwrap();
 
     let mut builder = wallet.build_fee_bump(txid).unwrap();
@@ -2263,7 +2263,7 @@ fn test_bump_fee_force_add_input() {
     wallet
         .insert_tx(
             tx.clone(),
-            ConfirmationTime::Unconfirmed { last_seen: None },
+            ConfirmationTime::Unconfirmed { last_seen: Some(1) },
         )
         .unwrap();
     // the new fee_rate is low enough that just reducing the change would be fine, but we force
@@ -2333,7 +2333,7 @@ fn test_bump_fee_absolute_force_add_input() {
     wallet
         .insert_tx(
             tx.clone(),
-            ConfirmationTime::Unconfirmed { last_seen: None },
+            ConfirmationTime::Unconfirmed { last_seen: Some(1) },
         )
         .unwrap();
 
@@ -2402,15 +2402,15 @@ fn test_bump_fee_unconfirmed_inputs_only() {
     receive_output(
         &mut wallet,
         25_000,
-        ConfirmationTime::Unconfirmed { last_seen: None },
+        ConfirmationTime::Unconfirmed { last_seen: Some(1) },
     );
     let mut tx = psbt.extract_tx().expect("failed to extract tx");
     let txid = tx.txid();
     for txin in &mut tx.input {
         txin.witness.push([0x00; P2WPKH_FAKE_WITNESS_SIZE]); // fake signature
     }
     wallet
-        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: None })
+        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: Some(1) })
         .unwrap();
     let mut builder = wallet.build_fee_bump(txid).unwrap();
     builder.fee_rate(FeeRate::from_sat_per_vb_unchecked(25));
@@ -2443,7 +2443,7 @@ fn test_bump_fee_unconfirmed_input() {
         txin.witness.push([0x00; P2WPKH_FAKE_WITNESS_SIZE]); // fake signature
     }
     wallet
-        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: None })
+        .insert_tx(tx, ConfirmationTime::Unconfirmed { last_seen: Some(1) })
         .unwrap();
 
     let mut builder = wallet.build_fee_bump(txid).unwrap();