aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Chow <achow101-github@achow101.com>2022-08-16 15:26:19 -0400
committerAndrew Chow <github@achow101.com>2022-10-06 15:32:51 -0400
commit30ff25cf37eec4b09ab40424eb5d6a4a80410955 (patch)
treef6f200da113d198086856e5c4fc503ff38b84e3e
parent0577d423adda8e719d7611d03355680c8fbacab8 (diff)
psbt: Only include m_tap_tree if it has scripts
-rw-r--r--src/psbt.cpp2
-rw-r--r--src/script/standard.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/psbt.cpp b/src/psbt.cpp
index 6c6ea6a555..cbf2f88788 100644
--- 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
index 1e6769782a..966a52b2c7 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -315,6 +315,8 @@ public:
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.