haskoin-core 0.21.0 → 0.21.1

raw patch · 3 files changed

+26/−11 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• CHANGELOG.md +4/−0
• haskoin-core.cabal +1/−1
• src/Haskoin/Address/Base58.hs +21/−10

@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## 0.21.1+### Changed+- Make Base58 faster.+ ## 0.21.0 ### Added - BCH Testnet4 support.

@@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack  name:           haskoin-core-version:        0.21.0+version:        0.21.1 synopsis:       Bitcoin & Bitcoin Cash library for Haskell description:    Please see the README on GitHub at <https://github.com/haskoin/haskoin-core#readme> category:       Bitcoin, Finance, Network

@@ -24,6 +24,8 @@ import Data.ByteString (ByteString) import qualified Data.ByteString as BS import qualified Data.ByteString.Char8 as C+import Data.Array+import Data.Char import Data.Bytes.Get import Data.Bytes.Put import Data.Bytes.Serial@@ -31,6 +33,7 @@ import Data.String.Conversions (cs) import Data.Text (Text) import qualified Data.Text as T+import Data.Word import Haskoin.Crypto.Hash import Haskoin.Util import Numeric (readInt, showIntAtBase)@@ -42,21 +45,29 @@ b58Data :: ByteString b58Data = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz" +b58Array :: Array Int Word8+b58Array = listArray (0, 57) (BS.unpack b58Data)++b58InvArray :: Array Word8 (Maybe Int)+b58InvArray = listArray (minBound, maxBound) (repeat Nothing) // map swap (assocs b58Array)+  where+    swap (i, c) = (c, Just i)+ {- | Convert a number less than or equal to provided integer into a 'Base58'  character. -}-b58 :: Int -> Char-b58 = C.index b58Data+b58 :: Int -> Word8+b58 = (b58Array !)  -- | Convert a 'Base58' character into the number it represents.-b58' :: Char -> Maybe Int-b58' = flip C.elemIndex b58Data+b58' :: Word8 -> Maybe Int+b58' = (b58InvArray !)  {- | Encode an arbitrary-length 'Integer' into a 'Base58' string. Leading zeroes  will not be part of the resulting string. -} encodeBase58I :: Integer -> Base58-encodeBase58I i = cs $ showIntAtBase 58 b58 i ""+encodeBase58I i = cs $ showIntAtBase 58 (chr . fromIntegral . b58) i ""  -- | Decode a 'Base58' string into an arbitrary-length 'Integer'. decodeBase58I :: Base58 -> Maybe Integer@@ -65,8 +76,8 @@         Just (r, []) -> Just r         _ -> Nothing   where-    p = isJust . b58'-    f = fromMaybe e . b58'+    p = isJust . b58' . fromIntegral . ord+    f = fromMaybe e . b58' . fromIntegral . ord     go = listToMaybe $ readInt 58 p f (cs s)     e = error "Could not decode base58" @@ -75,10 +86,10 @@ -} encodeBase58 :: ByteString -> Base58 encodeBase58 bs =-    l `mappend` r+    l <> r   where     (z, b) = BS.span (== 0) bs-    l = cs $ BS.replicate (BS.length z) (BS.index b58Data 0) -- preserve leading 0's+    l = cs $ BS.replicate (BS.length z) (b58 0) -- preserve leading 0's     r         | BS.null b = T.empty         | otherwise = encodeBase58I $ bsToInteger b@@ -88,7 +99,7 @@ decodeBase58 t =     BS.append prefix <$> r   where-    (z, b) = BS.span (== BS.index b58Data 0) (cs t)+    (z, b) = BS.span (== b58 0) (cs t)     prefix = BS.replicate (BS.length z) 0 -- preserve leading 1's     r         | BS.null b = Just BS.empty