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
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: