diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2022-08-16 21:17:43 -0400 |
|---|---|---|
| committer | Andrew Chow <github@achow101.com> | 2022-10-06 15:32:51 -0400 |
| commit | 0577d423adda8e719d7611d03355680c8fbacab8 (patch) | |
| tree | 8c89296dd7bd78b876ab1a6592b905f41a82aa6a /src/psbt.cpp | |
| parent | 22c051ca70bae73e0430b05fb9d879591df27699 (diff) | |
| download | bitcoin-0577d423adda8e719d7611d03355680c8fbacab8.tar.xz | |
psbt: Change m_tap_tree to store just the tuples
Instead of having an entire TaprootBuilder which may or may not be
complete, and could potentially have future changes that interact oddly
with taproot tree tuples, have m_tap_tree be just the tuples.
When needed in other a TaprootBuilder for actual use, the tuples will be
added to a a TaprootBuilder that, in the future, can take in whatever
other data is needed as well.
Diffstat (limited to 'src/psbt.cpp')
| -rw-r--r-- | src/psbt.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/psbt.cpp b/src/psbt.cpp index 6b75de91f8..6c6ea6a555 100644 --- a/src/psbt.cpp +++ b/src/psbt.cpp @@ -218,8 +218,14 @@ void PSBTOutput::FillSignatureData(SignatureData& sigdata) const for (const auto& key_pair : hd_keypaths) { sigdata.misc_pubkeys.emplace(key_pair.first.GetID(), key_pair); } - if (m_tap_tree.has_value() && m_tap_internal_key.IsFullyValid()) { - TaprootSpendData spenddata = m_tap_tree->GetSpendData(); + if (!m_tap_tree.empty() && m_tap_internal_key.IsFullyValid()) { + TaprootBuilder builder; + for (const auto& [depth, leaf_ver, script] : m_tap_tree) { + builder.Add((int)depth, script, (int)leaf_ver, /*track=*/true); + } + assert(builder.IsComplete()); + builder.Finalize(m_tap_internal_key); + TaprootSpendData spenddata = builder.GetSpendData(); sigdata.tr_spenddata.internal_key = m_tap_internal_key; sigdata.tr_spenddata.Merge(spenddata); @@ -244,7 +250,7 @@ void PSBTOutput::FromSignatureData(const SignatureData& sigdata) m_tap_internal_key = sigdata.tr_spenddata.internal_key; } if (sigdata.tr_builder.has_value()) { - m_tap_tree = sigdata.tr_builder; + m_tap_tree = sigdata.tr_builder->GetTreeTuples(); } for (const auto& [pubkey, leaf_origin] : sigdata.taproot_misc_pubkeys) { m_tap_bip32_paths.emplace(pubkey, leaf_origin); @@ -265,7 +271,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.empty() && !output.m_tap_tree.empty()) m_tap_tree = output.m_tap_tree; } bool PSBTInputSigned(const PSBTInput& input) { |