Skip to content

Expose InputPair outpoint over FFI #1654

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 4 commits into from
Jun 30, 2026
Merged

Expose InputPair outpoint over FFI #1654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f4237d
Expose InputPair outpoint over FFI
chavic Jun 17, 2026
2032bab
Rename InputPair outpoint accessor
chavic Jun 24, 2026
8110844
Remove InputPair outpoint tests
chavic Jun 30, 2026
8c69ac4
Cover InputPair outpoint accessor
chavic Jun 30, 2026
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
3 changes: 3 additions & 0 deletions payjoin-ffi/src/receive/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,6 +1114,9 @@ impl InputPair {
.map(Self)
.map_err(|err| InputPairError::InvalidPsbtInput(Arc::new(err.into())))
}

/// Returns the outpoint spent by this input pair.
pub fn outpoint(&self) -> OutPoint { self.0.outpoint().into() }
}

impl From<InputPair> for payjoin::receive::InputPair {
Expand Down
15 changes: 15 additions & 0 deletions payjoin/src/core/receive/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,9 @@ impl InputPair {
Self::new_segwit_input_pair(txout, outpoint, Some(expected_weight))
}

/// Returns the outpoint spent by this input pair.
pub fn outpoint(&self) -> OutPoint { self.txin.previous_output }

pub(crate) fn previous_txout(&self) -> TxOut {
InternalInputPair::from(self)
.previous_txout()
Expand Down Expand Up @@ -541,6 +544,18 @@ pub(crate) mod tests {
assert_eq!(input_pair.expected_weight, expected_satifiability_weight);
}

#[test]
fn input_pair_outpoint_preserves_txid_and_vout() {
let txout = TxOut {
value: Amount::from_sat(123),
script_pubkey: ScriptBuf::new_p2wpkh(&WPubkeyHash::from_byte_array(DUMMY20)),
};
let outpoint = OutPoint { txid: Txid::from_byte_array(DUMMY32), vout: 31 };
let input_pair = InputPair::new_p2wpkh(txout, outpoint).unwrap();

assert_eq!(input_pair.outpoint(), outpoint);
}

#[test]
fn create_p2pkh_input_pair() {
let p2sh_txout = TxOut {
Expand Down
Loading