From 9d55c62d68019fcf8f70cdd75dd4bb6df5c81e67 Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Tue, 22 Dec 2020 01:03:04 +0000 Subject: [PATCH] * revert pow to 5 * is is_alive in sneakernet observer * catch subprocess err in 3.9.x (dirty hack) in vanityonionr and block gen * bump version --- scripts/disable-dev-config.py | 4 ++-- src/etc/onionrvalues.py | 2 +- src/onionrproofs/subprocesspow.py | 15 +++++++++++---- src/sneakernet/__init__.py | 4 ++-- src/vanityonionr/__init__.py | 16 ++++++++++++---- static-data/default_config.json | 4 ++-- tests/runtime-result.txt | 2 +- tests/test_default_config_json.py | 4 ++-- 8 files changed, 33 insertions(+), 18 deletions(-) diff --git a/scripts/disable-dev-config.py b/scripts/disable-dev-config.py index d2b847b8..ca337a12 100755 --- a/scripts/disable-dev-config.py +++ b/scripts/disable-dev-config.py @@ -18,8 +18,8 @@ conf['general']['display_header'] = True conf['general']['security_level'] = 0 conf['general']['use_bootstrap_list'] = True conf['onboarding']['done'] = False -conf['general']['minimum_block_pow'] = 6 -conf['general']['minimum_send_pow'] = 6 +conf['general']['minimum_block_pow'] = 5 +conf['general']['minimum_send_pow'] = 5 conf['log']['file']['remove_on_exit'] = True conf['transports']['lan'] = True conf['transports']['tor'] = True diff --git a/src/etc/onionrvalues.py b/src/etc/onionrvalues.py index cafb8010..776068c2 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 = '8.0.0' +ONIONR_VERSION = '8.0.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/onionrproofs/subprocesspow.py b/src/onionrproofs/subprocesspow.py index 2923de74..a988b366 100755 --- a/src/onionrproofs/subprocesspow.py +++ b/src/onionrproofs/subprocesspow.py @@ -91,10 +91,17 @@ class SubprocessPOW: def _spawn_proc(self): """Create a child proof of work process wait for data and send shutdown signal when its found""" - parent_conn, child_conn = Pipe() - p = Process(target=self.do_pow, args=(child_conn,), daemon=True) - p.start() - #p.join() + # The importerror started happening in 3.9.x + # not worth fixing because this POW will be replaced by VDF + try: + parent_conn, child_conn = Pipe() + p = Process(target=self.do_pow, args=(child_conn,), daemon=True) + p.start() + except ImportError: + logger.error( + "Error in subprocess module when getting new POW " + + "pipe.\nThis is related to a problem in 3.9.x", terminal=True) + return payload = None try: while True: diff --git a/src/sneakernet/__init__.py b/src/sneakernet/__init__.py index 9c78b568..6b4002a8 100644 --- a/src/sneakernet/__init__.py +++ b/src/sneakernet/__init__.py @@ -63,6 +63,6 @@ def sneakernet_import_thread(): for path in watch_paths: observer.schedule(_Importer(), path, recursive=True) observer.start() - while observer.isAlive(): + while observer.is_alive(): # call import func with timeout - observer.join(60) \ No newline at end of file + observer.join(60) diff --git a/src/vanityonionr/__init__.py b/src/vanityonionr/__init__.py index 7be6abcd..49556619 100644 --- a/src/vanityonionr/__init__.py +++ b/src/vanityonionr/__init__.py @@ -29,6 +29,8 @@ from multiprocessing import Process, Pipe, Queue import re, time import threading +import logger + wordlist = niceware.WORD_LIST def find_vanity_mnemonic(start_words: str, queue): @@ -47,10 +49,16 @@ def find_vanity_mnemonic(start_words: str, queue): def _start(start_words, obj): done = False - q = Queue() - p = Process(target=find_vanity_mnemonic, args=[start_words, q], daemon=True) - p.daemon = True - p.start() + try: + q = Queue() + p = Process(target=find_vanity_mnemonic, args=[start_words, q], daemon=True) + p.daemon = True + p.start() + except ImportError: + logger.error( + "Error in subprocess module when getting new POW " + + "pipe.\nThis is related to a problem in 3.9.x", terminal=True) + return rec = None while not done: try: diff --git a/static-data/default_config.json b/static-data/default_config.json index dcad2e50..fe047199 100755 --- a/static-data/default_config.json +++ b/static-data/default_config.json @@ -72,9 +72,9 @@ "tor": true }, "ui": { - "animated_background": false, + "animated_background": true, "public_remote_enabled": false, "public_remote_hosts": [], "theme": "dark" } -} +} \ No newline at end of file diff --git a/tests/runtime-result.txt b/tests/runtime-result.txt index 3fe82038..ed6d5e78 100644 --- a/tests/runtime-result.txt +++ b/tests/runtime-result.txt @@ -1 +1 @@ -1606975647 \ No newline at end of file +1608601319 \ No newline at end of file diff --git a/tests/test_default_config_json.py b/tests/test_default_config_json.py index 2678b13c..76ec3e65 100644 --- a/tests/test_default_config_json.py +++ b/tests/test_default_config_json.py @@ -30,8 +30,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'], 6) - self.assertEqual(conf['general']['minimum_send_pow'], 6) + self.assertEqual(conf['general']['minimum_block_pow'], 5) + self.assertEqual(conf['general']['minimum_send_pow'], 5) self.assertEqual(conf['general']['public_key'], '') self.assertEqual(conf['general']['random_bind_ip'], True) self.assertEqual(conf['general']['security_level'], 0)