From fbe88f9e018215482a932c38a29b8052f9ba87f3 Mon Sep 17 00:00:00 2001 From: Forrest Voight Date: Wed, 11 Apr 2012 16:52:57 -0400 Subject: [PATCH] fixup! added special "p2pool" MM target to match P2Pool share target --- p2pool/main.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/p2pool/main.py b/p2pool/main.py index 6cb1435..cbf2c77 100644 --- a/p2pool/main.py +++ b/p2pool/main.py @@ -516,6 +516,8 @@ def main(args, net, datadir_path, merged_urls, worker_endpoint): net=net, ) + mm_later = [(dict(aux_work, target=aux_work['target'] if aux_work['target'] != 'p2pool' else share_info['bits'].target), index, hashes) for aux_work, index, hashes in mm_later] + target = net.PARENT.SANE_MAX_TARGET if desired_pseudoshare_target is None: if len(self.recent_shares_ts_work) == 50: @@ -572,7 +574,7 @@ def main(args, net, datadir_path, merged_urls, worker_endpoint): for aux_work, index, hashes in mm_later: try: - if pow_hash <= (aux_work['target'] if aux_work['target'] != 'p2pool' else share_info['bits'].target) or p2pool.DEBUG: + if pow_hash <= aux_work['target'] or p2pool.DEBUG: df = deferral.retry('Error submitting merged block: (will retry)', 10, 10)(aux_work['merged_proxy'].rpc_getauxblock)( pack.IntType(256, 'big').pack(aux_work['hash']).encode('hex'), bitcoin_data.aux_pow_type.pack(dict( -- 1.7.1