keelung 0.9.0.0 → 0.9.1.0

raw patch · 4 files changed

+73/−40 lines, 4 files

Files

• ChangeLog.md +6/−0
• README.md +1/−1
• keelung.cabal +1/−1
• src/Keelung.hs +65/−38

@@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v0.9.1]++### Added++* Docker support for the compiler.+ ## [v0.9.0]  ### Changed

@@ -10,7 +10,7 @@  ## Language Reference -The language reference will be available on Hackage soon.+The language reference is now available on [Hackage](https://hackage.haskell.org/package/keelung).  ## Standard Library 

@@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack  name:           keelung-version:        0.9.0.0+version:        0.9.1.0 synopsis:       DSL for creating zero-knowledge proofs description:    Please see the README on GitHub at <https://github.com/btq-ag/keelung#readme> category:       Cryptography

@@ -97,26 +97,26 @@ -- | Generate a proof generate_ :: (Serialize n, Integral n, Encode t) => FieldType -> Comp t -> [n] -> [n] -> IO (Either Error (FilePath, String)) generate_ fieldType prog publicInput privateInput = runM $ do-  exists <- checkCmd "aurora_prove"+  (cmd, args) <- findAuroraProver   _ <- genCircuit fieldType prog   _ <- genWitness_ fieldType prog publicInput privateInput   proofPath <- lift $ Path.makeAbsolute "proof"   genParameters-  if exists-    then lift $ do-      let arguments =-            [ "--r1cs_filepath",-              "circuit.jsonl",-              "--input_filepath",-              "witness.jsonl",-              "--parameter_filepath",-              "parameter.json",-              "--output_filepath",-              proofPath-            ]-      msg <- Process.readProcess "aurora_prove" arguments mempty-      return (proofPath, msg)-    else throwError CannotLocateProver+  genInputs publicInput+  lift $ do+    let arguments =+          args+            ++ [ "--r1cs_filepath",+                 "circuit.jsonl",+                 "--input_filepath",+                 "witness.jsonl",+                 "--parameter_filepath",+                 "parameter.json",+                 "--output_filepath",+                 proofPath+               ]+    msg <- Process.readProcess cmd arguments mempty+    return (proofPath, msg)  -- | Generate a proof generate :: Encode t => FieldType -> Comp t -> [Integer] -> [Integer] -> IO ()@@ -129,22 +129,21 @@ -- | Generate and verify a proof verify_ :: IO (Either Error String) verify_ = runM $ do-  exists <- checkCmd "aurora_verify"+  (cmd, args) <- findAuroraVerifier   genParameters-  if exists-    then lift $ do-      let arguments =-            [ "--r1cs_filepath",-              "circuit.jsonl",-              "--input_filepath",-              "inputs.jsonl",-              "--parameter_filepath",-              "parameter.json",-              "--proof_filepath",-              "proof"-            ]-      Process.readProcess "aurora_verify" arguments mempty-    else throwError CannotLocateVerifier+  lift $ do+    let arguments =+          args+            ++ [ "--r1cs_filepath",+                 "circuit.jsonl",+                 "--input_filepath",+                 "witness.jsonl",+                 "--parameter_filepath",+                 "parameter.json",+                 "--proof_filepath",+                 "proof"+               ]+    Process.readProcess cmd arguments mempty  -- | Verify a proof verify :: IO ()@@ -260,15 +259,43 @@   if keelungcExists     then return ("keelungc", [])     else do-      -- dockerExists <- checkCmd "docker"-      let dockerExists = False+      dockerExists <- checkCmd "docker"       if dockerExists-        then -- insert "--platform=linux/amd64" when we are not on a x86 machine-        case System.Info.arch of-          "x86_64" -> return ("docker", ["run", "-i", "banacorn/keelung"])-          _ -> return ("docker", ["run", "-i", "--platform=linux/amd64", "banacorn/keelung"])+        then case System.Info.arch of+          "x86_64" -> return ("docker", ["run", "-i", "btqag/keelungc"])+          -- insert "--platform=linux/amd64" when we are not on a x86 machine+          _ -> return ("docker", ["run", "-i", "--platform=linux/amd64", "btqag/keelungc"])         else throwError CannotLocateKeelungC +findAuroraProver :: M (String, [String])+findAuroraProver = do+  auroraExists <- checkCmd "aurora_prove"+  if auroraExists+    then return ("aurora_prove", [])+    else do+      dockerExists <- checkCmd "docker"+      -- let currentDirector = Path.getCurrentDirectory+      if dockerExists+        then case System.Info.arch of+          "x86_64" -> return ("docker", ["run", "-i", "btqag/aurora-prove"])+          -- insert "--platform=linux/amd64" when we are not on a x86 machine+          _ -> return ("docker", ["run", "-i", "--platform=linux/amd64", "btqag/aurora-prove"])+        else throwError CannotLocateProver++findAuroraVerifier :: M (String, [String])+findAuroraVerifier = do+  auroraExists <- checkCmd "aurora_verify"+  if auroraExists+    then return ("aurora_verify", [])+    else do+      dockerExists <- checkCmd "docker"+      if dockerExists+        then case System.Info.arch of+          "x86_64" -> return ("docker", ["run", "-i", "btqag/aurora-verify"])+          -- insert "--platform=linux/amd64" when we are not on a x86 machine+          _ -> return ("docker", ["run", "-i", "--platform=linux/amd64", "btqag/aurora-verify"])+        else throwError CannotLocateVerifier+ -- | Check the version of the Keelung compiler readKeelungVersion :: FilePath -> [String] -> M (Int, Int, Int) readKeelungVersion cmd args = do@@ -321,7 +348,7 @@  -- | The version of Keelung is a triple of three numbers, we're not going full semver yet keelungVersion_ :: (Int, Int, Int)-keelungVersion_ = (0, 9, 0)+keelungVersion_ = (0, 9, 1)  -- | String of Keelung version exposed to the user keelungVersion :: String