fixed build and overrides

Author: bleepbloopsify

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

@@ -69,34 +69,6 @@ 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,7 +17,8 @@
    bindings/verifier-index.js
    native/native-overrides/oracles.js
    native/native-overrides/util.js
-   native/native-overrides/circuit.js))
+   native/native-overrides/circuit.js
+   native/native-overrides/pasta-plonk-proof.js))
  (instrumentation
   (backend bisect_ppx))
  (preprocess

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

@@ -0,0 +1,23 @@
+/* global plonk_wasm, tsRustConversionNative,*/
+
+// Provides: caml_pasta_fq_plonk_proof_create
+// Requires: plonk_napi, tsRustConversionNative
+var caml_pasta_fq_plonk_proof_create = function (
+  index,
+  witness_cols,
+  caml_runtime_tables,
+  prev_challenges,
+  prev_sgs
+) {
+  console.log("overriding wasm caml_pasta_fq_plonk_proof_create with native")
+  
+  var proof = plonk_napi.caml_pasta_fq_plonk_proof_create(
+    index,
+    witness_cols,
+    caml_runtime_tables,
+    prev_challenges,
+    prev_sgs
+  );
+
+  return tsRustConversion.fq.proofFromRust(proof);
+};

src/lib/crypto/kimchi_bindings/js/native/native_backend.js

@@ -1,4 +1,2 @@
 // Provides: plonk_napi
-var plonk_napi = require('@o1labs/o1js-darwin-arm64');
-
-module.exports = plonk_napi;
+var plonk_napi = require('@o1js/native-' + process.platform + '-' + process.arch)

src/lib/crypto/kimchi_bindings/js/node_js/node_backend.js

@@ -1,29 +1,18 @@
 // Provides: plonk_wasm
-var plonk_wasm = require('./plonk_wasm.js');
-var native = null;
-try {
-  native = require(`@o1labs/o1js-${process.platform}-${process.arch}`);
-} catch (e) {
-  // native not available, keep WASM
-}
+var plonk_wasm = (function() {
+  var wasm = require('./plonk_wasm.js');
 
-function snakeToCamel(name) {
-  return name.replace(/_([a-z])/g, function (_match, ch) {
-    return ch.toUpperCase();
-  });
-}
+  try {
+    var native =  require('@o1js/native-' + process.platform + '-' + process.arch)
 
-function override(functionName) {
-  if (!native) return;
-  var camel = snakeToCamel(functionName);
-  var impl = native[functionName] || native[camel];
-  if (typeof impl === 'function') {
-    plonk_wasm[functionName] = impl;
+    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"]
+  } catch (e) {
+    console.error(e)
+    console.log("native didn't load")
+    process.exit(1);
   }
-}
 
-// Overwrite only the functions that are already available in native
-override('caml_pasta_fp_poseidon_block_cipher');
-override('caml_pasta_fq_poseidon_block_cipher');
-override('prover_to_json');
-override('prover_index_from_bytes');
+  return wasm
+})()
+

src/lib/crypto/kimchi_bindings/js/web/web_backend.js

@@ -1,2 +1,5 @@
 // Provides: plonk_wasm
 var plonk_wasm = globalThis.plonk_wasm;
+
+// Provides: plonk_napi
+var plonk_napi = globalThis.plonk_wasm

src/lib/crypto/kimchi_bindings/stubs/kimchi_bindings.ml

@@ -215,8 +215,7 @@ module Protocol = struct
         -> SRS.Fp.t
         -> bool
         -> t
-        = "caml_pasta_fp_plonk_index_create_bytecode"
-          "caml_pasta_fp_plonk_index_create"
+        = "caml_pasta_fp_plonk_index_create_bytecode" "caml_pasta_fp_plonk_index_create"
 
       external max_degree : t -> int = "caml_pasta_fp_plonk_index_max_degree"
 
@@ -251,8 +250,7 @@ module Protocol = struct
         -> SRS.Fq.t
         -> bool
         -> t
-        = "caml_pasta_fq_plonk_index_create_bytecode"
-          "caml_pasta_fq_plonk_index_create"
+        = "caml_pasta_fq_plonk_index_create_bytecode" "caml_pasta_fq_plonk_index_create"
 
       external max_degree : t -> int = "caml_pasta_fq_plonk_index_max_degree"
 

src/lib/crypto/proof-systems

@@ -2831,7 +2831,8 @@ module Tick : S = struct
                           + if_feature
                               ( LookupPattern RangeCheck
                               , (fun () ->
-                                  cell (var (LookupKindIndex RangeCheck, Curr)) )
+                                  cell (var (LookupKindIndex RangeCheck, Curr))
+                                  )
                               , fun () ->
                                   field
                                     "0x0000000000000000000000000000000000000000000000000000000000000000"
@@ -2841,7 +2842,8 @@ module Tick : S = struct
                               , (fun () ->
                                   cell
                                     (var
-                                       (LookupKindIndex ForeignFieldMul, Curr) ) )
+                                       (LookupKindIndex ForeignFieldMul, Curr) )
+                                  )
                               , fun () ->
                                   field
                                     "0x0000000000000000000000000000000000000000000000000000000000000000"