From 531aab627c7246b3bc2b1275da5ff95f99ecc31b Mon Sep 17 00:00:00 2001 From: Hodlinator <172445034+hodlinator@users.noreply.github.com> Date: Wed, 22 Jan 2025 21:19:24 +0100 Subject: [PATCH 1/3] miniscript doc: Remove mention of shared pointers Correct destructor implementation comment to no longer refer to shared pointers and also move it into the function body, in symmetry with Clone() right below. --- src/script/miniscript.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/script/miniscript.h b/src/script/miniscript.h index 03f0a7c3654..be642a91b22 100644 --- a/src/script/miniscript.h +++ b/src/script/miniscript.h @@ -515,9 +515,10 @@ struct Node { //! The Script context for this node. Either P2WSH or Tapscript. const MiniscriptContext m_script_ctx; - /* Destroy the shared pointers iteratively to avoid a stack-overflow due to recursive calls - * to the subs' destructors. */ - ~Node() { + ~Node() + { + // Destroy the subexpressions iteratively to avoid a stack-overflow due + // to recursive calls to the subs' destructors. while (!subs.empty()) { auto node = std::move(subs.back()); subs.pop_back(); From c7f1829b4bb3a579c65a99a62b42f64de946c0da Mon Sep 17 00:00:00 2001 From: Hodlinator <172445034+hodlinator@users.noreply.github.com> Date: Wed, 22 Jan 2025 21:50:15 +0100 Subject: [PATCH 2/3] miniscript refactor: Make fields non-const Makes a lot of fields in miniscript.h non-const in order to allow move-operations in next commit. --- src/script/miniscript.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/script/miniscript.h b/src/script/miniscript.h index be642a91b22..b8696f2cc0d 100644 --- a/src/script/miniscript.h +++ b/src/script/miniscript.h @@ -349,8 +349,8 @@ struct InputResult { //! Class whose objects represent the maximum of a list of integers. template struct MaxInt { - const bool valid; - const I value; + bool valid; + I value; MaxInt() : valid(false), value(0) {} MaxInt(I val) : valid(true), value(val) {} @@ -421,11 +421,11 @@ struct Ops { */ struct SatInfo { //! Whether a canonical satisfaction/dissatisfaction is possible at all. - const bool valid; + bool valid; //! How much higher the stack size at start of execution can be compared to at the end. - const int32_t netdiff; + int32_t netdiff; //! Mow much higher the stack size can be during execution compared to at the end. - const int32_t exec; + int32_t exec; /** Empty script set. */ constexpr SatInfo() noexcept : valid(false), netdiff(0), exec(0) {} @@ -480,7 +480,7 @@ struct SatInfo { }; struct StackSize { - const SatInfo sat, dsat; + SatInfo sat, dsat; constexpr StackSize(SatInfo in_sat, SatInfo in_dsat) noexcept : sat(in_sat), dsat(in_dsat) {}; constexpr StackSize(SatInfo in_both) noexcept : sat(in_both), dsat(in_both) {}; @@ -503,17 +503,17 @@ struct NoDupCheck {}; template struct Node { //! What node type this node is. - const Fragment fragment; + Fragment fragment; //! The k parameter (time for OLDER/AFTER, threshold for THRESH(_M)) - const uint32_t k = 0; + uint32_t k = 0; //! The keys used by this expression (only for PK_K/PK_H/MULTI) - const std::vector keys; + std::vector keys; //! The data bytes in this expression (only for HASH160/HASH256/SHA256/RIPEMD10). - const std::vector data; + std::vector data; //! Subexpressions (for WRAP_*/AND_*/OR_*/ANDOR/THRESH) mutable std::vector> subs; //! The Script context for this node. Either P2WSH or Tapscript. - const MiniscriptContext m_script_ctx; + MiniscriptContext m_script_ctx; ~Node() { @@ -545,15 +545,15 @@ struct Node { private: //! Cached ops counts. - const internal::Ops ops; + internal::Ops ops; //! Cached stack size bounds. - const internal::StackSize ss; + internal::StackSize ss; //! Cached witness size bounds. - const internal::WitnessSize ws; + internal::WitnessSize ws; //! Cached expression type (computed by CalcType and fed through SanitizeType). - const Type typ; + Type typ; //! Cached script length (computed by CalcScriptLen). - const size_t scriptlen; + size_t scriptlen; //! Whether a public key appears more than once in this node. This value is initialized //! by all constructors except the NoDupCheck ones. The NoDupCheck ones skip the //! computation, requiring it to be done manually by invoking DuplicateKeyCheck(). From 58e9c7ca89654abdae2e37fe848ed8afc1e250e1 Mon Sep 17 00:00:00 2001 From: Hodlinator <172445034+hodlinator@users.noreply.github.com> Date: Wed, 22 Jan 2025 21:47:09 +0100 Subject: [PATCH 3/3] miniscript refactor: Remove superfluous unique_ptr-indirection Functional parity is achieved through making Node move-able. (Also makes Node::subs no longer mutable). --- src/script/descriptor.cpp | 24 +-- src/script/miniscript.h | 377 +++++++++++++++++----------------- src/test/fuzz/miniscript.cpp | 39 ++-- src/test/miniscript_tests.cpp | 75 +++---- 4 files changed, 256 insertions(+), 259 deletions(-) diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp index c8802d2bf89..14d05407f62 100644 --- a/src/script/descriptor.cpp +++ b/src/script/descriptor.cpp @@ -1301,13 +1301,13 @@ public: class MiniscriptDescriptor final : public DescriptorImpl { private: - miniscript::NodeRef m_node; + const miniscript::Node m_node; protected: std::vector MakeScripts(const std::vector& keys, Span scripts, FlatSigningProvider& provider) const override { - const auto script_ctx{m_node->GetMsCtx()}; + const auto script_ctx{m_node.GetMsCtx()}; for (const auto& key : keys) { if (miniscript::IsTapscript(script_ctx)) { provider.pubkeys.emplace(Hash160(XOnlyPubKey{key}), key); @@ -1315,17 +1315,17 @@ protected: provider.pubkeys.emplace(key.GetID(), key); } } - return Vector(m_node->ToScript(ScriptMaker(keys, script_ctx))); + return Vector(m_node.ToScript(ScriptMaker(keys, script_ctx))); } public: - MiniscriptDescriptor(std::vector> providers, miniscript::NodeRef node) + MiniscriptDescriptor(std::vector> providers, miniscript::Node&& node) : DescriptorImpl(std::move(providers), "?"), m_node(std::move(node)) {} bool ToStringHelper(const SigningProvider* arg, std::string& out, const StringType type, const DescriptorCache* cache = nullptr) const override { - if (const auto res = m_node->ToString(StringMaker(arg, m_pubkey_args, type == StringType::PRIVATE))) { + if (const auto res = m_node.ToString(StringMaker(arg, m_pubkey_args, type == StringType::PRIVATE))) { out = *res; return true; } @@ -1335,15 +1335,15 @@ public: bool IsSolvable() const override { return true; } bool IsSingleType() const final { return true; } - std::optional ScriptSize() const override { return m_node->ScriptSize(); } + std::optional ScriptSize() const override { return m_node.ScriptSize(); } std::optional MaxSatSize(bool) const override { // For Miniscript we always assume high-R ECDSA signatures. - return m_node->GetWitnessSize(); + return m_node.GetWitnessSize(); } std::optional MaxSatisfactionElems() const override { - return m_node->GetStackSize(); + return m_node.GetStackSize(); } std::unique_ptr Clone() const override @@ -1353,7 +1353,7 @@ public: for (const auto& arg : m_pubkey_args) { providers.push_back(arg->Clone()); } - return std::make_unique(std::move(providers), m_node->Clone()); + return std::make_unique(std::move(providers), m_node.Clone()); } }; @@ -2090,7 +2090,7 @@ std::vector> ParseScript(uint32_t& key_exp_index } if (!node->IsSane() || node->IsNotSatisfiable()) { // Try to find the first insane sub for better error reporting. - auto insane_node = node.get(); + const auto* insane_node = &*node; if (const auto sub = node->FindInsaneSub()) insane_node = sub; if (const auto str = insane_node->ToString(parser)) error = *str; if (!insane_node->IsValid()) { @@ -2099,7 +2099,7 @@ std::vector> ParseScript(uint32_t& key_exp_index error += " is not sane"; if (!insane_node->IsNonMalleable()) { error += ": malleable witnesses exist"; - } else if (insane_node == node.get() && !insane_node->NeedsSignature()) { + } else if (insane_node == &*node && !insane_node->NeedsSignature()) { error += ": witnesses without signature exist"; } else if (!insane_node->CheckTimeLocksMix()) { error += ": contains mixes of timelocks expressed in blocks and seconds"; @@ -2299,7 +2299,7 @@ std::unique_ptr InferScript(const CScript& script, ParseScriptCo for (auto& key : parser.m_keys) { keys.emplace_back(std::move(key.at(0))); } - return std::make_unique(std::move(keys), std::move(node)); + return std::make_unique(std::move(keys), std::move(*node)); } } diff --git a/src/script/miniscript.h b/src/script/miniscript.h index b8696f2cc0d..69f694faa0b 100644 --- a/src/script/miniscript.h +++ b/src/script/miniscript.h @@ -188,13 +188,6 @@ inline consteval Type operator""_mst(const char* c, size_t l) using Opcode = std::pair>; -template struct Node; -template using NodeRef = std::unique_ptr>; - -//! Construct a miniscript node as a unique_ptr. -template -NodeRef MakeNodeRef(Args&&... args) { return std::make_unique>(std::forward(args)...); } - //! The different node types in miniscript. enum class Fragment { JUST_0, //!< OP_0 @@ -511,7 +504,7 @@ struct Node { //! The data bytes in this expression (only for HASH160/HASH256/SHA256/RIPEMD10). std::vector data; //! Subexpressions (for WRAP_*/AND_*/OR_*/ANDOR/THRESH) - mutable std::vector> subs; + std::vector subs; //! The Script context for this node. Either P2WSH or Tapscript. MiniscriptContext m_script_ctx; @@ -519,28 +512,30 @@ struct Node { { // Destroy the subexpressions iteratively to avoid a stack-overflow due // to recursive calls to the subs' destructors. - while (!subs.empty()) { - auto node = std::move(subs.back()); - subs.pop_back(); - while (!node->subs.empty()) { - subs.push_back(std::move(node->subs.back())); - node->subs.pop_back(); + std::vector>> to_be_stripped; + to_be_stripped.emplace_back(std::move(subs)); + while (!to_be_stripped.empty()) { + auto stripping{std::move(to_be_stripped.back())}; + to_be_stripped.pop_back(); + for (auto& i : stripping) { + to_be_stripped.emplace_back(std::move(i.subs)); } } } - NodeRef Clone() const + Node Clone() const { // Use TreeEval() to avoid a stack-overflow due to recursion - auto upfn = [](const Node& node, Span> children) { - std::vector> new_subs; - for (auto child = children.begin(); child != children.end(); ++child) { - new_subs.emplace_back(std::move(*child)); + auto upfn = [](const Node& node, Span children) { + std::vector new_subs; + for (auto& child : children) { + // It's fine to move from children as they are new nodes having + // been produced by calling this function one level down. + new_subs.emplace_back(std::move(child)); } - // std::make_unique (and therefore MakeNodeRef) doesn't work on private constructors - return std::unique_ptr{new Node{internal::NoDupCheck{}, node.m_script_ctx, node.fragment, std::move(new_subs), node.keys, node.data, node.k}}; + return Node{internal::NoDupCheck{}, node.m_script_ctx, node.fragment, std::move(new_subs), node.keys, node.data, node.k}; }; - return TreeEval>(upfn); + return TreeEval(upfn); } private: @@ -564,17 +559,17 @@ private: // Constructor which takes all of the data that a Node could possibly contain. // This is kept private as no valid fragment has all of these arguments. // Only used by Clone() - Node(internal::NoDupCheck, MiniscriptContext script_ctx, Fragment nt, std::vector> sub, std::vector key, std::vector arg, uint32_t val) + Node(internal::NoDupCheck, MiniscriptContext script_ctx, Fragment nt, std::vector> sub, std::vector key, std::vector arg, uint32_t val) : fragment(nt), k(val), keys(key), data(std::move(arg)), subs(std::move(sub)), m_script_ctx{script_ctx}, ops(CalcOps()), ss(CalcStackSize()), ws(CalcWitnessSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {} //! Compute the length of the script for this miniscript (including children). size_t CalcScriptLen() const { size_t subsize = 0; for (const auto& sub : subs) { - subsize += sub->ScriptSize(); + subsize += sub.ScriptSize(); } static constexpr auto NONE_MST{""_mst}; - Type sub0type = subs.size() > 0 ? subs[0]->GetType() : NONE_MST; + Type sub0type = subs.size() > 0 ? subs[0].GetType() : NONE_MST; return internal::ComputeScriptLen(fragment, sub0type, subsize, k, subs.size(), keys.size(), m_script_ctx); } @@ -645,7 +640,7 @@ private: * that child (and all earlier children) will be at the end of `results`. */ size_t child_index = stack.back().expanded++; State child_state = downfn(stack.back().state, node, child_index); - stack.emplace_back(*node.subs[child_index], 0, std::move(child_state)); + stack.emplace_back(node.subs[child_index], 0, std::move(child_state)); continue; } // Invoke upfn with the last node.subs.size() elements of results as input. @@ -722,7 +717,7 @@ private: if (b.subs.size() < a.subs.size()) return 1; size_t n = a.subs.size(); for (size_t i = 0; i < n; ++i) { - queue.emplace_back(*a.subs[n - 1 - i], *b.subs[n - 1 - i]); + queue.emplace_back(a.subs[n - 1 - i], b.subs[n - 1 - i]); } } return 0; @@ -735,13 +730,13 @@ private: // THRESH has a variable number of subexpressions std::vector sub_types; if (fragment == Fragment::THRESH) { - for (const auto& sub : subs) sub_types.push_back(sub->GetType()); + for (const auto& sub : subs) sub_types.push_back(sub.GetType()); } // All other nodes than THRESH can be computed just from the types of the 0-3 subexpressions. static constexpr auto NONE_MST{""_mst}; - Type x = subs.size() > 0 ? subs[0]->GetType() : NONE_MST; - Type y = subs.size() > 1 ? subs[1]->GetType() : NONE_MST; - Type z = subs.size() > 2 ? subs[2]->GetType() : NONE_MST; + Type x = subs.size() > 0 ? subs[0].GetType() : NONE_MST; + Type y = subs.size() > 1 ? subs[1].GetType() : NONE_MST; + Type z = subs.size() > 2 ? subs[2].GetType() : NONE_MST; return SanitizeType(ComputeType(fragment, x, y, z, sub_types, k, data.size(), subs.size(), keys.size(), m_script_ctx)); } @@ -780,7 +775,7 @@ public: case Fragment::WRAP_C: return BuildScript(std::move(subs[0]), verify ? OP_CHECKSIGVERIFY : OP_CHECKSIG); case Fragment::WRAP_D: return BuildScript(OP_DUP, OP_IF, subs[0], OP_ENDIF); case Fragment::WRAP_V: { - if (node.subs[0]->GetType() << "x"_mst) { + if (node.subs[0].GetType() << "x"_mst) { return BuildScript(std::move(subs[0]), OP_VERIFY); } else { return std::move(subs[0]); @@ -836,9 +831,9 @@ public: node.fragment == Fragment::WRAP_D || node.fragment == Fragment::WRAP_V || node.fragment == Fragment::WRAP_J || node.fragment == Fragment::WRAP_N || node.fragment == Fragment::WRAP_C || - (node.fragment == Fragment::AND_V && node.subs[1]->fragment == Fragment::JUST_1) || - (node.fragment == Fragment::OR_I && node.subs[0]->fragment == Fragment::JUST_0) || - (node.fragment == Fragment::OR_I && node.subs[1]->fragment == Fragment::JUST_0)); + (node.fragment == Fragment::AND_V && node.subs[1].fragment == Fragment::JUST_1) || + (node.fragment == Fragment::OR_I && node.subs[0].fragment == Fragment::JUST_0) || + (node.fragment == Fragment::OR_I && node.subs[1].fragment == Fragment::JUST_0)); }; // The upward function computes for a node, given whether its parent is a wrapper, // and the string representations of its child nodes, the string representation of the node. @@ -850,15 +845,15 @@ public: case Fragment::WRAP_A: return "a" + std::move(subs[0]); case Fragment::WRAP_S: return "s" + std::move(subs[0]); case Fragment::WRAP_C: - if (node.subs[0]->fragment == Fragment::PK_K) { + if (node.subs[0].fragment == Fragment::PK_K) { // pk(K) is syntactic sugar for c:pk_k(K) - auto key_str = ctx.ToString(node.subs[0]->keys[0]); + auto key_str = ctx.ToString(node.subs[0].keys[0]); if (!key_str) return {}; return std::move(ret) + "pk(" + std::move(*key_str) + ")"; } - if (node.subs[0]->fragment == Fragment::PK_H) { + if (node.subs[0].fragment == Fragment::PK_H) { // pkh(K) is syntactic sugar for c:pk_h(K) - auto key_str = ctx.ToString(node.subs[0]->keys[0]); + auto key_str = ctx.ToString(node.subs[0].keys[0]); if (!key_str) return {}; return std::move(ret) + "pkh(" + std::move(*key_str) + ")"; } @@ -869,11 +864,11 @@ public: case Fragment::WRAP_N: return "n" + std::move(subs[0]); case Fragment::AND_V: // t:X is syntactic sugar for and_v(X,1). - if (node.subs[1]->fragment == Fragment::JUST_1) return "t" + std::move(subs[0]); + if (node.subs[1].fragment == Fragment::JUST_1) return "t" + std::move(subs[0]); break; case Fragment::OR_I: - if (node.subs[0]->fragment == Fragment::JUST_0) return "l" + std::move(subs[1]); - if (node.subs[1]->fragment == Fragment::JUST_0) return "u" + std::move(subs[0]); + if (node.subs[0].fragment == Fragment::JUST_0) return "l" + std::move(subs[1]); + if (node.subs[1].fragment == Fragment::JUST_0) return "u" + std::move(subs[0]); break; default: break; } @@ -904,7 +899,7 @@ public: case Fragment::OR_I: return std::move(ret) + "or_i(" + std::move(subs[0]) + "," + std::move(subs[1]) + ")"; case Fragment::ANDOR: // and_n(X,Y) is syntactic sugar for andor(X,Y,0). - if (node.subs[2]->fragment == Fragment::JUST_0) return std::move(ret) + "and_n(" + std::move(subs[0]) + "," + std::move(subs[1]) + ")"; + if (node.subs[2].fragment == Fragment::JUST_0) return std::move(ret) + "and_n(" + std::move(subs[0]) + "," + std::move(subs[1]) + ")"; return std::move(ret) + "andor(" + std::move(subs[0]) + "," + std::move(subs[1]) + "," + std::move(subs[2]) + ")"; case Fragment::MULTI: { CHECK_NONFATAL(!is_tapscript); @@ -954,59 +949,59 @@ private: case Fragment::RIPEMD160: case Fragment::HASH256: case Fragment::HASH160: return {4, 0, {}}; - case Fragment::AND_V: return {subs[0]->ops.count + subs[1]->ops.count, subs[0]->ops.sat + subs[1]->ops.sat, {}}; + case Fragment::AND_V: return {subs[0].ops.count + subs[1].ops.count, subs[0].ops.sat + subs[1].ops.sat, {}}; case Fragment::AND_B: { - const auto count{1 + subs[0]->ops.count + subs[1]->ops.count}; - const auto sat{subs[0]->ops.sat + subs[1]->ops.sat}; - const auto dsat{subs[0]->ops.dsat + subs[1]->ops.dsat}; + const auto count{1 + subs[0].ops.count + subs[1].ops.count}; + const auto sat{subs[0].ops.sat + subs[1].ops.sat}; + const auto dsat{subs[0].ops.dsat + subs[1].ops.dsat}; return {count, sat, dsat}; } case Fragment::OR_B: { - const auto count{1 + subs[0]->ops.count + subs[1]->ops.count}; - const auto sat{(subs[0]->ops.sat + subs[1]->ops.dsat) | (subs[1]->ops.sat + subs[0]->ops.dsat)}; - const auto dsat{subs[0]->ops.dsat + subs[1]->ops.dsat}; + const auto count{1 + subs[0].ops.count + subs[1].ops.count}; + const auto sat{(subs[0].ops.sat + subs[1].ops.dsat) | (subs[1].ops.sat + subs[0].ops.dsat)}; + const auto dsat{subs[0].ops.dsat + subs[1].ops.dsat}; return {count, sat, dsat}; } case Fragment::OR_D: { - const auto count{3 + subs[0]->ops.count + subs[1]->ops.count}; - const auto sat{subs[0]->ops.sat | (subs[1]->ops.sat + subs[0]->ops.dsat)}; - const auto dsat{subs[0]->ops.dsat + subs[1]->ops.dsat}; + const auto count{3 + subs[0].ops.count + subs[1].ops.count}; + const auto sat{subs[0].ops.sat | (subs[1].ops.sat + subs[0].ops.dsat)}; + const auto dsat{subs[0].ops.dsat + subs[1].ops.dsat}; return {count, sat, dsat}; } case Fragment::OR_C: { - const auto count{2 + subs[0]->ops.count + subs[1]->ops.count}; - const auto sat{subs[0]->ops.sat | (subs[1]->ops.sat + subs[0]->ops.dsat)}; + const auto count{2 + subs[0].ops.count + subs[1].ops.count}; + const auto sat{subs[0].ops.sat | (subs[1].ops.sat + subs[0].ops.dsat)}; return {count, sat, {}}; } case Fragment::OR_I: { - const auto count{3 + subs[0]->ops.count + subs[1]->ops.count}; - const auto sat{subs[0]->ops.sat | subs[1]->ops.sat}; - const auto dsat{subs[0]->ops.dsat | subs[1]->ops.dsat}; + const auto count{3 + subs[0].ops.count + subs[1].ops.count}; + const auto sat{subs[0].ops.sat | subs[1].ops.sat}; + const auto dsat{subs[0].ops.dsat | subs[1].ops.dsat}; return {count, sat, dsat}; } case Fragment::ANDOR: { - const auto count{3 + subs[0]->ops.count + subs[1]->ops.count + subs[2]->ops.count}; - const auto sat{(subs[1]->ops.sat + subs[0]->ops.sat) | (subs[0]->ops.dsat + subs[2]->ops.sat)}; - const auto dsat{subs[0]->ops.dsat + subs[2]->ops.dsat}; + const auto count{3 + subs[0].ops.count + subs[1].ops.count + subs[2].ops.count}; + const auto sat{(subs[1].ops.sat + subs[0].ops.sat) | (subs[0].ops.dsat + subs[2].ops.sat)}; + const auto dsat{subs[0].ops.dsat + subs[2].ops.dsat}; return {count, sat, dsat}; } case Fragment::MULTI: return {1, (uint32_t)keys.size(), (uint32_t)keys.size()}; case Fragment::MULTI_A: return {(uint32_t)keys.size() + 1, 0, 0}; case Fragment::WRAP_S: case Fragment::WRAP_C: - case Fragment::WRAP_N: return {1 + subs[0]->ops.count, subs[0]->ops.sat, subs[0]->ops.dsat}; - case Fragment::WRAP_A: return {2 + subs[0]->ops.count, subs[0]->ops.sat, subs[0]->ops.dsat}; - case Fragment::WRAP_D: return {3 + subs[0]->ops.count, subs[0]->ops.sat, 0}; - case Fragment::WRAP_J: return {4 + subs[0]->ops.count, subs[0]->ops.sat, 0}; - case Fragment::WRAP_V: return {subs[0]->ops.count + (subs[0]->GetType() << "x"_mst), subs[0]->ops.sat, {}}; + case Fragment::WRAP_N: return {1 + subs[0].ops.count, subs[0].ops.sat, subs[0].ops.dsat}; + case Fragment::WRAP_A: return {2 + subs[0].ops.count, subs[0].ops.sat, subs[0].ops.dsat}; + case Fragment::WRAP_D: return {3 + subs[0].ops.count, subs[0].ops.sat, 0}; + case Fragment::WRAP_J: return {4 + subs[0].ops.count, subs[0].ops.sat, 0}; + case Fragment::WRAP_V: return {subs[0].ops.count + (subs[0].GetType() << "x"_mst), subs[0].ops.sat, {}}; case Fragment::THRESH: { uint32_t count = 0; auto sats = Vector(internal::MaxInt(0)); for (const auto& sub : subs) { - count += sub->ops.count + 1; - auto next_sats = Vector(sats[0] + sub->ops.dsat); - for (size_t j = 1; j < sats.size(); ++j) next_sats.push_back((sats[j] + sub->ops.dsat) | (sats[j - 1] + sub->ops.sat)); - next_sats.push_back(sats[sats.size() - 1] + sub->ops.sat); + count += sub.ops.count + 1; + auto next_sats = Vector(sats[0] + sub.ops.dsat); + for (size_t j = 1; j < sats.size(); ++j) next_sats.push_back((sats[j] + sub.ops.dsat) | (sats[j - 1] + sub.ops.sat)); + next_sats.push_back(sats[sats.size() - 1] + sub.ops.sat); sats = std::move(next_sats); } assert(k <= sats.size()); @@ -1033,48 +1028,48 @@ private: {} }; case Fragment::ANDOR: { - const auto& x{subs[0]->ss}; - const auto& y{subs[1]->ss}; - const auto& z{subs[2]->ss}; + const auto& x{subs[0].ss}; + const auto& y{subs[1].ss}; + const auto& z{subs[2].ss}; return { (x.sat + SatInfo::If() + y.sat) | (x.dsat + SatInfo::If() + z.sat), x.dsat + SatInfo::If() + z.dsat }; } case Fragment::AND_V: { - const auto& x{subs[0]->ss}; - const auto& y{subs[1]->ss}; + const auto& x{subs[0].ss}; + const auto& y{subs[1].ss}; return {x.sat + y.sat, {}}; } case Fragment::AND_B: { - const auto& x{subs[0]->ss}; - const auto& y{subs[1]->ss}; + const auto& x{subs[0].ss}; + const auto& y{subs[1].ss}; return {x.sat + y.sat + SatInfo::BinaryOp(), x.dsat + y.dsat + SatInfo::BinaryOp()}; } case Fragment::OR_B: { - const auto& x{subs[0]->ss}; - const auto& y{subs[1]->ss}; + const auto& x{subs[0].ss}; + const auto& y{subs[1].ss}; return { ((x.sat + y.dsat) | (x.dsat + y.sat)) + SatInfo::BinaryOp(), x.dsat + y.dsat + SatInfo::BinaryOp() }; } case Fragment::OR_C: { - const auto& x{subs[0]->ss}; - const auto& y{subs[1]->ss}; + const auto& x{subs[0].ss}; + const auto& y{subs[1].ss}; return {(x.sat + SatInfo::If()) | (x.dsat + SatInfo::If() + y.sat), {}}; } case Fragment::OR_D: { - const auto& x{subs[0]->ss}; - const auto& y{subs[1]->ss}; + const auto& x{subs[0].ss}; + const auto& y{subs[1].ss}; return { (x.sat + SatInfo::OP_IFDUP(true) + SatInfo::If()) | (x.dsat + SatInfo::OP_IFDUP(false) + SatInfo::If() + y.sat), x.dsat + SatInfo::OP_IFDUP(false) + SatInfo::If() + y.dsat }; } case Fragment::OR_I: { - const auto& x{subs[0]->ss}; - const auto& y{subs[1]->ss}; + const auto& x{subs[0].ss}; + const auto& y{subs[1].ss}; return {SatInfo::If() + (x.sat | y.sat), SatInfo::If() + (x.dsat | y.dsat)}; } // multi(k, key1, key2, ..., key_n) starts off with k+1 stack elements (a 0, plus k @@ -1088,18 +1083,18 @@ private: case Fragment::MULTI_A: return {SatInfo(keys.size() - 1, keys.size())}; case Fragment::WRAP_A: case Fragment::WRAP_N: - case Fragment::WRAP_S: return subs[0]->ss; + case Fragment::WRAP_S: return subs[0].ss; case Fragment::WRAP_C: return { - subs[0]->ss.sat + SatInfo::OP_CHECKSIG(), - subs[0]->ss.dsat + SatInfo::OP_CHECKSIG() + subs[0].ss.sat + SatInfo::OP_CHECKSIG(), + subs[0].ss.dsat + SatInfo::OP_CHECKSIG() }; case Fragment::WRAP_D: return { - SatInfo::OP_DUP() + SatInfo::If() + subs[0]->ss.sat, + SatInfo::OP_DUP() + SatInfo::If() + subs[0].ss.sat, SatInfo::OP_DUP() + SatInfo::If() }; - case Fragment::WRAP_V: return {subs[0]->ss.sat + SatInfo::OP_VERIFY(), {}}; + case Fragment::WRAP_V: return {subs[0].ss.sat + SatInfo::OP_VERIFY(), {}}; case Fragment::WRAP_J: return { - SatInfo::OP_SIZE() + SatInfo::OP_0NOTEQUAL() + SatInfo::If() + subs[0]->ss.sat, + SatInfo::OP_SIZE() + SatInfo::OP_0NOTEQUAL() + SatInfo::If() + subs[0].ss.sat, SatInfo::OP_SIZE() + SatInfo::OP_0NOTEQUAL() + SatInfo::If() }; case Fragment::THRESH: { @@ -1110,13 +1105,13 @@ private: // element i we need to add OP_ADD (if i>0). auto add = i ? SatInfo::BinaryOp() : SatInfo::Empty(); // Construct a variable that will become the next sats, starting with index 0. - auto next_sats = Vector(sats[0] + subs[i]->ss.dsat + add); + auto next_sats = Vector(sats[0] + subs[i].ss.dsat + add); // Then loop to construct next_sats[1..i]. for (size_t j = 1; j < sats.size(); ++j) { - next_sats.push_back(((sats[j] + subs[i]->ss.dsat) | (sats[j - 1] + subs[i]->ss.sat)) + add); + next_sats.push_back(((sats[j] + subs[i].ss.dsat) | (sats[j - 1] + subs[i].ss.sat)) + add); } // Finally construct next_sats[i+1]. - next_sats.push_back(sats[sats.size() - 1] + subs[i]->ss.sat + add); + next_sats.push_back(sats[sats.size() - 1] + subs[i].ss.sat + add); // Switch over. sats = std::move(next_sats); } @@ -1146,35 +1141,35 @@ private: case Fragment::HASH256: case Fragment::HASH160: return {1 + 32, {}}; case Fragment::ANDOR: { - const auto sat{(subs[0]->ws.sat + subs[1]->ws.sat) | (subs[0]->ws.dsat + subs[2]->ws.sat)}; - const auto dsat{subs[0]->ws.dsat + subs[2]->ws.dsat}; + const auto sat{(subs[0].ws.sat + subs[1].ws.sat) | (subs[0].ws.dsat + subs[2].ws.sat)}; + const auto dsat{subs[0].ws.dsat + subs[2].ws.dsat}; return {sat, dsat}; } - case Fragment::AND_V: return {subs[0]->ws.sat + subs[1]->ws.sat, {}}; - case Fragment::AND_B: return {subs[0]->ws.sat + subs[1]->ws.sat, subs[0]->ws.dsat + subs[1]->ws.dsat}; + case Fragment::AND_V: return {subs[0].ws.sat + subs[1].ws.sat, {}}; + case Fragment::AND_B: return {subs[0].ws.sat + subs[1].ws.sat, subs[0].ws.dsat + subs[1].ws.dsat}; case Fragment::OR_B: { - const auto sat{(subs[0]->ws.dsat + subs[1]->ws.sat) | (subs[0]->ws.sat + subs[1]->ws.dsat)}; - const auto dsat{subs[0]->ws.dsat + subs[1]->ws.dsat}; + const auto sat{(subs[0].ws.dsat + subs[1].ws.sat) | (subs[0].ws.sat + subs[1].ws.dsat)}; + const auto dsat{subs[0].ws.dsat + subs[1].ws.dsat}; return {sat, dsat}; } - case Fragment::OR_C: return {subs[0]->ws.sat | (subs[0]->ws.dsat + subs[1]->ws.sat), {}}; - case Fragment::OR_D: return {subs[0]->ws.sat | (subs[0]->ws.dsat + subs[1]->ws.sat), subs[0]->ws.dsat + subs[1]->ws.dsat}; - case Fragment::OR_I: return {(subs[0]->ws.sat + 1 + 1) | (subs[1]->ws.sat + 1), (subs[0]->ws.dsat + 1 + 1) | (subs[1]->ws.dsat + 1)}; + case Fragment::OR_C: return {subs[0].ws.sat | (subs[0].ws.dsat + subs[1].ws.sat), {}}; + case Fragment::OR_D: return {subs[0].ws.sat | (subs[0].ws.dsat + subs[1].ws.sat), subs[0].ws.dsat + subs[1].ws.dsat}; + case Fragment::OR_I: return {(subs[0].ws.sat + 1 + 1) | (subs[1].ws.sat + 1), (subs[0].ws.dsat + 1 + 1) | (subs[1].ws.dsat + 1)}; case Fragment::MULTI: return {k * sig_size + 1, k + 1}; case Fragment::MULTI_A: return {k * sig_size + static_cast(keys.size()) - k, static_cast(keys.size())}; case Fragment::WRAP_A: case Fragment::WRAP_N: case Fragment::WRAP_S: - case Fragment::WRAP_C: return subs[0]->ws; - case Fragment::WRAP_D: return {1 + 1 + subs[0]->ws.sat, 1}; - case Fragment::WRAP_V: return {subs[0]->ws.sat, {}}; - case Fragment::WRAP_J: return {subs[0]->ws.sat, 1}; + case Fragment::WRAP_C: return subs[0].ws; + case Fragment::WRAP_D: return {1 + 1 + subs[0].ws.sat, 1}; + case Fragment::WRAP_V: return {subs[0].ws.sat, {}}; + case Fragment::WRAP_J: return {subs[0].ws.sat, 1}; case Fragment::THRESH: { auto sats = Vector(internal::MaxInt(0)); for (const auto& sub : subs) { - auto next_sats = Vector(sats[0] + sub->ws.dsat); - for (size_t j = 1; j < sats.size(); ++j) next_sats.push_back((sats[j] + sub->ws.dsat) | (sats[j - 1] + sub->ws.sat)); - next_sats.push_back(sats[sats.size() - 1] + sub->ws.sat); + auto next_sats = Vector(sats[0] + sub.ws.dsat); + for (size_t j = 1; j < sats.size(); ++j) next_sats.push_back((sats[j] + sub.ws.dsat) | (sats[j - 1] + sub.ws.sat)); + next_sats.push_back(sats[sats.size() - 1] + sub.ws.sat); sats = std::move(next_sats); } assert(k <= sats.size()); @@ -1657,29 +1652,29 @@ public: bool operator==(const Node& arg) const { return Compare(*this, arg) == 0; } // Constructors with various argument combinations, which bypass the duplicate key check. - Node(internal::NoDupCheck, MiniscriptContext script_ctx, Fragment nt, std::vector> sub, std::vector arg, uint32_t val = 0) + Node(internal::NoDupCheck, MiniscriptContext script_ctx, Fragment nt, std::vector> sub, std::vector arg, uint32_t val = 0) : fragment(nt), k(val), data(std::move(arg)), subs(std::move(sub)), m_script_ctx{script_ctx}, ops(CalcOps()), ss(CalcStackSize()), ws(CalcWitnessSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {} Node(internal::NoDupCheck, MiniscriptContext script_ctx, Fragment nt, std::vector arg, uint32_t val = 0) : fragment(nt), k(val), data(std::move(arg)), m_script_ctx{script_ctx}, ops(CalcOps()), ss(CalcStackSize()), ws(CalcWitnessSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {} - Node(internal::NoDupCheck, MiniscriptContext script_ctx, Fragment nt, std::vector> sub, std::vector key, uint32_t val = 0) + Node(internal::NoDupCheck, MiniscriptContext script_ctx, Fragment nt, std::vector> sub, std::vector key, uint32_t val = 0) : fragment(nt), k(val), keys(std::move(key)), m_script_ctx{script_ctx}, subs(std::move(sub)), ops(CalcOps()), ss(CalcStackSize()), ws(CalcWitnessSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {} Node(internal::NoDupCheck, MiniscriptContext script_ctx, Fragment nt, std::vector key, uint32_t val = 0) : fragment(nt), k(val), keys(std::move(key)), m_script_ctx{script_ctx}, ops(CalcOps()), ss(CalcStackSize()), ws(CalcWitnessSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {} - Node(internal::NoDupCheck, MiniscriptContext script_ctx, Fragment nt, std::vector> sub, uint32_t val = 0) + Node(internal::NoDupCheck, MiniscriptContext script_ctx, Fragment nt, std::vector> sub, uint32_t val = 0) : fragment(nt), k(val), subs(std::move(sub)), m_script_ctx{script_ctx}, ops(CalcOps()), ss(CalcStackSize()), ws(CalcWitnessSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {} Node(internal::NoDupCheck, MiniscriptContext script_ctx, Fragment nt, uint32_t val = 0) : fragment(nt), k(val), m_script_ctx{script_ctx}, ops(CalcOps()), ss(CalcStackSize()), ws(CalcWitnessSize()), typ(CalcType()), scriptlen(CalcScriptLen()) {} // Constructors with various argument combinations, which do perform the duplicate key check. - template Node(const Ctx& ctx, Fragment nt, std::vector> sub, std::vector arg, uint32_t val = 0) + template Node(const Ctx& ctx, Fragment nt, std::vector> sub, std::vector arg, uint32_t val = 0) : Node(internal::NoDupCheck{}, ctx.MsContext(), nt, std::move(sub), std::move(arg), val) { DuplicateKeyCheck(ctx); } template Node(const Ctx& ctx, Fragment nt, std::vector arg, uint32_t val = 0) : Node(internal::NoDupCheck{}, ctx.MsContext(), nt, std::move(arg), val) { DuplicateKeyCheck(ctx);} - template Node(const Ctx& ctx, Fragment nt, std::vector> sub, std::vector key, uint32_t val = 0) + template Node(const Ctx& ctx, Fragment nt, std::vector> sub, std::vector key, uint32_t val = 0) : Node(internal::NoDupCheck{}, ctx.MsContext(), nt, std::move(sub), std::move(key), val) { DuplicateKeyCheck(ctx); } template Node(const Ctx& ctx, Fragment nt, std::vector key, uint32_t val = 0) : Node(internal::NoDupCheck{}, ctx.MsContext(), nt, std::move(key), val) { DuplicateKeyCheck(ctx); } - template Node(const Ctx& ctx, Fragment nt, std::vector> sub, uint32_t val = 0) + template Node(const Ctx& ctx, Fragment nt, std::vector> sub, uint32_t val = 0) : Node(internal::NoDupCheck{}, ctx.MsContext(), nt, std::move(sub), val) { DuplicateKeyCheck(ctx); } template Node(const Ctx& ctx, Fragment nt, uint32_t val = 0) : Node(internal::NoDupCheck{}, ctx.MsContext(), nt, val) { DuplicateKeyCheck(ctx); } @@ -1687,6 +1682,10 @@ public: // Delete copy constructor and assignment operator, use Clone() instead Node(const Node&) = delete; Node& operator=(const Node&) = delete; + + // subs is movable, circumventing recursion, so these are permitted. + Node(Node&&) = default; + Node& operator=(Node&&) = default; }; namespace internal { @@ -1774,14 +1773,14 @@ std::optional, int>> ParseHexStrEnd(Span -void BuildBack(const MiniscriptContext script_ctx, Fragment nt, std::vector>& constructed, const bool reverse = false) +void BuildBack(const MiniscriptContext script_ctx, Fragment nt, std::vector>& constructed, const bool reverse = false) { - NodeRef child = std::move(constructed.back()); + Node child{std::move(constructed.back())}; constructed.pop_back(); if (reverse) { - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, script_ctx, nt, Vector(std::move(child), std::move(constructed.back()))); + constructed.back() = Node{internal::NoDupCheck{}, script_ctx, nt, Vector(std::move(child), std::move(constructed.back()))}; } else { - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, script_ctx, nt, Vector(std::move(constructed.back()), std::move(child))); + constructed.back() = Node{internal::NoDupCheck{}, script_ctx, nt, Vector(std::move(constructed.back()), std::move(child))}; } } @@ -1791,7 +1790,7 @@ void BuildBack(const MiniscriptContext script_ctx, Fragment nt, std::vector -inline NodeRef Parse(Span in, const Ctx& ctx) +inline std::optional> Parse(Span in, const Ctx& ctx) { using namespace script; @@ -1810,7 +1809,7 @@ inline NodeRef Parse(Span in, const Ctx& ctx) // The two integers are used to hold state for thresh() std::vector> to_parse; - std::vector> constructed; + std::vector> constructed; to_parse.emplace_back(ParseContext::WRAPPED_EXPR, -1, -1); @@ -1842,10 +1841,10 @@ inline NodeRef Parse(Span in, const Ctx& ctx) if (is_multi_a) { // (push + xonly-key + CHECKSIG[ADD]) * n + k + OP_NUMEQUAL(VERIFY), minus one. script_size += (1 + 32 + 1) * keys.size() + BuildScript(k).size(); - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::MULTI_A, std::move(keys), k)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::MULTI_A, std::move(keys), k); } else { script_size += 2 + (keys.size() > 16) + (k > 16) + 34 * keys.size(); - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::MULTI, std::move(keys), k)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::MULTI, std::move(keys), k); } return true; }; @@ -1903,7 +1902,7 @@ inline NodeRef Parse(Span in, const Ctx& ctx) } else if (in[j] == 'l') { // The l: wrapper is equivalent to or_i(0,X) script_size += 4; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::JUST_0)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::JUST_0); to_parse.emplace_back(ParseContext::OR_I, -1, -1); } else { return {}; @@ -1916,63 +1915,63 @@ inline NodeRef Parse(Span in, const Ctx& ctx) } case ParseContext::EXPR: { if (Const("0", in)) { - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::JUST_0)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::JUST_0); } else if (Const("1", in)) { - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::JUST_1)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::JUST_1); } else if (Const("pk(", in)) { auto res = ParseKeyEnd(in, ctx); if (!res) return {}; auto& [key, key_size] = *res; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_C, Vector(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::PK_K, Vector(std::move(key)))))); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_C, Vector(Node(internal::NoDupCheck{}, ctx.MsContext(), Fragment::PK_K, Vector(std::move(key))))); in = in.subspan(key_size + 1); script_size += IsTapscript(ctx.MsContext()) ? 33 : 34; } else if (Const("pkh(", in)) { auto res = ParseKeyEnd(in, ctx); if (!res) return {}; auto& [key, key_size] = *res; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_C, Vector(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::PK_H, Vector(std::move(key)))))); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_C, Vector(Node(internal::NoDupCheck{}, ctx.MsContext(), Fragment::PK_H, Vector(std::move(key))))); in = in.subspan(key_size + 1); script_size += 24; } else if (Const("pk_k(", in)) { auto res = ParseKeyEnd(in, ctx); if (!res) return {}; auto& [key, key_size] = *res; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::PK_K, Vector(std::move(key)))); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::PK_K, Vector(std::move(key))); in = in.subspan(key_size + 1); script_size += IsTapscript(ctx.MsContext()) ? 32 : 33; } else if (Const("pk_h(", in)) { auto res = ParseKeyEnd(in, ctx); if (!res) return {}; auto& [key, key_size] = *res; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::PK_H, Vector(std::move(key)))); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::PK_H, Vector(std::move(key))); in = in.subspan(key_size + 1); script_size += 23; } else if (Const("sha256(", in)) { auto res = ParseHexStrEnd(in, 32, ctx); if (!res) return {}; auto& [hash, hash_size] = *res; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::SHA256, std::move(hash))); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::SHA256, std::move(hash)); in = in.subspan(hash_size + 1); script_size += 38; } else if (Const("ripemd160(", in)) { auto res = ParseHexStrEnd(in, 20, ctx); if (!res) return {}; auto& [hash, hash_size] = *res; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::RIPEMD160, std::move(hash))); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::RIPEMD160, std::move(hash)); in = in.subspan(hash_size + 1); script_size += 26; } else if (Const("hash256(", in)) { auto res = ParseHexStrEnd(in, 32, ctx); if (!res) return {}; auto& [hash, hash_size] = *res; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::HASH256, std::move(hash))); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::HASH256, std::move(hash)); in = in.subspan(hash_size + 1); script_size += 38; } else if (Const("hash160(", in)) { auto res = ParseHexStrEnd(in, 20, ctx); if (!res) return {}; auto& [hash, hash_size] = *res; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::HASH160, std::move(hash))); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::HASH160, std::move(hash)); in = in.subspan(hash_size + 1); script_size += 26; } else if (Const("after(", in)) { @@ -1980,7 +1979,7 @@ inline NodeRef Parse(Span in, const Ctx& ctx) if (arg_size < 1) return {}; const auto num{ToIntegral(std::string_view(in.data(), arg_size))}; if (!num.has_value() || *num < 1 || *num >= 0x80000000L) return {}; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::AFTER, *num)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::AFTER, *num); in = in.subspan(arg_size + 1); script_size += 1 + (*num > 16) + (*num > 0x7f) + (*num > 0x7fff) + (*num > 0x7fffff); } else if (Const("older(", in)) { @@ -1988,7 +1987,7 @@ inline NodeRef Parse(Span in, const Ctx& ctx) if (arg_size < 1) return {}; const auto num{ToIntegral(std::string_view(in.data(), arg_size))}; if (!num.has_value() || *num < 1 || *num >= 0x80000000L) return {}; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::OLDER, *num)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::OLDER, *num); in = in.subspan(arg_size + 1); script_size += 1 + (*num > 16) + (*num > 0x7f) + (*num > 0x7fff) + (*num > 0x7fffff); } else if (Const("multi(", in)) { @@ -2047,40 +2046,40 @@ inline NodeRef Parse(Span in, const Ctx& ctx) break; } case ParseContext::ALT: { - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_A, Vector(std::move(constructed.back()))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_A, Vector(std::move(constructed.back()))}; break; } case ParseContext::SWAP: { - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_S, Vector(std::move(constructed.back()))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_S, Vector(std::move(constructed.back()))}; break; } case ParseContext::CHECK: { - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_C, Vector(std::move(constructed.back()))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_C, Vector(std::move(constructed.back()))}; break; } case ParseContext::DUP_IF: { - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_D, Vector(std::move(constructed.back()))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_D, Vector(std::move(constructed.back()))}; break; } case ParseContext::NON_ZERO: { - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_J, Vector(std::move(constructed.back()))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_J, Vector(std::move(constructed.back()))}; break; } case ParseContext::ZERO_NOTEQUAL: { - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_N, Vector(std::move(constructed.back()))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_N, Vector(std::move(constructed.back()))}; break; } case ParseContext::VERIFY: { - script_size += (constructed.back()->GetType() << "x"_mst); - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_V, Vector(std::move(constructed.back()))); + script_size += (constructed.back().GetType() << "x"_mst); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_V, Vector(std::move(constructed.back()))}; break; } case ParseContext::WRAP_U: { - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::OR_I, Vector(std::move(constructed.back()), MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::JUST_0))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::OR_I, Vector(std::move(constructed.back()), Node(internal::NoDupCheck{}, ctx.MsContext(), Fragment::JUST_0))}; break; } case ParseContext::WRAP_T: { - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::AND_V, Vector(std::move(constructed.back()), MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::JUST_1))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::AND_V, Vector(std::move(constructed.back()), Node(internal::NoDupCheck{}, ctx.MsContext(), Fragment::JUST_1))}; break; } case ParseContext::AND_B: { @@ -2090,7 +2089,7 @@ inline NodeRef Parse(Span in, const Ctx& ctx) case ParseContext::AND_N: { auto mid = std::move(constructed.back()); constructed.pop_back(); - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::ANDOR, Vector(std::move(constructed.back()), std::move(mid), MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::JUST_0))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::ANDOR, Vector(std::move(constructed.back()), std::move(mid), Node(internal::NoDupCheck{}, ctx.MsContext(), Fragment::JUST_0))}; break; } case ParseContext::AND_V: { @@ -2118,7 +2117,7 @@ inline NodeRef Parse(Span in, const Ctx& ctx) constructed.pop_back(); auto mid = std::move(constructed.back()); constructed.pop_back(); - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::ANDOR, Vector(std::move(constructed.back()), std::move(mid), std::move(right))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::ANDOR, Vector(std::move(constructed.back()), std::move(mid), std::move(right))}; break; } case ParseContext::THRESH: { @@ -2132,13 +2131,13 @@ inline NodeRef Parse(Span in, const Ctx& ctx) if (k > n) return {}; in = in.subspan(1); // Children are constructed in reverse order, so iterate from end to beginning - std::vector> subs; + std::vector> subs; for (int i = 0; i < n; ++i) { subs.push_back(std::move(constructed.back())); constructed.pop_back(); } std::reverse(subs.begin(), subs.end()); - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::THRESH, std::move(subs), k)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::THRESH, std::move(subs), k); } else { return {}; } @@ -2159,10 +2158,10 @@ inline NodeRef Parse(Span in, const Ctx& ctx) // Sanity checks on the produced miniscript assert(constructed.size() == 1); - assert(constructed[0]->ScriptSize() == script_size); + assert(constructed[0].ScriptSize() == script_size); if (in.size() > 0) return {}; - NodeRef tl_node = std::move(constructed.front()); - tl_node->DuplicateKeyCheck(ctx); + Node tl_node{std::move(constructed.front())}; + tl_node.DuplicateKeyCheck(ctx); return tl_node; } @@ -2249,11 +2248,11 @@ enum class DecodeContext { //! Parse a miniscript from a bitcoin script template -inline NodeRef DecodeScript(I& in, I last, const Ctx& ctx) +inline std::optional> DecodeScript(I& in, I last, const Ctx& ctx) { // The two integers are used to hold state for thresh() std::vector> to_parse; - std::vector> constructed; + std::vector> constructed; // This is the top level, so we assume the type is B // (in particular, disallowing top level W expressions) @@ -2261,7 +2260,7 @@ inline NodeRef DecodeScript(I& in, I last, const Ctx& ctx) while (!to_parse.empty()) { // Exit early if the Miniscript is not going to be valid. - if (!constructed.empty() && !constructed.back()->IsValid()) return {}; + if (!constructed.empty() && !constructed.back().IsValid()) return {}; // Get the current context we are decoding within auto [cur_context, n, k] = to_parse.back(); @@ -2274,12 +2273,12 @@ inline NodeRef DecodeScript(I& in, I last, const Ctx& ctx) // Constants if (in[0].first == OP_1) { ++in; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::JUST_1)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::JUST_1); break; } if (in[0].first == OP_0) { ++in; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::JUST_0)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::JUST_0); break; } // Public keys @@ -2287,14 +2286,14 @@ inline NodeRef DecodeScript(I& in, I last, const Ctx& ctx) auto key = ctx.FromPKBytes(in[0].second.begin(), in[0].second.end()); if (!key) return {}; ++in; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::PK_K, Vector(std::move(*key)))); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::PK_K, Vector(std::move(*key))); break; } if (last - in >= 5 && in[0].first == OP_VERIFY && in[1].first == OP_EQUAL && in[3].first == OP_HASH160 && in[4].first == OP_DUP && in[2].second.size() == 20) { auto key = ctx.FromPKHBytes(in[2].second.begin(), in[2].second.end()); if (!key) return {}; in += 5; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::PK_H, Vector(std::move(*key)))); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::PK_H, Vector(std::move(*key))); break; } // Time locks @@ -2302,31 +2301,31 @@ inline NodeRef DecodeScript(I& in, I last, const Ctx& ctx) if (last - in >= 2 && in[0].first == OP_CHECKSEQUENCEVERIFY && (num = ParseScriptNumber(in[1]))) { in += 2; if (*num < 1 || *num > 0x7FFFFFFFL) return {}; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::OLDER, *num)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::OLDER, *num); break; } if (last - in >= 2 && in[0].first == OP_CHECKLOCKTIMEVERIFY && (num = ParseScriptNumber(in[1]))) { in += 2; if (num < 1 || num > 0x7FFFFFFFL) return {}; - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::AFTER, *num)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::AFTER, *num); break; } // Hashes if (last - in >= 7 && in[0].first == OP_EQUAL && in[3].first == OP_VERIFY && in[4].first == OP_EQUAL && (num = ParseScriptNumber(in[5])) && num == 32 && in[6].first == OP_SIZE) { if (in[2].first == OP_SHA256 && in[1].second.size() == 32) { - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::SHA256, in[1].second)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::SHA256, in[1].second); in += 7; break; } else if (in[2].first == OP_RIPEMD160 && in[1].second.size() == 20) { - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::RIPEMD160, in[1].second)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::RIPEMD160, in[1].second); in += 7; break; } else if (in[2].first == OP_HASH256 && in[1].second.size() == 32) { - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::HASH256, in[1].second)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::HASH256, in[1].second); in += 7; break; } else if (in[2].first == OP_HASH160 && in[1].second.size() == 20) { - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::HASH160, in[1].second)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::HASH160, in[1].second); in += 7; break; } @@ -2348,7 +2347,7 @@ inline NodeRef DecodeScript(I& in, I last, const Ctx& ctx) if (!k || *k < 1 || *k > *n) return {}; in += 3 + *n; std::reverse(keys.begin(), keys.end()); - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::MULTI, std::move(keys), *k)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::MULTI, std::move(keys), *k); break; } // Tapscript's equivalent of multi @@ -2378,7 +2377,7 @@ inline NodeRef DecodeScript(I& in, I last, const Ctx& ctx) if (keys.size() < (size_t)*k) return {}; in += 2 + keys.size() * 2; std::reverse(keys.begin(), keys.end()); - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::MULTI_A, std::move(keys), *k)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::MULTI_A, std::move(keys), *k); break; } /** In the following wrappers, we only need to push SINGLE_BKV_EXPR rather @@ -2473,38 +2472,38 @@ inline NodeRef DecodeScript(I& in, I last, const Ctx& ctx) case DecodeContext::SWAP: { if (in >= last || in[0].first != OP_SWAP || constructed.empty()) return {}; ++in; - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_S, Vector(std::move(constructed.back()))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_S, Vector(std::move(constructed.back()))}; break; } case DecodeContext::ALT: { if (in >= last || in[0].first != OP_TOALTSTACK || constructed.empty()) return {}; ++in; - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_A, Vector(std::move(constructed.back()))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_A, Vector(std::move(constructed.back()))}; break; } case DecodeContext::CHECK: { if (constructed.empty()) return {}; - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_C, Vector(std::move(constructed.back()))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_C, Vector(std::move(constructed.back()))}; break; } case DecodeContext::DUP_IF: { if (constructed.empty()) return {}; - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_D, Vector(std::move(constructed.back()))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_D, Vector(std::move(constructed.back()))}; break; } case DecodeContext::VERIFY: { if (constructed.empty()) return {}; - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_V, Vector(std::move(constructed.back()))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_V, Vector(std::move(constructed.back()))}; break; } case DecodeContext::NON_ZERO: { if (constructed.empty()) return {}; - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_J, Vector(std::move(constructed.back()))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_J, Vector(std::move(constructed.back()))}; break; } case DecodeContext::ZERO_NOTEQUAL: { if (constructed.empty()) return {}; - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_N, Vector(std::move(constructed.back()))); + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::WRAP_N, Vector(std::move(constructed.back()))}; break; } case DecodeContext::AND_V: { @@ -2534,12 +2533,12 @@ inline NodeRef DecodeScript(I& in, I last, const Ctx& ctx) } case DecodeContext::ANDOR: { if (constructed.size() < 3) return {}; - NodeRef left = std::move(constructed.back()); + Node left{std::move(constructed.back())}; constructed.pop_back(); - NodeRef right = std::move(constructed.back()); + Node right{std::move(constructed.back())}; constructed.pop_back(); - NodeRef mid = std::move(constructed.back()); - constructed.back() = MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::ANDOR, Vector(std::move(left), std::move(mid), std::move(right))); + Node mid{std::move(constructed.back())}; + constructed.back() = Node{internal::NoDupCheck{}, ctx.MsContext(), Fragment::ANDOR, Vector(std::move(left), std::move(mid), std::move(right))}; break; } case DecodeContext::THRESH_W: { @@ -2557,13 +2556,13 @@ inline NodeRef DecodeScript(I& in, I last, const Ctx& ctx) } case DecodeContext::THRESH_E: { if (k < 1 || k > n || constructed.size() < static_cast(n)) return {}; - std::vector> subs; + std::vector> subs; for (int i = 0; i < n; ++i) { - NodeRef sub = std::move(constructed.back()); + Node sub{std::move(constructed.back())}; constructed.pop_back(); subs.push_back(std::move(sub)); } - constructed.push_back(MakeNodeRef(internal::NoDupCheck{}, ctx.MsContext(), Fragment::THRESH, std::move(subs), k)); + constructed.emplace_back(internal::NoDupCheck{}, ctx.MsContext(), Fragment::THRESH, std::move(subs), k); break; } case DecodeContext::ENDIF: { @@ -2627,23 +2626,25 @@ inline NodeRef DecodeScript(I& in, I last, const Ctx& ctx) } } if (constructed.size() != 1) return {}; - NodeRef tl_node = std::move(constructed.front()); - tl_node->DuplicateKeyCheck(ctx); + Node tl_node{std::move(constructed.front())}; + tl_node.DuplicateKeyCheck(ctx); // Note that due to how ComputeType works (only assign the type to the node if the // subs' types are valid) this would fail if any node of tree is badly typed. - if (!tl_node->IsValidTopLevel()) return {}; + if (!tl_node.IsValidTopLevel()) return {}; return tl_node; } } // namespace internal template -inline NodeRef FromString(const std::string& str, const Ctx& ctx) { +inline std::optional> FromString(const std::string& str, const Ctx& ctx) +{ return internal::Parse(str, ctx); } template -inline NodeRef FromScript(const CScript& script, const Ctx& ctx) { +inline std::optional> FromScript(const CScript& script, const Ctx& ctx) +{ using namespace internal; // A too large Script is necessarily invalid, don't bother parsing it. if (script.size() > MaxScriptSize(ctx.MsContext())) return {}; diff --git a/src/test/fuzz/miniscript.cpp b/src/test/fuzz/miniscript.cpp index 60d096bb5a9..d40def707ac 100644 --- a/src/test/fuzz/miniscript.cpp +++ b/src/test/fuzz/miniscript.cpp @@ -14,11 +14,11 @@ #include #include +#include namespace { using Fragment = miniscript::Fragment; -using NodeRef = miniscript::NodeRef; using Node = miniscript::Node; using Type = miniscript::Type; using MsCtx = miniscript::MiniscriptContext; @@ -311,11 +311,6 @@ const struct KeyComparator { // A dummy scriptsig to pass to VerifyScript (we always use Segwit v0). const CScript DUMMY_SCRIPTSIG; -//! Construct a miniscript node as a shared_ptr. -template NodeRef MakeNodeRef(Args&&... args) { - return miniscript::MakeNodeRef(miniscript::internal::NoDupCheck{}, std::forward(args)...); -} - /** Information about a yet to be constructed Miniscript node. */ struct NodeInfo { //! The type of this node @@ -851,14 +846,14 @@ std::optional ConsumeNodeSmart(MsCtx script_ctx, FuzzedDataProvider& p * Generate a Miniscript node based on the fuzzer's input. * * - ConsumeNode is a function object taking a Type, and returning an std::optional. - * - root_type is the required type properties of the constructed NodeRef. + * - root_type is the required type properties of the constructed Node. * - strict_valid sets whether ConsumeNode is expected to guarantee a NodeInfo that results in - * a NodeRef whose Type() matches the type fed to ConsumeNode. + * a Node whose Type() matches the type fed to ConsumeNode. */ template -NodeRef GenNode(MsCtx script_ctx, F ConsumeNode, Type root_type, bool strict_valid = false) { +std::optional GenNode(MsCtx script_ctx, F ConsumeNode, Type root_type, bool strict_valid = false) { /** A stack of miniscript Nodes being built up. */ - std::vector stack; + std::vector stack; /** The queue of instructions. */ std::vector>> todo{{root_type, {}}}; /** Predict the number of (static) script ops. */ @@ -961,24 +956,24 @@ NodeRef GenNode(MsCtx script_ctx, F ConsumeNode, Type root_type, bool strict_val } else { // The back of todo has fragment and number of children decided, and // those children have been constructed at the back of stack. Pop - // that entry off todo, and use it to construct a new NodeRef on + // that entry off todo, and use it to construct a new Node on // stack. NodeInfo& info = *todo.back().second; // Gather children from the back of stack. - std::vector sub; + std::vector sub; sub.reserve(info.subtypes.size()); for (size_t i = 0; i < info.subtypes.size(); ++i) { sub.push_back(std::move(*(stack.end() - info.subtypes.size() + i))); } stack.erase(stack.end() - info.subtypes.size(), stack.end()); - // Construct new NodeRef. - NodeRef node; + // Construct new Node. + std::optional node; if (info.keys.empty()) { - node = MakeNodeRef(script_ctx, info.fragment, std::move(sub), std::move(info.hash), info.k); + node = Node{miniscript::internal::NoDupCheck{}, script_ctx, info.fragment, std::move(sub), std::move(info.hash), info.k}; } else { assert(sub.empty()); assert(info.hash.empty()); - node = MakeNodeRef(script_ctx, info.fragment, std::move(info.keys), info.k); + node = Node{miniscript::internal::NoDupCheck{}, script_ctx, info.fragment, std::move(info.keys), info.k}; } // Verify acceptability. if (!node || (node->GetType() & "KVWB"_mst) == ""_mst) { @@ -990,7 +985,7 @@ NodeRef GenNode(MsCtx script_ctx, F ConsumeNode, Type root_type, bool strict_val } if (!node->IsValid()) return {}; // Update resource predictions. - if (node->fragment == Fragment::WRAP_V && node->subs[0]->GetType() << "x"_mst) { + if (node->fragment == Fragment::WRAP_V && node->subs[0].GetType() << "x"_mst) { ops += 1; scriptsize += 1; } @@ -999,14 +994,14 @@ NodeRef GenNode(MsCtx script_ctx, F ConsumeNode, Type root_type, bool strict_val return {}; } // Move it to the stack. - stack.push_back(std::move(node)); + stack.push_back(std::move(*node)); todo.pop_back(); } } assert(stack.size() == 1); - assert(stack[0]->GetStaticOps() == ops); - assert(stack[0]->ScriptSize() == scriptsize); - stack[0]->DuplicateKeyCheck(KEY_COMP); + assert(stack[0].GetStaticOps() == ops); + assert(stack[0].ScriptSize() == scriptsize); + stack[0].DuplicateKeyCheck(KEY_COMP); return std::move(stack[0]); } @@ -1031,7 +1026,7 @@ void SatisfactionToWitness(MsCtx ctx, CScriptWitness& witness, const CScript& sc } /** Perform various applicable tests on a miniscript Node. */ -void TestNode(const MsCtx script_ctx, const NodeRef& node, FuzzedDataProvider& provider) +void TestNode(const MsCtx script_ctx, const std::optional node, FuzzedDataProvider& provider) { if (!node) return; diff --git a/src/test/miniscript_tests.cpp b/src/test/miniscript_tests.cpp index 077ef498b2d..877147733de 100644 --- a/src/test/miniscript_tests.cpp +++ b/src/test/miniscript_tests.cpp @@ -292,31 +292,31 @@ public: }; using Fragment = miniscript::Fragment; -using NodeRef = miniscript::NodeRef; using miniscript::operator""_mst; using Node = miniscript::Node; /** Compute all challenges (pubkeys, hashes, timelocks) that occur in a given Miniscript. */ // NOLINTNEXTLINE(misc-no-recursion) -std::set FindChallenges(const NodeRef& ref) { +std::set FindChallenges(const Node& node) +{ std::set chal; - for (const auto& key : ref->keys) { + for (const auto& key : node.keys) { chal.emplace(ChallengeType::PK, ChallengeNumber(key)); } - if (ref->fragment == miniscript::Fragment::OLDER) { - chal.emplace(ChallengeType::OLDER, ref->k); - } else if (ref->fragment == miniscript::Fragment::AFTER) { - chal.emplace(ChallengeType::AFTER, ref->k); - } else if (ref->fragment == miniscript::Fragment::SHA256) { - chal.emplace(ChallengeType::SHA256, ChallengeNumber(ref->data)); - } else if (ref->fragment == miniscript::Fragment::RIPEMD160) { - chal.emplace(ChallengeType::RIPEMD160, ChallengeNumber(ref->data)); - } else if (ref->fragment == miniscript::Fragment::HASH256) { - chal.emplace(ChallengeType::HASH256, ChallengeNumber(ref->data)); - } else if (ref->fragment == miniscript::Fragment::HASH160) { - chal.emplace(ChallengeType::HASH160, ChallengeNumber(ref->data)); + if (node.fragment == miniscript::Fragment::OLDER) { + chal.emplace(ChallengeType::OLDER, node.k); + } else if (node.fragment == miniscript::Fragment::AFTER) { + chal.emplace(ChallengeType::AFTER, node.k); + } else if (node.fragment == miniscript::Fragment::SHA256) { + chal.emplace(ChallengeType::SHA256, ChallengeNumber(node.data)); + } else if (node.fragment == miniscript::Fragment::RIPEMD160) { + chal.emplace(ChallengeType::RIPEMD160, ChallengeNumber(node.data)); + } else if (node.fragment == miniscript::Fragment::HASH256) { + chal.emplace(ChallengeType::HASH256, ChallengeNumber(node.data)); + } else if (node.fragment == miniscript::Fragment::HASH160) { + chal.emplace(ChallengeType::HASH160, ChallengeNumber(node.data)); } - for (const auto& sub : ref->subs) { + for (const auto& sub : node.subs) { auto sub_chal = FindChallenges(sub); chal.insert(sub_chal.begin(), sub_chal.end()); } @@ -345,8 +345,9 @@ void SatisfactionToWitness(miniscript::MiniscriptContext ctx, CScriptWitness& wi struct MiniScriptTest : BasicTestingSetup { /** Run random satisfaction tests. */ -void TestSatisfy(const KeyConverter& converter, const std::string& testcase, const NodeRef& node) { - auto script = node->ToScript(converter); +void TestSatisfy(const KeyConverter& converter, const std::string& testcase, const Node& node) +{ + auto script = node.ToScript(converter); auto challenges = FindChallenges(node); // Find all challenges in the generated miniscript. std::vector challist(challenges.begin(), challenges.end()); for (int iter = 0; iter < 3; ++iter) { @@ -364,12 +365,12 @@ void TestSatisfy(const KeyConverter& converter, const std::string& testcase, con // Run malleable satisfaction algorithm. CScriptWitness witness_mal; - const bool mal_success = node->Satisfy(satisfier, witness_mal.stack, false) == miniscript::Availability::YES; + const bool mal_success = node.Satisfy(satisfier, witness_mal.stack, false) == miniscript::Availability::YES; SatisfactionToWitness(converter.MsContext(), witness_mal, script, builder); // Run non-malleable satisfaction algorithm. CScriptWitness witness_nonmal; - const bool nonmal_success = node->Satisfy(satisfier, witness_nonmal.stack, true) == miniscript::Availability::YES; + const bool nonmal_success = node.Satisfy(satisfier, witness_nonmal.stack, true) == miniscript::Availability::YES; // Compute witness size (excluding script push, control block, and witness count encoding). const size_t wit_size = GetSerializeSize(witness_nonmal.stack) - GetSizeOfCompactSize(witness_nonmal.stack.size()); SatisfactionToWitness(converter.MsContext(), witness_nonmal, script, builder); @@ -378,23 +379,23 @@ void TestSatisfy(const KeyConverter& converter, const std::string& testcase, con // Non-malleable satisfactions are bounded by the satisfaction size plus: // - For P2WSH spends, the witness script // - For Tapscript spends, both the witness script and the control block - const size_t max_stack_size{*node->GetStackSize() + 1 + miniscript::IsTapscript(converter.MsContext())}; + const size_t max_stack_size{*node.GetStackSize() + 1 + miniscript::IsTapscript(converter.MsContext())}; BOOST_CHECK(witness_nonmal.stack.size() <= max_stack_size); // If a non-malleable satisfaction exists, the malleable one must also exist, and be identical to it. BOOST_CHECK(mal_success); BOOST_CHECK(witness_nonmal.stack == witness_mal.stack); - assert(wit_size <= *node->GetWitnessSize()); + assert(wit_size <= *node.GetWitnessSize()); // Test non-malleable satisfaction. ScriptError serror; bool res = VerifyScript(CScript(), script_pubkey, &witness_nonmal, STANDARD_SCRIPT_VERIFY_FLAGS, checker, &serror); // Non-malleable satisfactions are guaranteed to be valid if ValidSatisfactions(). - if (node->ValidSatisfactions()) BOOST_CHECK(res); + if (node.ValidSatisfactions()) BOOST_CHECK(res); // More detailed: non-malleable satisfactions must be valid, or could fail with ops count error (if CheckOpsLimit failed), // or with a stack size error (if CheckStackSize check fails). BOOST_CHECK(res || - (!node->CheckOpsLimit() && serror == ScriptError::SCRIPT_ERR_OP_COUNT) || - (!node->CheckStackSize() && serror == ScriptError::SCRIPT_ERR_STACK_SIZE)); + (!node.CheckOpsLimit() && serror == ScriptError::SCRIPT_ERR_OP_COUNT) || + (!node.CheckStackSize() && serror == ScriptError::SCRIPT_ERR_STACK_SIZE)); } if (mal_success && (!nonmal_success || witness_mal.stack != witness_nonmal.stack)) { @@ -406,7 +407,7 @@ void TestSatisfy(const KeyConverter& converter, const std::string& testcase, con BOOST_CHECK(res || serror == ScriptError::SCRIPT_ERR_OP_COUNT || serror == ScriptError::SCRIPT_ERR_STACK_SIZE); } - if (node->IsSane()) { + if (node.IsSane()) { // For sane nodes, the two algorithms behave identically. BOOST_CHECK_EQUAL(mal_success, nonmal_success); } @@ -416,7 +417,7 @@ void TestSatisfy(const KeyConverter& converter, const std::string& testcase, con // For nonmalleable solutions this is only true if the added condition is PK; // for other conditions, adding one may make an valid satisfaction become malleable. If the script // is sane, this cannot happen however. - if (node->IsSane() || add < 0 || challist[add].first == ChallengeType::PK) { + if (node.IsSane() || add < 0 || challist[add].first == ChallengeType::PK) { BOOST_CHECK(nonmal_success >= prev_nonmal_success); } // Remember results for the next added challenge. @@ -424,11 +425,11 @@ void TestSatisfy(const KeyConverter& converter, const std::string& testcase, con prev_nonmal_success = nonmal_success; } - bool satisfiable = node->IsSatisfiable([](const Node&) { return true; }); + bool satisfiable = node.IsSatisfiable([](const Node&) { return true; }); // If the miniscript was satisfiable at all, a satisfaction must be found after all conditions are added. BOOST_CHECK_EQUAL(prev_mal_success, satisfiable); // If the miniscript is sane and satisfiable, a nonmalleable satisfaction must eventually be found. - if (node->IsSane()) BOOST_CHECK_EQUAL(prev_nonmal_success, satisfiable); + if (node.IsSane()) BOOST_CHECK_EQUAL(prev_nonmal_success, satisfiable); } } @@ -471,7 +472,7 @@ void Test(const std::string& ms, const std::string& hexscript, int mode, const K if (stacklimit != -1) BOOST_CHECK_MESSAGE((int)*node->GetStackSize() == stacklimit, "Stack limit mismatch: " << ms << " (" << *node->GetStackSize() << " vs " << stacklimit << ")"); if (max_wit_size) BOOST_CHECK_MESSAGE(*node->GetWitnessSize() == *max_wit_size, "Witness size limit mismatch: " << ms << " (" << *node->GetWitnessSize() << " vs " << *max_wit_size << ")"); if (stack_exec) BOOST_CHECK_MESSAGE(*node->GetExecStackSize() == *stack_exec, "Stack execution limit mismatch: " << ms << " (" << *node->GetExecStackSize() << " vs " << *stack_exec << ")"); - TestSatisfy(converter, ms, node); + TestSatisfy(converter, ms, *node); } } @@ -599,11 +600,11 @@ BOOST_AUTO_TEST_CASE(fixed_tests) constexpr KeyConverter tap_converter{miniscript::MiniscriptContext::TAPSCRIPT}; constexpr KeyConverter wsh_converter{miniscript::MiniscriptContext::P2WSH}; const auto no_pubkey{"ac519c"_hex_u8}; - BOOST_CHECK(miniscript::FromScript({no_pubkey.begin(), no_pubkey.end()}, tap_converter) == nullptr); + BOOST_CHECK(!miniscript::FromScript({no_pubkey.begin(), no_pubkey.end()}, tap_converter)); const auto incomplete_multi_a{"ba20c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5ba519c"_hex_u8}; - BOOST_CHECK(miniscript::FromScript({incomplete_multi_a.begin(), incomplete_multi_a.end()}, tap_converter) == nullptr); + BOOST_CHECK(!miniscript::FromScript({incomplete_multi_a.begin(), incomplete_multi_a.end()}, tap_converter)); const auto incomplete_multi_a_2{"ac2079be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798ac20c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5ba519c"_hex_u8}; - BOOST_CHECK(miniscript::FromScript({incomplete_multi_a_2.begin(), incomplete_multi_a_2.end()}, tap_converter) == nullptr); + BOOST_CHECK(!miniscript::FromScript({incomplete_multi_a_2.begin(), incomplete_multi_a_2.end()}, tap_converter)); // Can use multi_a under Tapscript but not P2WSH. Test("and_v(v:multi_a(2,03d01115d548e7561b15c38f004d734633687cf4419620095bc5b0f47070afe85a,025601570cb47f238d2b0286db4a990fa0f3ba28d1a319f5e7cf55c2a2444da7cc),after(1231488000))", "?", "20d01115d548e7561b15c38f004d734633687cf4419620095bc5b0f47070afe85aac205601570cb47f238d2b0286db4a990fa0f3ba28d1a319f5e7cf55c2a2444da7ccba529d0400046749b1", TESTMODE_VALID | TESTMODE_NONMAL | TESTMODE_NEEDSIG | TESTMODE_P2WSH_INVALID, 4, 2, {}, {}, 3); // Can use more than 20 keys in a multi_a. @@ -649,13 +650,13 @@ BOOST_AUTO_TEST_CASE(fixed_tests) // A Script with a non minimal push is invalid constexpr auto nonminpush{"0000210232780000feff00ffffffffffff21ff005f00ae21ae00000000060602060406564c2102320000060900fe00005f00ae21ae00100000060606060606000000000000000000000000000000000000000000000000000000000000000000"_hex_u8}; const CScript nonminpush_script(nonminpush.begin(), nonminpush.end()); - BOOST_CHECK(miniscript::FromScript(nonminpush_script, wsh_converter) == nullptr); - BOOST_CHECK(miniscript::FromScript(nonminpush_script, tap_converter) == nullptr); + BOOST_CHECK(!miniscript::FromScript(nonminpush_script, wsh_converter)); + BOOST_CHECK(!miniscript::FromScript(nonminpush_script, tap_converter)); // A non-minimal VERIFY ( CHECKSIG VERIFY 1) constexpr auto nonminverify{"2103a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7ac6951"_hex_u8}; const CScript nonminverify_script(nonminverify.begin(), nonminverify.end()); - BOOST_CHECK(miniscript::FromScript(nonminverify_script, wsh_converter) == nullptr); - BOOST_CHECK(miniscript::FromScript(nonminverify_script, tap_converter) == nullptr); + BOOST_CHECK(!miniscript::FromScript(nonminverify_script, wsh_converter)); + BOOST_CHECK(!miniscript::FromScript(nonminverify_script, tap_converter)); // A threshold as large as the number of subs is valid. Test("thresh(2,c:pk_k(03d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65),altv:after(100))", "2103d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65ac6b6300670164b16951686c935287", "20d30199d74fb5a22d47b6e054e2f378cedacffcb89904a61d75d0dbd407143e65ac6b6300670164b16951686c935287", TESTMODE_VALID | TESTMODE_NEEDSIG | TESTMODE_NONMAL); // A threshold of 1 is valid.