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
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()
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))
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):
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))):
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)
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)
try:
shares = yield peer.get_shares(
hashes=[share_hash],
- parents=500,
+ 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],
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
print
def forget_old_txs():
- print "KNOWN:", sum(bitcoin_data.tx_type.packed_size(tx) for tx in self.known_txs_var.value.itervalues())
- print "MINING:", sum(bitcoin_data.tx_type.packed_size(tx) for tx in self.mining_txs_var.value.itervalues())
new_known_txs = {}
if self.p2p_node is not None:
for peer in self.p2p_node.peers.itervalues():
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)