From fc98547deffa225b47f77393d914d0165bcd5a7d Mon Sep 17 00:00:00 2001 From: Forrest Voight Date: Sun, 18 Aug 2013 01:45:32 -0400 Subject: [PATCH] added version, protocol_version, and fee to /local_stats --- p2pool/p2p.py | 4 +++- p2pool/web.py | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/p2pool/p2p.py b/p2pool/p2p.py index bc61982..cd85a2e 100644 --- a/p2pool/p2p.py +++ b/p2pool/p2p.py @@ -25,6 +25,8 @@ def fragment(f, **kwargs): fragment(f, **dict((k, v[len(v)//2:]) for k, v in kwargs.iteritems())) class Protocol(p2protocol.Protocol): + VERSION = 1300 + max_remembered_txs_size = 2500000 def __init__(self, node, incoming): @@ -43,7 +45,7 @@ class Protocol(p2protocol.Protocol): self.addr = self.transport.getPeer().host, self.transport.getPeer().port self.send_version( - version=1300, + version=self.VERSION, services=0, addr_to=dict( services=0, diff --git a/p2pool/web.py b/p2pool/web.py index b7d80b4..48d72a2 100644 --- a/p2pool/web.py +++ b/p2pool/web.py @@ -13,7 +13,7 @@ from twisted.web import resource, static import p2pool from bitcoin import data as bitcoin_data -from . import data as p2pool_data +from . import data as p2pool_data, p2p from util import deferral, deferred_resource, graph, math, memory, pack, variable def _atomic_read(filename): @@ -169,6 +169,9 @@ def get_web_root(wb, datadir_path, bitcoind_warning_var, stop_event=variable.Eve 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, + version=p2pool.__version__, + protocol_version=p2p.Protocol.VERSION, + fee=wb.worker_fee, ) class WebInterface(deferred_resource.DeferredResource): -- 1.7.1