proxy for native conversion core (wip)

Author: Trivo25

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

@@ -1,6 +1,4 @@
-/* global plonk_wasm, tsRustConversion,
-    
- */
+/* global plonk_wasm, tsRustConversion,*/
 
 // Provides: fp_oracles_create
 // Requires: plonk_wasm, tsRustConversion
@@ -75,31 +73,3 @@ function caml_pasta_fp_poseidon_params_create() {
 function caml_pasta_fq_poseidon_params_create() {
   return [0];
 }
-
-// Provides: caml_pasta_fp_poseidon_block_cipher
-// Requires: plonk_wasm, tsRustConversion, tsRustConversion
-function caml_pasta_fp_poseidon_block_cipher(_fake_params, fp_vector) {
-  // 1. get permuted field vector from rust
-  var wasm_flat_vector = plonk_wasm.caml_pasta_fp_poseidon_block_cipher(
-    tsRustConversion.fp.vectorToRust(fp_vector)
-  );
-  var new_fp_vector = tsRustConversion.fp.vectorFromRust(wasm_flat_vector);
-  // 2. write back modified field vector to original one
-  new_fp_vector.forEach(function (a, i) {
-    fp_vector[i] = a;
-  });
-}
-
-// Provides: caml_pasta_fq_poseidon_block_cipher
-// Requires: plonk_wasm, tsRustConversion, tsRustConversion
-function caml_pasta_fq_poseidon_block_cipher(_fake_params, fq_vector) {
-  // 1. get permuted field vector from rust
-  var wasm_flat_vector = plonk_wasm.caml_pasta_fq_poseidon_block_cipher(
-    tsRustConversion.fq.vectorToRust(fq_vector)
-  );
-  var new_fq_vector = tsRustConversion.fq.vectorFromRust(wasm_flat_vector);
-  // 2. write back modified field vector to original one
-  new_fq_vector.forEach(function (a, i) {
-    fq_vector[i] = a;
-  });
-}

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

@@ -1,6 +1,6 @@
 /* global UInt64, caml_int64_of_int32, caml_create_bytes,
     caml_bytes_unsafe_set, caml_bytes_unsafe_get, caml_ml_bytes_length,
-    plonk_wasm
+    plonk_wasm, getTsBindings
  */
 
 // Provides: tsBindings

src/lib/crypto/kimchi_bindings/js/dune

@@ -14,7 +14,10 @@
    bindings/prover-index.js
    bindings/util.js
    bindings/srs.js
-   bindings/verifier-index.js))
+   bindings/verifier-index.js
+   native/native-overrides/oracles.js
+   native/native-overrides/util.js
+   ))
  (instrumentation
   (backend bisect_ppx))
  (preprocess

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

@@ -0,0 +1,38 @@
+/* global plonk_wasm, tsRustConversionNative,*/
+
+
+// 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)
+  );
+  var new_fq_vector = tsRustConversionNative.fq.vectorFromRust(wasm_flat_vector);
+  // 2. write back modified field vector to original one
+  new_fq_vector.forEach(function (a, i) {
+    fq_vector[i] = a;
+  });
+}
+
+
+// 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)
+  );
+  var new_fp_vector = tsRustConversionNative.fp.vectorFromRust(wasm_flat_vector);
+  // 2. write back modified field vector to original one
+  new_fp_vector.forEach(function (a, i) {
+    fp_vector[i] = a;
+  });
+}

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

@@ -0,0 +1,6 @@
+/* global plonk_wasm, tsRustConversionNative, getTsBindings, tsBindings  */
+
+
+// Provides: tsRustConversionNative
+// Requires: tsBindings, plonk_wasm, getTsBindings
+var tsRustConversionNative = tsBindings.nativeRustConversion(plonk_wasm);

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

@@ -215,7 +215,8 @@ 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"
 
@@ -250,7 +251,8 @@ 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/pickles/plonk_checks/scalars.ml

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