git://git.novaco.in / p2pool.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: f5b2fc2)
Merge pull request #133 from terracoin/trc_hardfork_80002
authorForrest Voight <forrest.voight@gmail.com>
Fri, 1 Nov 2013 20:43:59 +0000 (13:43 -0700)
committerForrest Voight <forrest.voight@gmail.com>
Fri, 1 Nov 2013 20:43:59 +0000 (13:43 -0700)
TRC hardfork @block 192239 / v0.8.0.2 (80002)

README.md patch | blob | history
p2pool/bitcoin/p2p.py patch | blob | history
p2pool/web.py patch | blob | history
web-static/index.html patch | blob | history

diff --git a/README.md b/README.md
index 5f77351..1894bbd 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2,13 +2,13 @@ Requirements:
 -------------------------
 Generic:
 * Bitcoin >=0.8.5
-* Python
-* Twisted
-* python-argparse (for Python <=2.6)
+* Python >=2.6
+* Twisted >=10.0.0
+* python-argparse (for Python =2.6)
 
 Linux:
 * sudo apt-get install python-zope.interface python-twisted python-twisted-web
-* sudo apt-get install python-argparse # if on Python 2.6 or older
+* sudo apt-get install python-argparse # if on Python 2.6
 
 Windows:
 * Install Python 2.7: http://www.python.org/getit/
diff --git a/p2pool/bitcoin/p2p.py b/p2pool/bitcoin/p2p.py
index 83a3403..e7086b3 100644 (file)
--- a/p2pool/bitcoin/p2p.py
+++ b/p2pool/bitcoin/p2p.py
@@ -18,7 +18,7 @@ class Protocol(p2protocol.Protocol):
     
     def connectionMade(self):
         self.send_version(
-            version=32200,
+            version=70002,
             services=1,
             time=int(time.time()),
             addr_to=dict(
diff --git a/p2pool/web.py b/p2pool/web.py
index 02fd6bf..4400e7d 100644 (file)
--- a/p2pool/web.py
+++ b/p2pool/web.py
@@ -323,6 +323,7 @@ def get_web_root(wb, datadir_path, bitcoind_getinfo_var, stop_event=variable.Eve
     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))
+    new_root.putChild('my_share_hashes', WebInterface(lambda: ['%064x' % my_share_hash for my_share_hash in wb.my_share_hashes]))
     def get_share_data(share_hash_str):
         if int(share_hash_str, 16) not in node.tracker.items:
             return ''
diff --git a/web-static/index.html b/web-static/index.html
index a028e2f..62bfc62 100644 (file)
--- a/web-static/index.html
+++ b/web-static/index.html
@@ -94,6 +94,7 @@
             fill('../web/heads', '#heads');
             fill('../web/verified_tails', '#verified_tails');
             fill('../web/tails', '#tails');
+            fill('../web/my_share_hashes', '#my_share_hashes');
         </script>
     </head>
     <body>
@@ -114,6 +115,7 @@
         <p>Heads: <span id="heads"></span></p>
         <p>Verified tails: <span id="verified_tails"></span></p>
         <p>Tails: <span id="tails"></span></p>
+        <p>My shares: <span id="my_share_hashes"></span></p>
         
         <h2>Blocks found in last day:</h2>
         <p>Note that blocks may have been orphaned from the P2Pool chain and so not be here.</p>
Peer-to-peer Novacoin mining pool