Skip to content
Merged
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
5 changes: 5 additions & 0 deletions payjoin-ffi/changelog.d/input-pair-transaction-decode.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- Replace `InputPairError::InvalidTransaction(String)` with
`InputPairError::TransactionDecode(TransactionParseError)`, the same error
`classify_tx` returns for bytes that do not decode. Bindings that match on
the old variant need to match the new one and read the nested
`TransactionParseError`.
4 changes: 2 additions & 2 deletions payjoin-ffi/src/receive/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ pub enum InputPairError {
#[error("Invalid input: {0}")]
FfiValidation(FfiValidationError),
/// Provided transaction could not be consensus decoded.
#[error("Invalid transaction: {0}")]
InvalidTransaction(String),
#[error(transparent)]
TransactionDecode(#[from] TransactionParseError),
}

impl InputPairError {
Expand Down
25 changes: 18 additions & 7 deletions payjoin-ffi/src/receive/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ pub use error::{
InputPairError, JsonReply, OutputSubstitutionError, ProtocolError, PsbtInputError,
ReceiverCreateRequestError, ReceiverError, SessionError, TransactionParseError,
};
use payjoin::bitcoin::consensus::Decodable;
use payjoin::bitcoin::psbt::Psbt;
use payjoin::bitcoin::FeeRate;
use payjoin::persist::{MaybeFatalTransition, NextStateTransition};
Expand Down Expand Up @@ -192,8 +191,9 @@ macro_rules! impl_pending_fallback_cancel_for_receiver {
};
}

/// Decode a consensus-encoded transaction, rejecting trailing bytes.
fn decode_transaction(tx: &[u8]) -> Result<payjoin::bitcoin::Transaction, TransactionParseError> {
payjoin::bitcoin::Transaction::consensus_decode(&mut &tx[..])
payjoin::bitcoin::consensus::deserialize(tx)
.map_err(|e| TransactionParseError::InvalidTransaction(e.to_string()))
}

Expand Down Expand Up @@ -1547,9 +1547,7 @@ impl InputPair {
non_witness_utxo: Vec<u8>,
outpoint: OutPoint,
) -> Result<Self, InputPairError> {
let non_witness_utxo: payjoin::bitcoin::Transaction =
payjoin::bitcoin::consensus::deserialize(&non_witness_utxo)
.map_err(|e| InputPairError::InvalidTransaction(e.to_string()))?;
let non_witness_utxo = decode_transaction(&non_witness_utxo)?;
for txout in &non_witness_utxo.output {
validate_amount_sat(txout.value.to_sat())?;
}
Expand Down Expand Up @@ -2408,6 +2406,19 @@ mod tests {
}
}

#[test]
fn decode_transaction_rejects_trailing_bytes() {
let tx = funding_tx(p2pkh_script_pubkey());
let mut tx_bytes = payjoin::bitcoin::consensus::serialize(&tx);
assert_eq!(decode_transaction(&tx_bytes).expect("valid transaction"), tx);

tx_bytes.push(0x00);
assert!(matches!(
decode_transaction(&tx_bytes),
Err(TransactionParseError::InvalidTransaction(_))
));
}

#[test]
fn p2pkh_constructor_accepts_funding_transaction() {
let tx = funding_tx(p2pkh_script_pubkey());
Expand Down Expand Up @@ -2446,7 +2457,7 @@ mod tests {

assert!(matches!(
InputPair::new_p2pkh(vec![0x00], outpoint()),
Err(InputPairError::InvalidTransaction(_))
Err(InputPairError::TransactionDecode(TransactionParseError::InvalidTransaction(_)))
));

let mut too_much = funding_tx(p2pkh_script_pubkey());
Expand All @@ -2463,7 +2474,7 @@ mod tests {
trailing_bytes.push(0x00);
assert!(matches!(
InputPair::new_p2pkh(trailing_bytes, outpoint()),
Err(InputPairError::InvalidTransaction(_))
Err(InputPairError::TransactionDecode(TransactionParseError::InvalidTransaction(_)))
));
}
}
Loading