Merge pull request #43 from EspressoSystems/cl/update-jf

chore: update jellyfish dependency
EspressoSystems · May 9, 2024 · 569d6a6 · 569d6a6
2 parents 6a2578e + 9d40fc2
commit 569d6a6
Show file tree

Hide file tree

Showing 17 changed files with 113 additions and 282 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,8 +12,8 @@ tokio = { version = "1", default-features = false, features = [
     "parking_lot",
     "tracing"
 ] }
-jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish.git", tag = "0.4.2", default-features = false, features = [
-    "std",
+jf-signature = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish.git", tag = "0.4.5", default-features = false, features = [
+    "std", "bls"
 ] }
 rand = "0.8"
 tracing = { version = "0.1", default-features = false }

diff --git a/cdn-broker/Cargo.toml b/cdn-broker/Cargo.toml
@@ -43,7 +43,7 @@ console-subscriber = "0.2"
 
 
 [dependencies]
-jf-primitives.workspace = true
+jf-signature.workspace = true
 cdn-proto = { path = "../cdn-proto", default-features = false, features = [
     "metrics",
 ] }

diff --git a/cdn-broker/src/binaries/bad-broker.rs b/cdn-broker/src/binaries/bad-broker.rs
@@ -6,9 +6,7 @@ use std::time::Duration;
 use cdn_broker::{Broker, Config};
 use cdn_proto::{crypto::signature::KeyPair, def::ProductionRunDef, error::Result};
 use clap::Parser;
-use jf_primitives::signatures::{
-    bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS, SignatureScheme,
-};
+use jf_signature::{bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS, SignatureScheme};
 use rand::{rngs::StdRng, SeedableRng};
 use tokio::{spawn, time::sleep};
 use tracing_subscriber::EnvFilter;

diff --git a/cdn-broker/src/binaries/broker.rs b/cdn-broker/src/binaries/broker.rs
@@ -3,9 +3,7 @@
 use cdn_broker::{Broker, Config};
 use cdn_proto::{crypto::signature::KeyPair, def::ProductionRunDef, error::Result};
 use clap::Parser;
-use jf_primitives::signatures::{
-    bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS, SignatureScheme,
-};
+use jf_signature::{bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS, SignatureScheme};
 use rand::{rngs::StdRng, SeedableRng};
 use tracing_subscriber::EnvFilter;
 

diff --git a/cdn-broker/src/tasks/user/handler.rs b/cdn-broker/src/tasks/user/handler.rs
@@ -83,7 +83,7 @@ impl<Def: RunDef> Inner<Def> {
         }
     }
 
-    /// This is the main loop where we deal with user connectins. On exit, the calling function
+    /// This is the main loop where we deal with user connections. On exit, the calling function
     /// should remove the user from the map.
     pub async fn user_receive_loop(
         self: &Arc<Self>,

diff --git a/cdn-broker/src/tests/mod.rs b/cdn-broker/src/tests/mod.rs
@@ -14,9 +14,7 @@ use cdn_proto::{
     discovery::BrokerIdentifier,
     message::{Message, Topic},
 };
-use jf_primitives::signatures::{
-    bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS, SignatureScheme,
-};
+use jf_signature::{bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS, SignatureScheme};
 use rand::{rngs::StdRng, RngCore, SeedableRng};
 use tokio::spawn;
 

diff --git a/cdn-client/Cargo.toml b/cdn-client/Cargo.toml
@@ -26,7 +26,7 @@ path = "src/binaries/bad-sender.rs"
 [dependencies]
 tokio = { workspace = true }
 async-std = { workspace = true, optional = true }
-jf-primitives.workspace = true
+jf-signature.workspace = true
 cdn-proto = { path = "../cdn-proto", default-features = false }
 tracing-subscriber.workspace = true
 rand.workspace = true

diff --git a/cdn-client/src/binaries/bad-connector.rs b/cdn-client/src/binaries/bad-connector.rs
@@ -9,9 +9,7 @@ use cdn_proto::{
     def::{ProductionClientConnection, TestTopic},
 };
 use clap::Parser;
-use jf_primitives::signatures::{
-    bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS, SignatureScheme,
-};
+use jf_signature::{bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS, SignatureScheme};
 use rand::{rngs::StdRng, SeedableRng};
 use tokio::time::sleep;
 use tracing_subscriber::EnvFilter;

diff --git a/cdn-client/src/binaries/bad-sender.rs b/cdn-client/src/binaries/bad-sender.rs
@@ -7,9 +7,7 @@ use cdn_proto::{
     def::{ProductionClientConnection, TestTopic},
 };
 use clap::Parser;
-use jf_primitives::signatures::{
-    bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS, SignatureScheme,
-};
+use jf_signature::{bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS, SignatureScheme};
 use rand::{rngs::StdRng, SeedableRng};
 use tracing::info;
 use tracing_subscriber::EnvFilter;

diff --git a/cdn-client/src/binaries/client.rs b/cdn-client/src/binaries/client.rs
@@ -11,9 +11,7 @@ use cdn_proto::{
     message::{Broadcast, Direct, Message},
 };
 use clap::Parser;
-use jf_primitives::signatures::{
-    bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS, SignatureScheme,
-};
+use jf_signature::{bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS, SignatureScheme};
 use rand::{rngs::StdRng, SeedableRng};
 use tokio::time::sleep;
 use tracing::info;

diff --git a/cdn-marshal/Cargo.toml b/cdn-marshal/Cargo.toml
@@ -16,7 +16,7 @@ name = "marshal"
 path = "src/binaries/marshal.rs"
 
 [dependencies]
-jf-primitives.workspace = true
+jf-signature.workspace = true
 cdn-proto = { path = "../cdn-proto", default-features = false, features = [
     "metrics",
 ] }

diff --git a/cdn-proto/Cargo.toml b/cdn-proto/Cargo.toml
@@ -49,7 +49,7 @@ quinn = { version = "0.10", default-features = false, features = [
     "tls-rustls",
     "runtime-tokio",
 ] }
-jf-primitives.workspace = true
+jf-signature.workspace = true
 ark-serialize = "0.4"
 rand.workspace = true
 url = "2"

diff --git a/cdn-proto/src/crypto/signature.rs b/cdn-proto/src/crypto/signature.rs
@@ -3,7 +3,7 @@
 
 use anyhow::Result;
 use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
-use jf_primitives::signatures::{
+use jf_signature::{
     bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS, SignatureScheme as JfSignatureScheme,
 };
 
@@ -58,7 +58,7 @@ pub struct KeyPair<Scheme: SignatureScheme> {
 }
 
 /// An example implementation of `Serializable` for Jellyfish's `bls_over_bn254`.
-impl Serializable for jf_primitives::signatures::bls_over_bn254::VerKey {
+impl Serializable for jf_signature::bls_over_bn254::VerKey {
     /// Serialize `Self` using `ark-serialize` (uncompressed)
     ///
     /// # Errors
@@ -81,8 +81,8 @@ impl Serializable for jf_primitives::signatures::bls_over_bn254::VerKey {
 /// An example implementation of `SignatureScheme` for Jellyfish's `bls_over_bn254` signature scheme.
 impl SignatureScheme for BLS {
     /// The private and public key types
-    type PrivateKey = jf_primitives::signatures::bls_over_bn254::SignKey;
-    type PublicKey = jf_primitives::signatures::bls_over_bn254::VerKey;
+    type PrivateKey = jf_signature::bls_over_bn254::SignKey;
+    type PublicKey = jf_signature::bls_over_bn254::VerKey;
 
     /// Sign using the private key and the message. We have to serialize the signature
     /// so we can return it as a `Vec<u8>`.

diff --git a/cdn-proto/src/def.rs b/cdn-proto/src/def.rs
@@ -1,6 +1,6 @@
 //! Compile-time run configuration for all CDN components.
 
-use jf_primitives::signatures::bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS;
+use jf_signature::bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS;
 use num_enum::{IntoPrimitive, TryFromPrimitive};
 
 use crate::connection::middleware::{

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -13,4 +13,4 @@ cdn-broker.path = "../cdn-broker"
 cdn-proto.path = "../cdn-proto"
 cdn-marshal.path = "../cdn-marshal"
 rand.workspace = true
-jf-primitives.workspace = true
+jf-signature.workspace = true
diff --git a/tests/src/tests/mod.rs b/tests/src/tests/mod.rs
@@ -7,9 +7,7 @@ use cdn_proto::{
     discovery::{embedded::Embedded, BrokerIdentifier, DiscoveryClient},
     message::Topic,
 };
-use jf_primitives::signatures::{
-    bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS, SignatureScheme as _,
-};
+use jf_signature::{bls_over_bn254::BLSOverBN254CurveSignatureScheme as BLS, SignatureScheme as _};
 use rand::RngCore;
 use rand::{rngs::StdRng, SeedableRng};
 use tokio::spawn;