Update Jellyfish (#2640)

* Pin to version (0.4.0)
* Update VID construction
* Brings in persistent merkle tree for use in sequencer

Cargo.toml

@@ -61,10 +61,10 @@ futures = "0.3.30"
 # https://github.com/EspressoSystems/HotShot/issues/1850
 generic-array = { version = "0.14.7", features = ["serde"] }
 
-jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish" }
-jf-plonk = { git = "https://github.com/EspressoSystems/jellyfish" }
-jf-relation = { git = "https://github.com/EspressoSystems/jellyfish" }
-jf-utils = { git = "https://github.com/espressosystems/jellyfish" }
+jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.0" }
+jf-plonk = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.0" }
+jf-relation = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.0" }
+jf-utils = { git = "https://github.com/espressosystems/jellyfish", tag = "0.4.0" }
 libp2p-identity = "0.2"
 libp2p-networking = { path = "./crates/libp2p-networking", version = "0.1.0", default-features = false }
 libp2p-swarm-derive = { version = "0.34.1" }

crates/task-impls/src/vid.rs

@@ -82,7 +82,9 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>, A: ConsensusApi<TYPES, I> +
 
                 // calculate vid shares
                 let vid_disperse = spawn_blocking(move || {
-                    let vid = VidScheme::new(chunk_size, num_quorum_committee, &srs).unwrap();
+                    let multiplicity = 1;
+                    let vid = VidScheme::new(chunk_size, num_quorum_committee, multiplicity, &srs)
+                        .unwrap();
                     vid.disperse(encoded_transactions.clone()).unwrap()
                 })
                 .await;

crates/testing/src/task_helpers.rs

@@ -371,6 +371,6 @@ pub fn vid_init<TYPES: NodeType>(
 
     // TODO <https://github.com/EspressoSystems/HotShot/issues/1686>
     let srs = hotshot_types::data::test_srs(num_committee);
-
-    VidScheme::new(chunk_size, num_committee, srs).unwrap()
+    let multiplicity = 1;
+    VidScheme::new(chunk_size, num_committee, multiplicity, srs).unwrap()
 }

crates/types/src/traits/block_contents.rs

@@ -104,8 +104,8 @@ pub fn vid_commitment(
 
     // TODO <https://github.com/EspressoSystems/HotShot/issues/1686>
     let srs = test_srs(num_storage_nodes);
-
-    let vid = VidScheme::new(num_chunks, num_storage_nodes, srs).unwrap();
+    let multiplicity = 1;
+    let vid = VidScheme::new(num_chunks, num_storage_nodes, multiplicity, srs).unwrap();
     vid.commit_only(encoded_transactions).unwrap()
 }