milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Drop not-very-useful output dust threshold constants 

It doesn't really make sense to have a constant for every common
script type's dust limit, instead we should just use the
`Script::dust_value()` function to have users calculate it.
This commit is contained in:
Matt Corallo 2021-05-05 14:53:26 +00:00
parent 15981c945a
commit fc6f23fb9b
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/blockdata/script.rs
View File

@ -400,14 +400,6 @@ impl Script {
opcodes::All::from(self.0[0]).classify() == opcodes::Class::IllegalOp) opcodes::All::from(self.0[0]).classify() == opcodes::Class::IllegalOp)
} }
/// The minimum value an output with a P2WPKH script_pubkey must have in order to be
/// broadcastable on today's bitcoin network.
pub const P2WPKH_OUTPUT_DUST_THRESHOLD: u64 = 294;
/// The minimum value an output with a P2PKH script_pubkey must have in order to be
/// broadcastable on today's bitcoin network.
pub const P2PKH_OUTPUT_DUST_THRESHOLD: u64 = 546;
/// Gets the minimum value an output with this script should have in order to be /// Gets the minimum value an output with this script should have in order to be
/// broadcastable on today's bitcoin network. /// broadcastable on today's bitcoin network.
pub fn dust_value(&self) -> u64 { pub fn dust_value(&self) -> u64 {
@ -1240,9 +1232,12 @@ mod test {
#[test] #[test]
fn defult_dust_value_tests() { fn defult_dust_value_tests() {
// Check that our dust_value() calculator correctly calculates the dust limit on common
// well-known scriptPubKey types.
let script_p2wpkh = Builder::new().push_int(0).push_slice(&[42; 20]).into_script(); let script_p2wpkh = Builder::new().push_int(0).push_slice(&[42; 20]).into_script();
assert!(script_p2wpkh.is_v0_p2wpkh()); assert!(script_p2wpkh.is_v0_p2wpkh());
assert_eq!(script_p2wpkh.dust_value(), Script::P2WPKH_OUTPUT_DUST_THRESHOLD); assert_eq!(script_p2wpkh.dust_value(), 294);
let script_p2pkh = Builder::new() let script_p2pkh = Builder::new()
.push_opcode(opcodes::all::OP_DUP) .push_opcode(opcodes::all::OP_DUP)
.push_opcode(opcodes::all::OP_HASH160) .push_opcode(opcodes::all::OP_HASH160)
@ -1251,7 +1246,7 @@ mod test {
.push_opcode(opcodes::all::OP_CHECKSIG) .push_opcode(opcodes::all::OP_CHECKSIG)
.into_script(); .into_script();
assert!(script_p2pkh.is_p2pkh()); assert!(script_p2pkh.is_p2pkh());
assert_eq!(script_p2pkh.dust_value(), Script::P2PKH_OUTPUT_DUST_THRESHOLD); assert_eq!(script_p2pkh.dust_value(), 546);
} }
} }