[ fix ] witness generation (wtns binaries) for Snarkjs

Author: VikBTQ

app/Encode.hs

@@ -28,7 +28,6 @@ import Keelung.Syntax.Counters
 import Keelung.CircuitFormat hiding (WtnsBinHeader(..))
 import Keelung (FieldType(..))
 import Data.Int (Int64)
-import GHC.Num (integerLogBase)
 import Debug.Trace
 
 -- | IMPORTANT: Make sure major, minor and patch versions are updated
@@ -68,8 +67,11 @@ serializeInputAndWitnessToBin p witnessVec =
         toLazyByteString $
           int32LE (fromIntegral (primeLen p))
             <> lazyByteString primeBS
-            <> int32LE (fromIntegral $ length witnesses)
-      wtnses = toLazyByteString $ mconcat (fitPrimeSize p 1 : map (fitPrimeSize p . mod p . fromIntegral) witnesses)
+            <> int32LE (fromIntegral $ length witnesses + 1)
+      wtnses = toLazyByteString $ mconcat (fitPrimeSize p 1 : map (fitPrimeSize p . toInteger) witnesses)
+      -- "wtns, version 2, 2 sections"
+      meta :: ByteString
+      meta = BS.pack [0x77, 0x74, 0x6e, 0x73, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00]
    in meta
         <> BS.pack [0x01, 0x00, 0x00, 0x00]
         <> secLength header
@@ -79,9 +81,6 @@ serializeInputAndWitnessToBin p witnessVec =
         <> wtnses
   where
     secLength = toLazyByteString . word64LE . fromIntegral . BS.length
-    -- "wtns, version 2, 2 sections"
-    meta :: ByteString
-    meta = BS.pack [0x77, 0x74, 0x6e, 0x73, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00]
 --------------------------------------------------------------------------------
 
 -- | Encodes a R1CS in the JSON Lines text file format

cabal.project

@@ -8,6 +8,6 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/btq-ag/keelung.git
-	tag: 2cc69fcf6a982ae6dddda52db3ad15709b3e8f87
+	tag: 07b492fa27cd7ed0716046afe141ba0c241c1b8e
 
 with-compiler: ghc-9.2.8

stack.yaml

@@ -43,9 +43,8 @@ packages:
 extra-deps:
   - git: https://github.com/btq-ag/galois-field.git
     commit: d7d0da6b5df8045afdfb820ba8d08f34dc4c3e58
-  - ../keelung
-    #  - git: https://github.com/btq-ag/keelung.git
-    #    commit: 2cc69fcf6a982ae6dddda52db3ad15709b3e8f87
+  - git: https://github.com/btq-ag/keelung.git
+    commit: 07b492fa27cd7ed0716046afe141ba0c241c1b8e
   - MonadRandom-0.5.3@sha256:bb553af2bac914362a54983e4ed2e0b6352c09b73a1e1e280ec4befe14c4270c,1456
   - mod-0.1.2.2@sha256:58bc3a1471bbbc55569bf61fd49b537c3e64b0a86dd79522ca1d7805400523ce,2248
   - poly-0.5.1.0@sha256:8c574f017913982fd70567545bec423823ff5bdf236c19d1443f3af47e0218ba,3418

stack.yaml.lock

@@ -15,6 +15,17 @@ packages:
   original:
     commit: d7d0da6b5df8045afdfb820ba8d08f34dc4c3e58
     git: https://github.com/btq-ag/galois-field.git
+- completed:
+    commit: 07b492fa27cd7ed0716046afe141ba0c241c1b8e
+    git: https://github.com/btq-ag/keelung.git
+    name: keelung
+    pantry-tree:
+      sha256: d3a63f7756f91b0d3df17aa6cd8b1eec13735bc71a1f451b3ab05e57290085c5
+      size: 2004
+    version: 0.25.0
+  original:
+    commit: 07b492fa27cd7ed0716046afe141ba0c241c1b8e
+    git: https://github.com/btq-ag/keelung.git
 - completed:
     hackage: MonadRandom-0.5.3@sha256:bb553af2bac914362a54983e4ed2e0b6352c09b73a1e1e280ec4befe14c4270c,1456
     pantry-tree: