move /kimchi/{wasm,js} to kimchi_bindings

MinaProtocol · Dec 18, 2023 · b6a14e0 · b6a14e0
1 parent d4314b0
commit b6a14e0
Show file tree

Hide file tree

Showing 58 changed files with 11 additions and 11 deletions.
diff --git a/dockerfiles/stages/1-build-deps b/dockerfiles/stages/1-build-deps
@@ -25,7 +25,7 @@ ARG GO_CAPNP_VERSION=v3.0.0-alpha.5
 # - src/lib/crypto/proof-systems/rust-toolchain.toml
 ARG RUST_VERSION=1.72
 # Nightly Rust Version used for WebAssembly builds
-# - src/lib/snarkyjs/src/bindings/kimchi/wasm/rust-toolchain.toml
+# - src/lib/crypto/kimchi_bindings/wasm/rust-toolchain.toml
 ARG RUST_NIGHTLY=2023-09-01
 # wasm-pack version
 ARG WASM_PACK_VERSION=v0.12.1

diff --git a/nix/rust.nix b/nix/rust.nix
@@ -100,7 +100,7 @@ in
     };
 
   kimchi-rust = rustChannelFromToolchainFileOf
-    ../src/lib/crypto/kimchi/wasm/rust-toolchain.toml;
+    ../src/lib/crypto/kimchi_bindings/wasm/rust-toolchain.toml;
 
   # TODO: raise issue on nixpkgs and remove workaround when fix is applied
   kimchi-rust-wasm = (final.kimchi-rust.rust.override {
@@ -124,7 +124,7 @@ in
   plonk_wasm =
     let
 
-      lock = ../src/lib/crypto/kimchi/wasm/Cargo.lock;
+      lock = ../src/lib/crypto/kimchi_bindings/wasm/Cargo.lock;
 
       deps = builtins.listToAttrs (map
         (pkg: {
@@ -168,7 +168,7 @@ in
         "^lib(/crypto(/kimchi(/wasm(/.*)?)?)?)?$"
         "^lib(/crypto(/proof-systems(/.*)?)?)?$"
       ];
-      sourceRoot = "source/lib/crypto/kimchi/wasm";
+      sourceRoot = "source/lib/crypto/kimchi_bindings/wasm";
       nativeBuildInputs = [ final.wasm-pack wasm-bindgen-cli ];
       buildInputs = with final; lib.optional stdenv.isDarwin libiconv;
       cargoLock.lockFile = lock;

diff --git a/src/lib/crypto/kimchi/js/README.md → src/lib/crypto/kimchi_bindings/js/README.md b/src/lib/crypto/kimchi/js/README.md → src/lib/crypto/kimchi_bindings/js/README.md
diff --git a/...ib/crypto/kimchi/js/bindings-bigint256.js → .../kimchi_bindings/js/bindings-bigint256.js b/...ib/crypto/kimchi/js/bindings-bigint256.js → .../kimchi_bindings/js/bindings-bigint256.js
diff --git a/src/lib/crypto/kimchi/js/bindings-curve.js → ...ypto/kimchi_bindings/js/bindings-curve.js b/src/lib/crypto/kimchi/js/bindings-curve.js → ...ypto/kimchi_bindings/js/bindings-curve.js
diff --git a/src/lib/crypto/kimchi/js/bindings-field.js → ...ypto/kimchi_bindings/js/bindings-field.js b/src/lib/crypto/kimchi/js/bindings-field.js → ...ypto/kimchi_bindings/js/bindings-field.js
diff --git a/src/lib/crypto/kimchi/js/bindings-vector.js → ...pto/kimchi_bindings/js/bindings-vector.js b/src/lib/crypto/kimchi/js/bindings-vector.js → ...pto/kimchi_bindings/js/bindings-vector.js
diff --git a/src/lib/crypto/kimchi/js/bindings.js → ...lib/crypto/kimchi_bindings/js/bindings.js b/src/lib/crypto/kimchi/js/bindings.js → ...lib/crypto/kimchi_bindings/js/bindings.js
diff --git a/src/lib/crypto/kimchi/js/dune → src/lib/crypto/kimchi_bindings/js/dune b/src/lib/crypto/kimchi/js/dune → src/lib/crypto/kimchi_bindings/js/dune
diff --git a/src/lib/crypto/kimchi/js/node_js/build.sh → ...rypto/kimchi_bindings/js/node_js/build.sh b/src/lib/crypto/kimchi/js/node_js/build.sh → ...rypto/kimchi_bindings/js/node_js/build.sh
@@ -3,7 +3,7 @@ set -euo pipefail
 
 if [[ -z "${PLONK_WASM_NODEJS-}" ]]; then
     export RUSTFLAGS="-C target-feature=+atomics,+bulk-memory,+mutable-globals -C link-arg=--no-check-features -C link-arg=--max-memory=4294967296"
-    # The version should stay in line with the one in kimchi/wasm/rust-toolchain.toml
+    # The version should stay in line with the one in kimchi_bindings/wasm/rust-toolchain.toml
     rustup run nightly-2023-09-01 wasm-pack build --target nodejs --out-dir ../js/node_js ../../wasm -- -Z build-std=panic_abort,std --features nodejs
 else
     cp "$PLONK_WASM_NODEJS"/* -R .

diff --git a/src/lib/crypto/kimchi/js/node_js/dune → ...ib/crypto/kimchi_bindings/js/node_js/dune b/src/lib/crypto/kimchi/js/node_js/dune → ...ib/crypto/kimchi_bindings/js/node_js/dune
diff --git a/.../crypto/kimchi/js/node_js/node_backend.js → ...imchi_bindings/js/node_js/node_backend.js b/.../crypto/kimchi/js/node_js/node_backend.js → ...imchi_bindings/js/node_js/node_backend.js
diff --git a/...crypto/kimchi/js/test/bindings_js_test.ml → ...mchi_bindings/js/test/bindings_js_test.ml b/...crypto/kimchi/js/test/bindings_js_test.ml → ...mchi_bindings/js/test/bindings_js_test.ml
diff --git a/src/lib/crypto/kimchi/js/test/dune → src/lib/crypto/kimchi_bindings/js/test/dune b/src/lib/crypto/kimchi/js/test/dune → src/lib/crypto/kimchi_bindings/js/test/dune
diff --git a/...crypto/kimchi/js/test/nodejs/copy_over.sh → ...mchi_bindings/js/test/nodejs/copy_over.sh b/...crypto/kimchi/js/test/nodejs/copy_over.sh → ...mchi_bindings/js/test/nodejs/copy_over.sh
diff --git a/src/lib/crypto/kimchi/js/test/nodejs/dune → ...rypto/kimchi_bindings/js/test/nodejs/dune b/src/lib/crypto/kimchi/js/test/nodejs/dune → ...rypto/kimchi_bindings/js/test/nodejs/dune
diff --git a/...ypto/kimchi/js/test/nodejs/nodejs_test.ml → ...hi_bindings/js/test/nodejs/nodejs_test.ml b/...ypto/kimchi/js/test/nodejs/nodejs_test.ml → ...hi_bindings/js/test/nodejs/nodejs_test.ml
diff --git a/...ib/crypto/kimchi/js/test/web/copy_over.sh → .../kimchi_bindings/js/test/web/copy_over.sh b/...ib/crypto/kimchi/js/test/web/copy_over.sh → .../kimchi_bindings/js/test/web/copy_over.sh
diff --git a/src/lib/crypto/kimchi/js/test/web/dune → ...b/crypto/kimchi_bindings/js/test/web/dune b/src/lib/crypto/kimchi/js/test/web/dune → ...b/crypto/kimchi_bindings/js/test/web/dune
diff --git a/src/lib/crypto/kimchi/js/test/web/index.html → ...to/kimchi_bindings/js/test/web/index.html b/src/lib/crypto/kimchi/js/test/web/index.html → ...to/kimchi_bindings/js/test/web/index.html
diff --git a/src/lib/crypto/kimchi/js/test/web/server.py → ...pto/kimchi_bindings/js/test/web/server.py b/src/lib/crypto/kimchi/js/test/web/server.py → ...pto/kimchi_bindings/js/test/web/server.py
diff --git a/...lib/crypto/kimchi/js/test/web/web_test.ml → ...o/kimchi_bindings/js/test/web/web_test.ml b/...lib/crypto/kimchi/js/test/web/web_test.ml → ...o/kimchi_bindings/js/test/web/web_test.ml
diff --git a/src/lib/crypto/kimchi/js/web/build.sh → ...ib/crypto/kimchi_bindings/js/web/build.sh b/src/lib/crypto/kimchi/js/web/build.sh → ...ib/crypto/kimchi_bindings/js/web/build.sh
@@ -3,7 +3,7 @@ set -euo pipefail
 
 if [[ -z "${PLONK_WASM_WEB-}" ]]; then
     export RUSTFLAGS="-C target-feature=+atomics,+bulk-memory,+mutable-globals -C link-arg=--no-check-features -C link-arg=--max-memory=4294967296"
-    # The version should stay in line with the one in kimchi/wasm/rust-toolchain.toml
+    # The version should stay in line with the one in kimchi_bindings/wasm/rust-toolchain.toml
     rustup run nightly-2023-09-01 wasm-pack build --target web --out-dir ../js/web ../../wasm -- -Z build-std=panic_abort,std
 else
     cp "$PLONK_WASM_WEB"/* -R .

diff --git a/src/lib/crypto/kimchi/js/web/dune → src/lib/crypto/kimchi_bindings/js/web/dune b/src/lib/crypto/kimchi/js/web/dune → src/lib/crypto/kimchi_bindings/js/web/dune
diff --git a/src/lib/crypto/kimchi/js/web/web_backend.js → ...pto/kimchi_bindings/js/web/web_backend.js b/src/lib/crypto/kimchi/js/web/web_backend.js → ...pto/kimchi_bindings/js/web/web_backend.js
diff --git a/src/lib/crypto/kimchi/wasm/.cargo/config → ...crypto/kimchi_bindings/wasm/.cargo/config b/src/lib/crypto/kimchi/wasm/.cargo/config → ...crypto/kimchi_bindings/wasm/.cargo/config
diff --git a/src/lib/crypto/kimchi/wasm/.gitignore → ...ib/crypto/kimchi_bindings/wasm/.gitignore b/src/lib/crypto/kimchi/wasm/.gitignore → ...ib/crypto/kimchi_bindings/wasm/.gitignore
diff --git a/src/lib/crypto/kimchi/wasm/Cargo.lock → ...ib/crypto/kimchi_bindings/wasm/Cargo.lock b/src/lib/crypto/kimchi/wasm/Cargo.lock → ...ib/crypto/kimchi_bindings/wasm/Cargo.lock
diff --git a/src/lib/crypto/kimchi/wasm/Cargo.toml → ...ib/crypto/kimchi_bindings/wasm/Cargo.toml b/src/lib/crypto/kimchi/wasm/Cargo.toml → ...ib/crypto/kimchi_bindings/wasm/Cargo.toml
diff --git a/src/lib/crypto/kimchi/wasm/README.md → ...lib/crypto/kimchi_bindings/wasm/README.md b/src/lib/crypto/kimchi/wasm/README.md → ...lib/crypto/kimchi_bindings/wasm/README.md
diff --git a/src/lib/crypto/kimchi/wasm/dune → src/lib/crypto/kimchi_bindings/wasm/dune b/src/lib/crypto/kimchi/wasm/dune → src/lib/crypto/kimchi_bindings/wasm/dune
diff --git a/...ib/crypto/kimchi/wasm/rust-toolchain.toml → .../kimchi_bindings/wasm/rust-toolchain.toml b/...ib/crypto/kimchi/wasm/rust-toolchain.toml → .../kimchi_bindings/wasm/rust-toolchain.toml
@@ -1,6 +1,6 @@
 # A nightly is necessary to enable the use of #![feature]
 [toolchain]
 # This should stay in line with the versions in
-# - kimchi/js/node_js/build.sh
-# - kimchi/js/web/build.sh
+# - kimchi_bindings/js/node_js/build.sh
+# - kimchi_bindings/js/web/build.sh
 channel = "nightly-2023-09-01" # roughly matches 1.72
diff --git a/...to/kimchi/wasm/src/arkworks/bigint_256.rs → ..._bindings/wasm/src/arkworks/bigint_256.rs b/...to/kimchi/wasm/src/arkworks/bigint_256.rs → ..._bindings/wasm/src/arkworks/bigint_256.rs
diff --git a/.../kimchi/wasm/src/arkworks/group_affine.rs → ...indings/wasm/src/arkworks/group_affine.rs b/.../kimchi/wasm/src/arkworks/group_affine.rs → ...indings/wasm/src/arkworks/group_affine.rs
diff --git a/...chi/wasm/src/arkworks/group_projective.rs → ...ngs/wasm/src/arkworks/group_projective.rs b/...chi/wasm/src/arkworks/group_projective.rs → ...ngs/wasm/src/arkworks/group_projective.rs
diff --git a/...ib/crypto/kimchi/wasm/src/arkworks/mod.rs → .../kimchi_bindings/wasm/src/arkworks/mod.rs b/...ib/crypto/kimchi/wasm/src/arkworks/mod.rs → .../kimchi_bindings/wasm/src/arkworks/mod.rs
diff --git a/...ypto/kimchi/wasm/src/arkworks/pasta_fp.rs → ...hi_bindings/wasm/src/arkworks/pasta_fp.rs b/...ypto/kimchi/wasm/src/arkworks/pasta_fp.rs → ...hi_bindings/wasm/src/arkworks/pasta_fp.rs
diff --git a/...ypto/kimchi/wasm/src/arkworks/pasta_fq.rs → ...hi_bindings/wasm/src/arkworks/pasta_fq.rs b/...ypto/kimchi/wasm/src/arkworks/pasta_fq.rs → ...hi_bindings/wasm/src/arkworks/pasta_fq.rs
diff --git a/src/lib/crypto/kimchi/wasm/src/circuit.rs → ...rypto/kimchi_bindings/wasm/src/circuit.rs b/src/lib/crypto/kimchi/wasm/src/circuit.rs → ...rypto/kimchi_bindings/wasm/src/circuit.rs
diff --git a/...lib/crypto/kimchi/wasm/src/gate_vector.rs → ...o/kimchi_bindings/wasm/src/gate_vector.rs b/...lib/crypto/kimchi/wasm/src/gate_vector.rs → ...o/kimchi_bindings/wasm/src/gate_vector.rs
diff --git a/src/lib/crypto/kimchi/wasm/src/lib.rs → ...ib/crypto/kimchi_bindings/wasm/src/lib.rs b/src/lib/crypto/kimchi/wasm/src/lib.rs → ...ib/crypto/kimchi_bindings/wasm/src/lib.rs
diff --git a/src/lib/crypto/kimchi/wasm/src/oracles.rs → ...rypto/kimchi_bindings/wasm/src/oracles.rs b/src/lib/crypto/kimchi/wasm/src/oracles.rs → ...rypto/kimchi_bindings/wasm/src/oracles.rs
diff --git a/...o/kimchi/wasm/src/pasta_fp_plonk_index.rs → ...bindings/wasm/src/pasta_fp_plonk_index.rs b/...o/kimchi/wasm/src/pasta_fp_plonk_index.rs → ...bindings/wasm/src/pasta_fp_plonk_index.rs
diff --git a/...o/kimchi/wasm/src/pasta_fq_plonk_index.rs → ...bindings/wasm/src/pasta_fq_plonk_index.rs b/...o/kimchi/wasm/src/pasta_fq_plonk_index.rs → ...bindings/wasm/src/pasta_fq_plonk_index.rs
diff --git a/...lib/crypto/kimchi/wasm/src/plonk_proof.rs → ...o/kimchi_bindings/wasm/src/plonk_proof.rs b/...lib/crypto/kimchi/wasm/src/plonk_proof.rs → ...o/kimchi_bindings/wasm/src/plonk_proof.rs
diff --git a/...o/kimchi/wasm/src/plonk_verifier_index.rs → ...bindings/wasm/src/plonk_verifier_index.rs b/...o/kimchi/wasm/src/plonk_verifier_index.rs → ...bindings/wasm/src/plonk_verifier_index.rs
diff --git a/src/lib/crypto/kimchi/wasm/src/poly_comm.rs → ...pto/kimchi_bindings/wasm/src/poly_comm.rs b/src/lib/crypto/kimchi/wasm/src/poly_comm.rs → ...pto/kimchi_bindings/wasm/src/poly_comm.rs
diff --git a/src/lib/crypto/kimchi/wasm/src/poseidon.rs → ...ypto/kimchi_bindings/wasm/src/poseidon.rs b/src/lib/crypto/kimchi/wasm/src/poseidon.rs → ...ypto/kimchi_bindings/wasm/src/poseidon.rs
diff --git a/src/lib/crypto/kimchi/wasm/src/projective.rs → ...to/kimchi_bindings/wasm/src/projective.rs b/src/lib/crypto/kimchi/wasm/src/projective.rs → ...to/kimchi_bindings/wasm/src/projective.rs
diff --git a/src/lib/crypto/kimchi/wasm/src/rayon.rs → .../crypto/kimchi_bindings/wasm/src/rayon.rs b/src/lib/crypto/kimchi/wasm/src/rayon.rs → .../crypto/kimchi_bindings/wasm/src/rayon.rs
diff --git a/src/lib/crypto/kimchi/wasm/src/srs.rs → ...ib/crypto/kimchi_bindings/wasm/src/srs.rs b/src/lib/crypto/kimchi/wasm/src/srs.rs → ...ib/crypto/kimchi_bindings/wasm/src/srs.rs
diff --git a/src/lib/crypto/kimchi/wasm/src/urs_utils.rs → ...pto/kimchi_bindings/wasm/src/urs_utils.rs b/src/lib/crypto/kimchi/wasm/src/urs_utils.rs → ...pto/kimchi_bindings/wasm/src/urs_utils.rs
diff --git a/...rypto/kimchi/wasm/src/wasm_flat_vector.rs → ...chi_bindings/wasm/src/wasm_flat_vector.rs b/...rypto/kimchi/wasm/src/wasm_flat_vector.rs → ...chi_bindings/wasm/src/wasm_flat_vector.rs
diff --git a/...to/kimchi/wasm/src/wasm_ocaml_serde/de.rs → ..._bindings/wasm/src/wasm_ocaml_serde/de.rs b/...to/kimchi/wasm/src/wasm_ocaml_serde/de.rs → ..._bindings/wasm/src/wasm_ocaml_serde/de.rs
diff --git a/...o/kimchi/wasm/src/wasm_ocaml_serde/mod.rs → ...bindings/wasm/src/wasm_ocaml_serde/mod.rs b/...o/kimchi/wasm/src/wasm_ocaml_serde/mod.rs → ...bindings/wasm/src/wasm_ocaml_serde/mod.rs
diff --git a/...o/kimchi/wasm/src/wasm_ocaml_serde/ser.rs → ...bindings/wasm/src/wasm_ocaml_serde/ser.rs b/...o/kimchi/wasm/src/wasm_ocaml_serde/ser.rs → ...bindings/wasm/src/wasm_ocaml_serde/ser.rs
diff --git a/...lib/crypto/kimchi/wasm/src/wasm_vector.rs → ...o/kimchi_bindings/wasm/src/wasm_vector.rs b/...lib/crypto/kimchi/wasm/src/wasm_vector.rs → ...o/kimchi_bindings/wasm/src/wasm_vector.rs
diff --git a/src/lib/o1js_stub/dune b/src/lib/o1js_stub/dune
@@ -5,8 +5,8 @@
  (link_flags
   (-noautolink -g))
  (link_deps
-  ../crypto/kimchi/js/node_js/plonk_wasm.js
-  ../crypto/kimchi/js/node_js/plonk_wasm_bg.wasm)
+  ../crypto/kimchi_bindings/js/node_js/plonk_wasm.js
+  ../crypto/kimchi_bindings/js/node_js/plonk_wasm_bg.wasm)
  (libraries
   ;; opam libraries ;;
   core_kernel
@@ -75,4 +75,4 @@
   (backend bisect_ppx))
  (forbidden_libraries async core re2 ctypes)
  (preprocess
-  (pps ppx_custom_printf ppx_version js_of_ocaml-ppx)))
+  (pps ppx_custom_printf ppx_version js_of_ocaml-ppx)))