X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=p2pool%2Fnode.py;h=4a91620d8b7a8a5bed50345313423ba0a7995d3b;hb=012a8830c61226f48d979db9800edf1862d83df4;hp=a31dece55c63645caac3c3bb86dfe2f2dc91e0e9;hpb=67a76e69e8eb3ad0e97364d1f9315c3c29d01487;p=p2pool.git diff --git a/p2pool/node.py b/p2pool/node.py index a31dece..4a91620 100644 --- a/p2pool/node.py +++ b/p2pool/node.py @@ -2,7 +2,7 @@ import random import sys import time -from twisted.internet import defer, reactor, task +from twisted.internet import defer, reactor from twisted.python import log from p2pool import data as p2pool_data, p2p @@ -25,17 +25,25 @@ class P2PNode(p2p.Node): print 'Processing %i shares from %s...' % (len(shares), '%s:%i' % peer.addr if peer is not None else None) new_count = 0 - for share in shares: + all_new_txs = {} + for share, new_txs in shares: + if new_txs is not None: + all_new_txs.update((bitcoin_data.hash256(bitcoin_data.tx_type.pack(new_tx)), new_tx) for new_tx in new_txs) + if share.hash in self.node.tracker.items: #print 'Got duplicate share, ignoring. Hash: %s' % (p2pool_data.format_hash(share.hash),) continue new_count += 1 - #print 'Received share %s from %r' % (p2pool_data.format_hash(share.hash), share.peer.addr if share.peer is not None else None) + #print 'Received share %s from %r' % (p2pool_data.format_hash(share.hash), share.peer_addr) self.node.tracker.add(share) + new_known_txs = dict(self.node.known_txs_var.value) + new_known_txs.update(all_new_txs) + self.node.known_txs_var.set(new_known_txs) + if new_count: self.node.set_best_share() @@ -56,7 +64,7 @@ class P2PNode(p2p.Node): except: log.err(None, 'in handle_share_hashes:') else: - self.handle_shares(shares, peer) + self.handle_shares([(share, []) for share in shares], peer) def handle_get_shares(self, hashes, parents, stops, peer): parents = min(parents, 1000//len(hashes)) @@ -67,7 +75,8 @@ class P2PNode(p2p.Node): if share.hash in stops: break shares.append(share) - print 'Sending %i shares to %s:%i' % (len(shares), peer.addr[0], peer.addr[1]) + if len(shares) > 0: + print 'Sending %i shares to %s:%i' % (len(shares), peer.addr[0], peer.addr[1]) return shares def handle_bestblock(self, header, peer): @@ -75,7 +84,6 @@ class P2PNode(p2p.Node): raise p2p.PeerMisbehavingError('received block header fails PoW test') self.node.handle_header(header) - @defer.inlineCallbacks def broadcast_share(self, share_hash): shares = [] for share in self.node.tracker.get_chain(share_hash, min(5, self.node.tracker.get_height(share_hash))): @@ -84,8 +92,8 @@ class P2PNode(p2p.Node): self.shared_share_hashes.add(share.hash) shares.append(share) - for peer in list(self.peers.itervalues()): - yield peer.sendShares([share for share in shares if share.peer is not peer], self.node.tracker, self.node.known_txs_var.value, include_txs_with=[share_hash]) + for peer in self.peers.itervalues(): + peer.sendShares([share for share in shares if share.peer_addr != peer.addr], self.node.tracker, self.node.known_txs_var.value, include_txs_with=[share_hash]) def start(self): p2p.Node.start(self) @@ -98,7 +106,7 @@ class P2PNode(p2p.Node): def download_shares(): while True: desired = yield self.node.desired_var.get_when_satisfies(lambda val: len(val) != 0) - peer2, share_hash = random.choice(desired) + peer_addr, share_hash = random.choice(desired) if len(self.peers) == 0: yield deferral.sleep(1) @@ -109,11 +117,14 @@ class P2PNode(p2p.Node): try: shares = yield peer.get_shares( hashes=[share_hash], - parents=49, + parents=random.randrange(500), # randomize parents so that we eventually get past a too large block of shares stops=list(set(self.node.tracker.heads) | set( self.node.tracker.get_nth_parent_hash(head, min(max(0, self.node.tracker.get_height_and_last(head)[0] - 1), 10)) for head in self.node.tracker.heads ))[:100], ) + except defer.TimeoutError: + print 'Share request timed out!' + continue except: log.err(None, 'in download_shares:') continue @@ -121,7 +132,7 @@ class P2PNode(p2p.Node): if not shares: yield deferral.sleep(1) # sleep so we don't keep rerequesting the same share nobody has continue - self.handle_shares(shares, peer) + self.handle_shares([(share, []) for share in shares], peer) @self.node.best_block_header.changed.watch @@ -272,25 +283,32 @@ class Node(object): if tx_hash in self.known_txs_var.value: new_known_txs[tx_hash] = self.known_txs_var.value[tx_hash] self.known_txs_var.set(new_known_txs) - t = task.LoopingCall(forget_old_txs) + t = deferral.RobustLoopingCall(forget_old_txs) t.start(10) stop_signal.watch(t.stop) - t = task.LoopingCall(self.clean_tracker) + t = deferral.RobustLoopingCall(self.clean_tracker) t.start(5) stop_signal.watch(t.stop) def set_best_share(self): - best, desired, decorated_heads = self.tracker.think(self.get_height_rel_highest, self.bitcoind_work.value['previous_block'], self.bitcoind_work.value['bits'], self.known_txs_var.value) + best, desired, decorated_heads, bad_peer_addresses = self.tracker.think(self.get_height_rel_highest, self.bitcoind_work.value['previous_block'], self.bitcoind_work.value['bits'], self.known_txs_var.value) self.best_share_var.set(best) self.desired_var.set(desired) + if self.p2p_node is not None: + for bad_peer_address in bad_peer_addresses: + # XXX O(n) + for peer in self.p2p_node.peers.itervalues(): + if peer.addr == bad_peer_address: + peer.badPeerHappened() + break def get_current_txouts(self): return p2pool_data.get_expected_payouts(self.tracker, self.best_share_var.value, self.bitcoind_work.value['bits'].target, self.bitcoind_work.value['subsidy'], self.net) def clean_tracker(self): - best, desired, decorated_heads = self.tracker.think(self.get_height_rel_highest, self.bitcoind_work.value['previous_block'], self.bitcoind_work.value['bits'], self.known_txs_var.value) + best, desired, decorated_heads, bad_peer_addresses = self.tracker.think(self.get_height_rel_highest, self.bitcoind_work.value['previous_block'], self.bitcoind_work.value['bits'], self.known_txs_var.value) # eat away at heads if decorated_heads: