updating ark cli

This commit is contained in:
Jaremy Creechley 2024-05-02 22:35:23 +03:00
parent b842f76f8d
commit f2d41daac2
No known key found for this signature in database
GPG Key ID: 4E66FB67B21D3300
1 changed files with 19 additions and 8 deletions

View File

@ -62,20 +62,30 @@ proc printHelp() =
echo " -i, --index = <slotIndex> : index of the slot (within the dataset) we prove" echo " -i, --index = <slotIndex> : index of the slot (within the dataset) we prove"
echo " -K, --ncells = <ncells> : number of cells inside this slot (eg. 1024; must be a power of two)" echo " -K, --ncells = <ncells> : number of cells inside this slot (eg. 1024; must be a power of two)"
echo "" echo ""
echo "Must provide files options. Use either:"
echo " --dir:$CIRCUIT_DIR --name:$CIRCUIT_NAME"
echo "or:"
echo " --r1cs:$R1CS --wasm:$WASM --zkey:$ZKEY"
echo ""
quit(1) quit(1)
proc parseCliOptions(args: var CircuitArgs, files: var CircuitFiles) = proc parseCliOptions(args: var CircuitArgs, files: var CircuitFiles) =
var argCtr: int = 0 var argCtr: int = 0
template expectPath(val: string): string =
if val == "":
echo "ERROR: expected path a but got empty for: ", key
printHelp()
val.absolutePath
for kind, key, value in getOpt(): for kind, key, value in getOpt():
case kind case kind
# Positional arguments # Positional arguments
of cmdArgument: of cmdArgument:
echo "CMD ARG: ", key, " v: ", value echo "\nERROR: got unexpected arg: ", key, "\n"
# printHelp() printHelp()
# Switches # Switches
of cmdLongOption, cmdShortOption: of cmdLongOption, cmdShortOption:
@ -93,11 +103,11 @@ proc parseCliOptions(args: var CircuitArgs, files: var CircuitFiles) =
of "K", "ncells" : args.ncells = checkPowerOfTwo(parseInt(value),"nCells") of "K", "ncells" : args.ncells = checkPowerOfTwo(parseInt(value),"nCells")
of "i", "index" : args.index = parseInt(value) of "i", "index" : args.index = parseInt(value)
of "r1cs" : files.r1cs = value.absolutePath of "r1cs" : files.r1cs = value.expectPath()
of "wasm" : files.wasm = value.absolutePath of "wasm" : files.wasm = value.expectPath()
of "zkey" : files.zkey = value.absolutePath of "zkey" : files.zkey = value.expectPath()
of "inputs" : files.inputs = value.absolutePath of "inputs" : files.inputs = value.expectPath()
of "dir" : files.dir = value.absolutePath of "dir" : files.dir = value.expectPath()
of "name" : files.circName = value of "name" : files.circName = value
else: else:
@ -141,7 +151,8 @@ proc run*() =
checkFile files.zkey, "zkey" checkFile files.zkey, "zkey"
if fileErrors: if fileErrors:
quit 1 echo "ERROR: couldn't find all files"
printHelp()
var var
inputData = files.inputs.readFile() inputData = files.inputs.readFile()