rework native bindings

Author: bleepbloopsify

src/lib/crypto/kimchi_bindings/js/bindings/proof.js

@@ -69,6 +69,34 @@ var caml_pasta_fp_plonk_proof_deep_copy = function (proof) {
   );
 };
 
+// Provides: caml_pasta_fq_plonk_proof_create
+// Requires: plonk_wasm, tsRustConversion
+var caml_pasta_fq_plonk_proof_create = function (
+  index,
+  witness_cols,
+  caml_runtime_tables,
+  prev_challenges,
+  prev_sgs
+) {
+  var w = new plonk_wasm.WasmVecVecFq(witness_cols.length - 1);
+  for (var i = 1; i < witness_cols.length; i++) {
+    w.push(tsRustConversion.fq.vectorToRust(witness_cols[i]));
+  }
+  witness_cols = w;
+  prev_challenges = tsRustConversion.fq.vectorToRust(prev_challenges);
+  var wasm_runtime_tables =
+    tsRustConversion.fq.runtimeTablesToRust(caml_runtime_tables);
+  prev_sgs = tsRustConversion.fq.pointsToRust(prev_sgs);
+  var proof = plonk_wasm.caml_pasta_fq_plonk_proof_create(
+    index,
+    witness_cols,
+    wasm_runtime_tables,
+    prev_challenges,
+    prev_sgs
+  );
+  return tsRustConversion.fq.proofFromRust(proof);
+};
+
 // Provides: caml_pasta_fq_plonk_proof_verify
 // Requires: plonk_wasm, tsRustConversion
 var caml_pasta_fq_plonk_proof_verify = function (index, proof) {

src/lib/crypto/kimchi_bindings/js/dune

@@ -17,8 +17,7 @@
    bindings/verifier-index.js
    native/native-overrides/oracles.js
    native/native-overrides/util.js
-   native/native-overrides/circuit.js
-   native/native-overrides/pasta-plonk-proof.js))
+   native/native-overrides/circuit.js))
  (instrumentation
   (backend bisect_ppx))
  (preprocess

src/lib/crypto/kimchi_bindings/js/native/native-overrides/oracles.js

@@ -4,9 +4,6 @@
 // Provides: caml_pasta_fq_poseidon_block_cipher
 // Requires: plonk_wasm, tsRustConversionNative
 function caml_pasta_fq_poseidon_block_cipher(_fake_params, fq_vector) {
-
-    console.log("overriding the old wasm caml_pasta_fq_poseidon_block_cipher, now using the native one")
-
   // 1. get permuted field vector from rust
   var wasm_flat_vector = plonk_wasm.caml_pasta_fq_poseidon_block_cipher(
     tsRustConversionNative.fq.vectorToRust(fq_vector)
@@ -22,10 +19,6 @@ function caml_pasta_fq_poseidon_block_cipher(_fake_params, fq_vector) {
 // Provides: caml_pasta_fp_poseidon_block_cipher
 // Requires: plonk_wasm, tsRustConversionNative
 function caml_pasta_fp_poseidon_block_cipher(_fake_params, fp_vector) {
-
-    console.log("overriding the old wasm caml_pasta_fp_poseidon_block_cipher, now using the native one")
-
-
   // 1. get permuted field vector from rust
   var wasm_flat_vector = plonk_wasm.caml_pasta_fp_poseidon_block_cipher(
     tsRustConversionNative.fp.vectorToRust(fp_vector)

src/lib/crypto/kimchi_bindings/js/native/native-overrides/pasta-plonk-proof.js

@@ -5,14 +5,31 @@ var plonk_wasm = (function() {
   try {
     var native =  require('@o1js/native-' + process.platform + '-' + process.arch)
 
-    wasm["caml_pasta_fp_poseidon_block_cipher"] = native["caml_pasta_fp_poseidon_block_cipher"]
-    wasm["caml_pasta_fq_poseidon_block_cipher"] = native["caml_pasta_fq_poseidon_block_cipher"]
+    // THIS IS A RUNTIME OVERRIDE
+    // YOU HAVE TO RUN IT TO SEE IF IT BREAKS
+    // IT WON'T CRASH UNLESS O1JS_REQUIRE_NATIVE_BINDINGS
+    // IS SET
+    var overrides = [
+      "prover_to_json",
+      "prover_index_from_bytes",
+      "prover_index_to_bytes",
+      "caml_pasta_fp_poseidon_block_cipher",
+      "caml_pasta_fq_poseidon_block_cipher",
+      "caml_pasta_fp_plonk_proof_create",
+    ]
+
+    overrides.forEach(function (override) {
+      wasm[override] = native[override]
+    })
+
+    wasm.native = true;
   } catch (e) {
-    console.error(e)
-    console.log("native didn't load")
-    process.exit(1);
+    if (process.env.O1JS_REQUIRE_NATIVE_BINDINGS) {
+      console.error(e)
+      console.log("native didn't load")
+      process.exit(1);
+    }
   }
 
   return wasm
 })()
-