Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions src/crates/heuristics/src/ast/change.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ use tx_indexer_pipeline::{
};
use tx_indexer_primitives::{
AbstractTxIn,
handle::SpendableTxConstituent,
unified::{AnyOutId, AnyTxId},
};

use crate::change_identification::{
NLockTimeChangeIdentification, NaiveChangeIdentificationHueristic, TxOutChangeAnnotation,
NLockTimeChangeIdentification, NaiveChangeIdentificationHeuristic, TxOutChangeAnnotation,
};

/// Node that identifies change outputs in transactions.
Expand Down Expand Up @@ -44,10 +45,13 @@ impl Node for ChangeIdentificationNode {

for output_id in txouts.iter() {
let output = output_id.with(ctx.unified_storage());
let is_change = matches!(
NaiveChangeIdentificationHueristic::is_change(output),
TxOutChangeAnnotation::Change
);
let is_change = match SpendableTxConstituent::try_new(output) {
Ok(spendable) => matches!(
NaiveChangeIdentificationHeuristic::is_change(spendable),
TxOutChangeAnnotation::Change
),
Err(_) => false, // OP_RETURN outputs cannot be change
};
result.insert(*output_id, is_change);
}

Expand Down Expand Up @@ -114,10 +118,13 @@ impl Node for FingerPrintChangeIdentificationNode {
let is_change = match output.spender_txin() {
Some(spending_txin) => {
let spending_tx = spending_txin.containing_tx();
matches!(
NLockTimeChangeIdentification::is_change(output, spending_tx),
TxOutChangeAnnotation::Change
)
match SpendableTxConstituent::try_new(output) {
Ok(spendable) => matches!(
NLockTimeChangeIdentification::is_change(spendable, spending_tx),
TxOutChangeAnnotation::Change
),
Err(_) => false, // OP_RETURN outputs cannot be change
}
}
None => false, // Unspent output: not change by fingerprint
};
Expand Down
75 changes: 68 additions & 7 deletions src/crates/heuristics/src/ast/uih.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@

use std::collections::HashSet;

use bitcoin::Amount;
use tx_indexer_pipeline::{
engine::EvalContext,
expr::Expr,
node::{Node, NodeId},
value::{TxMask, TxOutSet, TxSet},
};
use tx_indexer_primitives::unified::{AnyOutId, AnyTxId};
use tx_indexer_primitives::{
traits::abstract_types::{EnumerateInputValueInArbitraryOrder, HasScriptPubkey},
unified::{AnyOutId, AnyTxId},
};

use crate::uih::UnnecessaryInputHeuristic;

Expand Down Expand Up @@ -45,12 +49,20 @@ impl Node for UnnecessaryInputHeuristic1Node {
for tx_id in &tx_ids {
let tx = tx_id.with(ctx.unified_storage());

let outputs: Vec<_> = tx.outputs().map(|o| (o.id(), o.value())).collect();
if outputs.is_empty() {
let outputs: Vec<_> = tx
.outputs()
.filter(|o| o.is_spendable())
.map(|o| (o.id(), o.value()))
.collect();
let Some(min_out) = outputs.iter().map(|(_, v)| *v).min() else {
continue;
}
};
let Some(min_in) = tx.input_values().min() else {
continue;
};

if let Some(min_out) = UnnecessaryInputHeuristic::uih1_min_output_value(&tx) {
if let Some(min_out) = UnnecessaryInputHeuristic::uih1_min_output_value(min_in, min_out)
{
for (out_id, v) in &outputs {
if *v == min_out {
result.insert(*out_id);
Expand Down Expand Up @@ -108,7 +120,24 @@ impl Node for UnnecessaryInputHeuristic2Node {
for tx_id in &tx_ids {
let tx = tx_id.with(ctx.unified_storage());

result.insert(*tx_id, UnnecessaryInputHeuristic::is_uih2(&tx));
let input_values: Vec<Amount> = tx.input_values().collect();
let output_values: Vec<Amount> = tx
.outputs()
.filter(|o| o.is_spendable())
.map(|o| o.value())
.collect();

let flagged = if input_values.len() < 2 || output_values.is_empty() {
false
} else {
let sum_in = input_values.iter().copied().sum();
let min_in = input_values.iter().copied().min().expect("len >= 2");
let sum_out = output_values.iter().copied().sum();
let min_out = output_values.iter().copied().min().expect("non-empty");
UnnecessaryInputHeuristic::is_uih2(sum_in, min_in, sum_out, min_out)
};

result.insert(*tx_id, flagged);
}

result
Expand Down Expand Up @@ -139,7 +168,7 @@ mod tests {
use tx_indexer_primitives::{
UnifiedStorage,
loose::{LooseIndexBuilder, TxId, TxOutId},
test_utils::DummyTxData,
test_utils::{DummyTxData, DummyTxOutData},
traits::abstract_types::AbstractTransaction,
unified::{AnyOutId, AnyTxId},
};
Expand Down Expand Up @@ -200,6 +229,22 @@ mod tests {
]
}

fn setup_uih1_op_return_value_zero_fixture() -> Vec<Arc<dyn AbstractTransaction + Send + Sync>>
{
vec![
Arc::new(DummyTxData::new_with_amounts(vec![100])),
Arc::new(DummyTxData::new_with_amounts(vec![200])),
Arc::new(DummyTxData::new(
vec![
DummyTxOutData::new(150, 0),
DummyTxOutData::new_with_script(0, 1, vec![0x6a, 0x04, 0xde, 0xad, 0xbe, 0xef]),
],
vec![TxOutId::new(TxId(1), 0), TxOutId::new(TxId(2), 0)],
0,
)),
]
}

fn setup_uih2_no_unnecessary_fixture() -> Vec<Arc<dyn AbstractTransaction + Send + Sync>> {
vec![
Arc::new(DummyTxData::new_with_amounts(vec![100])),
Expand Down Expand Up @@ -273,6 +318,22 @@ mod tests {
);
}

#[test]
fn test_uih1_ignores_op_return() {
let all_txs = setup_uih1_op_return_value_zero_fixture();
let ctx = Arc::new(PipelineContext::new());
let mut engine = engine_with_loose(ctx.clone(), all_txs);

let source = AllLooseTxs::new(&ctx);
let uih1 = UnnecessaryInputHeuristic1::new(source.txs());
let result = engine.eval(&uih1);

assert!(
result.is_empty(),
"UIH1 must not classify an OP_RETURN value=0 as a change candidate"
);
}

#[test]
fn test_uih1_tie_smallest_outputs() {
let all_txs = setup_uih1_tie_fixture();
Expand Down
Loading
Loading