Merge branch 'native/napi' into florian/napi-proof

Author: querolita

src/lib/crypto/kimchi_bindings/js/bindings/verifier-index.js

@@ -24,13 +24,16 @@ var caml_opt_to_rust = function (caml_optional_value, to_rust) {
 // Provides: caml_pasta_fp_plonk_verifier_index_create
 // Requires: plonk_wasm, tsRustConversion
 var caml_pasta_fp_plonk_verifier_index_create = function (x) {
+  console.log("caml_pasta_fp_plonk_verifier_index_create")
   var vk = plonk_wasm.caml_pasta_fp_plonk_verifier_index_create(x);
   return tsRustConversion.fp.verifierIndexFromRust(vk);
 };
 
 // Provides: caml_pasta_fp_plonk_verifier_index_read
 // Requires: plonk_wasm, caml_jsstring_of_string, tsRustConversion
 var caml_pasta_fp_plonk_verifier_index_read = function (offset, urs, path) {
+  console.log("caml_pasta_fp_plonk_verifier_index_read")
+
   if (offset === 0) {
     offset = undefined;
   } else {
@@ -48,6 +51,8 @@ var caml_pasta_fp_plonk_verifier_index_read = function (offset, urs, path) {
 // Provides: caml_pasta_fp_plonk_verifier_index_write
 // Requires: plonk_wasm, caml_jsstring_of_string, tsRustConversion
 var caml_pasta_fp_plonk_verifier_index_write = function (append, t, path) {
+  console.log("caml_pasta_fp_plonk_verifier_index_write")
+
   if (append === 0) {
     append = undefined;
   } else {
@@ -60,24 +65,20 @@ var caml_pasta_fp_plonk_verifier_index_write = function (append, t, path) {
   );
 };
 
-// Provides: caml_pasta_fp_plonk_verifier_index_shifts
-// Requires: plonk_wasm, tsRustConversion
-var caml_pasta_fp_plonk_verifier_index_shifts = function (log2_size) {
-  return tsRustConversion.fp.shiftsFromRust(
-    plonk_wasm.caml_pasta_fp_plonk_verifier_index_shifts(log2_size)
-  );
-};
 
 // Provides: caml_pasta_fp_plonk_verifier_index_dummy
 // Requires: plonk_wasm, tsRustConversion
 var caml_pasta_fp_plonk_verifier_index_dummy = function () {
+  console.log("caml_pasta_fp_plonk_verifier_index_dummy")
+
   var res = plonk_wasm.caml_pasta_fp_plonk_verifier_index_dummy();
   return tsRustConversion.fp.verifierIndexFromRust(res);
 };
 
 // Provides: caml_pasta_fp_plonk_verifier_index_deep_copy
 // Requires: plonk_wasm, tsRustConversion
 var caml_pasta_fp_plonk_verifier_index_deep_copy = function (x) {
+  console.log("caml_pasta_fp_plonk_verifier_index_deep_copy")
   return tsRustConversion.fp.verifierIndexFromRust(
     plonk_wasm.caml_pasta_fp_plonk_verifier_index_deep_copy(
       tsRustConversion.fp.verifierIndexToRust(x)
@@ -88,6 +89,7 @@ var caml_pasta_fp_plonk_verifier_index_deep_copy = function (x) {
 // Provides: caml_pasta_fq_plonk_verifier_index_create
 // Requires: plonk_wasm, tsRustConversion
 var caml_pasta_fq_plonk_verifier_index_create = function (x) {
+  console.log("caml_pasta_fq_plonk_verifier_index_create")
   return tsRustConversion.fq.verifierIndexFromRust(
     plonk_wasm.caml_pasta_fq_plonk_verifier_index_create(x)
   );
@@ -96,6 +98,7 @@ var caml_pasta_fq_plonk_verifier_index_create = function (x) {
 // Provides: caml_pasta_fq_plonk_verifier_index_read
 // Requires: plonk_wasm, caml_jsstring_of_string, tsRustConversion
 var caml_pasta_fq_plonk_verifier_index_read = function (offset, urs, path) {
+  console.log("caml_pasta_fq_plonk_verifier_index_read")
   if (offset === 0) {
     offset = undefined;
   } else {
@@ -113,6 +116,7 @@ var caml_pasta_fq_plonk_verifier_index_read = function (offset, urs, path) {
 // Provides: caml_pasta_fq_plonk_verifier_index_write
 // Requires: plonk_wasm, caml_jsstring_of_string, tsRustConversion
 var caml_pasta_fq_plonk_verifier_index_write = function (append, t, path) {
+  console.log("caml_pasta_fq_plonk_verifier_index_write")
   if (append === 0) {
     append = undefined;
   } else {
@@ -125,17 +129,10 @@ var caml_pasta_fq_plonk_verifier_index_write = function (append, t, path) {
   );
 };
 
-// Provides: caml_pasta_fq_plonk_verifier_index_shifts
-// Requires: plonk_wasm, tsRustConversion
-var caml_pasta_fq_plonk_verifier_index_shifts = function (log2_size) {
-  return tsRustConversion.fq.shiftsFromRust(
-    plonk_wasm.caml_pasta_fq_plonk_verifier_index_shifts(log2_size)
-  );
-};
-
 // Provides: caml_pasta_fq_plonk_verifier_index_dummy
 // Requires: plonk_wasm, tsRustConversion
 var caml_pasta_fq_plonk_verifier_index_dummy = function () {
+  console.log("caml_pasta_fq_plonk_verifier_index_dummy")
   return tsRustConversion.fq.verifierIndexFromRust(
     plonk_wasm.caml_pasta_fq_plonk_verifier_index_dummy()
   );
@@ -144,6 +141,7 @@ var caml_pasta_fq_plonk_verifier_index_dummy = function () {
 // Provides: caml_pasta_fq_plonk_verifier_index_deep_copy
 // Requires: plonk_wasm, tsRustConversion, tsRustConversion
 var caml_pasta_fq_plonk_verifier_index_deep_copy = function (x) {
+  console.log("caml_pasta_fq_plonk_verifier_index_deep_copy")
   return tsRustConversion.fq.verifierIndexFromRust(
     plonk_wasm.caml_pasta_fq_plonk_verifier_index_deep_copy(
       tsRustConversion.fq.verifierIndexToRust(x)

src/lib/crypto/kimchi_bindings/js/native/artifacts/.gitignore

@@ -0,0 +1,2 @@
+index.d.ts
+plonk_napi.node

src/lib/crypto/kimchi_bindings/js/native/build.sh

@@ -4,27 +4,10 @@ set -euo pipefail
 SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 CURRENT_DIRECTORY="${SCRIPT_DIR}"
 PROOF_SYSTEMS_ROOT=$(cd "${SCRIPT_DIR}/../../../proof-systems" && pwd)
-PLONK_NAPI_ROOT="${PROOF_SYSTEMS_ROOT}/plonk-napi"
 
-TARGET_ROOT="${CARGO_TARGET_DIR:-"${PROOF_SYSTEMS_ROOT}/target"}"
-export CARGO_TARGET_DIR="${TARGET_ROOT}"
-
-cargo build \
-    --manifest-path "${PLONK_NAPI_ROOT}/Cargo.toml" \
-    --release
-
-case "$(uname -s)" in
-    Darwin*) LIB_NAME="libplonk_napi.dylib" ;;
-    MINGW*|MSYS*|CYGWIN*) LIB_NAME="plonk_napi.dll" ;;
-    *) LIB_NAME="libplonk_napi.so" ;;
- esac
-
-ARTIFACT="${TARGET_ROOT}/release/${LIB_NAME}"
-
-if [[ ! -f "${ARTIFACT}" ]]; then
-    echo "Failed to locate plonk-napi artifact at ${ARTIFACT}" >&2
-    exit 1
-fi
-
-rm -f "${CURRENT_DIRECTORY}/plonk_napi.node"
-cp "${ARTIFACT}" "${CURRENT_DIRECTORY}/plonk_napi.node"
+napi build \
+    --manifest-path $PROOF_SYSTEMS_ROOT/Cargo.toml \
+    --package plonk-napi \
+    --output-dir ./ \
+    --release \
+    --esm

src/lib/crypto/kimchi_bindings/js/native/dune

@@ -2,20 +2,21 @@
  (name native_backend)
  (public_name bindings_js.native_backend)
  (js_of_ocaml
-  (flags
-   (:include flags.sexp))
   (javascript_files native_backend.js))
  (instrumentation
   (backend bisect_ppx))
  (preprocess
   (pps ppx_version js_of_ocaml-ppx)))
 
 (rule
- (targets
-  plonk_napi.node
-  flags.sexp)
+ (targets plonk_napi.node index.d.ts)
+ (mode
+  (promote
+   (into ./artifacts)))
  (deps
+  package.json
   build.sh
+  header-d.ts
   ../../dune-build-root
   (source_tree ../../../proof-systems))
  (locks /cargo-lock)
@@ -24,6 +25,4 @@
    (setenv
     CARGO_TARGET_DIR
     "%{read:../../dune-build-root}/cargo_kimchi_native"
-    (run bash build.sh))
-   (write-file flags.sexp "()"))))
-   
+    (run bash build.sh)))))

src/lib/crypto/kimchi_bindings/js/native/header-d.ts

@@ -0,0 +1,17 @@
+// Header section
+// To edit this section, look for 
+// ./src/lib/crypto/kimchi_bindings/js/native/header-d.ts
+// This file gets auto-included in the generated plonk-napi types to supplement
+// external pointer types.
+
+type WasmPastaFpPlonkIndex = {};
+type NapiVector<T> = {};
+type NapiGVesta = {};
+type NapiGPallas = {};
+type NapiPastaFpPlonkIndex = {};
+type NapiPastaFqPlonkIndex = {};
+type NapiLookupInfo = {};
+type NapiPastaFp = {};
+type NapiPastaFq = {};
+
+// Header section end

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

@@ -1,8 +1,8 @@
-/* global plonk_wasm */
+/* global plonk_wasm, tsRustConversionNative */
 
 
 // Provides: prover_to_json
-// Requires: plonk_wasm
+// Requires: plonk_wasm, tsRustConversionNative
 function prover_to_json(prover_index) {
   var bytes = prover_index.serialize()
   var index = plonk_wasm.prover_index_fp_from_bytes(bytes);

src/lib/crypto/kimchi_bindings/js/native/native-overrides/prover-index.js

@@ -198,7 +198,7 @@ var caml_pasta_fp_plonk_index_write = function (append, t, path) {
 };
 
 // Provides: caml_pasta_fq_plonk_index_create
-// Requires: plonk_wasm, free_on_finalize, tsRustConversion
+// Requires: plonk_wasm, free_on_finalize, tsRustConversionNative
 var caml_pasta_fq_plonk_index_create = function (
   gates,
   public_inputs,

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

@@ -181,7 +181,7 @@ var caml_fq_srs_b_poly_commitment = function (srs, chals) {
 };
 
 // Provides: caml_fq_srs_batch_accumulator_check
-// Requires: plonk_wasm, tsRustConversion
+// Requires: plonk_wasm, tsRustConversionNative
 var caml_fq_srs_batch_accumulator_check = function (srs, comms, chals) {
   console.log("native caml_fq_srs_batch_accumulator_check");
   var rust_comms = tsRustConversionNative.fq.pointsToRust(comms);

src/lib/crypto/kimchi_bindings/js/native/native-overrides/verifier-index.js

@@ -0,0 +1,18 @@
+/* global plonk_wasm, tsRustConversionNative */
+
+
+// Provides: caml_pasta_fq_plonk_verifier_index_shifts
+// Requires: plonk_wasm, tsRustConversionNative
+var caml_pasta_fq_plonk_verifier_index_shifts = function (log2_size) {
+  return tsRustConversionNative.fq.shiftsFromRust(
+    plonk_wasm.caml_pasta_fq_plonk_verifier_index_shifts(log2_size)
+  );
+};
+
+// Provides: caml_pasta_fp_plonk_verifier_index_shifts
+// Requires: plonk_wasm, tsRustConversionNative
+var caml_pasta_fp_plonk_verifier_index_shifts = function (log2_size) {
+  return tsRustConversionNative.fp.shiftsFromRust(
+    plonk_wasm.caml_pasta_fp_plonk_verifier_index_shifts(log2_size)
+  );
+};

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

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