X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=p2pool%2Fp2p.py;h=57c56bf911509ad392bcebca4cc48ec11ecda079;hb=541fa38d384428337da22f5115ae8ce92ed3f8e2;hp=a63fac2bd14aa556fd0026dbded923a5bee5b8de;hpb=7e823017a508feb861ee05cb163df88cde35b57b;p=p2pool.git diff --git a/p2pool/p2p.py b/p2pool/p2p.py index a63fac2..57c56bf 100644 --- a/p2pool/p2p.py +++ b/p2pool/p2p.py @@ -2,6 +2,7 @@ from __future__ import division import math import random +import sys import time from twisted.internet import defer, protocol, reactor @@ -20,8 +21,8 @@ def fragment(f, **kwargs): try: return f(**kwargs) except p2protocol.TooLong: - att(f, **dict((k, v[:len(v)//2]) for k, v in kwargs.iteritems())) - return att(f, **dict((k, v[len(v)//2:]) for k, v in kwargs.iteritems())) + fragment(f, **dict((k, v[:len(v)//2]) for k, v in kwargs.iteritems())) + return fragment(f, **dict((k, v[len(v)//2:]) for k, v in kwargs.iteritems())) class Protocol(p2protocol.Protocol): max_remembered_txs_size = 2500000 @@ -44,7 +45,7 @@ class Protocol(p2protocol.Protocol): self.addr = self.transport.getPeer().host, self.transport.getPeer().port self.send_version( - version=8, + version=1000, services=0, addr_to=dict( services=0, @@ -96,7 +97,8 @@ class Protocol(p2protocol.Protocol): if p2pool.DEBUG: print "Bad peer banned:", self.addr self.transport.loseConnection() - self.node.bans[self.transport.getPeer().host] = time.time() + 60*60 + if self.transport.getPeer().host != '127.0.0.1': # never ban localhost + self.node.bans[self.transport.getPeer().host] = time.time() + 60*60 def _timeout(self): self.timeout_delayed = None @@ -116,7 +118,7 @@ class Protocol(p2protocol.Protocol): def handle_version(self, version, services, addr_to, addr_from, nonce, sub_version, mode, best_share_hash): if self.other_version is not None: raise PeerMisbehavingError('more than one version message') - if version < 4: + if version < 8: raise PeerMisbehavingError('peer too old') self.other_version = version @@ -151,7 +153,7 @@ class Protocol(p2protocol.Protocol): random.expovariate(1/100)][-1]) self._stop_thread2 = deferral.run_repeatedly(lambda: [ - self.send_addrme(port=self.node.port), + self.send_addrme(port=self.node.serverfactory.listen_port.getHost().port) if self.node.serverfactory.listen_port is not None else None, random.expovariate(1/(100*len(self.node.peers) + 1))][-1]) if best_share_hash is not None: @@ -181,16 +183,16 @@ class Protocol(p2protocol.Protocol): added = set(after) - set(before) removed = set(before) - set(after) if added: - self.remote_remembered_txs_size += sum(len(bitcoin_data.tx_type.pack(after[x])) for x in added) + self.remote_remembered_txs_size += sum(100 + bitcoin_data.tx_type.packed_size(after[x]) for x in added) assert self.remote_remembered_txs_size <= self.max_remembered_txs_size fragment(self.send_remember_tx, tx_hashes=[x for x in added if x in self.remote_tx_hashes], txs=[after[x] for x in added if x not in self.remote_tx_hashes]) if removed: self.send_forget_tx(tx_hashes=list(removed)) - self.remote_remembered_txs_size -= sum(len(bitcoin_data.tx_type.pack(before[x])) for x in removed) + self.remote_remembered_txs_size -= sum(100 + bitcoin_data.tx_type.packed_size(before[x]) for x in removed) watch_id2 = self.node.mining_txs_var.transitioned.watch(update_remote_view_of_my_mining_txs) self.connection_lost_event.watch(lambda: self.node.mining_txs_var.transitioned.unwatch(watch_id2)) - self.remote_remembered_txs_size += sum(len(bitcoin_data.tx_type.pack(x)) for x in self.node.mining_txs_var.value.values()) + self.remote_remembered_txs_size += sum(100 + bitcoin_data.tx_type.packed_size(x) for x in self.node.mining_txs_var.value.values()) assert self.remote_remembered_txs_size <= self.max_remembered_txs_size fragment(self.send_remember_tx, tx_hashes=[], txs=self.node.mining_txs_var.value.values()) @@ -255,7 +257,7 @@ class Protocol(p2protocol.Protocol): ('shares', pack.ListType(p2pool_data.share_type)), ]) def handle_shares(self, shares): - self.node.handle_shares([p2pool_data.load_share(share, self.node.net, self) for share in shares if share['type'] not in [6, 7]], self) + self.node.handle_shares([p2pool_data.load_share(share, self.node.net, self) for share in shares if share['type'] >= 9], self) def sendShares(self, shares, tracker, known_txs, include_txs_with=[]): if not shares: @@ -265,11 +267,13 @@ class Protocol(p2protocol.Protocol): tx_hashes = set() for share in shares: if share.hash in include_txs_with: - tx_hashes.update(share.get_other_tx_hashes(tracker)) + x = share.get_other_tx_hashes(tracker) + if x is not None: + tx_hashes.update(x) hashes_to_send = [x for x in tx_hashes if x not in self.node.mining_txs_var.value and x in known_txs] - new_remote_remembered_txs_size = self.remote_remembered_txs_size + sum(len(bitcoin_data.tx_type.pack(known_txs[x])) for x in hashes_to_send) + new_remote_remembered_txs_size = self.remote_remembered_txs_size + sum(100 + bitcoin_data.tx_type.packed_size(known_txs[x]) for x in hashes_to_send) if new_remote_remembered_txs_size > self.max_remembered_txs_size: raise ValueError('shares have too many txs') self.remote_remembered_txs_size = new_remote_remembered_txs_size @@ -281,7 +285,7 @@ class Protocol(p2protocol.Protocol): if self.other_version >= 8: res = self.send_forget_tx(tx_hashes=hashes_to_send) - self.remote_remembered_txs_size -= sum(len(bitcoin_data.tx_type.pack(known_txs[x])) for x in hashes_to_send) + self.remote_remembered_txs_size -= sum(100 + bitcoin_data.tx_type.packed_size(known_txs[x]) for x in hashes_to_send) return res @@ -306,7 +310,7 @@ class Protocol(p2protocol.Protocol): ]) def handle_sharereply(self, id, result, shares): if result == 'good': - res = [p2pool_data.load_share(share, self.node.net, self) for share in shares if share['type'] not in [6, 7]] + res = [p2pool_data.load_share(share, self.node.net, self) for share in shares if share['type'] >= 9] else: res = failure.Failure("sharereply result: " + result) self.get_shares.got_response(id, res) @@ -323,13 +327,15 @@ class Protocol(p2protocol.Protocol): ('tx_hashes', pack.ListType(pack.IntType(256))), ]) def handle_have_tx(self, tx_hashes): - assert self.remote_tx_hashes.isdisjoint(tx_hashes) + #assert self.remote_tx_hashes.isdisjoint(tx_hashes) self.remote_tx_hashes.update(tx_hashes) + while len(self.remote_tx_hashes) > 10000: + self.remote_tx_hashes.pop() message_losing_tx = pack.ComposedType([ ('tx_hashes', pack.ListType(pack.IntType(256))), ]) def handle_losing_tx(self, tx_hashes): - assert self.remote_tx_hashes.issuperset(tx_hashes) + #assert self.remote_tx_hashes.issuperset(tx_hashes) self.remote_tx_hashes.difference_update(tx_hashes) @@ -350,15 +356,15 @@ class Protocol(p2protocol.Protocol): for cache in self.known_txs_cache.itervalues(): if tx_hash in cache: tx = cache[tx_hash] - print 'Transaction rescued from peer latency cache!' + print 'Transaction %064x rescued from peer latency cache!' % (tx_hash,) break else: - print >>sys.stderr, 'Peer referenced unknown transaction, disconnecting' + print >>sys.stderr, 'Peer referenced unknown transaction %064x, disconnecting' % (tx_hash,) self.transport.loseConnection() return self.remembered_txs[tx_hash] = tx - self.remembered_txs_size += len(bitcoin_data.tx_type.pack(tx)) + self.remembered_txs_size += 100 + bitcoin_data.tx_type.packed_size(tx) new_known_txs = dict(self.node.known_txs_var.value) warned = False for tx in txs: @@ -369,11 +375,11 @@ class Protocol(p2protocol.Protocol): return if tx_hash in self.node.known_txs_var.value and not warned: - print 'Peer sent entire transaction that was already received' + print 'Peer sent entire transaction %064x that was already received' % (tx_hash,) warned = True self.remembered_txs[tx_hash] = tx - self.remembered_txs_size += len(bitcoin_data.tx_type.pack(tx)) + self.remembered_txs_size += 100 + bitcoin_data.tx_type.packed_size(tx) new_known_txs[tx_hash] = tx self.node.known_txs_var.set(new_known_txs) if self.remembered_txs_size >= self.max_remembered_txs_size: @@ -383,7 +389,7 @@ class Protocol(p2protocol.Protocol): ]) def handle_forget_tx(self, tx_hashes): for tx_hash in tx_hashes: - self.remembered_txs_size -= len(bitcoin_data.tx_type.pack(self.remembered_txs[tx_hash])) + self.remembered_txs_size -= 100 + bitcoin_data.tx_type.packed_size(self.remembered_txs[tx_hash]) assert self.remembered_txs_size >= 0 del self.remembered_txs[tx_hash] @@ -416,6 +422,7 @@ class ServerFactory(protocol.ServerFactory): self.conns = {} self.running = False + self.listen_port = None def buildProtocol(self, addr): if sum(self.conns.itervalues()) >= self.max_conns or self.conns.get(self._host_to_ident(addr.host), 0) >= 3: @@ -551,17 +558,17 @@ class SingleClientFactory(protocol.ReconnectingClientFactory): self.node.lost_conn(proto, reason) class Node(object): - def __init__(self, best_share_hash_func, port, net, addr_store={}, connect_addrs=set(), desired_outgoing_conns=10, max_outgoing_attempts=30, max_incoming_conns=50, preferred_storage=1000, traffic_happened=variable.Event(), known_txs_var=variable.Variable({}), mining_txs_var=variable.Variable({})): + def __init__(self, best_share_hash_func, port, net, addr_store={}, connect_addrs=set(), desired_outgoing_conns=10, max_outgoing_attempts=30, max_incoming_conns=50, preferred_storage=1000, known_txs_var=variable.Variable({}), mining_txs_var=variable.Variable({})): self.best_share_hash_func = best_share_hash_func self.port = port self.net = net self.addr_store = dict(addr_store) self.connect_addrs = connect_addrs self.preferred_storage = preferred_storage - self.traffic_happened = traffic_happened self.known_txs_var = known_txs_var self.mining_txs_var = mining_txs_var + self.traffic_happened = variable.Event() self.nonce = random.randrange(2**64) self.peers = {} self.bans = {} # address -> end_time