Fix locktime calculations and improve API#36
Merged
ValuedMammal merged 2 commits intobitcoindevkit:masterfrom Feb 13, 2026
Merged
Fix locktime calculations and improve API#36ValuedMammal merged 2 commits intobitcoindevkit:masterfrom
ValuedMammal merged 2 commits intobitcoindevkit:masterfrom
Conversation
evanlinjin
force-pushed
the
feature/optional-mtp
branch
5 times, most recently
from
a10729c to
9f83bf8
Compare
evanlinjin
force-pushed
the
feature/optional-mtp
branch
4 times, most recently
from
174c73f to
bdc7fcf
Compare
evanlinjin
changed the title
ValuedMammal
requested changes
Feb 5, 2026
aagbotemi
reviewed
Feb 5, 2026
Collaborator
aagbotemi
left a comment
aagbotemi
left a comment
There was a problem hiding this comment.
Thank you for working on this PR @evanlinjin. I left some review
src/input.rs
Outdated
Comment on lines
+374
to
+378
| if let (Some(relative::LockTime::Blocks(lt_height)), Some(conf_status)) = | ||
| (self.plan.relative_timelock(), self.status) | ||
| { | ||
| let height_diff = spending_height.saturating_sub(conf_status.height.to_consensus_u32()); | ||
| return lt_height.to_consensus_u32() > height_diff; |
Collaborator
There was a problem hiding this comment.
When status is None (unconfirmed), this returns false, incorrectly marking the input as not timelocked. Should return true when status.is_none() && relative_lock.is_some().
src/input.rs
Outdated
Comment on lines
+394
to
+403
| if let (Some(relative::LockTime::Time(lt_time)), Some(conf_status)) = | ||
| (self.plan.relative_timelock(), self.status) | ||
| { | ||
| let time_diff = tip_mtp | ||
| .to_consensus_u32() | ||
| .saturating_sub(conf_status.prev_mtp?.to_consensus_u32()); | ||
| return Some(lt_time.value() as u32 * 512 > time_diff); | ||
| } | ||
|
|
||
| Some(false) |
Collaborator
There was a problem hiding this comment.
When status is None (unconfirmed), this returns Some(false), incorrectly marking the input as not timelocked. Unconfirmed inputs with relative time locks should return Some(true).
evanlinjin
force-pushed
the
feature/optional-mtp
branch
from
bdc7fcf to
85b311f
Compare
evanlinjin
added a commit
to evanlinjin/bdk-tx
that referenced
this pull request
Feb 6, 2026
Add comprehensive unit tests covering edge cases for is_block_timelocked, is_time_timelocked, and is_timelocked methods: - Unconfirmed inputs with relative timelocks (must be considered locked) - Missing prev_mtp for relative time locks (returns None) - No-lock and wrong-lock-type scenarios (return false/Some(false)) - Combined is_timelocked method with various lock combinations These tests cover the bug cases identified in PR bitcoindevkit#36 review. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
Member
Author
|
@ValuedMammal @aagbotemi Thank you for the reviews. Tests in #38 have also been updated to cover these edge cases. |
ValuedMammal
approved these changes
Feb 11, 2026
src/input.rs
Outdated
|
|
||
| /// Whether this is locked by any timelock constraint. | ||
| /// | ||
| /// Returns `None` if a time-based lock exists but `spending_mtp` is not provided or |
Collaborator
There was a problem hiding this comment.
📌 "spending_mtp" doesn't appear in the function.
src/input_candidates.rs
Outdated
Comment on lines
+321
to
+322
| spend_height: absolute::Height, | ||
| spend_mtp: Option<absolute::Time>, |
Collaborator
There was a problem hiding this comment.
📌 Should it be spend_height or tip_height? Also consider rename to just filter_unspendable.
Member
Author
There was a problem hiding this comment.
Good point. Addressed both.
aagbotemi
approved these changes
Feb 11, 2026
Comment on lines
+18
to
+19
| /// Previous block's MTP (median time past) value as per BIP-0068, if available. | ||
| pub prev_mtp: Option<absolute::Time>, |
Collaborator
There was a problem hiding this comment.
nit: the docs for prev_mtp don't explain what happens when it's None
Correctly calculate spendability of coins that are timelocked by taking MTP into account. API changes are a result of the different requirements between relative and absolute locktimes.
evanlinjin
force-pushed
the
feature/optional-mtp
branch
from
85b311f to
302faff
Compare
aagbotemi
approved these changes
Feb 13, 2026
Collaborator
|
ACK a35ecbf |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Previously, time-based locktimes are based on header timestamps, but they should be based on MTP.
Changes
TxStatustoConfirmationStatus.is_timelockedmethod into two methods as time-based and block-based timelocks have different required metadata.Testing
Testing is done in #38 as they require some unreleased changes in upstream crates.