Merge pull request zingolabs#504 from AloeareV/fix_initiation_below_o…

…rchard_activation Don't unwrap a tree that might not be there
juanky201271 · Sep 26, 2023 · ef38b78 · ef38b78
2 parents 324d39b + 83819f5
commit ef38b78
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/zingolib/src/wallet.rs b/zingolib/src/wallet.rs
@@ -253,17 +253,15 @@ impl LightWallet {
                 &[u8],
                 COMMITMENT_TREE_LEVELS,
             >(&hex::decode(trees.sapling_tree).unwrap()[..])
-            .unwrap()
-            .to_frontier()
-            .take(),
+            .ok()
+            .and_then(|tree| tree.to_frontier().take()),
             zcash_primitives::merkle_tree::read_commitment_tree::<
                 MerkleHashOrchard,
                 &[u8],
                 COMMITMENT_TREE_LEVELS,
             >(&hex::decode(trees.orchard_tree).unwrap()[..])
-            .unwrap()
-            .to_frontier()
-            .take(),
+            .ok()
+            .and_then(|tree| tree.to_frontier().take()),
         )
     }
     pub(crate) async fn initiate_witness_trees(&self, trees: crate::compact_formats::TreeState) {