Merge pull request #2 from PayneJoe/main

push to branch

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "rust-analyzer.linkedProjects": [
+        "./Cargo.toml"
+    ]
+}

Cargo.toml

@@ -7,14 +7,29 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0"
+serde = "1.0"
+thiserror = "1.0"
+rand_chacha = { version = "0.3.1", default-features = false }
+
+## numberics 
+ff = { version = "0.13.0", features = ["derive"] }
+num-bigint = { version = "0.4", features = ["serde", "rand"] }
+
+## arkworks
 ark-bls12-377 = "0.4.0"
 ark-bls12-381 = "0.4.0"
 ark-bn254 = "0.4.0"
 ark-bw6-761 = "0.4.0"
 ark-ec = "0.4"
 ark-poly = "0.4"
-jf_plonk = { git = "https://github.com/ZKMod-Lab/jellyfish", package = "jf-plonk", branch = "relaxed-stage-1" }
-jf_primitives = { git = "https://github.com/ZKMod-Lab/jellyfish", package = "jf-primitives", branch = "relaxed-stage-1" }
-jf_utils = { git = "https://github.com/ZKMod-Lab/jellyfish", package = "jf-utils", branch = "relaxed-stage-1" }
-serde = "1.0"
-thiserror = "1.0"
+ark-ff = { version = "0.4.0", features = [ "asm" ] }
+ark-std = { version = "0.4.0", default-features = false }
+
+## jellyfish
+# jf_plonk = { git = "https://github.com/ZKMod-Lab/jellyfish", package = "jf-plonk", branch = "relaxed-stage-1" }
+# jf_primitives = { git = "https://github.com/ZKMod-Lab/jellyfish", package = "jf-primitives", branch = "relaxed-stage-1" }
+# jf_utils = { git = "https://github.com/ZKMod-Lab/jellyfish", package = "jf-utils", branch = "relaxed-stage-1" }
+
+jf_plonk = { git = "https://github.com/EspressoSystems/jellyfish", package = "jf-plonk"}
+jf_primitives = { git = "https://github.com/EspressoSystems/jellyfish", package = "jf-primitives"}
+jf_utils = { git = "https://github.com/EspressoSystems/jellyfish", package = "jf-utils"}

src/errors.rs

@@ -5,6 +5,9 @@ use thiserror::Error;
 /// Errors returned by Nova
 #[derive(Clone, Debug, Eq, PartialEq, Error)]
 pub enum NovaError {
+    /// TODO
+    #[error("TODO")]
+    TODO,
     /// returned if the supplied number of public input not satsfied
     #[error("InvalidPublicInput")]
     InvalidNumPublicInput,

src/lib.rs

@@ -2,3 +2,14 @@ pub mod circuit;
 pub mod errors;
 pub mod nifs;
 pub mod plonk;
+pub mod traits;
+
+use crate::traits::{
+    commitment::{CommitmentEngineTrait, CommitmentTrait},
+    Group,
+};
+
+type CommitmentKey<G> = <<G as traits::Group>::CE as CommitmentEngineTrait<G>>::CommitmentKey;
+type Commitment<G> = <<G as Group>::CE as CommitmentEngineTrait<G>>::Commitment;
+type CompressedCommitment<G> = <<<G as Group>::CE as CommitmentEngineTrait<G>>::Commitment as CommitmentTrait<G>>::CompressedCommitment;
+type CE<G> = <G as Group>::CE;