nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

descriptors: make the satisfaction size helpers part of the multi desc

Browse Source 
Otherwise caller would have to call "receive_desc()" or "change_desc()"
before being able to call that which is unnecessary and an awkward API.
This commit is contained in:
Antoine Poinsot 2022-12-08 11:57:47 +01:00
parent 929c79a56a
commit 9cc748cd2a
No known key found for this signature in database
GPG Key ID: E13FC145CD3F4304
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/descriptors.rs
View File

@ -472,6 +472,20 @@ impl MultipathDescriptor {
assert!(csv.is_height_locked());
csv.to_consensus_u32()
}
/// Get the maximum size in WU of a satisfaction for this descriptor.
pub fn max_sat_weight(&self) -> usize {
self.multi_desc
.max_satisfaction_weight()
.expect("Cannot fail for P2WSH")
}
/// Get the maximum size in virtual bytes of the whole input in a transaction spending
/// a coin with this Script.
pub fn spender_input_size(&self) -> usize {
// txid + vout + nSequence + empty scriptSig + witness
32 + 4 + 4 + 1 + wu_to_vb(self.max_sat_weight())
}
}
impl InheritanceDescriptor {
@ -531,20 +545,6 @@ impl InheritanceDescriptor {
),
)
}
/// Get the maximum size in WU of a satisfaction for this descriptor.
pub fn max_sat_weight(&self) -> usize {
self.0
.max_satisfaction_weight()
.expect("Cannot fail for P2WSH")
}
/// Get the maximum size in virtual bytes of the whole input in a transaction spending
/// a coin with this Script.
pub fn spender_input_size(&self) -> usize {
// txid + vout + nSequence + empty scriptSig + witness
32 + 4 + 4 + 1 + wu_to_vb(self.max_sat_weight())
}
}
/// Map of a raw public key to the xpub used to derive it and its derivation path
@ -679,15 +679,8 @@ mod tests {
let receive_desc = desc.receive_descriptor();
let change_desc = desc.change_descriptor();
// Receive and change are the same descriptor.
assert_eq!(receive_desc.max_sat_weight(), change_desc.max_sat_weight());
assert_eq!(
receive_desc.spender_input_size(),
change_desc.spender_input_size()
);
// Derived or not the expected maximum satisfaction size should be the same for
// the same descriptor.
// the change and receive descriptor.
assert_eq!(
receive_desc.derive(999.into(), &secp).max_sat_weight(),
change_desc.derive(999.into(), &secp).max_sat_weight()
@ -709,7 +702,7 @@ mod tests {
.map(|item| bitcoin::VarInt(stack.len() as u64).len() + item.len())
.sum::<usize>();
assert_eq!(
receive_desc.spender_input_size(),
desc.spender_input_size(),
32 + 4 + 1 + 4 + wu_to_vb(witness_size),
);
}