uncomment legacy tests and adapt them to new api

Author: ProofOfKeags

libsecp256k1.cabal

@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -62,11 +62,14 @@ test-suite spec
   build-depends:
       HUnit
     , base >=4.9 && <5
+    , base16
     , bytestring >=0.10.8 && <0.12
+    , either
     , entropy >=0.3.8 && <0.5
     , hedgehog
     , hspec
     , libsecp256k1
     , memory >=0.14.15 && <1.0
+    , monad-par
     , transformers >=0.4.0.0 && <1.0
   default-language: Haskell2010

package.yaml

@@ -33,6 +33,9 @@ tests:
       - -rtsopts
       - -with-rtsopts=-N
     dependencies:
+      - base16
+      - either
       - hspec
       - libsecp256k1
+      - monad-par
       - HUnit

src/Crypto/Secp256k1.hs

@@ -47,6 +47,7 @@ module Crypto.Secp256k1 (
     ecdsaSign,
     ecdsaSignRecoverable,
     ecdsaRecover,
+    ecdsaNormalizeSignature,
 
     -- * Conversions
     recSigToSig,
@@ -64,6 +65,7 @@ module Crypto.Secp256k1 (
     pubKeyCombine,
     pubKeyNegate,
     secKeyNegate,
+    tweakNegate,
     pubKeyTweakAdd,
     pubKeyTweakMul,
     pubKeyXOTweakAdd,
@@ -362,12 +364,12 @@ importSignature bs = unsafePerformIO $
         outBuf <- mallocBytes 64
         ret <-
             if
-                    -- compact
-                    | len == 64 -> Prim.ecdsaSignatureParseCompact ctx outBuf inBuf
-                    -- der
-                    | len >= 69 && len <= 73 -> Prim.ecdsaSignatureParseDer ctx outBuf inBuf len
-                    -- invalid
-                    | otherwise -> pure 0
+                -- compact
+                | len == 64 -> Prim.ecdsaSignatureParseCompact ctx outBuf inBuf
+                -- der
+                | len >= 69 && len <= 73 -> Prim.ecdsaSignatureParseDer ctx outBuf inBuf len
+                -- invalid
+                | otherwise -> pure 0
         if isSuccess ret
             then Just . Signature <$> newForeignPtr finalizerFree outBuf
             else free outBuf $> Nothing
@@ -485,6 +487,17 @@ ecdsaRecover RecoverableSignature{..} msgHash
                 else free pubKeyBuf $> Nothing
 
 
+-- | Convert a 'Signature' to a normalized lower-S form. If the 'Signature' was already in its lower-S form it will
+-- be equal to the input.
+ecdsaNormalizeSignature :: Signature -> Signature
+ecdsaNormalizeSignature Signature{..} = unsafePerformIO . evalContT $ do
+    sigPtr <- ContT (withForeignPtr signatureFPtr)
+    lift $ do
+        outBuf <- mallocBytes 64
+        _ret <- Prim.ecdsaSignatureNormalize ctx outBuf sigPtr
+        Signature <$> newForeignPtr finalizerFree outBuf
+
+
 -- | Forgets the recovery id of a signature
 recSigToSig :: RecoverableSignature -> Signature
 recSigToSig RecoverableSignature{..} = unsafePerformIO . evalContT $ do
@@ -724,6 +737,16 @@ secKeyNegate SecKey{..} = unsafePerformIO $ do
     SecKey <$> newForeignPtr finalizerFree outBuf
 
 
+-- | Negate a 'Tweak'
+tweakNegate :: Tweak -> Tweak
+tweakNegate Tweak{..} = unsafePerformIO $ do
+    outBuf <- mallocBytes 32
+    let asKey = castForeignPtr tweakFPtr
+    withForeignPtr asKey $ flip (memcpy outBuf) 32
+    _ret <- Prim.ecSeckeyNegate ctx outBuf
+    Tweak <$> newForeignPtr finalizerFree (castPtr outBuf)
+
+
 -- | Convert 'PubKeyXY' to 'PubKeyXO'. See 'keyPairPubKeyXO' for more information on how to interpret the parity bit.
 xyToXO :: PubKeyXY -> (PubKeyXO, Bool)
 xyToXO PubKeyXY{..} = unsafePerformIO $ do