haskoin-store 0.23.11 → 0.23.12

raw patch · 4 files changed

+13/−9 lines, 4 files

Files

• CHANGELOG.md +4/−0
• haskoin-store.cabal +2/−2
• src/Haskoin/Store/BlockStore.hs +6/−6
• src/Haskoin/Store/Logic.hs +1/−1

@@ -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.23.12+### Fixed+- Do not do RBF checks when replacing a mempool transaction with a confirmed one.+ ## 0.23.11 ### Fixed - Streamline mempool transaction importing.

@@ -4,10 +4,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: 7993f74354bd0a9ecaf5f50e8e72712a0b0dca8d92ef828cefa5bf7ce77de855+-- hash: 55e62032049c92c13bb35a34be77f93a4dfe980fd4d27f24be133d68ad89fee8  name:           haskoin-store-version:        0.23.11+version:        0.23.12 synopsis:       Storage and index for Bitcoin and Bitcoin Cash description:    Store and index Bitcoin or Bitcoin Cash blocks, transactions, balances and unspent outputs.                 All data is available via REST API in JSON or binary format.

@@ -166,28 +166,28 @@             , myTxs = ts             }   where-    del n txs =-        forM (zip [(1 :: Integer) ..] txs) $ \(i, tx) -> do+    del x n txs =+        forM (zip [x ..] txs) $ \(i, tx) -> do             $(logDebugS) "BlockStore" $                 "Wiping mempool tx " <> cs (show i) <> "/" <> cs (show n) <>                 ": " <>                 txHashToHex (blockTxHash tx)             deleteTx True False (blockTxHash tx)-    wipeit n txs = do+    wipeit x n txs = do         let (txs1, txs2) = splitAt 1000 txs         case txs1 of             [] -> return ()             _ ->-                runImport (del n txs1) >>= \case+                runImport (del x n txs1) >>= \case                     Left e -> do                         $(logErrorS) "BlockStore" $                             "Could not delete mempool, database corrupt: " <>                             cs (show e)                         throwIO CorruptDatabase-                    Right _ -> wipeit n txs2+                    Right _ -> wipeit (x + length txs1) n txs2     wipe         | blockConfWipeMempool cfg =-            getMempool >>= \mem -> wipeit (length mem) mem+            getMempool >>= \mem -> wipeit 1 (length mem) mem         | otherwise = return ()     ini = do         runImport initBest >>= \case

@@ -311,7 +311,7 @@                             "Deleting transaction " <> txHashToHex s <>                             " because it conflicts with " <>                             txHashToHex (txHash tx)-                        ths <- deleteTx True True s+                        ths <- deleteTx True (not (confirmed br)) s                         getUnspent op >>= \case                             Nothing -> do                                 $(logErrorS) "BlockStore" $