diff --git a/Cargo.lock b/Cargo.lock index 9bbe80b050..2d086a84ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1127,11 +1127,13 @@ dependencies = [ [[package]] name = "blst" -version = "0.3.10" -source = "git+https://github.com/EspressoSystems/blst.git?branch=no-std#faefc7fcb21864aaf4f6f443636ce8924108fcbd" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94087b935a822949d3291a9989ad2b2051ea141eda0fd4e478a75f6aa3e604b" dependencies = [ "cc", "glob", + "threadpool", "zeroize", ] @@ -3503,7 +3505,7 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jf-plonk" version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish#d9c1b634a96256b9adf92f549fb87e0167adfae4" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.0#bffc0198a89c195e42f394a4acf2eebf1db8ad5b" dependencies = [ "ark-ec", "ark-ff", @@ -3532,7 +3534,7 @@ dependencies = [ [[package]] name = "jf-primitives" version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish#d9c1b634a96256b9adf92f549fb87e0167adfae4" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.0#bffc0198a89c195e42f394a4acf2eebf1db8ad5b" dependencies = [ "anyhow", "ark-bls12-377", @@ -3577,7 +3579,7 @@ dependencies = [ [[package]] name = "jf-relation" version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish#d9c1b634a96256b9adf92f549fb87e0167adfae4" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.0#bffc0198a89c195e42f394a4acf2eebf1db8ad5b" dependencies = [ "ark-bls12-377", "ark-bls12-381", @@ -3603,7 +3605,7 @@ dependencies = [ [[package]] name = "jf-utils" version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish#d9c1b634a96256b9adf92f549fb87e0167adfae4" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.0#bffc0198a89c195e42f394a4acf2eebf1db8ad5b" dependencies = [ "ark-ec", "ark-ff", @@ -6729,6 +6731,15 @@ dependencies = [ "once_cell", ] +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + [[package]] name = "tide" version = "0.16.0" diff --git a/Cargo.toml b/Cargo.toml index 779133a827..209f9c7816 100644 --- a/Cargo.toml +++ b/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" } diff --git a/crates/task-impls/src/vid.rs b/crates/task-impls/src/vid.rs index 7f02da307c..d27dc04d19 100644 --- a/crates/task-impls/src/vid.rs +++ b/crates/task-impls/src/vid.rs @@ -82,7 +82,9 @@ impl, A: ConsensusApi + // 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; diff --git a/crates/testing/src/task_helpers.rs b/crates/testing/src/task_helpers.rs index 4e65d21efd..4afec99b74 100644 --- a/crates/testing/src/task_helpers.rs +++ b/crates/testing/src/task_helpers.rs @@ -371,6 +371,6 @@ pub fn vid_init( // TODO 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() } diff --git a/crates/types/src/traits/block_contents.rs b/crates/types/src/traits/block_contents.rs index 7ac59e097e..8c5617803e 100644 --- a/crates/types/src/traits/block_contents.rs +++ b/crates/types/src/traits/block_contents.rs @@ -104,8 +104,8 @@ pub fn vid_commitment( // TODO 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() }