From: Duncan Dean <git@dunxen.dev>
Date: Tue, 26 Mar 2024 09:17:05 +0000 (+0200)
Subject: Check if msg.script.is_witness_program() before checking version
X-Git-Tag: v0.0.123-rc1~7^2~5
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=774b048d8f71e1e55f85a318366cd398f7941b7e;p=rust-lightning

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

diff --git a/lightning/src/ln/interactivetxs.rs b/lightning/src/ln/interactivetxs.rs
index aea1e8ecb..7e3addc77 100644
--- a/lightning/src/ln/interactivetxs.rs
+++ b/lightning/src/ln/interactivetxs.rs
@@ -259,9 +259,13 @@ impl NegotiationContext {
 		// 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
 		// of our concern really ¯\_(ツ)_/¯
-		if !msg.script.is_v0_p2wpkh()
-			&& !msg.script.is_v0_p2wsh()
-			&& msg.script.witness_version().map(|v| v.to_num() < 1).unwrap_or(true)
+		//
+		// TODO: The last check would be simplified when https://github.com/rust-bitcoin/rust-bitcoin/commit/1656e1a09a1959230e20af90d20789a4a8f0a31b
+		// 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);
 		}