From 9d1934b5f95fc929de32a99b9c8ad70e8daea754 Mon Sep 17 00:00:00 2001 From: mhchia Date: Wed, 16 Aug 2023 18:57:52 +0800 Subject: [PATCH 1/4] build: remove js-rln stuff --- scripts/clone-js-rln-zkeys.sh | 45 ----------------------------------- 1 file changed, 45 deletions(-) delete mode 100755 scripts/clone-js-rln-zkeys.sh diff --git a/scripts/clone-js-rln-zkeys.sh b/scripts/clone-js-rln-zkeys.sh deleted file mode 100755 index c7e24e93..00000000 --- a/scripts/clone-js-rln-zkeys.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# -# Clone zkeys (params) from js-rln -# - -js_rln_version=d77370f -js_rln_repo='js-rln' -js_rln_repo_url="https://github.com/waku-org/$js_rln_repo.git" - - -# Go to project root -cd `dirname $0`/.. - -target_zkeyfiles_dir="./zkeyFiles/js-rln" -target_rln_wasm_path="$target_zkeyfiles_dir/rln.wasm" -target_rln_zkey_path="$target_zkeyfiles_dir/rln_final.zkey" -target_rln_verifiation_key_path="$target_zkeyfiles_dir/verification_key.json" - -# Build params if any of them does not exist -if [[ -f $target_rln_wasm_path ]] && [[ -f $target_rln_zkey_path ]] && [[ -f $target_rln_verifiation_key_path ]]; then - echo "All params exist. Don't need to clone them" - exit 0; -fi - -# Clone js-rln in project root and checkout to the right version -git clone $js_rln_repo_url $js_rln_repo -cd $js_rln_repo -git checkout $js_rln_version -cd .. - -js_rln_zkeys_relative_path="$js_rln_repo/src/resources" -js_rln_zkeys_verification_js="$js_rln_zkeys_relative_path/verification_key.js" -js_rln_zkeys_verification_json="$js_rln_zkeys_relative_path/verification_key.json" -# Change js to json format in place -sed -i.bak -e "s/const verificationKey = {/{/" -e "/export default verificationKey/d" $js_rln_zkeys_verification_js -mv $js_rln_zkeys_verification_js $js_rln_zkeys_verification_json - -# Copy the clone & converted params to the zkeyFiles folder -mkdir -p $target_zkeyfiles_dir -cp $js_rln_zkeys_relative_path/* $target_zkeyfiles_dir -ls -al $target_zkeyfiles_dir - -# Remove the js-rln repo -rm -rf $js_rln_repo - From ccb3f6b0d5c22871bd405c0419ce84865f40ab06 Mon Sep 17 00:00:00 2001 From: mhchia Date: Wed, 16 Aug 2023 21:02:42 +0800 Subject: [PATCH 2/4] try longer timeout --- jest.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jest.config.ts b/jest.config.ts index 55070536..bc697105 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -9,7 +9,7 @@ const config: Config.InitialOptions = { "^.+\\.tsx?$": ["ts-jest", { tsconfig: "tsconfig.test.json" }] }, "silent": true, - "testTimeout": 100000, + "testTimeout": 200000, "collectCoverage": true, "forceExit": true, }; From ad3eeb5d51335cede3307fdc7e1596750ef61744 Mon Sep 17 00:00:00 2001 From: mhchia Date: Wed, 16 Aug 2023 21:06:01 +0800 Subject: [PATCH 3/4] refresh cache --- scripts/build-zkeys.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build-zkeys.sh b/scripts/build-zkeys.sh index cb291953..7c756049 100755 --- a/scripts/build-zkeys.sh +++ b/scripts/build-zkeys.sh @@ -22,6 +22,7 @@ rln_circuits_version=v1.0.0 rln_circuits_repo='circom-rln' rln_circuits_repo_url="https://github.com/Rate-Limiting-Nullifier/$rln_circuits_repo.git" + # # Determine which circuits to build # From 4c3b9cb2eca4f5e1f64fbc6473eed74c437875db Mon Sep 17 00:00:00 2001 From: mhchia Date: Wed, 16 Aug 2023 21:23:02 +0800 Subject: [PATCH 4/4] refresh cache --- scripts/build-zkeys.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build-zkeys.sh b/scripts/build-zkeys.sh index 7c756049..d3c42b0e 100755 --- a/scripts/build-zkeys.sh +++ b/scripts/build-zkeys.sh @@ -11,6 +11,7 @@ # $ ./scripts/build-zkeys.sh withdraw # Build all circuits defined in `supported_circuit_names` # $ ./scripts/build-zkeys.sh +# # # Configs