miniscript: IsSafe() implies IsValid(), separate IsSafe() and IsSafeT…

…opLevel() Signed-off-by: Antoine Poinsot <[email protected]>
sipa · Sep 29, 2021 · fa2fa68 · fa2fa68
1 parent d37485f
commit fa2fa68
Showing 1 changed file with 4 additions and 1 deletion.
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>