From e34b499044c006bc949e8f16426eddae4218b940 Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Wed, 2 Dec 2020 20:46:36 -0600 Subject: [PATCH] purge old blocks if POW increases --- src/communicatorutils/housekeeping.py | 38 +++++++++++++++------ src/onionrcommands/daemonlaunch/__init__.py | 3 ++ 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/communicatorutils/housekeeping.py b/src/communicatorutils/housekeeping.py index 97024663..a36f8556 100755 --- a/src/communicatorutils/housekeeping.py +++ b/src/communicatorutils/housekeeping.py @@ -18,6 +18,7 @@ from onionrstorage import removeblock from onionrblocks import onionrblacklist from onionrblocks.storagecounter import StorageCounter from etc.onionrvalues import DATABASE_LOCK_TIMEOUT +from onionrproofs import hashMeetsDifficulty """ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,16 +45,25 @@ def __remove_from_upload(shared_state, block_hash: str): pass +def __purge_block(shared_state, block_hash, add_to_blacklist = True): + blacklist = None + + removeblock.remove_block(block_hash) + onionrstorage.deleteBlock(block_hash) + __remove_from_upload(shared_state, block_hash) + + if add_to_blacklist: + blacklist = onionrblacklist.OnionrBlackList() + blacklist.addToDB(block_hash) + + def clean_old_blocks(shared_state): """Delete expired blocks + old blocks if disk allocation is near full""" blacklist = onionrblacklist.OnionrBlackList() # Delete expired blocks for bHash in blockmetadb.expiredblocks.get_expired_blocks(): - blacklist.addToDB(bHash) - removeblock.remove_block(bHash) - onionrstorage.deleteBlock(bHash) - __remove_from_upload(shared_state, bHash) - logger.info('Deleted block: %s' % (bHash,)) + __purge_block(shared_state, bHash, add_to_blacklist=True) + logger.info('Deleted expired block: %s' % (bHash,)) while storage_counter.is_full(): try: @@ -61,11 +71,8 @@ def clean_old_blocks(shared_state): except IndexError: break else: - blacklist.addToDB(oldest) - removeblock.remove_block(oldest) - onionrstorage.deleteBlock(oldest) - __remove_from_upload(shared_state, oldest) - logger.info('Deleted block: %s' % (oldest,)) + __purge_block(shared_state, bHash, add_to_blacklist=True) + logger.info('Deleted block because of full storage: %s' % (oldest,)) def clean_keys(): @@ -88,3 +95,14 @@ def clean_keys(): conn.close() onionrusers.deleteExpiredKeys() + + +def clean_blocks_not_meeting_pow(shared_state): + """Clean blocks not meeting min send/rec pow. Used if config.json POW changes""" + block_list = blockmetadb.get_block_list() + for block in block_list: + if not hashMeetsDifficulty(block): + logger.warn( + f"Deleting block {block} because it was stored" + + "with a POW level smaller than current.", terminal=True) + __purge_block(shared_state, block) diff --git a/src/onionrcommands/daemonlaunch/__init__.py b/src/onionrcommands/daemonlaunch/__init__.py index 2ea25726..9a980725 100755 --- a/src/onionrcommands/daemonlaunch/__init__.py +++ b/src/onionrcommands/daemonlaunch/__init__.py @@ -42,6 +42,7 @@ from lan.server import LANServer from sneakernet import sneakernet_import_thread from onionrstatistics.devreporting import statistics_reporter from setupkvvars import setup_kv +from communicatorutils.housekeeping import clean_blocks_not_meeting_pow from .spawndaemonthreads import spawn_client_threads """ This program is free software: you can redistribute it and/or modify @@ -222,6 +223,8 @@ def daemon(): 'proxyPort', net.socksPort) spawn_client_threads(shared_state) + clean_blocks_not_meeting_pow(shared_state) + communicator.startCommunicator(shared_state) clean_ephemeral_services()