import time
import traceback
-from twisted.internet import defer
+from twisted.internet import defer, reactor
from twisted.python import log
from twisted.web import resource, static
'local_dead_hash_rate': graph.DataStreamDescription(dataview_descriptions, is_gauge=False),
'local_share_hash_rate': graph.DataStreamDescription(dataview_descriptions, is_gauge=False),
'local_dead_share_hash_rate': graph.DataStreamDescription(dataview_descriptions, is_gauge=False),
+ 'local_orphan_share_hash_rate': graph.DataStreamDescription(dataview_descriptions, is_gauge=False),
'pool_rates': graph.DataStreamDescription(dataview_descriptions, multivalues=True,
multivalue_undefined_means_0=True),
'current_payout': graph.DataStreamDescription(dataview_descriptions),
if dead:
hd.datastreams['miner_dead_hash_rates'].add_datum(t, {user: work})
@wb.share_received.watch
- def _(work, dead):
+ def _(work, dead, share_hash):
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)
+ def later():
+ res = node.tracker.is_child_of(share_hash, node.best_share_var.value)
+ if res is None: return # share isn't connected to sharechain?
+ if res and dead: # share was DOA, but is now in sharechain
+ # remove from DOA graph
+ hd.datastreams['local_dead_share_hash_rate'].add_datum(t, -work)
+ elif not res and not dead: # share wasn't DOA, and isn't in sharechain
+ # add to orphan graph
+ hd.datastreams['local_orphan_share_hash_rate'].add_datum(t, work)
+ reactor.callLater(200, later)
@node.p2p_node.traffic_happened.watch
def _(name, bytes):
hd.datastreams['traffic_rate'].add_datum(time.time(), {name: bytes})
except:
log.err(None, 'Error forwarding block solution:')
- self.share_received.happened(bitcoin_data.target_to_average_attempts(share.target), not on_time)
+ self.share_received.happened(bitcoin_data.target_to_average_attempts(share.target), not on_time, share.hash)
if pow_hash > target:
print 'Worker %s submitted share with hash > target:' % (user,)
]);
plot_later(d3.select("#local_shares"), "H/s", "H", [
{"url": "../web/graph_data/local_share_hash_rate/last_" + lowerperiod, "color": "#0000FF", "label": "Total"},
- //{"url": getData("../web/graph_data/local_dead_share_hash_rate/last_" + lowerperiod, "color": "#FF0000", "label": "Dead"}
+ {"url": "../web/graph_data/local_dead_share_hash_rate/last_" + lowerperiod, "color": "#FF0000", "label": "Dead"},
+ {"url": "../web/graph_data/local_orphan_share_hash_rate/last_" + lowerperiod, "color": "#00FF00", "label": "Orphan"}
]);
plot_later(d3.select("#payout"), currency_info.symbol, null, [
{"url": "../web/graph_data/current_payout/last_" + lowerperiod, "color": "#0000FF"}