X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=p2pool%2Fp2p.py;h=bc61982eca3c0548e4f19aa7f18d6fef705230c9;hb=9541a77695bc98cccff001541ccb3880bca6d875;hp=22a731ff9e2731cc99d6c6ea4f26af08a10b5e97;hpb=764a90c3ab7c0fe29a85fd588333d17a1138ac6a;p=p2pool.git diff --git a/p2pool/p2p.py b/p2pool/p2p.py index 22a731f..bc61982 100644 --- a/p2pool/p2p.py +++ b/p2pool/p2p.py @@ -19,10 +19,10 @@ class PeerMisbehavingError(Exception): def fragment(f, **kwargs): try: - return f(**kwargs) + f(**kwargs) except p2protocol.TooLong: 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())) + fragment(f, **dict((k, v[len(v)//2:]) for k, v in kwargs.iteritems())) class Protocol(p2protocol.Protocol): max_remembered_txs_size = 2500000 @@ -36,8 +36,6 @@ class Protocol(p2protocol.Protocol): self.connected2 = False def connectionMade(self): - p2protocol.Protocol.connectionMade(self) - self.factory.proto_made_connection(self) self.connection_lost_event = variable.Event() @@ -45,7 +43,7 @@ class Protocol(p2protocol.Protocol): self.addr = self.transport.getPeer().host, self.transport.getPeer().port self.send_version( - version=8, + version=1300, services=0, addr_to=dict( services=0, @@ -69,7 +67,7 @@ class Protocol(p2protocol.Protocol): max_id=2**256, func=lambda id, hashes, parents, stops: self.send_sharereq(id=id, hashes=hashes, parents=parents, stops=stops), timeout=15, - on_timeout=self.transport.loseConnection, + on_timeout=self.disconnect, ) self.remote_tx_hashes = set() # view of peer's known_txs # not actually initially empty, but sending txs instead of tx hashes won't hurt @@ -82,7 +80,7 @@ class Protocol(p2protocol.Protocol): def _connect_timeout(self): self.timeout_delayed = None print 'Handshake timed out, disconnecting from %s:%i' % self.addr - self.transport.loseConnection() + self.disconnect() def packetReceived(self, command, payload2): try: @@ -96,13 +94,14 @@ class Protocol(p2protocol.Protocol): def badPeerHappened(self): if p2pool.DEBUG: print "Bad peer banned:", self.addr - self.transport.loseConnection() - self.node.bans[self.transport.getPeer().host] = time.time() + 60*60 + self.disconnect() + 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 print 'Connection timed out, disconnecting from %s:%i' % self.addr - self.transport.loseConnection() + self.disconnect() message_version = pack.ComposedType([ ('version', pack.IntType(32)), @@ -117,7 +116,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 < 1300: raise PeerMisbehavingError('peer too old') self.other_version = version @@ -129,7 +128,7 @@ class Protocol(p2protocol.Protocol): if nonce in self.node.peers: if p2pool.DEBUG: print 'Detected duplicate connection, disconnecting from %s:%i' % self.addr - self.transport.loseConnection() + self.disconnect() return self.nonce = nonce @@ -152,15 +151,12 @@ 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: self.node.handle_share_hashes([best_share_hash], self) - if self.other_version < 8: - return - def update_remote_view_of_my_known_txs(before, after): added = set(after) - set(before) removed = set(before) - set(after) @@ -182,16 +178,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()) @@ -256,35 +252,62 @@ 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) - - def sendShares(self, shares, tracker, known_txs, include_txs_with=[]): - if not shares: - return defer.succeed(None) - - if self.other_version >= 8: - tx_hashes = set() - for share in shares: - if share.hash in include_txs_with: - tx_hashes.update(share.get_other_tx_hashes(tracker)) - - hashes_to_send = [x for x in tx_hashes if x not in self.node.mining_txs_var.value and x in known_txs] + result = [] + for wrappedshare in shares: + if wrappedshare['type'] < 9: continue + share = p2pool_data.load_share(wrappedshare, self.node.net, self.addr) + if wrappedshare['type'] >= 13: + txs = [] + for tx_hash in share.share_info['new_transaction_hashes']: + if tx_hash in self.node.known_txs_var.value: + tx = self.node.known_txs_var.value[tx_hash] + else: + for cache in self.known_txs_cache.itervalues(): + if tx_hash in cache: + tx = cache[tx_hash] + print 'Transaction %064x rescued from peer latency cache!' % (tx_hash,) + break + else: + print >>sys.stderr, 'Peer referenced unknown transaction %064x, disconnecting' % (tx_hash,) + self.disconnect() + return + txs.append(tx) + else: + txs = None - 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) - 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 + result.append((share, txs)) - fragment(self.send_remember_tx, tx_hashes=[x for x in hashes_to_send if x in self.remote_tx_hashes], txs=[known_txs[x] for x in hashes_to_send if x not in self.remote_tx_hashes]) + self.node.handle_shares(result, self) + + def sendShares(self, shares, tracker, known_txs, include_txs_with=[]): + tx_hashes = set() + for share in shares: + if share.VERSION >= 13: + # send full transaction for every new_transaction_hash that peer does not know + for tx_hash in share.share_info['new_transaction_hashes']: + assert tx_hash in known_txs, 'tried to broadcast share without knowing all its new transactions' + if tx_hash not in self.remote_tx_hashes: + tx_hashes.add(tx_hash) + continue + if share.hash in include_txs_with: + x = share.get_other_tx_hashes(tracker) + if x is not None: + tx_hashes.update(x) - res = fragment(self.send_shares, shares=[share.as_share() for share in shares]) + hashes_to_send = [x for x in tx_hashes if x not in self.node.mining_txs_var.value and x in known_txs] - 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) + 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 + + fragment(self.send_remember_tx, tx_hashes=[x for x in hashes_to_send if x in self.remote_tx_hashes], txs=[known_txs[x] for x in hashes_to_send if x not in self.remote_tx_hashes]) + + fragment(self.send_shares, shares=[share.as_share() for share in shares]) + + self.send_forget_tx(tx_hashes=hashes_to_send) - return res + self.remote_remembered_txs_size -= sum(100 + bitcoin_data.tx_type.packed_size(known_txs[x]) for x in hashes_to_send) message_sharereq = pack.ComposedType([ @@ -307,7 +330,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.addr) for share in shares if share['type'] >= 9] else: res = failure.Failure("sharereply result: " + result) self.get_shares.got_response(id, res) @@ -324,13 +347,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) @@ -342,7 +367,7 @@ class Protocol(p2protocol.Protocol): for tx_hash in tx_hashes: if tx_hash in self.remembered_txs: print >>sys.stderr, 'Peer referenced transaction twice, disconnecting' - self.transport.loseConnection() + self.disconnect() return if tx_hash in self.node.known_txs_var.value: @@ -351,30 +376,30 @@ 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' - self.transport.loseConnection() + print >>sys.stderr, 'Peer referenced unknown transaction %064x, disconnecting' % (tx_hash,) + self.disconnect() 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: tx_hash = bitcoin_data.hash256(bitcoin_data.tx_type.pack(tx)) if tx_hash in self.remembered_txs: print >>sys.stderr, 'Peer referenced transaction twice, disconnecting' - self.transport.loseConnection() + self.disconnect() 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: @@ -384,7 +409,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] @@ -417,6 +442,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: @@ -628,7 +654,8 @@ class Node(object): old_services, old_first_seen, old_last_seen = self.addr_store[host, port] self.addr_store[host, port] = services, old_first_seen, max(old_last_seen, timestamp) else: - self.addr_store[host, port] = services, timestamp, timestamp + if len(self.addr_store) < 10000: + self.addr_store[host, port] = services, timestamp, timestamp def handle_shares(self, shares, peer): print 'handle_shares', (shares, peer)