psbt: Fix merging of m_tap_tree

achow101 · fanquake · commit 4abd2ab18e26 · 2022-10-13T23:44:01.000+08:00
Merging should be checking that the current PSBTOutput doesn't have a taptree and the other one's is copied over. The original merging had this inverted and would remove m_tap_tree if the other did not have it. Github-Pull: #25858 Rebased-From: 7df6e1b
diff --git a/src/psbt.cpp b/src/psbt.cpp
@@ -265,7 +265,7 @@ void PSBTOutput::Merge(const PSBTOutput& output)
     if (redeem_script.empty() && !output.redeem_script.empty()) redeem_script = output.redeem_script;
     if (witness_script.empty() && !output.witness_script.empty()) witness_script = output.witness_script;
     if (m_tap_internal_key.IsNull() && !output.m_tap_internal_key.IsNull()) m_tap_internal_key = output.m_tap_internal_key;
-    if (m_tap_tree.has_value() && !output.m_tap_tree.has_value()) m_tap_tree = output.m_tap_tree;
+    if (!m_tap_tree.has_value() && output.m_tap_tree.has_value()) m_tap_tree = output.m_tap_tree;
 }
 bool PSBTInputSigned(const PSBTInput& input)
 {

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ void PSBTOutput::Merge(const PSBTOutput& output)`
`265`	`265`	`if (redeem_script.empty() && !output.redeem_script.empty()) redeem_script = output.redeem_script;`
`266`	`266`	`if (witness_script.empty() && !output.witness_script.empty()) witness_script = output.witness_script;`
`267`	`267`	`if (m_tap_internal_key.IsNull() && !output.m_tap_internal_key.IsNull()) m_tap_internal_key = output.m_tap_internal_key;`
`268`		`- if (m_tap_tree.has_value() && !output.m_tap_tree.has_value()) m_tap_tree = output.m_tap_tree;`
	`268`	`+ if (!m_tap_tree.has_value() && output.m_tap_tree.has_value()) m_tap_tree = output.m_tap_tree;`
`269`	`269`	`}`
`270`	`270`	`bool PSBTInputSigned(const PSBTInput& input)`
`271`	`271`	`{`