Skip to content

fix: include varints for Taproot script and control block sizes #858

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
merged 1 commit into from
Sep 24, 2025
Merged

fix: include varints for Taproot script and control block sizes #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions src/plan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,23 +984,29 @@ mod test {
// expected weight: 4 (scriptSig len) + 1 (witness len) + 1 (OP_PUSH) + 64 (sig)
let internal_key_sat_weight = Some(70);
// expected weight: 4 (scriptSig len) + 1 (witness len) + 1 (OP_PUSH) + 64 (sig)
// + 1 (script len)
// + 34 [script: 1 (OP_PUSHBYTES_32) + 32 (key) + 1 (OP_CHECKSIG)]
// + 1 (control block len)
// + 65 [control block: 1 (control byte) + 32 (internal key) + 32 (hash BC)]
let first_leaf_sat_weight = Some(169);
let first_leaf_sat_weight = Some(171);
// expected weight: 4 (scriptSig len) + 1 (witness len) + 1 (OP_PUSH) + 64 (sig)
// + 1 (OP_ZERO)
// + 1 (script len)
// + 70 [script: 1 (OP_PUSHBYTES_32) + 32 (key) + 1 (OP_CHECKSIG)
// + 1 (OP_PUSHBYTES_32) + 32 (key) + 1 (OP_CHECKSIGADD)
// + 1 (OP_PUSHNUM1) + 1 (OP_NUMEQUAL)]
// + 1 (control block len)
// + 97 [control block: 1 (control byte) + 32 (internal key) + 32 (hash C) + 32 (hash
// A)]
let second_leaf_sat_weight = Some(238);
let second_leaf_sat_weight = Some(240);
// expected weight: 4 (scriptSig len) + 1 (witness len) + 1 (OP_PUSH) + 64 (sig)
// + 1 (script len)
// + 36 [script: 1 (OP_PUSHBYTES_32) + 32 (key) + 1 (OP_CHECKSIGVERIFY)
// + 1 (OP_PUSHNUM_10) + 1 (OP_CLTV)]
// + 1 (control block len)
// + 97 [control block: 1 (control byte) + 32 (internal key) + 32 (hash B) + 32 (hash
// A)]
let third_leaf_sat_weight = Some(203);
let third_leaf_sat_weight = Some(205);

let tests = vec![
// Don't give assets
Expand Down
7 changes: 5 additions & 2 deletions src/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ impl<Pk: MiniscriptKey> ItemSize for Placeholder<Pk> {
| Placeholder::Hash160Preimage(_) => 33,
Placeholder::PushOne => 2, // On legacy this should be 1 ?
Placeholder::PushZero => 1,
Placeholder::TapScript(s) => s.len(),
Placeholder::TapControlBlock(cb) => cb.serialize().len(),
Placeholder::TapScript(s) => s.len() + varint_len(s.len()),
Placeholder::TapControlBlock(cb) => {
let block_len = cb.serialize().len();
block_len + varint_len(block_len)
}
}
}
}
Expand Down
Loading