refactored p2pool node implementation from p2pool.main to p2pool.node. dedicated...
[p2pool.git] / p2pool / web.py
index 3eafa1b..ba7e9db 100644 (file)
@@ -44,21 +44,22 @@ def _atomic_write(filename, data):
         os.remove(filename)
         os.rename(filename + '.new', filename)
 
-def get_web_root(tracker, bitcoind_work, get_current_txouts, datadir_path, net, get_stale_counts, my_pubkey_hash, local_rate_monitor, worker_fee, p2p_node, my_share_hashes, pseudoshare_received, share_received, best_share_var, bitcoin_warning_var, traffic_happened, donation_percentage):
+def get_web_root(wb, datadir_path, bitcoind_warning_var):
+    node = wb.node
     start_time = time.time()
     
     web_root = resource.Resource()
     
     def get_users():
-        height, last = tracker.get_height_and_last(best_share_var.value)
-        weights, total_weight, donation_weight = tracker.get_cumulative_weights(best_share_var.value, min(height, 720), 65535*2**256)
+        height, last = node.tracker.get_height_and_last(node.best_share_var.value)
+        weights, total_weight, donation_weight = node.tracker.get_cumulative_weights(node.best_share_var.value, min(height, 720), 65535*2**256)
         res = {}
         for script in sorted(weights, key=lambda s: weights[s]):
-            res[bitcoin_data.script2_to_address(script, net.PARENT)] = weights[script]/total_weight
+            res[bitcoin_data.script2_to_address(script, node.net.PARENT)] = weights[script]/total_weight
         return res
     
     def get_current_scaled_txouts(scale, trunc=0):
-        txouts = get_current_txouts()
+        txouts = node.get_current_txouts()
         total = sum(txouts.itervalues())
         results = dict((script, value*scale//total) for script, value in txouts.iteritems())
         if trunc > 0:
@@ -84,15 +85,15 @@ def get_web_root(tracker, bitcoind_work, get_current_txouts, datadir_path, net,
         total = int(float(total)*1e8)
         trunc = int(float(trunc)*1e8)
         return json.dumps(dict(
-            (bitcoin_data.script2_to_address(script, net.PARENT), value/1e8)
+            (bitcoin_data.script2_to_address(script, node.net.PARENT), value/1e8)
             for script, value in get_current_scaled_txouts(total, trunc).iteritems()
-            if bitcoin_data.script2_to_address(script, net.PARENT) is not None
+            if bitcoin_data.script2_to_address(script, node.net.PARENT) is not None
         ))
     
     def get_local_rates():
         miner_hash_rates = {}
         miner_dead_hash_rates = {}
-        datums, dt = local_rate_monitor.get_datums_in_last()
+        datums, dt = wb.local_rate_monitor.get_datums_in_last()
         for datum in datums:
             miner_hash_rates[datum['user']] = miner_hash_rates.get(datum['user'], 0) + datum['work']/dt
             if datum['dead']:
@@ -101,43 +102,43 @@ def get_web_root(tracker, bitcoind_work, get_current_txouts, datadir_path, net,
     
     def get_global_stats():
         # averaged over last hour
-        if tracker.get_height(best_share_var.value) < 10:
+        if node.tracker.get_height(node.best_share_var.value) < 10:
             return None
-        lookbehind = min(tracker.get_height(best_share_var.value), 3600//net.SHARE_PERIOD)
+        lookbehind = min(node.tracker.get_height(node.best_share_var.value), 3600//node.net.SHARE_PERIOD)
         
-        nonstale_hash_rate = p2pool_data.get_pool_attempts_per_second(tracker, best_share_var.value, lookbehind)
-        stale_prop = p2pool_data.get_average_stale_prop(tracker, best_share_var.value, lookbehind)
+        nonstale_hash_rate = p2pool_data.get_pool_attempts_per_second(node.tracker, node.best_share_var.value, lookbehind)
+        stale_prop = p2pool_data.get_average_stale_prop(node.tracker, node.best_share_var.value, lookbehind)
         return dict(
             pool_nonstale_hash_rate=nonstale_hash_rate,
             pool_hash_rate=nonstale_hash_rate/(1 - stale_prop),
             pool_stale_prop=stale_prop,
-            min_difficulty=bitcoin_data.target_to_difficulty(tracker.items[best_share_var.value].max_target),
+            min_difficulty=bitcoin_data.target_to_difficulty(node.tracker.items[node.best_share_var.value].max_target),
         )
     
     def get_local_stats():
-        if tracker.get_height(best_share_var.value) < 10:
+        if node.tracker.get_height(node.best_share_var.value) < 10:
             return None
-        lookbehind = min(tracker.get_height(best_share_var.value), 3600//net.SHARE_PERIOD)
+        lookbehind = min(node.tracker.get_height(node.best_share_var.value), 3600//node.net.SHARE_PERIOD)
         
-        global_stale_prop = p2pool_data.get_average_stale_prop(tracker, best_share_var.value, lookbehind)
+        global_stale_prop = p2pool_data.get_average_stale_prop(node.tracker, node.best_share_var.value, lookbehind)
         
-        my_unstale_count = sum(1 for share in tracker.get_chain(best_share_var.value, lookbehind) if share.hash in my_share_hashes)
-        my_orphan_count = sum(1 for share in tracker.get_chain(best_share_var.value, lookbehind) if share.hash in my_share_hashes and share.share_data['stale_info'] == 'orphan')
-        my_doa_count = sum(1 for share in tracker.get_chain(best_share_var.value, lookbehind) if share.hash in my_share_hashes and share.share_data['stale_info'] == 'doa')
+        my_unstale_count = sum(1 for share in node.tracker.get_chain(node.best_share_var.value, lookbehind) if share.hash in wb.my_share_hashes)
+        my_orphan_count = sum(1 for share in node.tracker.get_chain(node.best_share_var.value, lookbehind) if share.hash in wb.my_share_hashes and share.share_data['stale_info'] == 'orphan')
+        my_doa_count = sum(1 for share in node.tracker.get_chain(node.best_share_var.value, lookbehind) if share.hash in wb.my_share_hashes and share.share_data['stale_info'] == 'doa')
         my_share_count = my_unstale_count + my_orphan_count + my_doa_count
         my_stale_count = my_orphan_count + my_doa_count
         
         my_stale_prop = my_stale_count/my_share_count if my_share_count != 0 else None
         
         my_work = sum(bitcoin_data.target_to_average_attempts(share.target)
-            for share in tracker.get_chain(best_share_var.value, lookbehind - 1)
-            if share.hash in my_share_hashes)
-        actual_time = (tracker.items[best_share_var.value].timestamp -
-            tracker.items[tracker.get_nth_parent_hash(best_share_var.value, lookbehind - 1)].timestamp)
+            for share in node.tracker.get_chain(node.best_share_var.value, lookbehind - 1)
+            if share.hash in wb.my_share_hashes)
+        actual_time = (node.tracker.items[node.best_share_var.value].timestamp -
+            node.tracker.items[node.tracker.get_nth_parent_hash(node.best_share_var.value, lookbehind - 1)].timestamp)
         share_att_s = my_work / actual_time
         
         miner_hash_rates, miner_dead_hash_rates = get_local_rates()
-        (stale_orphan_shares, stale_doa_shares), shares, _ = get_stale_counts()
+        (stale_orphan_shares, stale_doa_shares), shares, _ = wb.get_stale_counts()
         
         return dict(
             my_hash_rates_in_last_hour=dict(
@@ -163,8 +164,8 @@ def get_web_root(tracker, bitcoind_work, get_current_txouts, datadir_path, net,
             efficiency_if_miner_perfect=(1 - stale_orphan_shares/shares)/(1 - global_stale_prop) if shares else None, # ignores dead shares because those are miner's fault and indicated by pseudoshare rejection
             efficiency=(1 - (stale_orphan_shares+stale_doa_shares)/shares)/(1 - global_stale_prop) if shares else None,
             peers=dict(
-                incoming=sum(1 for peer in p2p_node.peers.itervalues() if peer.incoming),
-                outgoing=sum(1 for peer in p2p_node.peers.itervalues() if not peer.incoming),
+                incoming=sum(1 for peer in node.p2p_node.peers.itervalues() if peer.incoming),
+                outgoing=sum(1 for peer in node.p2p_node.peers.itervalues() if not peer.incoming),
             ),
             shares=dict(
                 total=shares,
@@ -172,11 +173,11 @@ def get_web_root(tracker, bitcoind_work, get_current_txouts, datadir_path, net,
                 dead=stale_doa_shares,
             ),
             uptime=time.time() - start_time,
-            attempts_to_share=bitcoin_data.target_to_average_attempts(tracker.items[best_share_var.value].max_target),
-            attempts_to_block=bitcoin_data.target_to_average_attempts(bitcoind_work.value['bits'].target),
-            block_value=bitcoind_work.value['subsidy']*1e-8,
-            warnings=p2pool_data.get_warnings(tracker, best_share_var.value, net, bitcoin_warning_var.value, bitcoind_work.value),
-            donation_proportion=donation_percentage/100,
+            attempts_to_share=bitcoin_data.target_to_average_attempts(node.tracker.items[node.best_share_var.value].max_target),
+            attempts_to_block=bitcoin_data.target_to_average_attempts(node.bitcoind_work.value['bits'].target),
+            block_value=node.bitcoind_work.value['subsidy']*1e-8,
+            warnings=p2pool_data.get_warnings(node.tracker, node.best_share_var.value, node.net, bitcoind_warning_var.value, node.bitcoind_work.value),
+            donation_proportion=wb.donation_percentage/100,
         )
     
     class WebInterface(deferred_resource.DeferredResource):
@@ -194,18 +195,18 @@ def get_web_root(tracker, bitcoind_work, get_current_txouts, datadir_path, net,
             res = yield self.func(*self.args)
             defer.returnValue(json.dumps(res) if self.mime_type == 'application/json' else res)
     
-    web_root.putChild('rate', WebInterface(lambda: p2pool_data.get_pool_attempts_per_second(tracker, best_share_var.value, 720)/(1-p2pool_data.get_average_stale_prop(tracker, best_share_var.value, 720))))
-    web_root.putChild('difficulty', WebInterface(lambda: bitcoin_data.target_to_difficulty(tracker.items[best_share_var.value].max_target)))
+    web_root.putChild('rate', WebInterface(lambda: p2pool_data.get_pool_attempts_per_second(node.tracker, node.best_share_var.value, 720)/(1-p2pool_data.get_average_stale_prop(node.tracker, node.best_share_var.value, 720))))
+    web_root.putChild('difficulty', WebInterface(lambda: bitcoin_data.target_to_difficulty(node.tracker.items[node.best_share_var.value].max_target)))
     web_root.putChild('users', WebInterface(get_users))
-    web_root.putChild('user_stales', WebInterface(lambda: dict((bitcoin_data.pubkey_hash_to_address(ph, net.PARENT), prop) for ph, prop in
-        p2pool_data.get_user_stale_props(tracker, best_share_var.value, tracker.get_height(best_share_var.value)).iteritems())))
-    web_root.putChild('fee', WebInterface(lambda: worker_fee))
-    web_root.putChild('current_payouts', WebInterface(lambda: dict((bitcoin_data.script2_to_address(script, net.PARENT), value/1e8) for script, value in get_current_txouts().iteritems())))
+    web_root.putChild('user_stales', WebInterface(lambda: dict((bitcoin_data.pubkey_hash_to_address(ph, node.net.PARENT), prop) for ph, prop in
+        p2pool_data.get_user_stale_props(node.tracker, node.best_share_var.value, node.tracker.get_height(node.best_share_var.value)).iteritems())))
+    web_root.putChild('fee', WebInterface(lambda: wb.worker_fee))
+    web_root.putChild('current_payouts', WebInterface(lambda: dict((bitcoin_data.script2_to_address(script, node.net.PARENT), value/1e8) for script, value in node.get_current_txouts().iteritems())))
     web_root.putChild('patron_sendmany', WebInterface(get_patron_sendmany, 'text/plain'))
     web_root.putChild('global_stats', WebInterface(get_global_stats))
     web_root.putChild('local_stats', WebInterface(get_local_stats))
-    web_root.putChild('peer_addresses', WebInterface(lambda: ['%s:%i' % (peer.transport.getPeer().host, peer.transport.getPeer().port) for peer in p2p_node.peers.itervalues()]))
-    web_root.putChild('peer_txpool_sizes', WebInterface(lambda: dict(('%s:%i' % (peer.transport.getPeer().host, peer.transport.getPeer().port), peer.remembered_txs_size) for peer in p2p_node.peers.itervalues())))
+    web_root.putChild('peer_addresses', WebInterface(lambda: ['%s:%i' % (peer.transport.getPeer().host, peer.transport.getPeer().port) for peer in node.p2p_node.peers.itervalues()]))
+    web_root.putChild('peer_txpool_sizes', WebInterface(lambda: dict(('%s:%i' % (peer.transport.getPeer().host, peer.transport.getPeer().port), peer.remembered_txs_size) for peer in node.p2p_node.peers.itervalues())))
     web_root.putChild('pings', WebInterface(defer.inlineCallbacks(lambda: defer.returnValue(
         dict([(a, (yield b)) for a, b in
             [(
@@ -213,19 +214,19 @@ def get_web_root(tracker, bitcoind_work, get_current_txouts, datadir_path, net,
                 defer.inlineCallbacks(lambda peer=peer: defer.returnValue(
                     min([(yield peer.do_ping().addCallback(lambda x: x/0.001).addErrback(lambda fail: None)) for i in xrange(3)])
                 ))()
-            ) for peer in list(p2p_node.peers.itervalues())]
+            ) for peer in list(node.p2p_node.peers.itervalues())]
         ])
     ))))
-    web_root.putChild('peer_versions', WebInterface(lambda: dict(('%s:%i' % peer.addr, peer.other_sub_version) for peer in p2p_node.peers.itervalues())))
-    web_root.putChild('payout_addr', WebInterface(lambda: bitcoin_data.pubkey_hash_to_address(my_pubkey_hash, net.PARENT)))
+    web_root.putChild('peer_versions', WebInterface(lambda: dict(('%s:%i' % peer.addr, peer.other_sub_version) for peer in node.p2p_node.peers.itervalues())))
+    web_root.putChild('payout_addr', WebInterface(lambda: bitcoin_data.pubkey_hash_to_address(wb.my_pubkey_hash, node.net.PARENT)))
     web_root.putChild('recent_blocks', WebInterface(lambda: [dict(
         ts=s.timestamp,
         hash='%064x' % s.header_hash,
         number=pack.IntType(24).unpack(s.share_data['coinbase'][1:4]),
         share='%064x' % s.hash,
-    ) for s in tracker.get_chain(best_share_var.value, min(tracker.get_height(best_share_var.value), 24*60*60//net.SHARE_PERIOD)) if s.pow_hash <= s.header['bits'].target]))
+    ) for s in node.tracker.get_chain(node.best_share_var.value, min(node.tracker.get_height(node.best_share_var.value), 24*60*60//node.net.SHARE_PERIOD)) if s.pow_hash <= s.header['bits'].target]))
     web_root.putChild('uptime', WebInterface(lambda: time.time() - start_time))
-    web_root.putChild('stale_rates', WebInterface(lambda: p2pool_data.get_stale_counts(tracker, best_share_var.value, 720, rates=True)))
+    web_root.putChild('stale_rates', WebInterface(lambda: p2pool_data.get_stale_counts(node.tracker, node.best_share_var.value, 720, rates=True)))
     
     new_root = resource.Resource()
     web_root.putChild('web', new_root)
@@ -241,31 +242,31 @@ def get_web_root(tracker, bitcoind_work, get_current_txouts, datadir_path, net,
         while stat_log and stat_log[0]['time'] < time.time() - 24*60*60:
             stat_log.pop(0)
         
-        lookbehind = 3600//net.SHARE_PERIOD
-        if tracker.get_height(best_share_var.value) < lookbehind:
+        lookbehind = 3600//node.net.SHARE_PERIOD
+        if node.tracker.get_height(node.best_share_var.value) < lookbehind:
             return None
         
-        global_stale_prop = p2pool_data.get_average_stale_prop(tracker, best_share_var.value, lookbehind)
-        (stale_orphan_shares, stale_doa_shares), shares, _ = get_stale_counts()
+        global_stale_prop = p2pool_data.get_average_stale_prop(node.tracker, node.best_share_var.value, lookbehind)
+        (stale_orphan_shares, stale_doa_shares), shares, _ = wb.get_stale_counts()
         miner_hash_rates, miner_dead_hash_rates = get_local_rates()
         
         stat_log.append(dict(
             time=time.time(),
-            pool_hash_rate=p2pool_data.get_pool_attempts_per_second(tracker, best_share_var.value, lookbehind)/(1-global_stale_prop),
+            pool_hash_rate=p2pool_data.get_pool_attempts_per_second(node.tracker, node.best_share_var.value, lookbehind)/(1-global_stale_prop),
             pool_stale_prop=global_stale_prop,
             local_hash_rates=miner_hash_rates,
             local_dead_hash_rates=miner_dead_hash_rates,
             shares=shares,
             stale_shares=stale_orphan_shares + stale_doa_shares,
             stale_shares_breakdown=dict(orphan=stale_orphan_shares, doa=stale_doa_shares),
-            current_payout=get_current_txouts().get(bitcoin_data.pubkey_hash_to_script2(my_pubkey_hash), 0)*1e-8,
+            current_payout=node.get_current_txouts().get(bitcoin_data.pubkey_hash_to_script2(wb.my_pubkey_hash), 0)*1e-8,
             peers=dict(
-                incoming=sum(1 for peer in p2p_node.peers.itervalues() if peer.incoming),
-                outgoing=sum(1 for peer in p2p_node.peers.itervalues() if not peer.incoming),
+                incoming=sum(1 for peer in node.p2p_node.peers.itervalues() if peer.incoming),
+                outgoing=sum(1 for peer in node.p2p_node.peers.itervalues() if not peer.incoming),
             ),
-            attempts_to_share=bitcoin_data.target_to_average_attempts(tracker.items[best_share_var.value].max_target),
-            attempts_to_block=bitcoin_data.target_to_average_attempts(bitcoind_work.value['bits'].target),
-            block_value=bitcoind_work.value['subsidy']*1e-8,
+            attempts_to_share=bitcoin_data.target_to_average_attempts(node.tracker.items[node.best_share_var.value].max_target),
+            attempts_to_block=bitcoin_data.target_to_average_attempts(node.bitcoind_work.value['bits'].target),
+            block_value=node.bitcoind_work.value['subsidy']*1e-8,
         ))
         
         with open(os.path.join(datadir_path, 'stats'), 'wb') as f:
@@ -274,15 +275,15 @@ def get_web_root(tracker, bitcoind_work, get_current_txouts, datadir_path, net,
     new_root.putChild('log', WebInterface(lambda: stat_log))
     
     def get_share(share_hash_str):
-        if int(share_hash_str, 16) not in tracker.items:
+        if int(share_hash_str, 16) not in node.tracker.items:
             return None
-        share = tracker.items[int(share_hash_str, 16)]
+        share = node.tracker.items[int(share_hash_str, 16)]
         
         return dict(
             parent='%064x' % share.previous_hash,
-            children=['%064x' % x for x in sorted(tracker.reverse.get(share.hash, set()), key=lambda sh: -len(tracker.reverse.get(sh, set())))], # sorted from most children to least children
+            children=['%064x' % x for x in sorted(node.tracker.reverse.get(share.hash, set()), key=lambda sh: -len(node.tracker.reverse.get(sh, set())))], # sorted from most children to least children
             local=dict(
-                verified=share.hash in tracker.verified.items,
+                verified=share.hash in node.tracker.verified.items,
                 time_first_seen=start_time if share.time_seen == 0 else share.time_seen,
                 peer_first_received_from=share.peer.addr if share.peer is not None else None,
             ),
@@ -290,7 +291,7 @@ def get_web_root(tracker, bitcoind_work, get_current_txouts, datadir_path, net,
                 timestamp=share.timestamp,
                 target=share.target,
                 max_target=share.max_target,
-                payout_address=bitcoin_data.script2_to_address(share.new_script, net.PARENT),
+                payout_address=bitcoin_data.script2_to_address(share.new_script, node.net.PARENT),
                 donation=share.share_data['donation']/65535,
                 stale_info=share.share_data['stale_info'],
                 nonce=share.share_data['nonce'],
@@ -315,21 +316,21 @@ def get_web_root(tracker, bitcoind_work, get_current_txouts, datadir_path, net,
             ),
         )
     new_root.putChild('share', WebInterface(lambda share_hash_str: get_share(share_hash_str)))
-    new_root.putChild('heads', WebInterface(lambda: ['%064x' % x for x in tracker.heads]))
-    new_root.putChild('verified_heads', WebInterface(lambda: ['%064x' % x for x in tracker.verified.heads]))
-    new_root.putChild('tails', WebInterface(lambda: ['%064x' % x for t in tracker.tails for x in tracker.reverse.get(t, set())]))
-    new_root.putChild('verified_tails', WebInterface(lambda: ['%064x' % x for t in tracker.verified.tails for x in tracker.verified.reverse.get(t, set())]))
-    new_root.putChild('best_share_hash', WebInterface(lambda: '%064x' % best_share_var.value))
+    new_root.putChild('heads', WebInterface(lambda: ['%064x' % x for x in node.tracker.heads]))
+    new_root.putChild('verified_heads', WebInterface(lambda: ['%064x' % x for x in node.tracker.verified.heads]))
+    new_root.putChild('tails', WebInterface(lambda: ['%064x' % x for t in node.tracker.tails for x in node.tracker.reverse.get(t, set())]))
+    new_root.putChild('verified_tails', WebInterface(lambda: ['%064x' % x for t in node.tracker.verified.tails for x in node.tracker.verified.reverse.get(t, set())]))
+    new_root.putChild('best_share_hash', WebInterface(lambda: '%064x' % node.best_share_var.value))
     def get_share_data(share_hash_str):
-        if int(share_hash_str, 16) not in tracker.items:
+        if int(share_hash_str, 16) not in node.tracker.items:
             return ''
-        share = tracker.items[int(share_hash_str, 16)]
+        share = node.tracker.items[int(share_hash_str, 16)]
         return p2pool_data.share_type.pack(share.as_share1a())
     new_root.putChild('share_data', WebInterface(lambda share_hash_str: get_share_data(share_hash_str), 'application/octet-stream'))
     new_root.putChild('currency_info', WebInterface(lambda: dict(
-        symbol=net.PARENT.SYMBOL,
-        block_explorer_url_prefix=net.PARENT.BLOCK_EXPLORER_URL_PREFIX,
-        address_explorer_url_prefix=net.PARENT.ADDRESS_EXPLORER_URL_PREFIX,
+        symbol=node.net.PARENT.SYMBOL,
+        block_explorer_url_prefix=node.net.PARENT.BLOCK_EXPLORER_URL_PREFIX,
+        address_explorer_url_prefix=node.net.PARENT.ADDRESS_EXPLORER_URL_PREFIX,
     )))
     new_root.putChild('version', WebInterface(lambda: p2pool.__version__))
     
@@ -392,7 +393,7 @@ def get_web_root(tracker, bitcoind_work, get_current_txouts, datadir_path, net,
         'traffic_rate': graph.DataStreamDescription(dataview_descriptions, is_gauge=False, multivalues=True),
     }, hd_obj)
     task.LoopingCall(lambda: _atomic_write(hd_path, json.dumps(hd.to_obj()))).start(100)
-    @pseudoshare_received.watch
+    @wb.pseudoshare_received.watch
     def _(work, dead, user):
         t = time.time()
         hd.datastreams['local_hash_rate'].add_datum(t, work)
@@ -402,33 +403,33 @@ def get_web_root(tracker, bitcoind_work, get_current_txouts, datadir_path, net,
             hd.datastreams['miner_hash_rates'].add_datum(t, {user: work})
             if dead:
                 hd.datastreams['miner_dead_hash_rates'].add_datum(t, {user: work})
-    @share_received.watch
+    @wb.share_received.watch
     def _(work, dead):
         t = time.time()
         hd.datastreams['local_share_hash_rate'].add_datum(t, work)
         if dead:
             hd.datastreams['local_dead_share_hash_rate'].add_datum(t, work)
-    @traffic_happened.watch
+    @node.p2p_node.traffic_happened.watch
     def _(name, bytes):
         hd.datastreams['traffic_rate'].add_datum(time.time(), {name: bytes})
     def add_point():
-        if tracker.get_height(best_share_var.value) < 10:
+        if node.tracker.get_height(node.best_share_var.value) < 10:
             return None
-        lookbehind = min(net.CHAIN_LENGTH, 60*60//net.SHARE_PERIOD, tracker.get_height(best_share_var.value))
+        lookbehind = min(node.net.CHAIN_LENGTH, 60*60//node.net.SHARE_PERIOD, node.tracker.get_height(node.best_share_var.value))
         t = time.time()
         
-        hd.datastreams['pool_rates'].add_datum(t, p2pool_data.get_stale_counts(tracker, best_share_var.value, lookbehind, rates=True))
+        hd.datastreams['pool_rates'].add_datum(t, p2pool_data.get_stale_counts(node.tracker, node.best_share_var.value, lookbehind, rates=True))
         
-        current_txouts = get_current_txouts()
-        hd.datastreams['current_payout'].add_datum(t, current_txouts.get(bitcoin_data.pubkey_hash_to_script2(my_pubkey_hash), 0)*1e-8)
+        current_txouts = node.get_current_txouts()
+        hd.datastreams['current_payout'].add_datum(t, current_txouts.get(bitcoin_data.pubkey_hash_to_script2(wb.my_pubkey_hash), 0)*1e-8)
         miner_hash_rates, miner_dead_hash_rates = get_local_rates()
-        current_txouts_by_address = dict((bitcoin_data.script2_to_address(script, net.PARENT), amount) for script, amount in current_txouts.iteritems())
+        current_txouts_by_address = dict((bitcoin_data.script2_to_address(script, node.net.PARENT), amount) for script, amount in current_txouts.iteritems())
         hd.datastreams['current_payouts'].add_datum(t, dict((user, current_txouts_by_address[user]*1e-8) for user in miner_hash_rates if user in current_txouts_by_address))
         
-        hd.datastreams['incoming_peers'].add_datum(t, sum(1 for peer in p2p_node.peers.itervalues() if peer.incoming))
-        hd.datastreams['outgoing_peers'].add_datum(t, sum(1 for peer in p2p_node.peers.itervalues() if not peer.incoming))
+        hd.datastreams['incoming_peers'].add_datum(t, sum(1 for peer in node.p2p_node.peers.itervalues() if peer.incoming))
+        hd.datastreams['outgoing_peers'].add_datum(t, sum(1 for peer in node.p2p_node.peers.itervalues() if not peer.incoming))
         
-        vs = p2pool_data.get_desired_version_counts(tracker, best_share_var.value, lookbehind)
+        vs = p2pool_data.get_desired_version_counts(node.tracker, node.best_share_var.value, lookbehind)
         vs_total = sum(vs.itervalues())
         hd.datastreams['desired_versions'].add_datum(t, dict((str(k), v/vs_total) for k, v in vs.iteritems()))
     task.LoopingCall(add_point).start(5)