add json opts for witness

Author: martyall

Diff for: circom-compat/src/Circom/CLI.hs

@@ -55,9 +55,9 @@ data Command
   | Solve SolveOpts
 
 data CompileOpts = CompileOpts
-  { optimizeOpts :: OptimizeOpts,
-    genDotFile :: Bool,
-    includeJson :: Bool
+  { coOptimizeOpts :: OptimizeOpts,
+    coGenDotFile :: Bool,
+    coIncludeJson :: Bool
   }
 
 compileOptsParser :: Parser CompileOpts
@@ -86,7 +86,8 @@ optimizeOptsParser =
       )
 
 data SolveOpts = SolveOpts
-  { inputsFile :: FilePath
+  { soInputsFile :: FilePath,
+    soIncludeJson :: Bool
   }
 
 solveOptsParser :: Parser SolveOpts
@@ -98,6 +99,10 @@ solveOptsParser =
           <> showDefault
           <> value "inputs.json"
       )
+    <*> switch
+      ( long "json"
+          <> help "also write json versions of artifacts"
+      )
 
 defaultMain ::
   forall f a.
@@ -111,25 +116,28 @@ defaultMain progName program = do
   case cmd opts of
     Compile compilerOpts -> do
       let BuilderState {..} = snd $ runCircuitBuilder program
-          prog = optimize (optimizeOpts compilerOpts) $ mkCircomProgram bsVars bsCircuit
+          prog = optimize (coOptimizeOpts compilerOpts) $ mkCircomProgram bsVars bsCircuit
           r1cs = r1csToCircomR1CS $ toR1CS (cpVars prog) (cpCircuit prog)
       createDirectoryIfMissing True outDir
       encodeFile (r1csFilePath outDir) r1cs
       encodeFile (binFilePath outDir) prog
       -- We generarate a template json file for the inputs with default values set to null
       let inputsTemplate = map (const A.Null) $ labelToVar $ cvInputsLabels $ cpVars prog
       A.encodeFile (inputsTemplateFilePath outDir) inputsTemplate
-      when (includeJson compilerOpts) $ do
+      when (coIncludeJson compilerOpts) $ do
         A.encodeFile (r1csFilePath outDir <> ".json") (map fromP r1cs)
-      when (genDotFile compilerOpts) $ do
+        A.encodeFile (binFilePath outDir <> ".json") (map fromP prog)
+      when (coGenDotFile compilerOpts) $ do
         writeFile (dotFilePath outDir) $ arithCircuitToDot (cpCircuit prog)
     Solve solveOpts -> do
       inputs <- do
-        mInputs <- decodeFileStrict (inputsFile solveOpts)
+        mInputs <- decodeFileStrict (soInputsFile solveOpts)
         maybe (panic "Failed to decode inputs") (pure . map (fromInteger @f)) mInputs
       circuit <- decodeFile (binFilePath outDir)
       let wtns = nativeGenWitness circuit inputs
       encodeFile (witnessFilePath outDir) wtns
+      when (soIncludeJson solveOpts) $ do
+        A.encodeFile (witnessFilePath outDir <> ".json") (map fromP wtns)
   where
     baseFilePath :: FilePath -> FilePath
     baseFilePath dir = dir <> "/" <> Text.unpack progName

Diff for: circom-compat/src/Circom/Solver.hs

@@ -25,6 +25,7 @@ where
 
 import Circom.R1CS (CircomWitness, FieldSize (..), circomReindexMap, integerFromLittleEndian, integerToLittleEndian, n32, witnessToCircomWitness)
 import Circuit
+import Data.Aeson (ToJSON)
 import Data.Binary (Binary)
 import Data.Field.Galois (GaloisField, PrimeField (fromP), char)
 import Data.IORef (IORef, readIORef, writeIORef)
@@ -47,6 +48,15 @@ data CircomProgram f = CircomProgram
 
 instance (Binary f) => Binary (CircomProgram f)
 
+instance Functor CircomProgram where
+  fmap f CircomProgram {cpVars, cpCircuit} =
+    CircomProgram
+      { cpVars,
+        cpCircuit = fmap f cpCircuit
+      }
+
+instance (ToJSON f) => ToJSON (CircomProgram f)
+
 mkCircomProgram ::
   CircuitVars Text ->
   ArithCircuit f ->

Diff for: circuit/src/Circuit/Arithmetic.hs

@@ -30,7 +30,7 @@ import Circuit.Affine
   ( AffineCircuit (..),
     evalAffineCircuit,
   )
-import Data.Aeson (FromJSON, ToJSON)
+import Data.Aeson (FromJSON, ToJSON, ToJSONKey)
 import Data.Binary (Binary)
 import Data.Field.Galois (PrimeField, fromP)
 import Data.IntMap qualified as IntMap
@@ -300,6 +300,8 @@ data CircuitVars label = CircuitVars
 
 instance (Binary label) => Binary (CircuitVars label)
 
+instance (ToJSON label, ToJSONKey label) => ToJSON (CircuitVars label)
+
 instance (Pretty label) => Pretty (CircuitVars label) where
   pretty CircuitVars {cvVars, cvPrivateInputs, cvPublicInputs, cvOutputs, cvInputsLabels} =
     vcat
@@ -407,6 +409,8 @@ data InputBindings label = InputBindings
 
 instance (Binary label) => Binary (InputBindings label)
 
+instance (ToJSON label, ToJSONKey label) => ToJSON (InputBindings label)
+
 mapLabels :: (Ord l2) => (l1 -> l2) -> InputBindings l1 -> InputBindings l2
 mapLabels f InputBindings {labelToVar, varToLabel} =
   InputBindings