From cc12a62534b1213046c04308c5154da55a055950 Mon Sep 17 00:00:00 2001 From: Ouziel Slama <ouziel@gmail.com> Date: Mon, 13 Jan 2025 09:30:22 +0000 Subject: [PATCH] Don't clean mempool on catch-up --- counterparty-core/counterpartycore/lib/blocks.py | 2 -- counterparty-core/counterpartycore/lib/follow.py | 3 ++- release-notes/release-notes-v10.9.0.md | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/counterparty-core/counterpartycore/lib/blocks.py b/counterparty-core/counterpartycore/lib/blocks.py index ed750881b5..17896d77d9 100644 --- a/counterparty-core/counterpartycore/lib/blocks.py +++ b/counterparty-core/counterpartycore/lib/blocks.py @@ -24,7 +24,6 @@ gas, ledger, log, - mempool, message_type, util, ) @@ -1503,7 +1502,6 @@ def catch_up(db, check_asset_conservation=True): fetcher = start_rsfetcher() else: assert parsed_block_index == block_height - mempool.clean_mempool(db) parsed_blocks += 1 formatted_duration = util.format_duration(time.time() - start_time) diff --git a/counterparty-core/counterpartycore/lib/follow.py b/counterparty-core/counterpartycore/lib/follow.py index ba9646e0c6..af287d7f74 100644 --- a/counterparty-core/counterpartycore/lib/follow.py +++ b/counterparty-core/counterpartycore/lib/follow.py @@ -138,7 +138,8 @@ def receive_rawblock(self, body): blocks.catch_up(self.db, check_asset_conservation=False) else: blocks.parse_new_block(self.db, decoded_block) - mempool.clean_mempool(self.db) + if not config.NO_MEMPOOL: + mempool.clean_mempool(self.db) if not config.NO_TELEMETRY: TelemetryOneShot().submit() diff --git a/release-notes/release-notes-v10.9.0.md b/release-notes/release-notes-v10.9.0.md index d994036250..ee00c1173b 100644 --- a/release-notes/release-notes-v10.9.0.md +++ b/release-notes/release-notes-v10.9.0.md @@ -42,6 +42,7 @@ The following transaction construction parameters have been deprecated (but rema - Have the node terminate when the `follow` loop raises an error - Don't stop the server on "No such mempool or blockchain" error - Handle correctly RPC call errors from the API +- Don't clean mempool on catchup ## Codebase