From e6fdef6d0b4481932ac9647796eb3fa56197ed66 Mon Sep 17 00:00:00 2001
From: Boog900 <54e72d8a-345f-4599-bd90-c6b9bc7d0ec5@aleeas.com>
Date: Fri, 15 Nov 2024 20:34:11 +0000
Subject: [PATCH] change `merkle_root` return to `Option`

---
 networks/monero/src/block.rs  |  5 ++++-
 networks/monero/src/merkle.rs | 13 ++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/networks/monero/src/block.rs b/networks/monero/src/block.rs
index a0bbe506b..a15bd7eb6 100644
--- a/networks/monero/src/block.rs
+++ b/networks/monero/src/block.rs
@@ -126,7 +126,10 @@ impl Block {
     transactions.push(self.miner_transaction.hash());
     transactions.extend_from_slice(&self.transactions);
 
-    blob.extend_from_slice(&merkle_root(transactions));
+    blob.extend_from_slice(
+      &merkle_root(transactions)
+        .expect("the tree will not be empty, the miner tx is always present"),
+    );
     write_varint(&(1 + self.transactions.len()), &mut blob).unwrap();
     blob
   }
diff --git a/networks/monero/src/merkle.rs b/networks/monero/src/merkle.rs
index 8a0f8134b..c30e83b4f 100644
--- a/networks/monero/src/merkle.rs
+++ b/networks/monero/src/merkle.rs
@@ -6,13 +6,12 @@ use crate::primitives::keccak256;
 /// https://github.com/monero-project/monero/blob/893916ad091a92e765ce3241b94e706ad012b62a
 ///   /src/crypto/tree-hash.c#L62
 ///
-/// # Panics
-/// This function will panic if the tree is empty.
-pub fn merkle_root(mut leafs: Vec<[u8; 32]>) -> [u8; 32] {
+/// This function returns [`None`] if the tree is empty.
+pub fn merkle_root(mut leafs: Vec<[u8; 32]>) -> Option<[u8; 32]> {
   match leafs.len() {
-    0 => panic!("Can't compute Merkle root for empty tree"),
-    1 => leafs[0],
-    2 => keccak256([leafs[0], leafs[1]].concat()),
+    0 => None,
+    1 => Some(leafs[0]),
+    2 => Some(keccak256([leafs[0], leafs[1]].concat())),
     _ => {
       // Monero preprocess this so the length is a power of 2
       let mut high_pow_2 = 4; // 4 is the lowest value this can be
@@ -52,7 +51,7 @@ pub fn merkle_root(mut leafs: Vec<[u8; 32]>) -> [u8; 32] {
         leafs = new_hashes;
         new_hashes = Vec::with_capacity(leafs.len() / 2);
       }
-      leafs[0]
+      Some(leafs[0])
     }
   }
 }