X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=p2pool%2Fwork.py;h=8108a5932c3d8bf04bd11cb7f922b768cb00fb6a;hb=010a44f01552fe500581f8fa6bdaee1e7c8207fb;hp=346db56a2915454c14b3a2977815af0f207944ac;hpb=819f0e3e3ab9460fe60606c3f1e9c562d40361c7;p=p2pool.git diff --git a/p2pool/work.py b/p2pool/work.py index 346db56..8108a59 100644 --- a/p2pool/work.py +++ b/p2pool/work.py @@ -15,7 +15,7 @@ from util import forest, jsonrpc, variable, deferral, math, pack import p2pool, p2pool.data as p2pool_data class WorkerBridge(worker_interface.WorkerBridge): - COINBASE_NONCE_LENGTH = 4 + COINBASE_NONCE_LENGTH = 8 def __init__(self, node, my_pubkey_hash, donation_percentage, merged_urls, worker_fee): worker_interface.WorkerBridge.__init__(self) @@ -31,6 +31,7 @@ class WorkerBridge(worker_interface.WorkerBridge): self.pseudoshare_received = variable.Event() self.share_received = variable.Event() self.local_rate_monitor = math.RateMonitor(10*60) + self.local_addr_rate_monitor = math.RateMonitor(10*60) self.removed_unstales_var = variable.Variable((0, 0, 0)) self.removed_doa_unstales_var = variable.Variable(0) @@ -67,7 +68,7 @@ class WorkerBridge(worker_interface.WorkerBridge): merged_proxy = jsonrpc.HTTPProxy(merged_url, dict(Authorization='Basic ' + base64.b64encode(merged_userpass))) while self.running: auxblock = yield deferral.retry('Error while calling merged getauxblock:', 30)(merged_proxy.rpc_getauxblock)() - self.merged_work.set(dict(self.merged_work.value, **{auxblock['chainid']: dict( + self.merged_work.set(math.merge_dicts(self.merged_work.value, {auxblock['chainid']: dict( hash=int(auxblock['hash'], 16), target='p2pool' if auxblock['target'] == 'p2pool' else pack.IntType(256).unpack(auxblock['target'].decode('hex')), merged_proxy=merged_proxy, @@ -168,6 +169,10 @@ class WorkerBridge(worker_interface.WorkerBridge): return user, pubkey_hash, desired_share_target, desired_pseudoshare_target def preprocess_request(self, user): + if (self.node.p2p_node is None or len(self.node.p2p_node.peers) == 0) and self.node.net.PERSIST: + raise jsonrpc.Error_for_code(-12345)(u'p2pool is not connected to any peers') + if time.time() > self.current_work.value['last_update'] + 60: + raise jsonrpc.Error_for_code(-12345)(u'lost contact with bitcoind') user, pubkey_hash, desired_share_target, desired_pseudoshare_target = self.get_user_details(user) return pubkey_hash, desired_share_target, desired_pseudoshare_target @@ -178,13 +183,26 @@ class WorkerBridge(worker_interface.WorkerBridge): return hash_rate return None + def get_local_rates(self): + miner_hash_rates = {} + miner_dead_hash_rates = {} + datums, dt = self.local_rate_monitor.get_datums_in_last() + for datum in datums: + miner_hash_rates[datum['user']] = miner_hash_rates.get(datum['user'], 0) + datum['work']/dt + if datum['dead']: + miner_dead_hash_rates[datum['user']] = miner_dead_hash_rates.get(datum['user'], 0) + datum['work']/dt + return miner_hash_rates, miner_dead_hash_rates + + def get_local_addr_rates(self): + addr_hash_rates = {} + datums, dt = self.local_addr_rate_monitor.get_datums_in_last() + for datum in datums: + addr_hash_rates[datum['pubkey_hash']] = addr_hash_rates.get(datum['pubkey_hash'], 0) + datum['work']/dt + return addr_hash_rates + def get_work(self, pubkey_hash, desired_share_target, desired_pseudoshare_target): - if (self.node.p2p_node is None or len(self.node.p2p_node.peers) == 0) and self.node.net.PERSIST: - raise jsonrpc.Error_for_code(-12345)(u'p2pool is not connected to any peers') if self.node.best_share_var.value is None and self.node.net.PERSIST: raise jsonrpc.Error_for_code(-12345)(u'p2pool is downloading shares') - if time.time() > self.current_work.value['last_update'] + 60: - raise jsonrpc.Error_for_code(-12345)(u'lost contact with bitcoind') if self.merged_work.value: tree, size = bitcoin_data.make_auxpow_tree(self.merged_work.value) @@ -202,10 +220,10 @@ class WorkerBridge(worker_interface.WorkerBridge): tx_hashes = [bitcoin_data.hash256(bitcoin_data.tx_type.pack(tx)) for tx in self.current_work.value['transactions']] tx_map = dict(zip(tx_hashes, self.current_work.value['transactions'])) - if self.node.best_share_var.value is None: + previous_share = self.node.tracker.items[self.node.best_share_var.value] if self.node.best_share_var.value is not None else None + if previous_share is None: share_type = p2pool_data.Share else: - previous_share = self.node.tracker.items[self.node.best_share_var.value] previous_share_type = type(previous_share) if previous_share_type.SUCCESSOR is None or self.node.tracker.get_height(previous_share.hash) < self.node.net.CHAIN_LENGTH: @@ -215,7 +233,11 @@ class WorkerBridge(worker_interface.WorkerBridge): counts = p2pool_data.get_desired_version_counts(self.node.tracker, self.node.tracker.get_nth_parent_hash(previous_share.hash, self.node.net.CHAIN_LENGTH*9//10), self.node.net.CHAIN_LENGTH//10) - # Share -> NewShare only valid if 85% of hashes in [net.CHAIN_LENGTH*9//10, net.CHAIN_LENGTH] for new version + upgraded = counts.get(successor_type.VERSION, 0)/sum(counts.itervalues()) + if upgraded > .65: + print 'Switchover imminent. Upgraded: %.3f%% Threshold: %.3f%%' % (upgraded*100, 95) + print + # Share -> NewShare only valid if 95% of hashes in [net.CHAIN_LENGTH*9//10, net.CHAIN_LENGTH] for new version if counts.get(successor_type.VERSION, 0) > sum(counts.itervalues())*95//100: share_type = successor_type else: @@ -227,6 +249,17 @@ class WorkerBridge(worker_interface.WorkerBridge): if local_hash_rate is not None: desired_share_target = min(desired_share_target, bitcoin_data.average_attempts_to_target(local_hash_rate * self.node.net.SHARE_PERIOD / 0.05)) # limit to 5% of pool shares by modulating share difficulty + + local_addr_rates = self.get_local_addr_rates() + lookbehind = 3600//self.node.net.SHARE_PERIOD + block_subsidy = self.node.bitcoind_work.value['subsidy'] + if previous_share is not None and self.node.tracker.get_height(previous_share.hash) > lookbehind: + expected_payout_per_block = local_addr_rates.get(pubkey_hash, 0)/p2pool_data.get_pool_attempts_per_second(self.node.tracker, self.node.best_share_var.value, lookbehind) \ + * block_subsidy*(1-self.donation_percentage/100) # XXX doesn't use global stale rate to compute pool hash + if expected_payout_per_block < self.node.net.PARENT.DUST_THRESHOLD: + desired_share_target = min(desired_share_target, + bitcoin_data.average_attempts_to_target((bitcoin_data.target_to_average_attempts(self.node.bitcoind_work.value['bits'].target)*self.node.net.SPREAD)*self.node.net.PARENT.DUST_THRESHOLD/block_subsidy) + ) if True: share_info, gentx, other_transaction_hashes, get_share = share_type.generate_transaction( @@ -291,7 +324,7 @@ class WorkerBridge(worker_interface.WorkerBridge): version=min(self.current_work.value['version'], 2), previous_block=self.current_work.value['previous_block'], merkle_link=merkle_link, - coinb1=packed_gentx[:-4-4], + coinb1=packed_gentx[:-self.COINBASE_NONCE_LENGTH-4], coinb2=packed_gentx[-4:], timestamp=self.current_work.value['time'], bits=self.current_work.value['bits'], @@ -301,8 +334,8 @@ class WorkerBridge(worker_interface.WorkerBridge): received_header_hashes = set() def got_response(header, user, coinbase_nonce): - assert len(coinbase_nonce) == self.COINBASE_NONCE_LENGTH == 4 - new_packed_gentx = packed_gentx[:-4-4] + coinbase_nonce + packed_gentx[-4:] if coinbase_nonce != '\0'*self.COINBASE_NONCE_LENGTH else packed_gentx + assert len(coinbase_nonce) == self.COINBASE_NONCE_LENGTH + new_packed_gentx = packed_gentx[:-self.COINBASE_NONCE_LENGTH-4] + coinbase_nonce + packed_gentx[-4:] if coinbase_nonce != '\0'*self.COINBASE_NONCE_LENGTH else packed_gentx new_gentx = bitcoin_data.tx_type.unpack(new_packed_gentx) if coinbase_nonce != '\0'*self.COINBASE_NONCE_LENGTH else gentx header_hash = bitcoin_data.hash256(bitcoin_data.block_header_type.pack(header)) @@ -352,7 +385,8 @@ class WorkerBridge(worker_interface.WorkerBridge): log.err(None, 'Error while processing merged mining POW:') if pow_hash <= share_info['bits'].target and header_hash not in received_header_hashes: - share = get_share(header, pack.IntType(32).unpack(coinbase_nonce)) + last_txout_nonce = pack.IntType(8*self.COINBASE_NONCE_LENGTH).unpack(coinbase_nonce) + share = get_share(header, last_txout_nonce) print 'GOT SHARE! %s %s prev %s age %.2fs%s' % ( user, @@ -389,7 +423,8 @@ class WorkerBridge(worker_interface.WorkerBridge): self.recent_shares_ts_work.append((time.time(), bitcoin_data.target_to_average_attempts(target))) while len(self.recent_shares_ts_work) > 50: self.recent_shares_ts_work.pop(0) - self.local_rate_monitor.add_datum(dict(work=bitcoin_data.target_to_average_attempts(target), dead=not on_time, user=user)) + self.local_rate_monitor.add_datum(dict(work=bitcoin_data.target_to_average_attempts(target), dead=not on_time, user=user, share_target=share_info['bits'].target)) + self.local_addr_rate_monitor.add_datum(dict(work=bitcoin_data.target_to_average_attempts(target), pubkey_hash=pubkey_hash)) return on_time