update jf/hotshot deps

Cargo.toml

@@ -74,11 +74,12 @@ derivative = "2.2"
 derive_more = "0.99"
 either = "1.11"
 futures = "0.3"
-hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50" }
-hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50" }
-hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50" }
+hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.51" }
+hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.51" }
+hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.51" }
 itertools = "0.12.1"
-jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.4" }
+jf-merkle-tree = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = ["std"] }
+jf-vid = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = ["std", "parallel"] }
 prometheus = "0.13"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -110,7 +111,7 @@ tokio-postgres = { version = "0.7", optional = true, default-features = false, f
 
 # Dependencies enabled by feature "testing".
 espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0", optional = true }
-hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50", optional = true }
+hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.51", optional = true }
 portpicker = { version = "0.1", optional = true }
 rand = { version = "0.8", optional = true }
 spin_sleep = { version = "1.2", optional = true }
@@ -131,7 +132,7 @@ backtrace-on-stack-overflow = { version = "0.3", optional = true }
 clap = { version = "4.5", features = ["derive", "env"] }
 espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0" }
 generic-array = "0.14"
-hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50" }
+hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.51" }
 portpicker = "0.1"
 rand = "0.8"
 reqwest = "0.12.3"

src/availability/query_data.rs

@@ -22,7 +22,7 @@ use hotshot_types::{
     },
     vid::{vid_scheme, VidCommitment},
 };
-use jf_primitives::vid::VidScheme;
+use jf_vid::VidScheme;
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use snafu::{ensure, Snafu};
 use std::fmt::Debug;

src/data_source.rs

@@ -572,7 +572,7 @@ pub mod node_tests {
         traits::block_contents::{vid_commitment, BlockPayload},
         vid::{vid_scheme, VidSchemeType},
     };
-    use jf_primitives::vid::VidScheme;
+    use jf_vid::VidScheme;
 
     #[async_std::test]
     pub async fn test_sync_status<D: TestableDataSource>() {

src/data_source/extension.rs

@@ -29,7 +29,7 @@ use crate::{
 };
 use async_trait::async_trait;
 use hotshot_types::traits::node_implementation::NodeType;
-use jf_primitives::merkle_tree::prelude::MerkleProof;
+use jf_merkle_tree::prelude::MerkleProof;
 use std::ops::RangeBounds;
 
 /// Wrapper to add extensibility to an existing data source.

src/data_source/fetching.rs

@@ -110,7 +110,7 @@ use futures::{
     stream::{self, BoxStream, Stream, StreamExt},
 };
 use hotshot_types::traits::node_implementation::NodeType;
-use jf_primitives::merkle_tree::{prelude::MerkleProof, MerkleTreeScheme};
+use jf_merkle_tree::{prelude::MerkleProof, MerkleTreeScheme};
 
 use std::{
     cmp::min,

src/data_source/sql.rs

@@ -428,7 +428,7 @@ mod test {
     };
     use hotshot_example_types::state_types::TestInstanceState;
     use hotshot_types::vid::vid_scheme;
-    use jf_primitives::vid::VidScheme;
+    use jf_vid::VidScheme;
 
     type D = SqlDataSource<MockTypes, NoFetching>;
 

src/data_source/storage/sql.rs

@@ -63,7 +63,7 @@ use hotshot_types::{
     },
 };
 use itertools::{izip, Itertools};
-use jf_primitives::merkle_tree::{
+use jf_merkle_tree::{
     prelude::{MerkleNode, MerkleProof},
     DigestAlgorithm, MerkleCommitment, ToTraversalPath,
 };
@@ -3207,7 +3207,7 @@ pub mod testing {
 mod test {
 
     use hotshot_example_types::state_types::TestInstanceState;
-    use jf_primitives::merkle_tree::{
+    use jf_merkle_tree::{
         universal_merkle_tree::UniversalMerkleTree, LookupResult, UniversalMerkleTreeScheme,
     };
     use rand::{seq::IteratorRandom, RngCore};
@@ -3454,7 +3454,7 @@ mod test {
 
     use crate::data_source::VersionedDataSource;
 
-    use jf_primitives::merkle_tree::MerkleTreeScheme;
+    use jf_merkle_tree::MerkleTreeScheme;
 
     #[async_std::test]
     async fn test_merklized_state_storage() {

src/data_source/update.rs

@@ -28,7 +28,7 @@ use hotshot_types::{
     },
     vid::vid_scheme,
 };
-use jf_primitives::vid::VidScheme;
+use jf_vid::VidScheme;
 use std::{error::Error, fmt::Debug, iter::once};
 
 /// An extension trait for types which implement the update trait for each API module.

src/fetching/provider/query_service.rs

@@ -23,7 +23,7 @@ use hotshot_types::{
     traits::{node_implementation::NodeType, BlockPayload},
     vid::{vid_scheme, VidSchemeType},
 };
-use jf_primitives::vid::VidScheme;
+use jf_vid::VidScheme;
 use surf_disco::{Client, Url};
 use vbs::version::StaticVersionType;
 

src/merklized_state/data_source.rs

@@ -22,7 +22,7 @@ use derivative::Derivative;
 use derive_more::Display;
 use hotshot_types::traits::node_implementation::NodeType;
 
-use jf_primitives::merkle_tree::{
+use jf_merkle_tree::{
     prelude::MerkleProof, DigestAlgorithm, Element, ForgetableMerkleTreeScheme, Index,
     MerkleCommitment, NodeValue, ToTraversalPath,
 };

src/testing/mocks.rs

@@ -32,7 +32,7 @@ use hotshot_types::{
     traits::node_implementation::NodeType,
 };
 
-use jf_primitives::merkle_tree::{
+use jf_merkle_tree::{
     prelude::{MerkleProof, Sha3Digest, Sha3Node},
     universal_merkle_tree::UniversalMerkleTree,
     ForgetableMerkleTreeScheme, ForgetableUniversalMerkleTreeScheme,