diff options
| author | Andrew Chow <github@achow101.com> | 2022-10-06 15:19:30 -0400 |
|---|---|---|
| committer | Andrew Chow <github@achow101.com> | 2022-10-06 15:19:30 -0400 |
| commit | 7df6e1bb77a96eac4fbcba424bbe780636b86650 (patch) | |
| tree | 3e7d46a6a3d8a61be448529991d6aba474f9b184 /src/psbt.cpp | |
| parent | 0652dc53b291bd295caff4093ec2854fd4b34645 (diff) | |
| download | bitcoin-7df6e1bb77a96eac4fbcba424bbe780636b86650.tar.xz | |
psbt: Fix merging of m_tap_tree
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.
Diffstat (limited to 'src/psbt.cpp')
| -rw-r--r-- | src/psbt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/psbt.cpp b/src/psbt.cpp index 36fec74bc9..6b75de91f8 100644 --- 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) { |