From e6521bf1eca42cfb141f1fb80078a5502049d22d Mon Sep 17 00:00:00 2001
From: Hanting Zhang <winston@lurk-lab.com>
Date: Thu, 14 Mar 2024 18:38:08 +0000
Subject: [PATCH] ingonyama msm

---
 Cargo.toml                     |  1 +
 src/provider/bn256_grumpkin.rs | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index ef6bf8523..466e6a0f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,6 +51,7 @@ rayon-scan = "0.1.0"
 # grumpkin-msm has been patched to support MSMs for the pasta curve cycle
 # see: https://github.com/lurk-lab/grumpkin-msm/pull/3
 grumpkin-msm = { git = "https://github.com/lurk-lab/grumpkin-msm", branch = "dev" }
+ingonyama-grumpkin-msm = { git = "https://github.com/lurk-lab/ingonyama-grumpkin-msm" }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 getrandom = { version = "0.2.0", default-features = false, features = ["js"] }
diff --git a/src/provider/bn256_grumpkin.rs b/src/provider/bn256_grumpkin.rs
index 7418549b3..b6c9c218b 100644
--- a/src/provider/bn256_grumpkin.rs
+++ b/src/provider/bn256_grumpkin.rs
@@ -8,7 +8,7 @@ use digest::{ExtendableOutput, Update};
 use ff::{FromUniformBytes, PrimeField};
 use group::{cofactor::CofactorCurveAffine, Curve, Group as AnotherGroup};
 #[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
-use grumpkin_msm::{bn256 as bn256_msm, grumpkin as grumpkin_msm};
+use grumpkin_msm::{grumpkin as grumpkin_msm};
 // Remove this when https://github.com/zcash/pasta_curves/issues/41 resolves
 use halo2curves::{bn256::G2Affine, CurveAffine, CurveExt};
 use num_bigint::BigInt;
@@ -35,12 +35,18 @@ pub mod grumpkin {
   };
 }
 
+fn ingonyama_bn256_msm(points: &[bn256::Affine], scalars: &[bn256::Scalar]) -> bn256::Point {
+  let stream = ingonyama_grumpkin_msm::Config::new();
+  let cfg = ingonyama_grumpkin_msm::default_config(&stream.stream);
+  ingonyama_grumpkin_msm::bn256_msm(&points, &scalars, &cfg)
+}
+
 #[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
 impl_traits!(
   bn256,
   "30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001",
   "30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47",
-  bn256_msm
+  ingonyama_bn256_msm
 );
 #[cfg(not(any(target_arch = "x86_64", target_arch = "aarch64")))]
 impl_traits!(