GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge c0e30933e0 into merged_master (Bitcoin PR bitcoin/bitcoin#22323)

Browse source
This commit is contained in:
Andrew Poelstra 2021-07-28 15:20:02 +00:00
commit 6d72443536
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/script/standard.cpp
View file

@ -564,9 +564,9 @@ std::optional<std::vector<std::tuple<int, CScript, int>>> InferTaprootTree(const
std::vector<std::tuple<int, CScript, int>> ret;
if (spenddata.merkle_root.IsNull()) return ret;
/** Data structure to represent the nodes of the tree we're going to be build. */
/** Data structure to represent the nodes of the tree we're going to build. */
struct TreeNode {
/** Hash of this none, if known; 0 otherwise. */
/** Hash of this node, if known; 0 otherwise. */
uint256 hash;
/** The left and right subtrees (note that their order is irrelevant). */
std::unique_ptr<TreeNode> sub[2];
@ -581,7 +581,7 @@ std::optional<std::vector<std::tuple<int, CScript, int>>> InferTaprootTree(const
bool done = false;
};
// Build tree from the provides branches.
// Build tree from the provided branches.
TreeNode root;
root.hash = spenddata.merkle_root;
for (const auto& [key, control_blocks] : spenddata.scripts) {