Merge pull request #3217 from o1-labs/rust-native-with-neon

Rust native with `neon-rs`

Author: richardpringle

Cargo.lock

@@ -2,6 +2,7 @@
 members = [
   "arrabbiata",
   "book",
+  "crates/*",
   "curves",
   "folding",
   "groupmap",
@@ -13,6 +14,7 @@ members = [
   "msm",
   "mvpoly",
   "o1vm",
+  "plonk-neon",
   "plonk-wasm",
   "poly-commitment",
   "poseidon",
@@ -87,6 +89,7 @@ tinytemplate = "1.1"
 wasm-bindgen = "=0.2.89"
 wasm-bindgen-test = ">=0.3.0"
 
+arkworks = { path = "crates/arkworks" }
 arrabbiata = { path = "./arrabbiata", version = "0.1.0" }
 folding = { path = "./folding", version = "0.1.0" }
 groupmap = { path = "./groupmap", version = "0.1.0" }
@@ -108,6 +111,7 @@ saffron = { path = "./poly-commitment", version = "0.1.0" }
 signer = { path = "./signer", version = "0.1.0" }
 turshi = { path = "./turshi", version = "0.1.0" }
 utils = { path = "./utils", version = "0.1.0" }
+wasm-types = { path = "./crates/wasm-types" }
 
 [profile.release]
 lto = true

Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "arkworks"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+default = ["wasm"]
+wasm = []
+std = []
+
+[dependencies]
+# arkworks
+ark-ec.workspace = true
+ark-ff.workspace = true
+ark-poly.workspace = true
+ark-serialize.workspace = true
+
+# proof-systems
+mina-curves.workspace = true
+num-bigint.workspace = true
+rand.workspace = true
+wasm-bindgen.workspace = true
+wasm-types.workspace = true

crates/arkworks/Cargo.toml

@@ -1,5 +1,9 @@
+extern crate alloc;
+
+use alloc::{string::String, vec::Vec};
 use ark_ff::{BigInt, BigInteger as ark_BigInteger, BigInteger256};
-use ark_serialize::{CanonicalDeserialize, CanonicalSerialize, Write};
+use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
+
 use core::{
     cmp::Ordering::{Equal, Greater, Less},
     convert::TryInto,
@@ -25,7 +29,7 @@ pub struct WasmBigInteger256(pub BigInteger256);
 
 impl wasm_bindgen::describe::WasmDescribe for WasmBigInteger256 {
     fn describe() {
-        <Vec<u8> as wasm_bindgen::describe::WasmDescribe>::describe()
+        <Vec<u8> as wasm_bindgen::describe::WasmDescribe>::describe();
     }
 }
 
@@ -40,15 +44,14 @@ impl FromWasmAbi for WasmBigInteger256 {
 
 impl IntoWasmAbi for WasmBigInteger256 {
     type Abi = <Vec<u8> as FromWasmAbi>::Abi;
+
     fn into_abi(self) -> Self::Abi {
-        let mut bytes: Vec<u8> = vec![];
-        bytes.write_all(self.0.to_bytes_le().as_slice()).unwrap();
-        bytes.into_abi()
+        self.0.to_bytes_le().into_abi()
     }
 }
 
 pub fn to_biguint(x: &BigInteger256) -> BigUint {
-    let x_ = x.0.as_ptr() as *const u8;
+    let x_ = x.0.as_ptr().cast::<u8>();
     let x_ = unsafe { core::slice::from_raw_parts(x_, BIGINT256_NUM_BYTES) };
     num_bigint::BigUint::from_bytes_le(x_)
 }
@@ -57,7 +60,7 @@ pub fn of_biguint(x: &BigUint) -> BigInteger256 {
     let mut bytes = x.to_bytes_le();
     bytes.resize(BIGINT256_NUM_BYTES, 0);
     let limbs = bytes.as_ptr();
-    let limbs = limbs as *const [u64; BIGINT256_NUM_LIMBS as usize];
+    let limbs = limbs.cast::<[u64; BIGINT256_NUM_LIMBS as usize]>();
     let limbs = unsafe { &(*limbs) };
     BigInt(*limbs)
 }
@@ -103,12 +106,16 @@ pub fn caml_bigint_256_compare(x: WasmBigInteger256, y: WasmBigInteger256) -> i8
     }
 }
 
-#[wasm_bindgen]
+// I don't think this is used anywhere
+#[cfg_attr(feature = "std", wasm_bindgen)]
+#[cfg(feature = "std")]
 pub fn caml_bigint_256_print(x: WasmBigInteger256) {
     println!("{}", to_biguint(&x.0));
 }
 
-#[wasm_bindgen]
+// I don't think this is used anywhere
+#[cfg_attr(feature = "std", wasm_bindgen)]
+#[cfg(feature = "std")]
 pub fn caml_bigint_256_to_string(x: WasmBigInteger256) -> String {
     to_biguint(&x.0).to_string()
 }
@@ -123,7 +130,9 @@ pub fn caml_bigint_256_test_bit(x: WasmBigInteger256, i: i32) -> bool {
 
 #[wasm_bindgen]
 pub fn caml_bigint_256_to_bytes(x: WasmBigInteger256) -> Vec<u8> {
-    let mut serialized_bytes = vec![];
+    // This is the size of the implementation of BigInteger256 at the time of writing
+    // but even if it changes, we will be no worse off than the original code `vec![]`
+    let mut serialized_bytes = Vec::with_capacity(core::mem::size_of::<WasmBigInteger256>());
     x.0.serialize_compressed(&mut serialized_bytes)
         .expect("serialize failed");
     serialized_bytes
@@ -132,9 +141,7 @@ pub fn caml_bigint_256_to_bytes(x: WasmBigInteger256) -> Vec<u8> {
 #[wasm_bindgen]
 pub fn caml_bigint_256_of_bytes(x: &[u8]) -> WasmBigInteger256 {
     let len = core::mem::size_of::<WasmBigInteger256>();
-    if x.len() != len {
-        panic!("caml_bigint_256_of_bytes");
-    };
+    assert!(x.len() == len, "caml_bigint_256_of_bytes");
     // TODO this used FromBytes before arkworks 0.4.2, check serialization is consistent after update
     WasmBigInteger256(
         BigInteger256::deserialize_compressed(&mut &x[..]).expect("deserialization error"),

plonk-wasm/src/arkworks/bigint_256.rs renamed to crates/arkworks/src/bigint_256.rs

@@ -1,4 +1,4 @@
-use crate::arkworks::{pasta_fp::WasmPastaFp, pasta_fq::WasmPastaFq};
+use crate::{pasta_fp::WasmPastaFp, pasta_fq::WasmPastaFq};
 use mina_curves::pasta::{
     curves::{
         pallas::{G_GENERATOR_X as GeneratorPallasX, G_GENERATOR_Y as GeneratorPallasY},

plonk-wasm/src/arkworks/group_affine.rs renamed to crates/arkworks/src/group_affine.rs

@@ -0,0 +1,13 @@
+#![cfg_attr(not(feature = "std"), no_std)]
+
+mod bigint_256;
+mod group_affine;
+mod group_projective;
+mod pasta_fp;
+mod pasta_fq;
+
+pub use bigint_256::WasmBigInteger256;
+pub use group_affine::{WasmGPallas, WasmGVesta};
+pub use group_projective::{WasmPallasGProjective, WasmVestaGProjective};
+pub use pasta_fp::WasmPastaFp;
+pub use pasta_fq::WasmPastaFq;