psbt: Only include m_tap_tree if it has scripts

achow101 · fanquake · commit 4d42c3a2401c · 2022-10-13T23:45:36.000+08:00
Github-Pull: #25858 Rebased-From: 30ff25c
diff --git a/src/psbt.cpp b/src/psbt.cpp
@@ -249,7 +249,7 @@ void PSBTOutput::FromSignatureData(const SignatureData& sigdata)
     if (!sigdata.tr_spenddata.internal_key.IsNull()) {
         m_tap_internal_key = sigdata.tr_spenddata.internal_key;
     }
-    if (sigdata.tr_builder.has_value()) {
+    if (sigdata.tr_builder.has_value() && sigdata.tr_builder->HasScripts()) {
         m_tap_tree = sigdata.tr_builder->GetTreeTuples();
     }
     for (const auto& [pubkey, leaf_origin] : sigdata.taproot_misc_pubkeys) {
diff --git a/src/script/standard.h b/src/script/standard.h
@@ -315,6 +315,8 @@ class TaprootBuilder
     TaprootSpendData GetSpendData() const;
     /** Returns a vector of tuples representing the depth, leaf version, and script */
     std::vector<std::tuple<uint8_t, uint8_t, CScript>> GetTreeTuples() const;
+    /** Returns true if there are any tapscripts */
+    bool HasScripts() const { return !m_branch.empty(); }
 };
 
 /** Given a TaprootSpendData and the output key, reconstruct its script tree.

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ void PSBTOutput::FromSignatureData(const SignatureData& sigdata)`
`249`	`249`	`if (!sigdata.tr_spenddata.internal_key.IsNull()) {`
`250`	`250`	`m_tap_internal_key = sigdata.tr_spenddata.internal_key;`
`251`	`251`	`}`
`252`		`- if (sigdata.tr_builder.has_value()) {`
	`252`	`+ if (sigdata.tr_builder.has_value() && sigdata.tr_builder->HasScripts()) {`
`253`	`253`	`m_tap_tree = sigdata.tr_builder->GetTreeTuples();`
`254`	`254`	`}`
`255`	`255`	`for (const auto& [pubkey, leaf_origin] : sigdata.taproot_misc_pubkeys) {`