haskoin-store 0.34.2 → 0.34.3

raw patch · 2 files changed

+9/−23 lines, 2 filesdep ~haskoin-storedep ~haskoin-store-data

Dependency ranges changed: haskoin-store, haskoin-store-data

Files

• haskoin-store.cabal +6/−6
• src/Haskoin/Store/Logic.hs +3/−17

@@ -4,10 +4,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: 4abbf05c9d06beeed2fc882666c6c8fdd2b036724366447bd998471b965e8191+-- hash: 043df4dcff9f6f17106efe3b4dba479d97f95d3bdf73257d09b201d42f0b7eb1  name:           haskoin-store-version:        0.34.2+version:        0.34.3 synopsis:       Storage and index for Bitcoin and Bitcoin Cash description:    Please see the README on GitHub at <https://github.com/haskoin/haskoin-store#readme> category:       Bitcoin, Finance, Network@@ -53,7 +53,7 @@     , hashable >=1.3.0.0     , haskoin-core >=0.13.6     , haskoin-node >=0.14.1-    , haskoin-store-data ==0.34.2+    , haskoin-store-data ==0.34.3     , hedis >=0.12.13     , http-types >=0.12.3     , monad-logger >=0.3.32@@ -96,7 +96,7 @@     , haskoin-core >=0.13.6     , haskoin-node >=0.14.1     , haskoin-store-    , haskoin-store-data ==0.34.2+    , haskoin-store-data ==0.34.3     , monad-logger >=0.3.32     , mtl >=2.2.2     , nqe >=0.6.1@@ -135,8 +135,8 @@     , hashable >=1.3.0.0     , haskoin-core >=0.13.6     , haskoin-node >=0.14.1-    , haskoin-store ==0.34.2-    , haskoin-store-data ==0.34.2+    , haskoin-store ==0.34.3+    , haskoin-store-data ==0.34.3     , hedis >=0.12.13     , hspec >=2.7.1     , http-types >=0.12.3

@@ -35,9 +35,6 @@                                                 isNothing, mapMaybe) import           Data.Ord                      (Down (Down)) import           Data.Serialize                (encode)-import           Data.String                   (IsString (..))-import           Data.String.Conversions       (ConvertibleStrings, cs)-import           Data.Text                     (Text) import           Data.Word                     (Word32, Word64) import           Haskoin                       (Address, Block (..), BlockHash,                                                 BlockHeader (..),@@ -57,8 +54,7 @@                                                 TxRef (..), UnixTime,                                                 Unspent (..), confirmed) import           Haskoin.Store.Database.Writer (MemoryTx, WriterT, runTx)-import           UnliftIO                      (Exception, MonadIO, async,-                                                liftIO, wait)+import           UnliftIO                      (Exception, MonadIO, liftIO)  type MonadImport m =     ( MonadError ImportException m@@ -137,9 +133,8 @@         liftIO (runLoggingT (runReaderT go r) l)   where     go = do-        prev_asyncs <- mapM (async . mapM_ loadPrevOut . prevOuts) txs-        out_asyncs <- mapM (async . loadOutputBalances) txs-        mapM_ wait $ prev_asyncs <> out_asyncs+        mapM_ loadPrevOut (concatMap prevOuts txs)+        mapM_ loadOutputBalances txs         runTx . setMempool =<< getMempool  bestBlockData :: MonadImport m => WriterT m BlockData@@ -749,12 +744,3 @@  testPresent :: StoreReadBase m => Tx -> m Bool testPresent tx = isJust <$> getActiveTxData (txHash tx)--logOutput :: ( ConvertibleStrings Text a-             , ConvertibleStrings String a-             , Semigroup a-             , IsString a-             )-          => OutPoint-          -> a-logOutput (OutPoint h i) = cs (txHashToHex h) <> ":" <> cs (show i)