rework circom compat

codex/slots/proofs/backends/circomcompat.nim

@@ -21,6 +21,9 @@ import ../../../merkletree
 
 import pkg/constantine/math/arithmetic
 
+import pkg/constantine/math/arithmetic
+import pkg/constantine/math/io/io_bigints
+
 export circomcompat
 
 type
@@ -30,10 +33,12 @@ type
     zKeyPath    : string
     backendCfg  : ptr CircomBn254Cfg
 
-  CircomProof* = object
+  CircomG1* = G1
-    proof*: Proof
+  CircomG2* = G2
-    backend: ptr CircomCompatCtx
+
-    cfg: ptr CircomBn254Cfg
+  CircomProof* = Proof
+  CircomInputs* = Inputs
+  CircomKey* = VerifyingKey
 
 proc release*(self: CircomCompat) =
   ## Release the backend
@@ -41,12 +46,19 @@ proc release*(self: CircomCompat) =
 
   self.backendCfg.unsafeAddr.releaseCfg()
 
-proc release*(proof: CircomProof) =
+proc getVerifyingKey*(
-  ## Release the backend context
+  self: CircomCompat): ?!ptr CircomKey =
+  ## Get the verifying key
   ##
 
-  proof.backend.unsafeAddr.release_circom_compat()
+  var
-  doAssert(proof.backend == nil)
+    cfg: ptr CircomBn254Cfg = self.backendCfg
+    vkpPtr: ptr VerifyingKey = nil
+
+  if cfg.getVerifyingKey(vkpPtr.addr) != ERR_OK or vkpPtr == nil:
+    return failure("Failed to get verifying key")
+
+  success vkpPtr
 
 proc prove*(
   self: CircomCompat,
@@ -130,31 +142,27 @@ proc prove*(
       proofPtr[]
     finally:
       if proofPtr != nil:
-        release_proof(proofPtr.addr)
+        proofPtr.addr.releaseProof()
 
-  success CircomProof(
+      if backend != nil:
-    proof: proof,
+        backend.addr.releaseCircomCompat()
-    cfg: self.backendCfg,
-    backend: backend)
 
-proc verify*(self: CircomCompat, proof: CircomProof): ?!bool =
+  success proof
+
+proc verify*(
+  self: CircomCompat,
+  proof: CircomProof,
+  inputs: CircomInputs,
+  vkp: CircomKey): ?!bool =
   ## Verify a proof using a backend
   ##
 
   var
-    inputsPtr: ptr Inputs = nil
+    proofPtr : ptr Proof = unsafeAddr proof
-    vkPtr: ptr VerifyingKey = nil
+    inputsPtr: ptr Inputs = unsafeAddr inputs
+    vpkPtr: ptr CircomKey = unsafeAddr vkp
 
-  if (let res = proof.cfg.getVerifyingKey(vkPtr.addr); res != ERR_OK) or
+  let res = verifyCircuit(proofPtr, inputsPtr, vpkPtr)
-    vkPtr == nil:
-    return failure("Failed to get verifying key - err code: " & $res)
-
-  if (let res = proof.backend.getPubInputs(inputsPtr.addr); res != ERR_OK) or
-    inputsPtr == nil:
-    return failure("Failed to get public inputs - err code: " & $res)
-
-  try:
-    let res = verifyCircuit(proof.proof.unsafeAddr, inputsPtr, vkPtr)
   if res == ERR_OK:
     success true
   elif res == ERR_FAILED_TO_VERIFY_PROOF:
@@ -162,13 +170,6 @@ proc verify*(self: CircomCompat, proof: CircomProof): ?!bool =
   else:
     failure("Failed to verify proof - err code: " & $res)
 
-  finally:
-    if inputsPtr != nil:
-      releaseInputs(inputsPtr.addr)
-
-    if vkPtr != nil:
-      releaseKey(vkPtr.addr)
-
 proc init*(
   _: type CircomCompat,
   r1csPath: string,