Merge pull request #528 from IntersectMBO/lehins/fix-praos-version

Fix praos version

Author: lehins

.github/ISSUE_TEMPLATE/release-packages.md

@@ -13,7 +13,6 @@ Once all the pending issues/pull-requests are integrated:
 ./scripts/add-from-github.sh "https://github.com/intersectmbo/cardano-base" <COMMIT_HASH> \
   base-deriving-via \
   cardano-binary \
-  test/cardano-binary-test \
   cardano-crypto-class \
   cardano-crypto-praos \
   cardano-crypto-tests \
@@ -33,6 +32,6 @@ Once all the pending issues/pull-requests are integrated:
 
 ### CHaP PRs
 
-To know the exact versions and packages released, check these pull-requests on [CHaP](https://github.com/IntersectMBO/cardano-haskell-packages). 
+To know the exact versions and packages released, check these pull-requests on [CHaP](https://github.com/IntersectMBO/cardano-haskell-packages).
 
 - [Link](#)

cardano-crypto-praos/CHANGELOG.md

@@ -1,8 +1,11 @@
 # Changelog for `cardano-crypto-praos`
 
-## 2.2.0.1
+## 2.2.1.0
 
-* Add and expose `outputFromBytes` for both `Praos` and `PraosBatchCompat` modules
+* Add `outputFromBytes` to `Cardano.Crypto.VRF.Praos` module
+* Expose `outputFromProof` from `Cardano.Crypto.VRF.Praos` module
+* Add `outputFromBytes` to `Cardano.Crypto.VRF.PraosBatchCompat` module
+* Expose `Proof`, `Output`, `proofFromBytes`, `skFromBytes`, `vkFromBytes` and `outputFromProof` from `Cardano.Crypto.VRF.PraosBatchCompat` module
 
 ## 2.2.0.0
 

cardano-crypto-praos/cardano-crypto-praos.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name: cardano-crypto-praos
-version: 2.2.0.0
+version: 2.2.1.0
 synopsis: Crypto primitives from libsodium
 description: VRF (and KES, tba) primitives from libsodium.
 license: Apache-2.0

cardano-crypto-praos/src/Cardano/Crypto/VRF/Praos.hs

@@ -239,6 +239,9 @@ copyFromByteString ptr bs lenExpected =
             <> show lenActual
 
 seedFromBytes :: ByteString -> Seed
+seedFromBytes bs
+  | BS.length bs /= fromIntegral crypto_vrf_seedbytes =
+      error $ "Expected " ++ show crypto_vrf_seedbytes ++ " bytes"
 seedFromBytes bs = unsafePerformIO $ do
   seed <- mkSeed
   withForeignPtr (unSeed seed) $ \ptr ->

cardano-crypto-praos/src/Cardano/Crypto/VRF/PraosBatchCompat.hs

@@ -40,7 +40,6 @@ module Cardano.Crypto.VRF.PraosBatchCompat (
   Seed,
   genSeed,
   keypairFromSeed,
-  seedFromBytes,
 
   -- * Conversions
   unsafeRawSeed,
@@ -62,8 +61,8 @@ module Cardano.Crypto.VRF.PraosBatchCompat (
   SignKeyVRF (..),
   VerKeyVRF (..),
   CertVRF (..),
-  Proof (..),
-  Output (..),
+  Proof,
+  Output,
 )
 where
 
@@ -256,8 +255,8 @@ copyFromByteString ptr bs lenExpected =
 
 seedFromBytes :: ByteString -> Seed
 seedFromBytes bs
-  | BS.length bs < fromIntegral crypto_vrf_ietfdraft13_seedbytes =
-      error "Not enough bytes for seed"
+  | BS.length bs /= fromIntegral crypto_vrf_ietfdraft13_seedbytes =
+      error $ "Expected " ++ show crypto_vrf_ietfdraft13_seedbytes ++ " bytes"
 seedFromBytes bs = unsafePerformIO $ do
   seed <- mkSeed
   withForeignPtr (unSeed seed) $ \ptr ->

cardano-crypto-tests/cardano-crypto-tests.cabal

@@ -90,7 +90,7 @@ library
     bytestring >=0.10.12.0,
     cardano-binary,
     cardano-crypto-class ^>=2.2.2,
-    cardano-crypto-praos,
+    cardano-crypto-praos >=2.2.1,
     cborg,
     containers,
     contra-tracer ==0.1.0.1,