feat: merkle tree hash with keccak

Author: MarcosNicolau

aggregation-mode/Cargo.lock

@@ -9,3 +9,4 @@ members = ["sp1"]
 serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.117"
 sha2 = "0.10.8"
+sha3 = "0.10.8"

aggregation-mode/zkvm/Cargo.lock

@@ -9,9 +9,11 @@ sp1-zkvm = { version = "4.1.3", features = ["verify"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 sha2 = { workspace = true }
+sha3 = { workspace = true }
 
 [patch.crates-io]
 sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", tag = "sha2-v0.10.8-patch-v1" }
+sha3 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", tag = "sha3-v0.10.8-patch-v1" }
 
 [lib]
 path = "./src/lib.rs"

aggregation-mode/zkvm/Cargo.toml

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use sha2::{Digest, Sha256};
+use sha3::{Digest, Keccak256};
 
 #[derive(Serialize, Deserialize)]
 pub struct SP1CompressedProof {
@@ -21,7 +21,7 @@ impl SP1CompressedProof {
     }
 
     pub fn hash(&self) -> [u8; 32] {
-        let mut hasher = Sha256::new();
+        let mut hasher = Keccak256::new();
         hasher.update(&self.vk);
         hasher.update(&self.public_inputs);
         hasher.finalize().into()
@@ -44,4 +44,5 @@ impl Proof {
 #[derive(Serialize, Deserialize)]
 pub struct Input {
     pub proofs: Vec<Proof>,
+    pub merkle_root: [u8; 32],
 }

aggregation-mode/zkvm/sp1/Cargo.toml

@@ -2,10 +2,11 @@
 sp1_zkvm::entrypoint!(main);
 
 use sha2::{Digest, Sha256};
+use sha3::Keccak256;
 use sp1_aggregator::{Input, Proof};
 
 fn combine_hashes(hash_a: &[u8; 32], hash_b: &[u8; 32]) -> [u8; 32] {
-    let mut hasher = Sha256::new();
+    let mut hasher = Keccak256::new();
     hasher.update(hash_a);
     hasher.update(hash_b);
     hasher.finalize().into()
@@ -53,5 +54,8 @@ pub fn main() {
     }
 
     let merkle_root = compute_merkle_root(&input.proofs);
+
+    assert_eq!(merkle_root, input.merkle_root);
+
     sp1_zkvm::io::commit_slice(&merkle_root);
 }