Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feijoa Circuits #280

Merged
merged 16 commits into from
Apr 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ main_blob.pil.json
tools/full-tracer-tests/ft-traces/
batch-l2-data.json
src/sm/sm_main/logs-ft-*
MyLogFile.log
488 changes: 439 additions & 49 deletions package-lock.json

Large diffs are not rendered by default.

208 changes: 135 additions & 73 deletions package.json

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions pre.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ checkAllMandatoryOptArgs() {
checkMandatoryOptArg build $npm_config_build buildpath
checkMandatoryOptArg pil $npm_config_pil file.pil
checkMandatoryOptArg pilconfig $npm_config_pilconfig pilconfig.json
checkMandatoryOptArg blobpil $npm_config_blob_pil blobfile.pil
checkMandatoryOptArg blobpilconfig $npm_config_blob_pilconfig blobpilconfig.json
checkMandatoryOptArg bctree $npm_config_bctree constanttreebuilder
checkMandatoryOptArg fflonksetup $npm_config_fflonk_setup fflonksetupbuilder
checkMandatoryOptArg nth $npm_config_nth
checkMandatoryOptArg starkstruct $npm_config_starkstruct debug
checkMandatoryOptArg input $npm_config_input input
Expand All @@ -23,7 +26,10 @@ usage() {
echo " --build=<buildpath> folder were outputs was stored."
echo " --pil=<file.pil>"
echo " --pilconfig=<pilconfig.json>"
echo " --blobpil=<blobfile.pil>"
echo " --blobpilconfig=<blobpilconfig.json>"
echo " --bctree=<builder> alternative binary to generate constanttree (ex: ../zkevm-prover/build/bctree)"
echo " --fflonksetup=<builder> alternative binary to generate fflonksetup (ex: ../zkevm-prover/build/fflonksetup)"
echo " --nth=<sufix> suffix used on commited files and derivated (ex: _0)"
echo " --starkstruct=debug auto-generate starkstruct, used in non-stardard pil as basic."
echo " --input=<input.json> input used in execution/proof."
Expand Down Expand Up @@ -54,10 +60,16 @@ PIL_MAIN="${npm_config_pil:=pil/main.pil}"
PIL_JSON="`basename $PIL_MAIN`.json"
PIL_DIR="`dirname $PIL_MAIN`"
PIL="$PIL_MAIN`[ ! -z $npm_config_pilconfig ] && echo \" -P $npm_config_pilconfig\"`"
BLOB_PIL_MAIN="${npm_config_blob_pil:=pil/main_blob.pil}"
BLOB_PIL_JSON="`basename $BLOB_PIL_MAIN`.json"
BLOB_PIL_DIR="`dirname $BLOB_PIL_MAIN`"
BLOB_PIL="$BLOB_PIL_MAIN`[ ! -z $npm_config_blob_pilconfig ] && echo \" -P $npm_config_blob_pilconfig\"`"
PILSTARK="node $NODE node_modules/pil-stark/src"
PILCOM="node $NODE node_modules/.bin/pilcom"
SNARKJS="node $NODE node_modules/snarkjs/cli.js"
BCTREE="${npm_config_bctree:=$PILSTARK/main_buildconsttree.js}"
FFLONKSETUP="${npm_config_fflonksetup:=$SNARKJS --verbose ffs}"
NUMCORES=$(nproc)
# [ ! -z $npm_config_nth ] &&
NTH="${npm_config_nth}"
true
194 changes: 0 additions & 194 deletions recursive/final.circom

This file was deleted.

78 changes: 0 additions & 78 deletions recursive/recursive1.circom

This file was deleted.

Loading
Loading