Merge pull request #3157 from o1-labs/dw/tmp-bump-up-again

Reverting some commits...

Author: dannywillems

.github/workflows/ci.yml

@@ -17,6 +17,7 @@ env:
   CARGO_TERM_COLOR: always
   # 30 MB of stack for Keccak tests
   RUST_MIN_STACK: 31457280
+  CARGO_EXTRA_ARGS: "--workspace --exclude plonk_wasm --exclude saffron"
 
 jobs:
   run_mdbook:

Makefile

@@ -31,7 +31,7 @@ O1VM_MIPS_BIN_FILES = $(patsubst ${O1VM_MIPS_SOURCE_DIR}/%.asm,${O1VM_MIPS_BIN_D
 # In addition to that, the version in the CI (see file
 # .github/workflows/wasm.yml) should be changed accordingly.
 NIGHTLY_RUST_VERSION = "nightly-2024-06-13"
-WASM_RUSTFLAGS = "-C target-feature=+atomics,+bulk-memory,+mutable-globals -C link-arg=--max-memory=4294967296"
+WASM_RUSTFLAGS = "-C target-feature=+atomics,+bulk-memory,+mutable-globals -C link-arg=--no-check-features -C link-arg=--max-memory=4294967296"
 PLONK_WASM_NODEJS_OUTDIR ?= target/nodejs
 PLONK_WASM_WEB_OUTDIR ?= target/web
 

plonk-wasm/Cargo.toml

@@ -73,10 +73,14 @@ wasm-opt = false
 rustflags = [
   "-C",
   "target-feature=+atomics,+bulk-memory",
+  "-C",
+  "link-arg=--no-check-features",
 ]
 
 [target.wasm32-unknown-unknown]
 rustflags = [
   "-C",
   "target-feature=+atomics,+bulk-memory",
+  "-C",
+  "link-arg=--no-check-features",
 ]

plonk-wasm/src/arkworks/pasta_fp.rs

@@ -224,7 +224,7 @@ pub fn caml_pasta_fp_domain_generator(log2_size: i32) -> WasmPastaFp {
 #[wasm_bindgen]
 pub fn caml_pasta_fp_to_bytes(x: WasmPastaFp) -> Vec<u8> {
     let len = core::mem::size_of::<Fp>();
-    let mut str: Vec<u8> = vec![0; len];
+    let mut str: Vec<u8> = Vec::with_capacity(len);
     str.resize(len, 0);
     let str_as_fp: *mut Fp = str.as_mut_ptr().cast::<Fp>();
     unsafe {

plonk-wasm/src/arkworks/pasta_fq.rs

@@ -224,7 +224,7 @@ pub fn caml_pasta_fq_domain_generator(log2_size: i32) -> WasmPastaFq {
 #[wasm_bindgen]
 pub fn caml_pasta_fq_to_bytes(x: WasmPastaFq) -> Vec<u8> {
     let len = core::mem::size_of::<Fq>();
-    let mut str: Vec<u8> = vec![0; len];
+    let mut str: Vec<u8> = Vec::with_capacity(len);
     str.resize(len, 0);
     let str_as_fq: *mut Fq = str.as_mut_ptr().cast::<Fq>();
     unsafe {

plonk-wasm/src/lib.rs

@@ -43,27 +43,13 @@ pub fn create_zero_u32_ptr() -> *mut u32 {
     Box::into_raw(std::boxed::Box::new(0))
 }
 
-/// Free a pointer. This method is exported in the WebAssembly module to be used
-/// on the JavaScript side, see `web-backend.js`.
-///
-/// # Safety
-///
-/// See
-/// `<https://rust-lang.github.io/rust-clippy/master/index.html#not_unsafe_ptr_arg_deref>`
 #[wasm_bindgen]
-pub unsafe fn free_u32_ptr(ptr: *mut u32) {
+pub fn free_u32_ptr(ptr: *mut u32) {
     let _drop_me = unsafe { std::boxed::Box::from_raw(ptr) };
 }
 
-/// Set the value of a pointer. This method is exported in the WebAssembly
-/// module to be used on the JavaScript side, see `web-backend.js`.
-///
-/// # Safety
-///
-/// See
-/// `<https://rust-lang.github.io/rust-clippy/master/index.html#not_unsafe_ptr_arg_deref>`
 #[wasm_bindgen]
-pub unsafe fn set_u32_ptr(ptr: *mut u32, arg: u32) {
+pub fn set_u32_ptr(ptr: *mut u32, arg: u32) {
     // The rust docs explicitly forbid using this for cross-thread syncronization. Oh well, we
     // don't have anything better. As long as it works in practice, we haven't upset the undefined
     // behavior dragons.
@@ -72,16 +58,9 @@ pub unsafe fn set_u32_ptr(ptr: *mut u32, arg: u32) {
     }
 }
 
-/// This method is exported in the WebAssembly to be used on the JavaScript
-/// side, see `web-backend.js`.
-///
-/// # Safety
-///
-/// See
-/// `<https://rust-lang.github.io/rust-clippy/master/index.html#not_unsafe_ptr_arg_deref>`
 #[allow(unreachable_code)]
 #[wasm_bindgen]
-pub unsafe fn wait_until_non_zero(ptr: *const u32) -> u32 {
+pub fn wait_until_non_zero(ptr: *const u32) -> u32 {
     // The rust docs explicitly forbid using this for cross-thread syncronization. Oh well, we
     // don't have anything better. As long as it works in practice, we haven't upset the undefined
     // behavior dragons.

plonk-wasm/src/pasta_fp_plonk_index.rs

@@ -1,5 +1,4 @@
 use ark_poly::EvaluationDomain;
-use base64::{engine::general_purpose, Engine};
 use kimchi::circuits::lookup::runtime_tables::RuntimeTableCfg;
 
 use crate::{
@@ -271,7 +270,7 @@ pub fn caml_pasta_fp_plonk_index_write(
 #[wasm_bindgen]
 pub fn caml_pasta_fp_plonk_index_serialize(index: &WasmPastaFpPlonkIndex) -> String {
     let serialized = rmp_serde::to_vec(&index.0).unwrap();
-    general_purpose::STANDARD.encode(serialized)
+    base64::encode(serialized)
 }
 
 // helpers

plonk-wasm/src/pasta_fq_plonk_index.rs

@@ -1,5 +1,4 @@
 use ark_poly::EvaluationDomain;
-use base64::{engine::general_purpose, Engine};
 use kimchi::circuits::lookup::runtime_tables::RuntimeTableCfg;
 
 use crate::{
@@ -270,5 +269,5 @@ pub fn caml_pasta_fq_plonk_index_write(
 #[wasm_bindgen]
 pub fn caml_pasta_fq_plonk_index_serialize(index: &WasmPastaFqPlonkIndex) -> String {
     let serialized = rmp_serde::to_vec(&index.0).unwrap();
-    general_purpose::STANDARD.encode(serialized)
+    base64::encode(serialized)
 }

plonk-wasm/src/plonk_proof.rs

@@ -4,7 +4,6 @@ use crate::{
 };
 use ark_ec::AffineRepr;
 use ark_ff::One;
-use base64::{engine::general_purpose, Engine};
 use core::{array, convert::TryInto};
 use groupmap::GroupMap;
 use kimchi::{
@@ -619,7 +618,7 @@ macro_rules! impl_proof {
                 pub fn serialize(&self) -> String {
                     let (proof, _public_input) = self.into();
                     let serialized = rmp_serde::to_vec(&proof).unwrap();
-                    general_purpose::STANDARD.encode(serialized)
+                    base64::encode(serialized)
                 }
             }
 

plonk-wasm/src/plonk_verifier_index.rs

@@ -587,7 +587,6 @@ macro_rules! impl_verification_key {
             #[wasm_bindgen]
             impl [<Wasm $field_name:camel PlonkVerifierIndex>] {
                 #[wasm_bindgen(constructor)]
-                #[allow(clippy::too_many_arguments)]
                 pub fn new(
                     domain: &WasmDomain,
                     max_poly_size: i32,
@@ -643,7 +642,7 @@ macro_rules! impl_verification_key {
                 }
             }
 
-            pub fn to_wasm(
+            pub fn to_wasm<'a>(
                 srs: &Arc<SRS<$G>>,
                 vi: DlogVerifierIndex<$G, OpeningProof<$G>>,
             ) -> WasmPlonkVerifierIndex {