From 7c28b06588bb29928e733991566544636e8e5547 Mon Sep 17 00:00:00 2001 From: Forrest Voight Date: Mon, 24 Jun 2013 10:25:34 -0400 Subject: [PATCH 1/1] reinstated share voting logic --- p2pool/data.py | 3 ++- p2pool/work.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/p2pool/data.py b/p2pool/data.py index 5ab1e7b..1793043 100644 --- a/p2pool/data.py +++ b/p2pool/data.py @@ -53,6 +53,7 @@ DONATION_SCRIPT = '4104ffd03de44a6e11b9917f3a29f9443283d9871c9d743ef30d5eddcd370 class Share(object): VERSION = 9 + VOTING_VERSION = 11 SUCCESSOR = None other_txs = None @@ -596,7 +597,7 @@ def get_warnings(tracker, best_share, net, bitcoind_warning, bitcoind_work_value desired_version_counts = get_desired_version_counts(tracker, best_share, min(net.CHAIN_LENGTH, 60*60//net.SHARE_PERIOD, tracker.get_height(best_share))) majority_desired_version = max(desired_version_counts, key=lambda k: desired_version_counts[k]) - if majority_desired_version > 11 and desired_version_counts[majority_desired_version] > sum(desired_version_counts.itervalues())/2: + if majority_desired_version > (Share.SUCCESSOR if Share.SUCCESSOR is not None else Share).VOTING_VERSION and desired_version_counts[majority_desired_version] > sum(desired_version_counts.itervalues())/2: res.append('A MAJORITY OF SHARES CONTAIN A VOTE FOR AN UNSUPPORTED SHARE IMPLEMENTATION! (v%i with %i%% support)\n' 'An upgrade is likely necessary. Check http://p2pool.forre.st/ for more information.' % ( majority_desired_version, 100*desired_version_counts[majority_desired_version]/sum(desired_version_counts.itervalues()))) diff --git a/p2pool/work.py b/p2pool/work.py index 7c5823b..e8cbbec 100644 --- a/p2pool/work.py +++ b/p2pool/work.py @@ -226,7 +226,7 @@ class WorkerBridge(worker_interface.WorkerBridge): 'doa' if doas > doas_recorded_in_chain else None )(*self.get_stale_counts()), - desired_version=11, + desired_version=(share_type.SUCCESSOR if share_type.SUCCESSOR is not None else share_type).VOTING_VERSION, ), block_target=self.current_work.value['bits'].target, desired_timestamp=int(time.time() + 0.5), -- 1.7.1