wip

Author: ProofOfKeags

bitcoin.cabal

@@ -113,12 +113,12 @@ library
     , entropy >=0.4.1.5
     , hashable >=1.3.0.0
     , hspec >=2.7.1
+    , libsecp256k1 >=0.1.0
     , memory >=0.15.0
     , murmur3 >=1.0.3
     , network >=3.1.1.1
     , safe >=0.3.18
     , scientific >=0.3.6.2
-    , secp256k1-haskell >=0.4.0
     , split >=0.2.3.3
     , string-conversions >=0.4.0.1
     , text >=1.2.3.0
@@ -171,12 +171,12 @@ test-suite spec
     , hspec >=2.7.1
     , lens >=4.18.1
     , lens-aeson >=1.1
+    , libsecp256k1 >=0.1.0
     , memory >=0.15.0
     , murmur3 >=1.0.3
     , network >=3.1.1.1
     , safe >=0.3.18
     , scientific >=0.3.6.2
-    , secp256k1-haskell >=0.4.0
     , split >=0.2.3.3
     , string-conversions >=0.4.0.1
     , text >=1.2.3.0

package.yaml

@@ -40,7 +40,7 @@ dependencies:
   - split >= 0.2.3.3
   - safe >= 0.3.18
   - scientific >= 0.3.6.2
-  - secp256k1-haskell >= 0.4.0
+  - libsecp256k1 >= 0.1.0
   - string-conversions >= 0.4.0.1
   - text >= 1.2.3.0
   - time >= 1.9.3

src/Bitcoin/Crypto/Signature.hs

@@ -14,7 +14,6 @@ module Bitcoin.Crypto.Signature (
     verifyHashSig,
     isCanonicalHalfOrder,
     decodeStrictSig,
-    exportSig,
 ) where
 
 import Bitcoin.Crypto.Hash
@@ -31,28 +30,20 @@ import Data.Serialize (Serialize (..))
 import Numeric (showHex)
 
 
--- | Convert 256-bit hash into a 'Msg' for signing or verification.
-hashToMsg :: Hash256 -> Msg
-hashToMsg =
-    fromMaybe e . msg . runPutS . serialize
-  where
-    e = error "Could not convert 32-byte hash to secp256k1 message"
-
-
 -- | Sign a 256-bit hash using secp256k1 elliptic curve.
-signHash :: SecKey -> Hash256 -> Sig
-signHash k = signMsg k . hashToMsg
+signHash :: SecKey -> Hash256 -> Signature
+signHash k = ecdsaSign k . fromShort . getHash256
 
 
 -- | Verify an ECDSA signature for a 256-bit hash.
-verifyHashSig :: Hash256 -> Sig -> PubKey -> Bool
+verifyHashSig :: Hash256 -> Signature -> PubKeyXY -> Bool
 verifyHashSig h s p = verifySig p norm (hashToMsg h)
   where
     norm = fromMaybe s (normalizeSig s)
 
 
 -- | Deserialize an ECDSA signature as commonly encoded in Bitcoin.
-getSig :: MonadGet m => m Sig
+getSig :: MonadGet m => m Signature
 getSig = do
     l <-
         lookAhead $ do
@@ -72,17 +63,17 @@ getSig = do
 
 
 -- | Serialize an ECDSA signature for Bitcoin use.
-putSig :: MonadPut m => Sig -> m ()
+putSig :: MonadPut m => Signature -> m ()
 putSig s = putByteString $ exportSig s
 
 
 -- | Is canonical half order.
-isCanonicalHalfOrder :: Sig -> Bool
+isCanonicalHalfOrder :: Signature -> Bool
 isCanonicalHalfOrder = isNothing . normalizeSig
 
 
 -- | Decode signature strictly.
-decodeStrictSig :: ByteString -> Maybe Sig
+decodeStrictSig :: ByteString -> Maybe Signature
 decodeStrictSig bs = do
     g <- importSig bs
     -- <http://www.secg.org/sec1-v2.pdf Section 4.1.4>

stack.yaml

@@ -6,3 +6,4 @@ nix:
     - pkg-config
 extra-deps:
   - fourmolu-0.8.2.0
+  - libsecp256k1-0.1.0

stack.yaml.lock

@@ -11,6 +11,13 @@ packages:
       size: 143718
   original:
     hackage: fourmolu-0.8.2.0
+- completed:
+    hackage: libsecp256k1-0.1.0@sha256:c8de65c640e2e36b14947db00366228d550881640f5e61f496aeb2249966039c,1898
+    pantry-tree:
+      size: 901
+      sha256: 9713733dbf509b8af64449ea9b4b3d1ee518cb1e7e61c03a8a9297fa29c3b274
+  original:
+    hackage: libsecp256k1-0.1.0
 snapshots:
 - completed:
     sha256: 1ecad1f0bd2c27de88dbff6572446cfdf647c615d58a7e2e2085c6b7dfc04176