Skip to content

Commit

Permalink
Do coin selection for many outputs
Browse files Browse the repository at this point in the history
  • Loading branch information
spacebear21 committed Aug 5, 2024
1 parent 420ce37 commit 897db6b
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 7 deletions.
4 changes: 4 additions & 0 deletions payjoin/src/receive/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,8 @@ pub(crate) enum InternalSelectionError {
TooManyOutputs,
/// No selection candidates improve privacy
NotFound,
/// Cannot afford the transaction cost with available inputs
CannotAfford,
}

impl fmt::Display for SelectionError {
Expand All @@ -223,6 +225,8 @@ impl fmt::Display for SelectionError {
),
InternalSelectionError::NotFound =>
write!(f, "No selection candidates improve privacy"),
InternalSelectionError::CannotAfford =>
write!(f, "Cannot afford the transaction cost with available inputs"),
}
}
}
Expand Down
39 changes: 32 additions & 7 deletions payjoin/src/receive/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ impl WantsInputs {
/// Proper coin selection allows payjoin to resemble ordinary transactions.
/// To ensure the resemblance, a number of heuristics must be avoided.
///
/// UIH "Unnecessary input heuristic" is avoided for multi-output transactions.
/// UIH "Unnecessary input heuristic" is avoided for two-output transactions.
/// A simple consolidation is otherwise chosen if available.
pub fn try_preserving_privacy(
&self,
Expand All @@ -428,18 +428,43 @@ impl WantsInputs {
}

if self.payjoin_psbt.outputs.len() > 2 {
// This UIH avoidance function supports only
// many-input, n-output transactions such that n <= 2 for now
return Err(SelectionError::from(InternalSelectionError::TooManyOutputs));
}

if self.payjoin_psbt.outputs.len() == 2 {
// This doesn't attempt to preserve privacy...
self.do_coin_selection(candidate_inputs)
} else if self.payjoin_psbt.outputs.len() == 2 {
self.avoid_uih(candidate_inputs)
} else {
self.select_first_candidate(candidate_inputs)
}
}

fn do_coin_selection(
&self,
candidate_inputs: HashMap<Amount, OutPoint>,
) -> Result<Vec<OutPoint>, SelectionError> {
// Calculate the amount that the receiver must contribute
let output_amount =
self.payjoin_psbt.unsigned_tx.output.iter().fold(0, |acc, output| acc + output.value);
let original_output_amount =
self.original_psbt.unsigned_tx.output.iter().fold(0, |acc, output| acc + output.value);
let min_input_amount = min(0, output_amount - original_output_amount);

// Select inputs that can pay for that amount
// TODO: use a better coin selection algorithm
let mut selected_coins = vec![];
let mut input_sats = 0;
for candidate in candidate_inputs {
let candidate_sats = candidate.0.to_sat();
selected_coins.push(candidate.1);
input_sats += candidate_sats;

if input_sats >= min_input_amount {
return Ok(selected_coins);
}
}

Err(SelectionError::from(InternalSelectionError::CannotAfford))
}

/// UIH "Unnecessary input heuristic" is one class of heuristics to avoid. We define
/// UIH1 and UIH2 according to the BlockSci practice
/// BlockSci UIH1 and UIH2:
Expand Down

0 comments on commit 897db6b

Please sign in to comment.