self.addr = self.transport.getPeer().host, self.transport.getPeer().port
self.send_version(
- version=8,
+ version=1100,
services=0,
addr_to=dict(
services=0,
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
('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.addr) for share in shares if share['type'] >= 9], self)
def sendShares(self, shares, tracker, known_txs, include_txs_with=[]):
if not shares:
])
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)
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
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
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)