mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 07:17:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Check if msg.script.is_witness_program() before checking version

Browse source
This commit is contained in:
Duncan Dean 2024-03-26 11:17:05 +02:00
parent 4eb70fdf7a
commit 774b048d8f
No known key found for this signature in database
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lightning/src/ln/interactivetxs.rs
View file

@ -259,9 +259,13 @@ impl NegotiationContext {
// with witness versions V1 and up are always considered standard. Yes, the scripts can be // with witness versions V1 and up are always considered standard. Yes, the scripts can be
// anyone-can-spend-able, but if our counterparty wants to add an output like that then it's none // anyone-can-spend-able, but if our counterparty wants to add an output like that then it's none
// of our concern really ¯\_(ツ)_/¯ // of our concern really ¯\_(ツ)_/¯
if !msg.script.is_v0_p2wpkh() //
&& !msg.script.is_v0_p2wsh() // TODO: The last check would be simplified when https://github.com/rust-bitcoin/rust-bitcoin/commit/1656e1a09a1959230e20af90d20789a4a8f0a31b
&& msg.script.witness_version().map(|v| v.to_num() < 1).unwrap_or(true) // hits the next release of rust-bitcoin.
if !(msg.script.is_v0_p2wpkh()
|| msg.script.is_v0_p2wsh()
|| (msg.script.is_witness_program()
&& msg.script.witness_version().map(|v| v.to_num() >= 1).unwrap_or(false)))
{ {
return Err(AbortReason::InvalidOutputScript); return Err(AbortReason::InvalidOutputScript);
} }