Skip to content

Respect disableoutputsubstitution in payjoin-cli #239

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
DanGould merged 1 commit into from
May 1, 2024
Merged

Respect disableoutputsubstitution in payjoin-cli #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions payjoin-cli/src/app/v1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,14 @@ impl App {
.map_err(|e| log::warn!("Failed to contribute inputs: {}", e));
}

let receiver_substitute_address = bitcoind
.get_new_address(None, None)
.map_err(|e| Error::Server(e.into()))?
.assume_checked();
provisional_payjoin.substitute_output_address(receiver_substitute_address);
if !provisional_payjoin.is_output_substitution_disabled() {
// Substitute the receiver output address.
let receiver_substitute_address = bitcoind
.get_new_address(None, None)
.map_err(|e| Error::Server(e.into()))?
.assume_checked();
provisional_payjoin.substitute_output_address(receiver_substitute_address);
}

let payjoin_proposal = provisional_payjoin.finalize_proposal(
|psbt: &Psbt| {
Expand Down
13 changes: 8 additions & 5 deletions payjoin-cli/src/app/v2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,14 @@ impl App {
.map_err(|e| log::warn!("Failed to contribute inputs: {}", e));
}

let receiver_substitute_address = bitcoind
.get_new_address(None, None)
.map_err(|e| Error::Server(e.into()))?
.assume_checked();
provisional_payjoin.substitute_output_address(receiver_substitute_address);
if !provisional_payjoin.is_output_substitution_disabled() {
// Substitute the receiver output address.
let receiver_substitute_address = bitcoind
.get_new_address(None, None)
.map_err(|e| Error::Server(e.into()))?
.assume_checked();
provisional_payjoin.substitute_output_address(receiver_substitute_address);
}

let payjoin_proposal = provisional_payjoin.finalize_proposal(
|psbt: &Psbt| {
Expand Down
4 changes: 4 additions & 0 deletions payjoin/src/receive/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,10 @@ impl ProvisionalProposal {
);
}

pub fn is_output_substitution_disabled(&self) -> bool {
self.params.disable_output_substitution
}

/// Just replace an output address with
pub fn substitute_output_address(&mut self, substitute_address: bitcoin::Address) {
self.payjoin_psbt.unsigned_tx.output[self.owned_vouts[0]].script_pubkey =
Expand Down
4 changes: 4 additions & 0 deletions payjoin/src/receive/v2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,10 @@ impl ProvisionalProposal {
self.inner.contribute_non_witness_input(tx, outpoint)
}

pub fn is_output_substitution_disabled(&self) -> bool {
self.inner.is_output_substitution_disabled()
}

/// Just replace an output address with
pub fn substitute_output_address(&mut self, substitute_address: bitcoin::Address) {
self.inner.substitute_output_address(substitute_address)
Expand Down