From d067a343e6621f6cbf8e7cb86c12ddc529d02a09 Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Sun, 11 Oct 2020 05:58:42 +0000 Subject: [PATCH] fixed pex --- src/communicatorutils/lookupadders.py | 2 +- src/communicatorutils/uploadblocks/mixmate/__init__.py | 2 +- src/etc/onionrvalues.py | 2 +- src/onionrstorage/__init__.py | 2 +- static-data/default_config.json | 4 ++-- tests/runtime-result.txt | 2 +- tests/test_default_config_json.py | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/communicatorutils/lookupadders.py b/src/communicatorutils/lookupadders.py index ae03ad39..76d18953 100755 --- a/src/communicatorutils/lookupadders.py +++ b/src/communicatorutils/lookupadders.py @@ -64,4 +64,4 @@ def lookup_new_peer_transports_with_communicator(shared_state): except ValueError: pass kv.get('newPeers').extend(newPeers) - shared_state.get_by_string("OnionrCommunicatorDaemon").decrementThreadCount('clean_old_blocks') + shared_state.get_by_string("OnionrCommunicatorDaemon").decrementThreadCount('lookup_new_peer_transports_with_communicator') diff --git a/src/communicatorutils/uploadblocks/mixmate/__init__.py b/src/communicatorutils/uploadblocks/mixmate/__init__.py index 617fa163..446ac44a 100644 --- a/src/communicatorutils/uploadblocks/mixmate/__init__.py +++ b/src/communicatorutils/uploadblocks/mixmate/__init__.py @@ -38,7 +38,7 @@ def block_mixer(upload_list: List[onionrtypes.BlockHash], to the said block list """ bl = onionrblockapi.Block(block_to_mix) - print(bl.raw) + if time.time() - bl.claimedTime > onionrvalues.BLOCK_POOL_MAX_AGE: raise ValueError if block_to_mix: diff --git a/src/etc/onionrvalues.py b/src/etc/onionrvalues.py index 50d23e7b..33a2aaec 100755 --- a/src/etc/onionrvalues.py +++ b/src/etc/onionrvalues.py @@ -23,7 +23,7 @@ import filepaths DENIABLE_PEER_ADDRESS = "OVPCZLOXD6DC5JHX4EQ3PSOGAZ3T24F75HQLIUZSDSMYPEOXCPFA" PASSWORD_LENGTH = 25 ONIONR_TAGLINE = 'Private P2P Communication - GPLv3 - https://Onionr.net' -ONIONR_VERSION = '6.1.0' +ONIONR_VERSION = '6.1.1' ONIONR_VERSION_CODENAME = 'Genesis' ONIONR_VERSION_TUPLE = tuple(ONIONR_VERSION.split('.')) # (MAJOR, MINOR, VERSION) API_VERSION = '2' # increments of 1; only change when something fundamental about how the API works changes. This way other nodes know how to communicate without learning too much information about you. diff --git a/src/onionrstorage/__init__.py b/src/onionrstorage/__init__.py index 37ccc2c6..1b964d46 100755 --- a/src/onionrstorage/__init__.py +++ b/src/onionrstorage/__init__.py @@ -12,7 +12,7 @@ from coredb import dbfiles from filepaths import block_data_location import onionrexceptions from onionrcrypto import hashers -from . import setdata +from . import setdata, removeblock from etc.onionrvalues import DATABASE_LOCK_TIMEOUT, BLOCK_EXPORT_FILE_EXT """ This program is free software: you can redistribute it and/or modify diff --git a/static-data/default_config.json b/static-data/default_config.json index b20fe114..c7e3b280 100755 --- a/static-data/default_config.json +++ b/static-data/default_config.json @@ -14,8 +14,8 @@ "hide_created_blocks": true, "insert_deniable_blocks": true, "max_block_age": 2678400, - "minimum_block_pow": 5, - "minimum_send_pow": 5, + "minimum_block_pow": 6, + "minimum_send_pow": 6, "public_key": "", "random_bind_ip": true, "security_level": 0, diff --git a/tests/runtime-result.txt b/tests/runtime-result.txt index 130450c1..b06e92a5 100644 --- a/tests/runtime-result.txt +++ b/tests/runtime-result.txt @@ -1 +1 @@ -1602268895 \ No newline at end of file +1602391371 \ No newline at end of file diff --git a/tests/test_default_config_json.py b/tests/test_default_config_json.py index fe9f9561..c8aa14d6 100644 --- a/tests/test_default_config_json.py +++ b/tests/test_default_config_json.py @@ -27,8 +27,8 @@ class OnionrConfig(unittest.TestCase): self.assertEqual(conf['general']['ephemeral_tunnels'], False) self.assertEqual(conf['general']['hide_created_blocks'], True) self.assertEqual(conf['general']['insert_deniable_blocks'], True) - self.assertEqual(conf['general']['minimum_block_pow'], 5) - self.assertEqual(conf['general']['minimum_send_pow'], 5) + self.assertEqual(conf['general']['minimum_block_pow'], 6) + self.assertEqual(conf['general']['minimum_send_pow'], 6) self.assertEqual(conf['general']['public_key'], '') self.assertEqual(conf['general']['random_bind_ip'], True) self.assertEqual(conf['general']['security_level'], 0)