Skip to content

Include fallback_locktime in locktime accumulation #24

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Include fallback_locktime in locktime accumulation #24

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
1b5f01c
ci: pin `syn` to 2.0.106
ValuedMammal Oct 22, 2025
6b76766
fix(selection): Include fallback locktime in locktime accumulation
ValuedMammal Oct 22, 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
1 change: 1 addition & 0 deletions ci/pin-msrv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ cargo update -p ring --precise "0.17.12"
cargo update -p once_cell --precise "1.20.3"
cargo update -p base64ct --precise "1.6.0"
cargo update -p minreq --precise "2.13.2"
cargo update -p syn --precise "2.0.106"
14 changes: 4 additions & 10 deletions src/selection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ pub struct PsbtParams {

/// Fallback tx locktime.
///
/// The locktime to use if no inputs specifies a required absolute locktime.
/// The locktime to use if no input specifies a required absolute locktime.
///
/// It is best practive to set this to the latest block height to avoid fee sniping.
/// It is best practice to set this to the latest block height to avoid fee sniping.
pub fallback_locktime: absolute::LockTime,

/// [`Sequence`] value to use by default if not provided by the input.
Expand Down Expand Up @@ -99,11 +99,8 @@ impl std::error::Error for CreatePsbtError {}

impl Selection {
/// Returns none if there is a mismatch of units in `locktimes`.
///
// TODO: As according to BIP-64... ?
fn _accumulate_max_locktime(
locktimes: impl IntoIterator<Item = absolute::LockTime>,
fallback: absolute::LockTime,
) -> Option<absolute::LockTime> {
let mut acc = Option::<absolute::LockTime>::None;
for locktime in locktimes {
Expand All @@ -119,9 +116,6 @@ impl Selection {
acc => *acc = Some(locktime),
};
}
if acc.is_none() {
acc = Some(fallback);
}
acc
}

Expand All @@ -132,8 +126,8 @@ impl Selection {
lock_time: Self::_accumulate_max_locktime(
self.inputs
.iter()
.filter_map(|input| input.absolute_timelock()),
params.fallback_locktime,
.filter_map(|input| input.absolute_timelock())
.chain([params.fallback_locktime]),
)
.ok_or(CreatePsbtError::LockTypeMismatch)?,
input: self
Expand Down