patches

Cargo.toml

@@ -65,13 +65,11 @@ keystore-rs = "0.1.0"
 toml = "0.8.14"
 dirs = "5.0.1"
 anyhow = "1.0.44"
-jmt = { path = "../jmt", features = [
-    "mocks",
-] } #{ version = "0.10.0", features = ["mocks"] }
+jmt = { version = "0.10.0", features = ["mocks"] }
 bellpepper-core = { version = "0.4.0", default-features = false }
 bellpepper = "0.4.1"
-arecibo = { git = "https://github.com/deltadevsde/arecibo" }
-itertools = "0.13.0" # zip_eq
+itertools = "0.13.0"                                              # zip_eq
+arecibo = "0.2.0"
 sha2 = "0.10.8"
 auto_impl = "1.2.0"
 bincode = "1.3.3"
@@ -86,6 +84,10 @@ sp1-helper = "1.2.0"
 
 [patch.crates-io]
 sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" }
+arecibo = { git = "https://github.com/deltadevsde/arecibo" }
+jmt = { git = "https://github.com/deltadevsde/jmt", branch = "rehashing-circuit", features = [
+    "mocks",
+] }
 
 # [workspace.dev-dependencies]
 # serial_test = "3.1.1"

crates/prism/src/node_types/sequencer.rs

@@ -374,7 +374,7 @@ impl Sequencer {
                 let proof =
                     tree.update(KeyHash::with::<Hasher>(hashed_id), current_chain.clone())?;
                 self.db
-                    .update_hashchain(operation, &current_chain)
+                    .set_hashchain(operation, &current_chain)
                     .context(format!(
                         "Failed to update hashchain for operation {:?}",
                         operation
@@ -408,12 +408,10 @@ impl Sequencer {
                 let mut chain = Hashchain::new(id.clone());
                 chain.create_account(value.into(), source.clone())?;
 
-                self.db
-                    .update_hashchain(operation, &chain)
-                    .context(format!(
-                        "Failed to create hashchain for operation {:?}",
-                        operation
-                    ))?;
+                self.db.set_hashchain(operation, &chain).context(format!(
+                    "Failed to create hashchain for operation {:?}",
+                    operation
+                ))?;
 
                 let mut tree = self.tree.lock().await;
                 let hashed_id = hash(id.as_bytes());

crates/prism/src/storage.rs

@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Context, Result};
+use anyhow::{anyhow, Result};
 use auto_impl::auto_impl;
 use jmt::{
     storage::{LeafNode, Node, NodeBatch, NodeKey, TreeReader, TreeWriter},
@@ -32,11 +32,8 @@ pub struct RedisConnection {
 #[auto_impl(&, Box, Arc)]
 pub trait Database: Send + Sync + TreeReader + TreeWriter {
     fn get_hashchain(&self, key: &str) -> Result<Hashchain>;
-    fn update_hashchain(
-        &self,
-        incoming_operation: &Operation,
-        value: &[HashchainEntry],
-    ) -> Result<()>;
+    fn set_hashchain(&self, incoming_operation: &Operation, value: &[HashchainEntry])
+        -> Result<()>;
 
     fn get_commitment(&self, epoch: &u64) -> Result<String>;
     fn set_commitment(&self, epoch: &u64, commitment: &Digest) -> Result<()>;
@@ -220,7 +217,7 @@ impl Database for RedisConnection {
             .map_err(|_| anyhow!(DatabaseError::WriteError(format!("epoch: {}", epoch))))
     }
 
-    fn update_hashchain(
+    fn set_hashchain(
         &self,
         incoming_operation: &Operation,
         value: &[HashchainEntry],
@@ -313,7 +310,7 @@ mod tests {
         let chain_entry = create_mock_chain_entry();
 
         redis_connections
-            .update_hashchain(&incoming_operation, &[chain_entry.clone()])
+            .set_hashchain(&incoming_operation, &[chain_entry.clone()])
             .unwrap();
 
         let hashchain = redis_connections
@@ -338,7 +335,7 @@ mod tests {
         let chain_entry = create_mock_chain_entry();
 
         redis_connections
-            .update_hashchain(&incoming_operation, &[chain_entry.clone()])
+            .set_hashchain(&incoming_operation, &[chain_entry.clone()])
             .unwrap();
 
         let hashchain = redis_connections.get_hashchain("main:missing_test_key");
@@ -406,7 +403,7 @@ mod tests {
 
         let chain_entries: Vec<HashchainEntry> = vec![create_mock_chain_entry()];
 
-        match redis_connections.update_hashchain(&incoming_operation, &chain_entries) {
+        match redis_connections.set_hashchain(&incoming_operation, &chain_entries) {
             Ok(_) => (),
             Err(e) => panic!("Failed to update hashchain: {}", e),
         }