weird compatibility and cleanup 3

Author: markosg04

Cargo.toml

@@ -29,6 +29,7 @@ include = ["Cargo.toml", "src", "README.md", "LICENSE-APACHE", "LICENSE-MIT", "d
 license = "MIT OR Apache-2.0"
 edition = "2021"
 rust-version = "1.75"
+keywords = ["cryptography", "zero-knowledge", "elliptic-curves", "arkworks"]
 
 [workspace.metadata.docs.rs]
 rustdoc-args = [ "--html-in-header katex-header.html" ]
@@ -50,6 +51,9 @@ ark-algebra-bench-templates =  { version = "0.5.0", path = "./bench-templates",
 ark-algebra-test-templates = { version = "0.5.0", path = "./test-templates", default-features = false }
 ark-test-curves = { version = "0.5.0", path = "./test-curves", default-features = false }
 
+ark-r1cs-std = { version = "0.5.0", default-features = false }
+ark-relations = { version = "0.5.0", default-features = false }
+
 num-traits = { version = "0.2", default-features = false }
 num-bigint = { version = "0.4", default-features = false }
 num-integer = { version = "0.1", default-features = false }
@@ -100,3 +104,7 @@ lto = "thin"
 incremental = true
 debug-assertions = true
 debug = true
+
+[patch.crates-io]
+ark-bn254 = { path = "./curves/bn254", features = ["curve", "scalar_field"] }
+

curves/bn254/Cargo.toml

@@ -31,6 +31,7 @@ std = [ "ark-std/std", "ark-ff/std", "ark-ec/std", "ark-r1cs-std?/std" ]
 r1cs = [ "ark-r1cs-std" ]
 curve = [ "scalar_field" ]
 scalar_field = []
+asm = [ "ark-ff/asm" ]
 
 [[bench]]
 name = "bn254"

jolt-optimizations/Cargo.toml

@@ -1,36 +1,36 @@
 [package]
 name = "jolt-optimizations"
-version = "0.1.0"
-edition = "2021"
-authors = ["arkworks contributors"]
-description = "Optimized BN254 G2 scalar multiplication using 4D GLV decomposition"
-license = "MIT/Apache-2.0"
+version.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+categories.workspace = true
+include.workspace = true
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+metadata.docs.rs.workspace = true
+description = "Optimized BN254 G1/G2 scalar multiplication primitives using 2D/4D GLV decomposition"
 
 [dependencies]
-# Use published arkworks versions for stability
-
 ark-bn254 = "0.5.0"
-ark-ec = { version = "0.5.0", default-features = false, features = [
-    "parallel",
-] }
-ark-ff = { version = "0.5.0", default-features = false, features = [
-    "parallel",
-] }
-ark-serialize = { version = "0.5.0", default-features = false, features = [
-    "derive",
-    "parallel",
-] }
-ark-std = "0.4"
-num-bigint = "0.4"
+ark-ec.workspace = true
+ark-ff.workspace = true
+ark-serialize.workspace = true
+ark-std.workspace = true
+num-bigint.workspace = true
 num-rational = "0.4.2"
-num-integer = "0.1.46"
-num-traits = "0.2"
-rayon = "1.8"
-
-# Patches should be in workspace root Cargo.toml
+num-integer.workspace = true
+num-traits.workspace = true
+rayon.workspace = true
 
 [dev-dependencies]
-criterion = "0.5"
+criterion.workspace = true
+
+[features]
+default = []
+std = ["ark-std/std", "ark-ff/std", "ark-ec/std", "ark-serialize/std"]
+parallel = ["std", "ark-std/parallel", "ark-ff/parallel", "ark-ec/parallel", "ark-serialize/parallel"]
 
 [[bench]]
 name = "scalar_multiplication"

jolt-optimizations/src/constants.rs

@@ -5,6 +5,7 @@
 
 use ark_bn254::Fq2;
 use ark_ff::MontFp;
+use ark_bn254::Fr;
 
 // Include the generated power of 2 decompositions table
 include!(concat!(env!("OUT_DIR"), "/power_of_2_decompositions.rs"));
@@ -64,9 +65,9 @@ pub fn get_frobenius_coefficients() -> FrobeniusCoefficients {
 }
 
 /// Get the Frobenius eigenvalue λ_ψ for BN254
-pub fn get_bn254_frobenius_eigenvalue() -> ark_bn254::Fr {
+pub fn get_bn254_frobenius_eigenvalue() -> Fr {
     use ark_ff::PrimeField;
-    ark_bn254::Fr::from_be_bytes_mod_order(&[
+    Fr::from_be_bytes_mod_order(&[
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x6f, 0x4d, 0x82, 0x48, 0xee, 0xb8, 0x59, 0xfb, 0xf8, 0x3e, 0x96, 0x82, 0xe8, 0x7c,
         0xfd, 0x46,