miniscript: IsSafe() implies IsValid(), separate IsSafe() and IsSafeTopLevel()

darosior · darosior · commit fa2fa683d552 · 2021-09-29T17:25:55.000+02:00
Signed-off-by: Antoine Poinsot &lt;darosior@protonmail.com&gt;
diff --git a/bitcoin/script/miniscript.h b/bitcoin/script/miniscript.h
@@ -784,7 +784,10 @@ struct Node {
     bool NeedsSignature() const { return GetType() << "s"_mst; }
 
     //! Do all sanity checks.
-    bool IsSafeTopLevel() const { return GetType() << "Bmsk"_mst && CheckOpsLimit() && CheckStackSize(); }
+    bool IsSafe() const { return GetType() << "msk"_mst && CheckOpsLimit() && CheckStackSize() && IsValid(); }
+
+    //! Check whether this node is safe as a script on its own.
+    bool IsSafeTopLevel() const { return GetType() << "B"_mst && IsSafe() && IsValidTopLevel(); }
 
     //! Construct the script for this miniscript (including subexpressions).
     template<typename Ctx>
