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

Author: querolita

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

@@ -24,8 +24,13 @@ 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);
+  console.log("caml_pasta_fp_plonk_verifier_index_create", x)
+  var bytes = plonk_wasm.prover_index_fp_to_bytes(x);
+  console.log("bytes", bytes)
+  var index = plonk_wasm.WasmPastaFpPlonkIndex.deserialize(bytes)
+  console.log("index", index)
+  var vk = plonk_wasm.caml_pasta_fp_plonk_verifier_index_create(index);
+  console.log("vk", vk)
   return tsRustConversion.fp.verifierIndexFromRust(vk);
 };
 

src/lib/crypto/kimchi_bindings/js/dune

@@ -21,7 +21,8 @@
    native/native-overrides/prover-index.js
    native/native-overrides/srs.js
    native/native-overrides/util.js
-   native/native-overrides/proof.js))
+   native/native-overrides/proof.js
+   native/native-overrides/verifier-index.js))
  (instrumentation
   (backend bisect_ppx))
  (preprocess

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

@@ -4,14 +4,20 @@
 // 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 = {};
+type NapiLookupInfo = {};
+type WasmPastaFqPlonkIndex = {};
+type WasmPastaFpPlonkIndex = {};
+type Proof = {}
+type NapiVector<T> = {};
+type NapiFlatVector<T> = {};
+type WasmVecVecFq = {};
+type WasmVecVecFp = {};
+type Self = {};
 
 // Header section end

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

@@ -20,6 +20,14 @@ var caml_pasta_fp_plonk_proof_create = function (
   var wasm_runtime_tables =
     tsRustConversionNative.fp.runtimeTablesToRust(caml_runtime_tables);
   prev_sgs = tsRustConversionNative.fp.pointsToRust(prev_sgs);
+    /*w.push(tsRustConversion.fp.vectorToRust(witness_cols[i]));
+  }
+  witness_cols = w;
+  prev_challenges = tsRustConversion.fp.vectorToRust(prev_challenges);
+  var wasm_runtime_tables =
+    tsRustConversion.fp.runtimeTablesToRust(caml_runtime_tables);
+  prev_sgs = tsRustConversion.fp.pointsToRust(prev_sgs);
+  */
   var proof = plonk_wasm.caml_pasta_fp_plonk_proof_create(
     index,
     witness_cols,
@@ -28,6 +36,7 @@ var caml_pasta_fp_plonk_proof_create = function (
     prev_sgs
   );
   return tsRustConversionNative.fp.proofFromRust(proof);
+  /*   return tsRustConversion.fp.proofFromRust(proof); */
 };
 
 // Provides: caml_pasta_fp_plonk_proof_verify

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

@@ -1,16 +1,19 @@
 /* global plonk_wasm, caml_jsstring_of_string, 
-  tsBindings, tsRustConversion
+  tsBindings, tsRustConversionNative
 */
 
 // Provides: tsSrs
 // Requires: tsBindings, plonk_wasm
-var tsSrs = tsBindings.srs(plonk_wasm);
+var tsSrs = tsBindings.srsNative(plonk_wasm);
 
 // srs
 
 // Provides: caml_fp_srs_create
 // Requires: tsSrs
-var caml_fp_srs_create = tsSrs.fp.create;
+var caml_fp_srs_create = function (log_size) {
+  console.log("native caml_fp_srs_create");
+  return tsSrs.fp.create(log_size);
+}
 
 // Provides: caml_fp_srs_write
 // Requires: plonk_wasm, caml_jsstring_of_string
@@ -43,17 +46,25 @@ var caml_fp_srs_read = function (offset, path) {
 
 // Provides: caml_fp_srs_lagrange_commitments_whole_domain
 // Requires: tsSrs
-var caml_fp_srs_lagrange_commitments_whole_domain =
-  tsSrs.fp.lagrangeCommitmentsWholeDomain;
+var caml_fp_srs_lagrange_commitments_whole_domain = function (srs, domain_size) {
+  console.log("native caml_fp_srs_lagrange_commitments_whole_domain");
+  return tsSrs.fp.lagrangeCommitmentsWholeDomain(srs, domain_size);
+}
 
 // Provides: caml_fq_srs_lagrange_commitments_whole_domain
 // Requires: tsSrs
 var caml_fq_srs_lagrange_commitments_whole_domain =
-  tsSrs.fq.lagrangeCommitmentsWholeDomain;
+  function (srs, domain_size) {
+    console.log("native caml_fq_srs_lagrange_commitments_whole_domain");
+    return tsSrs.fq.lagrangeCommitmentsWholeDomain(srs, domain_size);
+  }
 
 // Provides: caml_fp_srs_lagrange_commitment
 // Requires: tsSrs
-var caml_fp_srs_lagrange_commitment = tsSrs.fp.lagrangeCommitment;
+var caml_fp_srs_lagrange_commitment = function (srs, i) {
+  console.log("native caml_fp_srs_lagrange_commitment");
+  return tsSrs.fp.lagrangeCommitment(srs, i);
+}
 
 // Provides: caml_fp_srs_commit_evaluations
 // Requires: plonk_wasm, tsRustConversionNative
@@ -114,11 +125,17 @@ var caml_fp_srs_h = function (t) {
 
 // Provides: caml_fp_srs_add_lagrange_basis
 // Requires: tsSrs
-var caml_fp_srs_add_lagrange_basis = tsSrs.fp.addLagrangeBasis;
+var caml_fp_srs_add_lagrange_basis = function (srs, domain_size) {
+  console.log("native caml_fp_srs_add_lagrange_basis");
+  return tsSrs.fp.addLagrangeBasis(srs, domain_size);
+};
 
 // Provides: caml_fq_srs_create
 // Requires: tsSrs
-var caml_fq_srs_create = tsSrs.fq.create;
+var caml_fq_srs_create = function (log_size) {  
+  console.log("native caml_fq_srs_create");
+  return tsSrs.fq.create(log_size);
+}
 
 // Provides: caml_fq_srs_write
 // Requires: plonk_wasm, caml_jsstring_of_string
@@ -151,7 +168,10 @@ var caml_fq_srs_read = function (offset, path) {
 
 // Provides: caml_fq_srs_lagrange_commitment
 // Requires: tsSrs
-var caml_fq_srs_lagrange_commitment = tsSrs.fq.lagrangeCommitment;
+var caml_fq_srs_lagrange_commitment = function (srs, i) {
+  console.log("native caml_fq_srs_lagrange_commitment");
+  return tsSrs.fq.lagrangeCommitment(srs, i);
+}
 
 // Provides: caml_fq_srs_commit_evaluations
 // Requires: plonk_wasm, tsRustConversionNative
@@ -216,4 +236,7 @@ var caml_fq_srs_h = function (t) {
 
 // Provides: caml_fq_srs_add_lagrange_basis
 // Requires: tsSrs
-var caml_fq_srs_add_lagrange_basis = tsSrs.fq.addLagrangeBasis;
+var caml_fq_srs_add_lagrange_basis = function (srs, domain_size) {
+  console.log("native caml_fq_srs_add_lagrange_basis");
+  return tsSrs.fq.addLagrangeBasis(srs, domain_size);
+};

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

@@ -4,9 +4,20 @@
 // 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)
-  );
+  console.log("log2_size", log2_size);
+  try {
+    var shifts = plonk_wasm.caml_pasta_fq_plonk_verifier_index_shifts(log2_size);
+    console.log("shifts", shifts);
+    console.log("shiftsFromRust", tsRustConversionNative.fq.shiftsFromRust(
+      shifts
+    ))
+    return tsRustConversionNative.fq.shiftsFromRust(
+      shifts
+    );
+  } catch (e) {
+    console.error("Error calling caml_pasta_fq_plonk_verifier_index_shifts:", e);
+    throw e;
+  }
 };
 
 // Provides: caml_pasta_fp_plonk_verifier_index_shifts

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

@@ -19,8 +19,6 @@ var plonk_wasm = (function() {
       "caml_pasta_fq_poseidon_block_cipher",
       "caml_pasta_fp_plonk_verifier_index_shifts",
       "caml_pasta_fq_plonk_verifier_index_shifts",
-      "WasmFpPolyComm",
-      "WasmFqPolyComm",
       "caml_pasta_fp_plonk_gate_vector_create",
       "caml_pasta_fq_plonk_gate_vector_create",
       "caml_pasta_fp_plonk_gate_vector_add",
@@ -60,8 +58,8 @@ var plonk_wasm = (function() {
       "WasmFpSrs",
       "caml_fp_srs_create",
       "caml_fp_srs_create_parallel",
-      "caml_fq_srs_get",
-      "caml_fq_srs_set",
+      "caml_fp_srs_get",
+      "caml_fp_srs_set",
       "caml_fp_srs_write",
       "caml_fp_srs_read",
       "caml_fp_srs_add_lagrange_basis",
@@ -83,10 +81,10 @@ var plonk_wasm = (function() {
       "caml_fq_srs_batch_accumulator_check",
       "caml_fq_srs_batch_accumulator_generate",
       "caml_fq_srs_h",
-      "WasmFpPolyComm",
-      "WasmFqPolyComm",
-      "WasmGPallas",
-      "WasmGVesta",
+/*       "WasmFpPolyComm",
+      "WasmFqPolyComm", */
+/*       "WasmGPallas",
+      "WasmGVesta", */
       "WasmPastaFp",
       "WasmPastaFq",
       "caml_pasta_fp_plonk_proof_create",
@@ -106,7 +104,10 @@ var plonk_wasm = (function() {
     ];
 
     overrides.forEach(function (override) {
-      wasm[override] = native[override]
+      wasm[override] = function(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12) {
+        console.log("calling native override:", override);
+        return native[override](x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12);
+      }
     })
     wasm.native = true;
   } catch (e) {
@@ -115,4 +116,4 @@ var plonk_wasm = (function() {
     }
   }
   return wasm
-})()
+})()