Merge pull request #50 from o1-labs/feature/revive-snarkyjs-ci-develop

Blocking SnarkyJS CI tests

compiled/.gitignore

@@ -0,0 +1 @@
+_node_bindings

compiled/node_bindings/snarky_js_node.bc.d.cts

@@ -0,0 +1 @@
+// this file exists to prevent TS from type-checking `snarky_js_node.bc.cjs`

js/node/node-backend.js

@@ -1,6 +1,6 @@
 import { isMainThread, parentPort, workerData, Worker } from 'worker_threads';
 import os from 'os';
-import wasm_ from '../../../_node_bindings/plonk_wasm.cjs';
+import wasm_ from '../../compiled/_node_bindings/plonk_wasm.cjs';
 import { fileURLToPath } from 'url';
 let url = import.meta.url;
 let filename = url !== undefined ? fileURLToPath(url) : __filename;

js/wrapper.d.ts

@@ -1,4 +1,4 @@
-import * as wasm from '../compiled/node_bindings/plonk_wasm.js';
+import * as wasm from '../compiled/node_bindings/plonk_wasm.cjs';
 
 export { WasmModule, getWasm, getSnarky, withThreadPool };
 

js/wrapper.js

@@ -1,5 +1,5 @@
 import { wasm, withThreadPool } from './node/node-backend.js';
-import { default as snarky } from '../../_node_bindings/snarky_js_node.bc.cjs';
+import { default as snarky } from '../compiled/_node_bindings/snarky_js_node.bc.cjs';
 
 export { getSnarky, getWasm, withThreadPool };
 

scripts/build-snarkyjs-node-artifacts.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+
+set -e
+
+SNARKY_JS_PATH="src/lib/snarkyjs"
+DUNE_PATH="$SNARKY_JS_PATH/src/bindings/ocaml"
+BUILD_PATH="_build/default/$DUNE_PATH"
+KIMCHI_BINDINGS="$SNARKY_JS_PATH/src/bindings/kimchi"
+
+pushd "$SNARKY_JS_PATH"
+  [ -d node_modules ] || npm i
+popd
+
+export DUNE_USE_DEFAULT_LINKER="y"
+
+if [ -f "$BUILD_PATH/snarky_js_node.bc.js" ]; then
+  echo "found snarky_js_node.bc.js"
+  if [ -f "$BUILD_PATH/snarky_js_node.bc.map" ]; then
+    echo "found snarky_js_node.bc.map, saving at a tmp location because dune will delete it"
+    cp "$BUILD_PATH/snarky_js_node.bc.map" _build/snarky_js_node.bc.map ;
+  else
+    echo "did not find snarky_js_node.bc.map, deleting snarky_js_node.bc.js to force calling jsoo again"
+    rm -f "$BUILD_PATH/snarky_js_node.bc.js"
+  fi
+fi
+
+dune b $KIMCHI_BINDINGS/js/node_js \
+&& dune b $DUNE_PATH/snarky_js_node.bc.js || exit 1
+
+# update if new source map was built
+if [ -f "$BUILD_PATH/snarky_js_node.bc.map" ]; then
+  echo "new source map created";
+  cp "$BUILD_PATH/snarky_js_node.bc.map" "_build/snarky_js_node.bc.map";
+fi
+
+dune b $SNARKY_JS_PATH/src/bindings/mina-transaction/gen/js-layout.ts \
+&& dune b $SNARKY_JS_PATH/src/bindings/crypto/constants.ts \
+ $SNARKY_JS_PATH/src/bindings/crypto/test_vectors/poseidonKimchi.ts \
+|| exit 1
+
+BINDINGS_PATH="$SNARKY_JS_PATH"/src/bindings/compiled/_node_bindings/
+mkdir -p "$BINDINGS_PATH"
+chmod -R 777 "$BINDINGS_PATH"
+cp _build/default/$KIMCHI_BINDINGS/js/node_js/plonk_wasm* "$BINDINGS_PATH"
+mv -f $BINDINGS_PATH/plonk_wasm.js $BINDINGS_PATH/plonk_wasm.cjs
+mv -f $BINDINGS_PATH/plonk_wasm.d.ts $BINDINGS_PATH/plonk_wasm.d.cts
+cp $BUILD_PATH/snarky_js_node*.js "$BINDINGS_PATH"
+cp $SNARKY_JS_PATH/src/bindings/compiled/node_bindings/snarky_js_node.bc.d.cts $BINDINGS_PATH/
+cp "_build/snarky_js_node.bc.map" "$BINDINGS_PATH"/snarky_js_node.bc.map
+mv -f $BINDINGS_PATH/snarky_js_node.bc.js $BINDINGS_PATH/snarky_js_node.bc.cjs
+sed -i 's/plonk_wasm.js/plonk_wasm.cjs/' $BINDINGS_PATH/snarky_js_node.bc.cjs
+
+# cleanup tmp source map
+cp _build/snarky_js_node.bc.map $BUILD_PATH/snarky_js_node.bc.map
+rm -f _build/snarky_js_node.bc.map
+
+# better error messages
+# TODO: find a less hacky way to make adjustments to jsoo compiler output
+# `s` is the jsoo representation of the error message string, and `s.c` is the actual JS string
+sed -i 's/function failwith(s){throw \[0,Failure,s\]/function failwith(s){throw joo_global_object.Error(s.c)/' "$BINDINGS_PATH"/snarky_js_node.bc.cjs
+sed -i 's/function invalid_arg(s){throw \[0,Invalid_argument,s\]/function invalid_arg(s){throw joo_global_object.Error(s.c)/' "$BINDINGS_PATH"/snarky_js_node.bc.cjs
+sed -i 's/return \[0,Exn,t\]/return joo_global_object.Error(t.c)/' "$BINDINGS_PATH"/snarky_js_node.bc.cjs
+# TODO: this doesn't cover all cases, maybe should rewrite to_exn instead
+sed -i 's/function raise(t){throw caml_call1(to_exn$0,t)}/function raise(t){throw Error(t?.[1]?.c ?? "Unknown error thrown by raise")}/' "$BINDINGS_PATH"/snarky_js_node.bc.cjs
+
+chmod 777 "$BINDINGS_PATH"/*
+node "$SNARKY_JS_PATH/src/build/fix-wasm-bindings-node.js" "$BINDINGS_PATH/plonk_wasm.cjs"
+

scripts/build-snarkyjs-node.sh

@@ -2,66 +2,6 @@
 
 set -e
 
-SNARKY_JS_PATH="src/lib/snarkyjs"
-DUNE_PATH="$SNARKY_JS_PATH/src/bindings/ocaml"
-BUILD_PATH="_build/default/$DUNE_PATH"
-KIMCHI_BINDINGS="$SNARKY_JS_PATH/src/bindings/kimchi"
+$(dirname "$0")/build-snarkyjs-node-artifacts.sh
 
-pushd "$SNARKY_JS_PATH"
-  [ -d node_modules ] || npm i
-popd
-
-export DUNE_USE_DEFAULT_LINKER="y"
-
-if [ -f "$BUILD_PATH/snarky_js_node.bc.js" ]; then
-  echo "found snarky_js_node.bc.js"
-  if [ -f "$BUILD_PATH/snarky_js_node.bc.map" ]; then
-    echo "found snarky_js_node.bc.map, saving at a tmp location because dune will delete it"
-    cp "$BUILD_PATH/snarky_js_node.bc.map" _build/snarky_js_node.bc.map ;
-  else
-    echo "did not find snarky_js_node.bc.map, deleting snarky_js_node.bc.js to force calling jsoo again"
-    rm -f "$BUILD_PATH/snarky_js_node.bc.js"
-  fi
-fi
-
-dune b $KIMCHI_BINDINGS/js/node_js \
-&& dune b $DUNE_PATH/snarky_js_node.bc.js || exit 1
-
-# update if new source map was built
-if [ -f "$BUILD_PATH/snarky_js_node.bc.map" ]; then
-  echo "new source map created";
-  cp "$BUILD_PATH/snarky_js_node.bc.map" "_build/snarky_js_node.bc.map";
-fi
-
-dune b $SNARKY_JS_PATH/src/bindings/mina-transaction/gen/js-layout.ts \
-&& dune b $SNARKY_JS_PATH/src/bindings/crypto/constants.ts \
- $SNARKY_JS_PATH/src/bindings/crypto/test_vectors/poseidonKimchi.ts \
-|| exit 1
-
-BINDINGS_PATH="$SNARKY_JS_PATH"/dist/node/_node_bindings/
-mkdir -p "$BINDINGS_PATH"
-chmod -R 777 "$BINDINGS_PATH"
-cp _build/default/$KIMCHI_BINDINGS/js/node_js/plonk_wasm* "$BINDINGS_PATH"
-mv -f $BINDINGS_PATH/plonk_wasm.js $BINDINGS_PATH/plonk_wasm.cjs
-cp $BUILD_PATH/snarky_js_node*.js "$BINDINGS_PATH"
-cp "_build/snarky_js_node.bc.map" "$BINDINGS_PATH"/snarky_js_node.bc.map
-mv -f $BINDINGS_PATH/snarky_js_node.bc.js $BINDINGS_PATH/snarky_js_node.bc.cjs
-sed -i 's/plonk_wasm.js/plonk_wasm.cjs/' $BINDINGS_PATH/snarky_js_node.bc.cjs
-
-# cleanup tmp source map
-cp _build/snarky_js_node.bc.map $BUILD_PATH/snarky_js_node.bc.map
-rm -f _build/snarky_js_node.bc.map
-
-# better error messages
-# TODO: find a less hacky way to make adjustments to jsoo compiler output
-# `s` is the jsoo representation of the error message string, and `s.c` is the actual JS string
-sed -i 's/function failwith(s){throw \[0,Failure,s\]/function failwith(s){throw joo_global_object.Error(s.c)/' "$BINDINGS_PATH"/snarky_js_node.bc.cjs
-sed -i 's/function invalid_arg(s){throw \[0,Invalid_argument,s\]/function invalid_arg(s){throw joo_global_object.Error(s.c)/' "$BINDINGS_PATH"/snarky_js_node.bc.cjs
-sed -i 's/return \[0,Exn,t\]/return joo_global_object.Error(t.c)/' "$BINDINGS_PATH"/snarky_js_node.bc.cjs
-# TODO: this doesn't cover all cases, maybe should rewrite to_exn instead
-sed -i 's/function raise(t){throw caml_call1(to_exn$0,t)}/function raise(t){throw Error(t?.[1]?.c ?? "Unknown error thrown by raise")}/' "$BINDINGS_PATH"/snarky_js_node.bc.cjs
-
-chmod 777 "$BINDINGS_PATH"/*
-node "$SNARKY_JS_PATH/src/build/fix-wasm-bindings-node.js" "$BINDINGS_PATH/plonk_wasm.cjs"
-
-npm run --prefix="$SNARKY_JS_PATH" dev
+npm run --prefix="src/lib/snarkyjs" dev

scripts/update-snarkyjs-bindings.sh

@@ -16,7 +16,7 @@ $DIR_PATH/build-snarkyjs-node.sh
 
 chmod -R 777 "$NODE_BINDINGS"
 
-BINDINGS_PATH="$SNARKY_JS_PATH"/dist/node/_node_bindings/
+BINDINGS_PATH="$SNARKY_JS_PATH"/dist/node/bindings/compiled/_node_bindings/
 cp "$BINDINGS_PATH"/snarky_js_node.bc.cjs "$NODE_BINDINGS"/snarky_js_node.bc.cjs
 cp "$BINDINGS_PATH"/snarky_js_node.bc.map "$NODE_BINDINGS"/snarky_js_node.bc.map
 cp "$BINDINGS_PATH"/plonk_wasm* "$NODE_BINDINGS"/