Bug fixes

grandinetech · Jun 7, 2024 · 7adda07 · 7adda07
1 parent 138718a
commit 7adda07
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/arkworks3-sppark-wlc/cuda/pippenger_inf.cu b/arkworks3-sppark-wlc/cuda/pippenger_inf.cu
@@ -426,8 +426,6 @@ RustError mult_pippenger_faster_inf(RustContext<bucket_t, affine_t, scalar_t> *c
                              const scalar_t scalars[],
                              size_t ffi_affine_sz)
 {
-    (void)points; // Silence unused param warning
-
     Context<bucket_t, affine_t, scalar_t> *ctx = context->context;
     assert(ctx->config.npoints == npoints);
     assert(ctx->ffi_affine_sz == ffi_affine_sz);

diff --git a/arkworks3-sppark-wlc/src/lib.rs b/arkworks3-sppark-wlc/src/lib.rs
@@ -32,7 +32,6 @@ extern "C" {
     fn mult_pippenger_faster_inf(
         context: *mut MultiScalarMultContext,
         out: *mut u64,
-        points_with_infinity: *const G1Affine,
         npoints: usize,
         batch_size: usize,
         scalars: *const Fr,
@@ -72,28 +71,22 @@ pub fn multi_scalar_mult_free(context: &mut MultiScalarMultContext) {
 
 pub fn multi_scalar_mult<G: AffineCurve>(
     context: &mut MultiScalarMultContext,
-    points: &[G],
+    npoints: usize,
     scalars: &[<G::ScalarField as PrimeField>::BigInt],
 ) -> Vec<G::Projective> {
-    let npoints = points.len();
     if scalars.len() % npoints != 0 {
         panic!("length mismatch")
     }
 
-    //let mut context = multi_scalar_mult_init(points);
-
     let batch_size = scalars.len() / npoints;
     let mut ret = vec![G::Projective::zero(); batch_size];
     let err = unsafe {
         let result_ptr = &mut *(&mut ret as *mut Vec<G::Projective> as *mut Vec<u64>);
 
-        // mult_pippenger_faster_inf2();
-
         mult_pippenger_faster_inf(
             context,
             result_ptr.as_mut_ptr(),
             points as *const _ as *const G1Affine,
-            npoints,
             batch_size,
             scalars as *const _ as *const Fr,
             std::mem::size_of::<G1Affine>(),

diff --git a/arkworks3/src/fft_g1.rs b/arkworks3/src/fft_g1.rs
@@ -90,7 +90,7 @@ pub fn g1_linear_combination(
         };
 
         let msm_results =
-            rust_kzg_arkworks3_sppark_wlc::multi_scalar_mult(&mut context, affines, unsafe {
+            rust_kzg_arkworks3_sppark_wlc::multi_scalar_mult(&mut context, len, unsafe {
                 std::mem::transmute::<&[_], &[BigInteger256]>(&ark_scalars)
             });
 

diff --git a/arkworks3/src/kzg_types.rs b/arkworks3/src/kzg_types.rs
@@ -877,9 +877,12 @@ impl KZGSettings<ArkFr, ArkG1, ArkG2, LFFTSettings, PolyData, ArkFp, ArkG1Affine
                 #[cfg(feature = "sppark_wlc")]
                 {
                     let affines =
-                        kzg::msm::msm_impls::batch_convert::<ArkG1, ArkFp, ArkG1Affine>(&points);
+                        kzg::msm::msm_impls::batch_convert::<ArkG1, ArkFp, ArkG1Affine>(&secret_g1);
                     let affines = unsafe {
-                        alloc::slice::from_raw_parts(affines.as_ptr() as *const G1Affine, len)
+                        alloc::slice::from_raw_parts(
+                            affines.as_ptr() as *const G1Affine,
+                            secret_g1.len(),
+                        )
                     };
 
                     Some(Arc::new(PrecomputationTable::from_ptr(