From fd76c9f8523c8a3fa5f1a7fc782cbaacafa7db4f Mon Sep 17 00:00:00 2001 From: alexhz Date: Sun, 31 Mar 2013 22:53:49 +0000 Subject: [PATCH] fixes for v3 blocks --- p2pool/data.py | 2 +- p2pool/work.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/p2pool/data.py b/p2pool/data.py index cd1efa7..d1d8cbe 100644 --- a/p2pool/data.py +++ b/p2pool/data.py @@ -708,7 +708,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 > 13 and desired_version_counts[majority_desired_version] > sum(desired_version_counts.itervalues())/2: + if majority_desired_version > 14 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 https://github.com/CryptoManiac/p2pool 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 0b3227e..8beb8d2 100644 --- a/p2pool/work.py +++ b/p2pool/work.py @@ -232,7 +232,7 @@ class WorkerBridge(worker_interface.WorkerBridge): 'doa' if doas > doas_recorded_in_chain else None )(*self.get_stale_counts()), - desired_version=13, + desired_version=14, ), block_target=self.current_work.value['bits'].target, desired_timestamp=desired_timestamp if txn_timestamp < desired_timestamp else txn_timestamp + 1, @@ -274,7 +274,7 @@ class WorkerBridge(worker_interface.WorkerBridge): ) ba = dict( - version=min(self.current_work.value['version'], 2), + version=min(self.current_work.value['version'], 3), previous_block=self.current_work.value['previous_block'], merkle_link=merkle_link, coinb1=packed_gentx[:-4-4], -- 1.7.1