haskoin-store 0.41.3 → 0.42.0

raw patch · 5 files changed

+16/−31 lines, 5 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• CHANGELOG.md +8/−0
• haskoin-store.cabal +2/−2
• src/Haskoin/Store/BlockStore.hs +3/−26
• src/Haskoin/Store/Logic.hs +0/−1
• src/Haskoin/Store/Web.hs +3/−2

@@ -4,6 +4,14 @@ 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.42.0+### Removed+- No more pruning of old mempool transactions.++## 0.41.4+### Fixed+- Correct error computing wallet balances.+ ## 0.41.3 ### Changed - Use whole active set when computing results for multiaddr.

@@ -4,10 +4,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: fe4fe3b91bd3a543e142871a26155bbafbb91dfada3edd1ef1fbf91373dcdca6+-- hash: 24bfa2396f72b6d1ea3fede4dfa852b1b496fbb0f080a1c2f8f82d0e3694234c  name:           haskoin-store-version:        0.41.3+version:        0.42.0 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

@@ -79,9 +79,8 @@ import           Haskoin.Store.Database.Writer import           Haskoin.Store.Logic           (ImportException (Orphan),                                                 deleteUnconfirmedTx,-                                                getOldMempool, importBlock,-                                                initBest, newMempoolTx,-                                                revertBlock)+                                                importBlock, initBest,+                                                newMempoolTx, revertBlock) import           Haskoin.Store.Stats import           NQE                           (Listen, Mailbox, Publisher,                                                 inboxToMailbox, newInbox,@@ -171,7 +170,7 @@         Nothing -> setit m 0         Just bb -> getBlock bb >>= \case             Nothing -> setit m 0-            Just b -> setit m (blockDataHeight b)+            Just b  -> setit m (blockDataHeight b)   where     setit m i = liftIO $ storeHeight m `Metrics.Gauge.set` fromIntegral i @@ -728,27 +727,6 @@                     "Syncing peer timeout: " <> peerText p                 killPeer PeerTimeout p -pruneMempool :: MonadLoggerIO m => BlockT m ()-pruneMempool = guardMempool $ do-    s <- isInSync-    when s $ do-        now <- liftIO getCurrentTime-        let seconds = floor (utcTimeToPOSIXSeconds now)-        getOldMempool seconds >>= \old ->-            unless (null old) $-            runImport (mapM_ delete_it old) >>= \case-                Left e -> do-                    $(logErrorS) "BlockStore" $-                        "Could not prune mempool: "-                        <> cs (show e)-                    throwIO e-                Right x -> return x-  where-    delete_it txid = do-        $(logDebugS) "BlockStore" $-            "Deleting old mempool tx: " <> txHashToHex txid-        deleteUnconfirmedTx False txid- revertToMainChain :: MonadLoggerIO m => BlockT m () revertToMainChain = do     h <- headerHash . nodeHeader <$> getBest@@ -972,7 +950,6 @@     processMempool     pruneOrphans     checkTime-    pruneMempool     atomically (r ())  pingMe :: MonadLoggerIO m => Mailbox BlockStoreMessage -> m ()

@@ -9,7 +9,6 @@     ( ImportException (..)     , MonadImport     , initBest-    , getOldMempool     , revertBlock     , importBlock     , newMempoolTx

@@ -1238,8 +1238,9 @@         btxs = binfo_txs etxs abook prune ibal txs         ftxs = drop offset btxs         baddrs = toBinfoAddrs sabals sxbals xtns-        recv = sum $ map getBinfoAddrReceived baddrs-        sent = sum $ map getBinfoAddrSent baddrs+        abaddrs = toBinfoAddrs abals xbals xtns+        recv = sum $ map getBinfoAddrReceived abaddrs+        sent = sum $ map getBinfoAddrSent abaddrs         txn = fromIntegral $ Set.size alltrs         wallet =             BinfoWallet