diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2022-08-16 15:26:19 -0400 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-10-13 23:45:36 +0800 |
| commit | 4d42c3a2401c63084bf94433609240daa366753e (patch) | |
| tree | 1079545b13ab823f96cc0281d49b1585e1e7965a | |
| parent | d810fde8ea64b71567f8b50895ac76bcb7afbfbc (diff) | |
| download | bitcoin-4d42c3a2401c63084bf94433609240daa366753e.tar.xz | |
psbt: Only include m_tap_tree if it has scripts
Github-Pull: #25858
Rebased-From: 30ff25cf37eec4b09ab40424eb5d6a4a80410955
| -rw-r--r-- | src/psbt.cpp | 2 | ||||
| -rw-r--r-- | src/script/standard.h | 2 |
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. |