Skip to content

Handle receiver contribution errors as unavailable #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spacebear21 merged 2 commits into from
Feb 16, 2025
Merged

Handle receiver contribution errors as unavailable #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
836842f
Impl std::error::Error for all receive errs
DanGould Feb 12, 2025
16f4bbb
Error payjoin-cli if input contribution fails
DanGould Feb 12, 2025
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
18 changes: 7 additions & 11 deletions payjoin-cli/src/app/v1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,10 +365,7 @@ impl App {
.commit_outputs();

let provisional_payjoin = try_contributing_inputs(payjoin.clone(), &bitcoind)
.unwrap_or_else(|e| {
log::warn!("Failed to contribute inputs: {}", e);
payjoin.commit_inputs()
});
.map_err(ReplyableError::Implementation)?;

let payjoin_proposal = provisional_payjoin.finalize_proposal(
|psbt: &Psbt| {
Expand All @@ -386,20 +383,19 @@ impl App {
fn try_contributing_inputs(
payjoin: payjoin::receive::v1::WantsInputs,
bitcoind: &bitcoincore_rpc::Client,
) -> Result<payjoin::receive::v1::ProvisionalProposal> {
) -> Result<payjoin::receive::v1::ProvisionalProposal, ImplementationError> {
let candidate_inputs = bitcoind
.list_unspent(None, None, None, None, None)
.context("Failed to list unspent from bitcoind")?
.map_err(ImplementationError::from)?
.into_iter()
.map(input_pair_from_list_unspent);
let selected_input = payjoin
.try_preserving_privacy(candidate_inputs)
.map_err(|e| anyhow!("Failed to make privacy preserving selection: {}", e))?;
log::debug!("selected input: {:#?}", selected_input);

let selected_input =
payjoin.try_preserving_privacy(candidate_inputs).map_err(ImplementationError::from)?;

Ok(payjoin
.contribute_inputs(vec![selected_input])
.expect("This shouldn't happen. Failed to contribute inputs.")
.map_err(ImplementationError::from)?
.commit_inputs())
}

Expand Down
18 changes: 7 additions & 11 deletions payjoin-cli/src/app/v2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,7 @@ impl App {
.commit_outputs();

let provisional_payjoin = try_contributing_inputs(payjoin.clone(), &bitcoind)
.unwrap_or_else(|e| {
log::warn!("Failed to contribute inputs: {}", e);
payjoin.commit_inputs()
});
.map_err(ReplyableError::Implementation)?;

let payjoin_proposal = provisional_payjoin.finalize_proposal(
|psbt: &Psbt| {
Expand Down Expand Up @@ -355,20 +352,19 @@ async fn handle_recoverable_error(
fn try_contributing_inputs(
payjoin: payjoin::receive::v2::WantsInputs,
bitcoind: &bitcoincore_rpc::Client,
) -> Result<payjoin::receive::v2::ProvisionalProposal> {
) -> Result<payjoin::receive::v2::ProvisionalProposal, ImplementationError> {
let candidate_inputs = bitcoind
.list_unspent(None, None, None, None, None)
.context("Failed to list unspent from bitcoind")?
.map_err(ImplementationError::from)?
.into_iter()
.map(input_pair_from_list_unspent);
let selected_input = payjoin
.try_preserving_privacy(candidate_inputs)
.map_err(|e| anyhow!("Failed to make privacy preserving selection: {}", e))?;
log::debug!("selected input: {:#?}", selected_input);

let selected_input =
payjoin.try_preserving_privacy(candidate_inputs).map_err(ImplementationError::from)?;

Ok(payjoin
.contribute_inputs(vec![selected_input])
.expect("This shouldn't happen. Failed to contribute inputs.")
.map_err(ImplementationError::from)?
.commit_inputs())
}

Expand Down
19 changes: 19 additions & 0 deletions payjoin/src/receive/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,17 @@ impl fmt::Display for SelectionError {
}
}

impl error::Error for SelectionError {
fn source(&self) -> Option<&(dyn error::Error + 'static)> {
use InternalSelectionError::*;

match &self.0 {
Empty => None,
UnsupportedOutputLength => None,
NotFound => None,
}
}
}
impl From<InternalSelectionError> for SelectionError {
fn from(value: InternalSelectionError) -> Self { SelectionError(value) }
}
Expand All @@ -363,6 +374,14 @@ impl fmt::Display for InputContributionError {
}
}

impl error::Error for InputContributionError {
fn source(&self) -> Option<&(dyn error::Error + 'static)> {
match &self.0 {
InternalInputContributionError::ValueTooLow => None,
}
}
}

impl From<InternalInputContributionError> for InputContributionError {
fn from(value: InternalInputContributionError) -> Self { InputContributionError(value) }
}
Loading