bindings: exposing serde helpers

Author: querolita

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

@@ -20,14 +20,7 @@ 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,
@@ -36,7 +29,6 @@ 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/prover-index.js

@@ -4,7 +4,7 @@
 // Requires: plonk_wasm
 function caml_pasta_fp_plonk_index_max_degree(prover_index) {
   var bytes = prover_index.serialize()
-  var index = plonk_wasm.prover_index_fp_from_bytes(bytes);
+  var index = plonk_wasm.prover_index_fp_deserialize(bytes);
   // TODO: ^ remove the round trip when napi has direct access to the object
 
   return plonk_wasm.caml_pasta_fp_plonk_index_max_degree(index);
@@ -14,7 +14,7 @@ function caml_pasta_fp_plonk_index_max_degree(prover_index) {
 // Requires: plonk_wasm
 function caml_pasta_fp_plonk_index_public_inputs(prover_index) {
   var bytes = prover_index.serialize()
-  var index = plonk_wasm.prover_index_fp_from_bytes(bytes);
+  var index = plonk_wasm.prover_index_fp_deserialize(bytes);
   // TODO: ^ remove the round trip when napi has direct access to the object
 
   return plonk_wasm.caml_pasta_fp_plonk_index_public_inputs(index);
@@ -24,7 +24,7 @@ function caml_pasta_fp_plonk_index_public_inputs(prover_index) {
 // Requires: plonk_wasm
 function caml_pasta_fp_plonk_index_domain_d1_size(prover_index) {
   var bytes = prover_index.serialize()
-  var index = plonk_wasm.prover_index_fp_from_bytes(bytes);
+  var index = plonk_wasm.prover_index_fp_deserialize(bytes);
   // TODO: ^ remove the round trip when napi has direct access to the object
 
   return plonk_wasm.caml_pasta_fp_plonk_index_domain_d1_size(index);
@@ -34,7 +34,7 @@ function caml_pasta_fp_plonk_index_domain_d1_size(prover_index) {
 // Requires: plonk_wasm
 function caml_pasta_fp_plonk_index_domain_d4_size(prover_index) {
   var bytes = prover_index.serialize()
-  var index = plonk_wasm.prover_index_fp_from_bytes(bytes);
+  var index = plonk_wasm.prover_index_fp_deserialize(bytes);
   // TODO: ^ remove the round trip when napi has direct access to the object
 
   return plonk_wasm.caml_pasta_fp_plonk_index_domain_d4_size(index);
@@ -44,7 +44,7 @@ function caml_pasta_fp_plonk_index_domain_d4_size(prover_index) {
 // Requires: plonk_wasm
 function caml_pasta_fp_plonk_index_domain_d8_size(prover_index) {
   var bytes = prover_index.serialize()
-  var index = plonk_wasm.prover_index_fp_from_bytes(bytes);
+  var index = plonk_wasm.prover_index_fp_deserialize(bytes);
   // TODO: ^ remove the round trip when napi has direct access to the object
 
   return plonk_wasm.caml_pasta_fp_plonk_index_domain_d8_size(index);
@@ -58,7 +58,7 @@ function caml_pasta_fp_plonk_index_domain_d8_size(prover_index) {
 // Requires: plonk_wasm
 function caml_pasta_fq_plonk_index_max_degree(prover_index) {
   var bytes = prover_index.serialize()
-  var index = plonk_wasm.prover_index_fq_from_bytes(bytes);
+  var index = plonk_wasm.prover_index_fq_deserialize(bytes);
   // TODO: ^ remove the round trip when napi has direct access to the object
 
   return plonk_wasm.caml_pasta_fq_plonk_index_max_degree(index);
@@ -68,7 +68,7 @@ function caml_pasta_fq_plonk_index_max_degree(prover_index) {
 // Requires: plonk_wasm
 function caml_pasta_fq_plonk_index_public_inputs(prover_index) {
   var bytes = prover_index.serialize()
-  var index = plonk_wasm.prover_index_fq_from_bytes(bytes);
+  var index = plonk_wasm.prover_index_fq_deserialize(bytes);
   // TODO: ^ remove the round trip when napi has direct access to the object
 
   return plonk_wasm.caml_pasta_fq_plonk_index_public_inputs(index);
@@ -78,7 +78,7 @@ function caml_pasta_fq_plonk_index_public_inputs(prover_index) {
 // Requires: plonk_wasm
 function caml_pasta_fq_plonk_index_domain_d1_size(prover_index) {
   var bytes = prover_index.serialize()
-  var index = plonk_wasm.prover_index_fq_from_bytes(bytes);
+  var index = plonk_wasm.prover_index_fq_deserialize(bytes);
   // TODO: ^ remove the round trip when napi has direct access to the object
 
   return plonk_wasm.caml_pasta_fq_plonk_index_domain_d1_size(index);
@@ -88,7 +88,7 @@ function caml_pasta_fq_plonk_index_domain_d1_size(prover_index) {
 // Requires: plonk_wasm
 function caml_pasta_fq_plonk_index_domain_d4_size(prover_index) {
   var bytes = prover_index.serialize()
-  var index = plonk_wasm.prover_index_fq_from_bytes(bytes);
+  var index = plonk_wasm.prover_index_fq_deserialize(bytes);
   // TODO: ^ remove the round trip when napi has direct access to the object
 
   return plonk_wasm.caml_pasta_fq_plonk_index_domain_d4_size(index);
@@ -98,13 +98,33 @@ function caml_pasta_fq_plonk_index_domain_d4_size(prover_index) {
 // Requires: plonk_wasm
 function caml_pasta_fq_plonk_index_domain_d8_size(prover_index) {
   var bytes = prover_index.serialize()
-  var index = plonk_wasm.prover_index_fq_from_bytes(bytes);
+  var index = plonk_wasm.prover_index_fq_deserialize(bytes);
   // TODO: ^ remove the round trip when napi has direct access to the object
 
   return plonk_wasm.caml_pasta_fq_plonk_index_domain_d8_size(index);
 }
 
 
+// Provides: caml_pasta_fp_plonk_index_serialize
+// Requires: plonk_wasm
+var caml_pasta_fp_plonk_index_serialize = function (index) {
+  // Workaround for napi issue where methods on External objects are not accessible
+  if (typeof index.serialize === 'function') {
+    return index.serialize();
+  }
+  return plonk_wasm.prover_index_fp_serialize(index);
+};
+
+// Provides: caml_pasta_fp_plonk_index_deserialize
+// Requires: plonk_wasm
+var caml_pasta_fp_plonk_index_deserialize = function (index) {
+  // Workaround for napi issue where methods on External objects are not accessible
+  if (typeof index.deserialize === 'function') {
+    return index.deserialize();
+  }
+  return plonk_wasm.prover_index_fp_deserialize(index);
+};
+
 // Provides: caml_pasta_fp_plonk_index_create
 // Requires: plonk_wasm, tsRustConversionNative
 var caml_pasta_fp_plonk_index_create = function (
@@ -138,7 +158,7 @@ var caml_pasta_fp_plonk_index_create = function (
   );
   console.timeEnd("index_create");
 
-  return plonk_wasm.prover_index_fp_to_bytes(t);
+  return t;
 };
 
 // Provides: caml_pasta_fp_plonk_index_create_bytecode
@@ -193,6 +213,26 @@ var caml_pasta_fp_plonk_index_write = function (append, t, path) {
   );
 };
 
+// Provides: caml_pasta_fq_plonk_index_serialize
+// Requires: plonk_wasm
+var caml_pasta_fq_plonk_index_serialize = function (index) {
+  // Workaround for napi issue where methods on External objects are not accessible
+  if (typeof index.serialize === 'function') {
+    return index.serialize();
+  }
+  return plonk_wasm.prover_index_fq_serialize(index);
+};
+
+// Provides: caml_pasta_fq_plonk_index_deserialize
+// Requires: plonk_wasm
+var caml_pasta_fq_plonk_index_deserialize = function (index) {
+  // Workaround for napi issue where methods on External objects are not accessible
+  if (typeof index.deserialize === 'function') {
+    return index.deserialize();
+  }
+  return plonk_wasm.prover_index_fq_deserialize(index);
+};
+
 // Provides: caml_pasta_fq_plonk_index_create
 // Requires: plonk_wasm, tsRustConversionNative
 var caml_pasta_fq_plonk_index_create = function (
@@ -214,7 +254,7 @@ var caml_pasta_fq_plonk_index_create = function (
   console.log("anais: 3");
 
   console.time("conversion")
-  var gate_vec = plonk_wasm.caml_pasta_fq_plonk_gate_vector_from_bytes(gates.serialize());
+  var gate_vec = plonk_wasm.caml_pasta_fq_plonk_gate_vector_deserialize(gates.serialize());
   var urs_ser = plonk_wasm.caml_fq_srs_from_bytes_external(urs.serialize())
   console.timeEnd("conversion")
   console.log("anais: 4");
@@ -231,7 +271,7 @@ var caml_pasta_fq_plonk_index_create = function (
   );
   console.timeEnd("index_create");
 
-  return plonk_wasm.prover_index_fq_to_bytes(t);
+  return t;
 }; 
 
 // Provides: caml_pasta_fq_plonk_index_create_bytecode

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

@@ -63,13 +63,40 @@ var caml_fq_srs_lagrange_commitments_whole_domain =
 // Requires: tsSrs
 var caml_fp_srs_lagrange_commitment = tsSrs.fp.lagrangeCommitment;
 
+// Provides: caml_fp_srs_to_bytes_external
+// Requires: plonk_wasm
+var caml_fp_srs_to_bytes_external = function (srs) {
+  console.log("native caml_fp_srs_to_bytes_external");
+  return plonk_wasm.caml_fp_srs_to_bytes_external(srs);
+};
+
+// Provides: caml_fp_srs_from_bytes_external
+// Requires: plonk_wasm
+var caml_fp_srs_from_bytes_external = function (bytes) {
+  console.log("native caml_fp_srs_from_bytes_external");
+  return plonk_wasm.caml_fp_srs_from_bytes_external(bytes);
+};
+
 // Provides: caml_fp_srs_lagrange_commitment
 // Requires: tsSrs
 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_maybe_lagrange_commitment
+// Requires: plonk_wasm, tsRustConversionNative
+var caml_fp_srs_maybe_lagrange_commitment = function (srs, domain_size, i) {
+  console.log("native caml_fp_srs_maybe_lagrange_commitment");
+  var result = plonk_wasm.caml_fp_srs_maybe_lagrange_commitment(srs, domain_size, i);
+  console.log("result", result);
+  if (result == null) return 0; // None
+  var polyComm = tsRustConversionNative.fp.polyCommFromRust(result);
+  console.log("polyComm", polyComm);
+  if (polyComm == undefined) return 0; // None
+  return [0, polyComm]; // Some(...)
+};
+
 // Provides: caml_fp_srs_commit_evaluations
 // Requires: plonk_wasm, tsRustConversionNative
 var caml_fp_srs_commit_evaluations = function (t, domain_size, fps) {
@@ -181,6 +208,17 @@ var caml_fq_srs_lagrange_commitment = function (srs, i) {
   return tsSrs.fq.lagrangeCommitment(srs, i);
 };
 
+// Provides: caml_fq_srs_maybe_lagrange_commitment
+// Requires: plonk_wasm, tsRustConversionNative
+var caml_fq_srs_maybe_lagrange_commitment = function (srs, domain_size, i) {
+  console.log("native caml_fq_srs_maybe_lagrange_commitment");
+  var result = plonk_wasm.caml_fq_srs_maybe_lagrange_commitment(srs, domain_size, i);
+  if (result == null) return 0; // None
+  var polyComm = tsRustConversionNative.fq.polyCommFromRust(result);
+  if (polyComm == undefined) return 0; // None
+  return [0, polyComm]; // Some(...)
+};
+
 // Provides: caml_fq_srs_commit_evaluations
 // Requires: plonk_wasm, tsRustConversionNative
 var caml_fq_srs_commit_evaluations = function (t, domain_size, fqs) {
@@ -247,4 +285,4 @@ var caml_fq_srs_h = function (t) {
 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/node_js/node_backend.js

@@ -11,10 +11,12 @@ var plonk_wasm = (function() {
     // IS SET
     var overrides = [
       "prover_to_json",
-      "prover_index_fp_from_bytes",
-      "prover_index_fq_from_bytes",
-      "prover_index_fp_to_bytes",
-      "prover_index_fq_to_bytes",
+      "prover_index_fp_deserialize",
+      "prover_index_fq_deserialize",
+      "prover_index_fp_serialize",
+      "prover_index_fq_serialize",
+      "WasmPastaFpPlonkIndex",
+      "WasmPastaFqPlonkIndex",
       "caml_pasta_fp_poseidon_block_cipher",
       "caml_pasta_fq_poseidon_block_cipher",
       "caml_pasta_fp_plonk_proof_create",