haskoin-store 0.56.0 → 0.57.0

raw patch · 3 files changed

+16/−7 lines, 3 filesdep ~haskoin-store-dataPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: haskoin-store-data

API changes (from Hackage documentation)

Files

• CHANGELOG.md +4/−0
• haskoin-store.cabal +4/−4
• src/Haskoin/Store/Logic.hs +8/−3

@@ -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.57.0+### Changed+- Report errors freeing outputs.+ ## 0.56.0 ### Changed - Report all deleted mempool transactions.

@@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack  name:           haskoin-store-version:        0.56.0+version:        0.57.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@@ -60,7 +60,7 @@     , hashable >=1.3.0.0     , haskoin-core >=0.21.0     , haskoin-node >=0.17.0-    , haskoin-store-data ==0.56.0+    , haskoin-store-data ==0.57.0     , hedis >=0.12.13     , http-types >=0.12.3     , lens >=4.18.1@@ -116,7 +116,7 @@     , haskoin-core >=0.21.0     , haskoin-node >=0.17.0     , haskoin-store-    , haskoin-store-data ==0.56.0+    , haskoin-store-data ==0.57.0     , hedis >=0.12.13     , http-types >=0.12.3     , lens >=4.18.1@@ -177,7 +177,7 @@     , haskoin-core >=0.21.0     , haskoin-node >=0.17.0     , haskoin-store-    , haskoin-store-data ==0.56.0+    , haskoin-store-data ==0.57.0     , hedis >=0.12.13     , hspec >=2.7.1     , http-types >=0.12.3

@@ -398,13 +398,18 @@     let prevs = prevOuts tx     unspents <- mapM getUnspent prevs     let spents = map fst $ filter (isNothing . snd) $ zip prevs unspents-    spndrs <- mapM (spender <=< getSpender) spents+    spndrs <- mapM (\s -> getSpender s >>= spender s) spents     let txids = HashSet.fromList $ filter (/= txHash tx) $ map spenderHash spndrs     del <- fmap concat $ mapM (deleteTx memonly rbfcheck) $ HashSet.toList txids     return $ HashSet.fromList del   where-    spender Nothing  = throwError SpenderNotFound-    spender (Just s) = return s+    spender s Nothing = do+      $(logErrorS) "BlockStore" $+          "Spender not found for output " <>+          txHashToHex (outPointHash s) <> ":" <>+          cs (show (outPointIndex s))+      throwError SpenderNotFound+    spender _ (Just s) = return s  deleteConfirmedTx :: MonadImport m => TxHash -> m [TxHash] deleteConfirmedTx = deleteTx False False