Skip to content

Remove duplicate TXIN_BASE_WEIGHT from new_tr_keyspend #32

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
LLFourn merged 2 commits into from
Jan 29, 2025
Merged

Remove duplicate TXIN_BASE_WEIGHT from new_tr_keyspend #32

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
6c95918
fix: remove duplicate TXIN_BASE_WEIGHT from new_tr_keyspend #31
cygnet3 Jan 29, 2025
52767a4
Add test for new_tr_keyspend weight
LLFourn Jan 29, 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
2 changes: 1 addition & 1 deletion src/coin_selector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ pub struct Candidate {
impl Candidate {
/// Create a [`Candidate`] input that spends a single taproot keyspend output.
pub fn new_tr_keyspend(value: u64) -> Self {
let weight = TXIN_BASE_WEIGHT + TR_KEYSPEND_SATISFACTION_WEIGHT;
let weight = TR_KEYSPEND_SATISFACTION_WEIGHT;
Copy link
Copy Markdown
Collaborator

@LLFourn LLFourn Jan 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait did you mean to use TR_KEYSPEND_TXIN_WEIGHT.

EDIT -- oh no I see now.

Self::new(value, weight, true)
}

Expand Down
12 changes: 12 additions & 0 deletions tests/weight.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,3 +199,15 @@ fn legacy_three_inputs_one_segwit() {
tx.weight().to_wu()
);
}

#[test]
fn new_tr_keyspend_correct_weight() {
// FROM https://mempool.space/tx/4936a1a4ea1a0085b9dc2a1d5b59d361f5b1b41241772f3e465153712b6d8dc0
let tx_bytes = hex_decode("0200000000010133356a4ad67383c8d4a822c088bb411a0c008fcdba84bf4505a0ac4cfc4e6d8c0100000000fdffffff01e0d2b50000000000160014e137b1254bc0b1f0df4c1f30bdb5e8ee88bfae6401401d69b620120db44b5441fc8630b3c4483f8fc15322c57b27ae55ad0b2e70e8bee1371fb32506288b5c430767b2e63b17dc047a101611114323058ce7fea72c6d00000000");
let tx = Transaction::consensus_decode(&mut tx_bytes.as_slice()).unwrap();

assert_eq!(
tx.input[0].segwit_weight().to_wu(),
Candidate::new_tr_keyspend(420).weight
);
}