From 2dbb6125142f24288db15d5dc86485e6977b0653 Mon Sep 17 00:00:00 2001 From: markosg04 Date: Mon, 6 Oct 2025 11:33:12 -0400 Subject: [PATCH 1/3] fix: align deps --- Cargo.toml | 3 ++- jolt-optimizations/Cargo.toml | 4 ++-- jolt-optimizations/src/lib.rs | 7 +++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2b1136a91..e3fcf0ca9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -46,7 +46,7 @@ ark-poly = { version = "0.5.0", path = "./poly", default-features = false } ark-serialize = { version = "0.5.0", path = "./serialize", default-features = false } ark-serialize-derive = { version = "0.5.0", path = "./serialize-derive" } ark-std = { version = "0.5.0", default-features = false } -ark-bn254 = { version = "0.5.0"} +ark-bn254 = { path = "./curves/bn254", version = "0.5.0-alpha.0", features = ["curve", "scalar_field"] } ark-algebra-bench-templates = { version = "0.5.0", path = "./bench-templates", default-features = false } ark-algebra-test-templates = { version = "0.5.0", path = "./test-templates", default-features = false } @@ -58,6 +58,7 @@ 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 } +num-rational = { version = "0.4.2", default-features = false } arrayvec = { version = "0.7", default-features = false } criterion = "0.5.0" diff --git a/jolt-optimizations/Cargo.toml b/jolt-optimizations/Cargo.toml index e644c37e4..74523726b 100644 --- a/jolt-optimizations/Cargo.toml +++ b/jolt-optimizations/Cargo.toml @@ -13,13 +13,13 @@ metadata.docs.rs.workspace = true description = "Optimized BN254 G1/G2 scalar multiplication primitives using 2D/4D GLV decomposition" [dependencies] -ark-bn254 = "0.5.0" +ark-bn254.workspace = true 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-rational.workspace = true num-integer.workspace = true num-traits.workspace = true rayon.workspace = true diff --git a/jolt-optimizations/src/lib.rs b/jolt-optimizations/src/lib.rs index 2f40915e6..422ebb669 100644 --- a/jolt-optimizations/src/lib.rs +++ b/jolt-optimizations/src/lib.rs @@ -9,6 +9,8 @@ //! Uses Strauss-shamir batched scalar multiplication to maximally take advantage of GLV. pub mod batch_addition; +pub mod block_subset_msm; +pub mod block_subset_msm_simple; pub mod constants; pub mod decomp_2d; pub mod decomp_4d; @@ -57,6 +59,11 @@ pub use dory_g2::{ pub use batch_addition::{batch_g1_additions, batch_g1_additions_multi}; +pub use block_subset_msm::{ + batch_sum_one_hot, build_block_subset_tables, histogram_counts, sum_direct_gather_reduce, + sum_with_block_tables_binary, sum_with_block_tables_radix, BlockSubsetTable, BuildParams, +}; + pub use fq12_poly::{ eq_weights, eval_multilinear, fq12_to_multilinear_evals, fq12_to_poly12_coeffs, g_coeffs, g_eval, to_multilinear_evals, From 6fbcca6e075d1cb4572da3a9a572cae91c97111a Mon Sep 17 00:00:00 2001 From: markosg04 Date: Mon, 6 Oct 2025 11:35:12 -0400 Subject: [PATCH 2/3] style: unused utils --- jolt-optimizations/src/lib.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/jolt-optimizations/src/lib.rs b/jolt-optimizations/src/lib.rs index 422ebb669..d69601d9f 100644 --- a/jolt-optimizations/src/lib.rs +++ b/jolt-optimizations/src/lib.rs @@ -59,11 +59,6 @@ pub use dory_g2::{ pub use batch_addition::{batch_g1_additions, batch_g1_additions_multi}; -pub use block_subset_msm::{ - batch_sum_one_hot, build_block_subset_tables, histogram_counts, sum_direct_gather_reduce, - sum_with_block_tables_binary, sum_with_block_tables_radix, BlockSubsetTable, BuildParams, -}; - pub use fq12_poly::{ eq_weights, eval_multilinear, fq12_to_multilinear_evals, fq12_to_poly12_coeffs, g_coeffs, g_eval, to_multilinear_evals, From 62b75a0e92b89016657570b141f0f296ab3a4e0d Mon Sep 17 00:00:00 2001 From: markosg04 Date: Mon, 6 Oct 2025 11:36:21 -0400 Subject: [PATCH 3/3] fix: removed unused import --- jolt-optimizations/src/lib.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/jolt-optimizations/src/lib.rs b/jolt-optimizations/src/lib.rs index d69601d9f..2f40915e6 100644 --- a/jolt-optimizations/src/lib.rs +++ b/jolt-optimizations/src/lib.rs @@ -9,8 +9,6 @@ //! Uses Strauss-shamir batched scalar multiplication to maximally take advantage of GLV. pub mod batch_addition; -pub mod block_subset_msm; -pub mod block_subset_msm_simple; pub mod constants; pub mod decomp_2d; pub mod decomp_4d;