status-im
/
nim-dagger
mirror of https://github.com/status-im/nim-dagger.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixes

This commit is contained in:
Jaremy Creechley 2024-05-24 15:23:09 +03:00
parent cbd59da5cc
commit 0d26410e42
No known key found for this signature in database
GPG Key ID: 4E66FB67B21D3300
1 changed files with 52 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
benchmarks/circomcompat_prover_cli.nim
View File

@ -93,37 +93,32 @@ proc prove*[H](self: CircomCircuit, input: JsonNode): ?!Proof =
success proof success proof
proc toCircomInputs*(inputs: ProofInputs[Poseidon2Hash]): Inputs = # proc toCircomInputs*(inputs: ProofInputs[Poseidon2Hash]): Inputs =
var # var
slotIndex = inputs.slotIndex.toF.toBytes.toArray32 # slotIndex = inputs.slotIndex.toF.toBytes.toArray32
datasetRoot = inputs.datasetRoot.toBytes.toArray32 # datasetRoot = inputs.datasetRoot.toBytes.toArray32
entropy = inputs.entropy.toBytes.toArray32 # entropy = inputs.entropy.toBytes.toArray32
# elms = [entropy, datasetRoot, slotIndex]
# let inputsPtr = allocShared0(32 * elms.len)
# copyMem(inputsPtr, addr elms[0], elms.len * 32)
# CircomInputs(elms: cast[ptr array[32, byte]](inputsPtr), len: elms.len.uint)
elms = [entropy, datasetRoot, slotIndex] # proc verify*[H](self: CircomCircuit, proof: CircomProof, inputs: ProofInputs[H]): ?!bool =
# ## Verify a proof using a ctx
let inputsPtr = allocShared0(32 * elms.len) # ##
copyMem(inputsPtr, addr elms[0], elms.len * 32) # var
# proofPtr = unsafeAddr proof
CircomInputs(elms: cast[ptr array[32, byte]](inputsPtr), len: elms.len.uint) # inputs = inputs.toCircomInputs()
# try:
proc verify*[H](self: CircomCircuit, proof: CircomProof, inputs: ProofInputs[H]): ?!bool = # let res = verifyCircuit(proofPtr, inputs.addr, self.vkp)
## Verify a proof using a ctx # if res == ERR_OK:
## # success true
# elif res == ERR_FAILED_TO_VERIFY_PROOF:
var # success false
proofPtr = unsafeAddr proof # else:
inputs = inputs.toCircomInputs() # failure("Failed to verify proof - err code: " & $res)
# finally:
try: # inputs.releaseCircomInputs()
let res = verifyCircuit(proofPtr, inputs.addr, self.vkp)
if res == ERR_OK:
success true
elif res == ERR_FAILED_TO_VERIFY_PROOF:
success false
else:
failure("Failed to verify proof - err code: " & $res)
finally:
inputs.releaseCircomInputs()
proc init*( proc init*(
_: type CircomCircuit, _: type CircomCircuit,
@ -158,28 +153,6 @@ proc init*(
vkp: vkpPtr, vkp: vkpPtr,
) )
proc runArkCircom(
args: CircuitArgs, self: CircomCircuit, proofInputs: ProofInputs[Poseidon2Hash]
) =
echo "Loading sample proof..."
var circom = CircomCircuit.init(
self.r1csPath,
self.wasmPath,
self.zkeyPath,
)
defer:
circom.release() # this comes from the rust FFI
echo "Sample proof loaded..."
echo "Proving..."
var proof: CircomProof = circom.prove(proofInputs).tryGet
var verRes: bool = circom.verify(proof, proofInputs).tryGet
if not verRes:
echo "verification failed"
quit 100
proc printHelp() = proc printHelp() =
echo "usage:" echo "usage:"
echo " ./circom_ark_prover_cli [options] " echo " ./circom_ark_prover_cli [options] "
@ -196,7 +169,7 @@ proc printHelp() =
quit(1) quit(1)
proc parseCliOptions(args: var CircuitArgs, files: var CircomCircuit) = proc parseCliOptions(args: var CircuitArgs, self: var CircomCircuit) =
var argCtr: int = 0 var argCtr: int = 0
template expectPath(val: string): string = template expectPath(val: string): string =
if val == "": if val == "":
@ -218,17 +191,17 @@ proc parseCliOptions(args: var CircuitArgs, files: var CircomCircuit) =
of "h", "help": of "h", "help":
printHelp() printHelp()
of "r1cs": of "r1cs":
files.r1cs = value.expectPath() self.r1csPath = value.expectPath()
of "wasm": of "wasm":
files.wasm = value.expectPath() self.wasmPath = value.expectPath()
of "zkey": of "zkey":
files.zkey = value.expectPath() self.zkeyPath = value.expectPath()
of "inputs": of "inputs":
files.inputs = value.expectPath() self.inputsPath = value.expectPath()
of "dir": of "dir":
files.dir = value.expectPath() self.dir = value.expectPath()
of "name": of "name":
files.circName = value self.circName = value
else: else:
echo "Unknown option: ", key echo "Unknown option: ", key
echo "use --help to get a list of options" echo "use --help to get a list of options"
@ -245,27 +218,27 @@ proc run*() =
var var
args = CircuitArgs() args = CircuitArgs()
files = CircomCircuit() self = CircomCircuit()
parseCliOptions(args, files) parseCliOptions(args, self)
let dir = let dir =
if files.dir != "": if self.dir != "":
files.dir self.dir
else: else:
getCurrentDir() getCurrentDir()
if files.circName != "": if self.circName != "":
if files.r1cs == "": if self.r1csPath == "":
files.r1cs = dir / fmt"{files.circName}.r1cs" self.r1csPath = dir / fmt"{self.circName}.r1cs"
if files.wasm == "": if self.wasmPath == "":
files.wasm = dir / fmt"{files.circName}.wasm" self.wasmPath = dir / fmt"{self.circName}.wasm"
if files.zkey == "": if self.zkeyPath == "":
files.zkey = dir / fmt"{files.circName}.zkey" self.zkeyPath = dir / fmt"{self.circName}.zkey"
if files.inputs == "": if self.inputsPath == "":
files.inputs = dir / fmt"input.json" self.inputsPath = dir / fmt"input.json"
echo "Got file args: ", files echo "Got file args: ", self
var fileErrors = false var fileErrors = false
template checkFile(file, name: untyped) = template checkFile(file, name: untyped) =
@ -273,46 +246,21 @@ proc run*() =
echo "\nERROR: must provide `" & name & "` file" echo "\nERROR: must provide `" & name & "` file"
fileErrors = true fileErrors = true
checkFile files.inputs, "inputs.json" checkFile self.inputsPath, "inputs.json"
checkFile files.r1cs, "r1cs" checkFile self.r1csPath, "r1cs"
checkFile files.wasm, "wasm" checkFile self.wasmPath, "wasm"
checkFile files.zkey, "zkey" checkFile self.zkeyPath, "zkey"
if fileErrors: if fileErrors:
echo "ERROR: couldn't find all files" echo "ERROR: couldn't find all files"
printHelp() printHelp()
var var
inputData = files.inputs.readFile() inputData = self.inputsPath.readFile()
inputs: JsonNode = !JsonNode.parse(inputData) inputs: JsonNode = !JsonNode.parse(inputData)
# sets default values for these args
if args.depth == 0:
args.depth = codextypes.DefaultMaxSlotDepth
# maximum depth of the slot tree
if args.maxslots == 0:
args.maxslots = 256
# maximum number of slots
# sets number of samples to take
if args.nsamples == 0:
args.nsamples = 1
# number of samples to prove
# overrides the input.json params
if args.entropy != 0:
inputs["entropy"] = %($args.entropy)
if args.nslots != 0:
inputs["nSlotsPerDataSet"] = %args.nslots
if args.index != 0:
inputs["slotIndex"] = %args.index
if args.ncells != 0:
inputs["nCellsPerSlot"] = %args.ncells
var proofInputs = Poseidon2Hash.jsonToProofInput(inputs)
echo "Got args: ", args echo "Got args: ", args
runArkCircom(args, files, proofInputs) runArkCircom(args, self)
when isMainModule: when isMainModule:
run() run()