Prevent TapTree from hidden parts

rust-bitcoin · Apr 5, 2022 · 7771531 · 7771531
1 parent b0f3992
commit 7771531
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/util/psbt/map/output.rs b/src/util/psbt/map/output.rs
@@ -143,6 +143,8 @@ impl TapTree {
     pub fn from_inner(inner: TaprootBuilder) -> Result<Self, IncompleteTapTree> {
         if !inner.is_finalized() {
             Err(IncompleteTapTree::NotFinalized(inner))
+        } else if inner.has_hidden_nodes() {
+            Err(IncompleteTapTree::HiddenParts(inner))
         } else {
             Ok(TapTree(inner))
         }

diff --git a/src/util/psbt/serialize.rs b/src/util/psbt/serialize.rs
@@ -355,7 +355,7 @@ impl Deserialize for TapTree {
             builder = builder.add_leaf_with_ver(*depth, script, leaf_version)
                 .map_err(|_| encode::Error::ParseFailed("Tree not in DFS order"))?;
         }
-        if builder.is_finalized() {
+        if builder.is_finalized() || !builder.has_hidden_nodes() {
             Ok(TapTree(builder))
         } else {
             Err(encode::Error::ParseFailed("Incomplete taproot Tree"))