downgrade jf

Cargo.toml

@@ -145,9 +145,9 @@ hotshot-utils = { path = "./utils" }
 hotshot-task = { path = "./task", version = "0.1.0", default-features = false }
 hotshot-task-impls = { path = "./task-impls", version = "0.1.0", default-features = false }
 itertools = "0.10"
-hotshot-primitives = { git = "ssh://[email protected]/EspressoSystems/hotshot-primitives.git", branch = 'update_jellyfish_0.4.0_pre.0' }
-jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", rev = "36dceb6", features = [
-        "std",
+# hotshot-primitives = { git = "ssh://[email protected]/EspressoSystems/hotshot-primitives.git", branch = 'update_jellyfish_0.4.0_pre.0' }
+jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.1.2-patch.1", features = [
+  "std",
 ] }
 libp2p-swarm-derive = { version = "=0.32.0" }
 libp2p-networking = { path = "./libp2p-networking", version = "0.1.0", default-features = false }

src/traits/election/static_committee.rs

@@ -1,5 +1,5 @@
 use super::vrf::JfPubKey;
-// use ark_bls12_381::Parameters as Param381;
+use ark_bls12_381::Parameters as Param381;
 use commit::{Commitment, Committable, RawCommitmentBuilder};
 use espresso_systems_common::hotshot::tag;
 use hotshot_types::{
@@ -32,7 +32,7 @@ pub struct GeneralStaticCommittee<T, LEAF: LeafType<NodeType = T>, PUBKEY: Signa
 }
 
 /// static committee using a vrf kp
-pub type StaticCommittee<T, LEAF> = GeneralStaticCommittee<T, LEAF, JfPubKey<BLSSignatureScheme>>;
+pub type StaticCommittee<T, LEAF> = GeneralStaticCommittee<T, LEAF, JfPubKey<BLSSignatureScheme<Param381>>>;
 
 impl<T, LEAF: LeafType<NodeType = T>, PUBKEY: SignatureKey>
     GeneralStaticCommittee<T, LEAF, PUBKEY>

src/traits/election/vrf.rs

@@ -1,7 +1,7 @@
 // // Needed to avoid the non-biding `let` warning.
 // #![allow(clippy::let_underscore_untyped)]
 
-// use ark_ed_on_bls12_381::EdwardsConfig as Param381;
+use ark_ed_on_bls12_381::EdwardsConfig as Param381;
 // use ark_bls12_381::Parameters as Param381;
 // use ark_ec::bls12::Bls12Parameters;
 use bincode::Options;
@@ -73,7 +73,7 @@ impl<VRF, VRFHASHER, VRFPARAMS> Clone for VRFStakeTable<VRF, VRFHASHER, VRFPARAM
 }
 
 /// concrete type for bls public key
-pub type BlsPubKey = JfPubKey<BLSSignatureScheme>;
+pub type BlsPubKey = JfPubKey<BLSSignatureScheme<Param381>>;
 
 /// type wrapper for VRF's public key
 #[derive(Deserialize, Serialize)]

testing-macros/Cargo.toml

@@ -63,8 +63,8 @@ hotshot = { path = "../", default-features = false }
 hotshot-consensus = { path = "../consensus", default-features = false }
 hotshot-types = { path = "../types", default-features = false }
 hotshot-testing = { path = "../testing", default-features = false }
-hotshot-primitives = { git = "ssh://[email protected]/EspressoSystems/hotshot-primitives.git", branch = 'update_jellyfish_0.4.0_pre.0' }
-jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", rev = "36dceb6", features = [
+# hotshot-primitives = { git = "ssh://[email protected]/EspressoSystems/hotshot-primitives.git", branch = 'update_jellyfish_0.4.0_pre.0' }
+jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.1.2-patch.1", features = [
   "std",
 ] }
 nll = { git = "https://github.com/EspressoSystems/nll.git" }

testing/Cargo.toml

@@ -69,8 +69,8 @@ hotshot-types = { path = "../types", default-features = false }
 hotshot-utils = { path = "../utils" }
 hotshot-task = { path = "../task", version = "0.1.0", default-features = false }
 hotshot-task-impls = { path = "../task-impls", version = "0.1.0", default-features = false }
-hotshot-primitives = { git = "ssh://[email protected]/EspressoSystems/hotshot-primitives.git", branch = 'update_jellyfish_0.4.0_pre.0' }
-jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", rev = "36dceb6", features = [
+# hotshot-primitives = { git = "ssh://[email protected]/EspressoSystems/hotshot-primitives.git", branch = 'update_jellyfish_0.4.0_pre.0' }
+jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.1.2-patch.1", features = [
   "std",
 ] }
 # nll = { git = "https://github.com/EspressoSystems/nll.git" }

testing/src/test_runner.rs

@@ -13,6 +13,8 @@ use hotshot::{
     types::{Message, SystemContextHandle},
     HotShotError, HotShotInitializer, HotShotType, SystemContext, ViewRunner,
 };
+use ark_bls12_381::Parameters as Param381;
+
 use hotshot_types::{
     certificate::QuorumCertificate,
     traits::{
@@ -559,7 +561,7 @@ pub mod test {
         type ConsensusType = SequencingConsensus;
         type Time = ViewNumber;
         type BlockType = SDemoBlock;
-        type SignatureKey = JfPubKey<BLSSignatureScheme>;
+        type SignatureKey = JfPubKey<BLSSignatureScheme<Param381>>;
         type VoteTokenType = StaticVoteToken<Self::SignatureKey>;
         type Transaction = SDemoTransaction;
         type ElectionConfigType = StaticElectionConfig;

testing/src/test_types.rs

@@ -1,5 +1,5 @@
 use crate::test_runner::TestRunner;
-// use ark_bls12_381::Parameters as Param381;
+use ark_bls12_381::Parameters as Param381;
 // use blake3::Hasher;
 use hotshot::{
     demos::vdemo::{VDemoBlock, VDemoState, VDemoTransaction},
@@ -76,8 +76,8 @@ impl NodeType for StaticCommitteeTestTypes {
     type ConsensusType = ValidatingConsensus;
     type Time = ViewNumber;
     type BlockType = VDemoBlock;
-    type SignatureKey = JfPubKey<BLSSignatureScheme>;
-    type VoteTokenType = StaticVoteToken<JfPubKey<BLSSignatureScheme>>;
+    type SignatureKey = JfPubKey<BLSSignatureScheme<Param381>>;
+    type VoteTokenType = StaticVoteToken<JfPubKey<BLSSignatureScheme<Param381>>>;
     type Transaction = VDemoTransaction;
     type ElectionConfigType = StaticElectionConfig;
     type StateType = VDemoState;

testing/tests/consensus_task.rs

@@ -1,4 +1,5 @@
 use async_lock::Mutex;
+use ark_bls12_381::Parameters as Param381;
 
 use hotshot_testing::{
     round::{Round, RoundCtx, RoundHook, RoundResult, RoundSafetyCheck, RoundSetup},
@@ -17,7 +18,7 @@ use hotshot::{
     HotShotType, SystemContext,
 };
 
-use ark_bls12_381::Parameters as Param381;
+// use ark_bls12_381::Parameters as Param381;
 use async_compatibility_layer::art::async_spawn;
 use hotshot::demos::sdemo::SDemoBlock;
 use hotshot::demos::sdemo::SDemoState;
@@ -109,7 +110,7 @@ impl NodeType for SequencingTestTypes {
     type ConsensusType = SequencingConsensus;
     type Time = ViewNumber;
     type BlockType = SDemoBlock;
-    type SignatureKey = JfPubKey<BLSSignatureScheme>;
+    type SignatureKey = JfPubKey<BLSSignatureScheme<Param381>>;
     type VoteTokenType = StaticVoteToken<Self::SignatureKey>;
     type Transaction = SDemoTransaction;
     type ElectionConfigType = StaticElectionConfig;
@@ -199,7 +200,7 @@ async fn build_consensus_task<
     TYPES: NodeType<
         ConsensusType = SequencingConsensus,
         ElectionConfigType = StaticElectionConfig,
-        SignatureKey = JfPubKey<BLSSignatureScheme>,
+        SignatureKey = JfPubKey<BLSSignatureScheme<Param381>>,
         Time = ViewNumber,
     >,
     I: TestableNodeImplementation<
@@ -248,7 +249,7 @@ where
     GeneralStaticCommittee<
         SequencingTestTypes,
         SequencingLeaf<SequencingTestTypes>,
-        JfPubKey<BLSSignatureScheme>,
+        JfPubKey<BLSSignatureScheme<Param381>>,
     >: Membership<TYPES>,
 {
     let builder = TestBuilder::default_multiple_rounds();

types/Cargo.toml

@@ -61,8 +61,8 @@ futures = "0.3.28"
 hex_fmt = "0.3.0"
 hotshot-utils = { path = "../utils" }
 hotshot-task = { path = "../task", default-features = false }
-hotshot-primitives = { git = "ssh://[email protected]/EspressoSystems/hotshot-primitives.git", branch = 'update_jellyfish_0.4.0_pre.0' }
-jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", rev = "36dceb6", features = [
+# hotshot-primitives = { git = "ssh://[email protected]/EspressoSystems/hotshot-primitives.git", branch = 'update_jellyfish_0.4.0_pre.0' }
+jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.1.2-patch.1", features = [
   "std",
 ] }
 nll = { git = "https://github.com/EspressoSystems/nll.git" }

web_server/Cargo.toml

@@ -40,8 +40,8 @@ futures = "0.3.28"
 libp2p-core = { version = "0.39.2", default-features = false }
 hotshot-types = { path = "../types", default-features = false }
 hotshot-utils = { path = "../utils"}
-hotshot-primitives = { git = "ssh://[email protected]/EspressoSystems/hotshot-primitives.git", branch = 'update_jellyfish_0.4.0_pre.0' }
-jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", rev = "36dceb6", features = [
+# hotshot-primitives = { git = "ssh://[email protected]/EspressoSystems/hotshot-primitives.git", branch = 'update_jellyfish_0.4.0_pre.0' }
+jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.1.2-patch.1", features = [
   "std",
 ] }
 tide-disco = { git = "https://github.com/EspressoSystems/tide-disco.git", tag = "v0.4.1" }