Merge branch 'master' of https://github.com/donSchoe/p2pool-n into do…

…nSchoe-master Conflicts: p2pool/bitcoin/networks.py
donSchoe · Apr 3, 2014 · 4495575 · 4495575
2 parents 89e1853 + 139406d
commit 4495575
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,9 @@ P2Pool Server Node software for Scrypt-N coins. Currently supported:
 * Vertcoin [VTC]
 * GPUCoin [GPUC]
 * Execoin [EXE]
+* TenfiveCoin [10-5]
+* Spaincoin [SPA]
+* Rotocoin [RT2]
 
 
 Requirements:
@@ -104,6 +107,18 @@ Execoin:
 * Run P2Pool with the "--net execoin" option.
 * Run your miner program, connecting to 127.0.0.1 on port 9173.
 
+TenfiveCoin: 
+* Run P2Pool with the "--net tenfivecoin" option.
+* Run your miner program, connecting to 127.0.0.1 on port 10579.
+
+Rotocoin: 
+* Run P2Pool with the "--net rotocoin" option.
+* Run your miner program, connecting to 127.0.0.1 on port 7274.
+
+Spaincoin: 
+* Run P2Pool with the "--net spaincoin" option.
+* Run your miner program, connecting to 127.0.0.1 on port 26490.
+
 
 Sponsors:
 -------------------------

diff --git a/p2pool/bitcoin/networks.py b/p2pool/bitcoin/networks.py
@@ -223,8 +223,8 @@ def check_genesis_block(bitcoind, genesis_block_hash):
         DUMB_SCRYPT_DIFF=2**16,
         DUST_THRESHOLD=0.03e8,
     ),                                                                                                                                                                      
-   
-   spaincoin=math.Object(
+
+    spaincoin=math.Object(
         P2P_PREFIX='fb149200'.decode('hex'),
         P2P_PORT=11492,
         ADDRESS_VERSION=63,

diff --git a/p2pool/networks.py b/p2pool/networks.py
@@ -67,7 +67,7 @@
         VERSION_CHECK=lambda v: True,
     ),
 
-    vertcoin=math.Object(
+    vertcoin=math.Object( # --> main net
         PARENT=networks.nets['vertcoin'],
         SHARE_PERIOD=15, # seconds
         CHAIN_LENGTH=24*60*60//10, # shares
@@ -81,12 +81,12 @@
         MAX_TARGET=2**256//2**20 - 1,
         PERSIST=False,
         WORKER_PORT=9171,
-        BOOTSTRAP_ADDRS='q30.qhor.net seed.p2pool.etyd.org vtc.royalminingco.com'.split(' '),
+        BOOTSTRAP_ADDRS='q30.qhor.net seed.p2pool.etyd.org vtc.royalminingco.com p2pool.letsmine.it'.split(' '),
         ANNOUNCE_CHANNEL='#p2pool-vtc',
         VERSION_CHECK=lambda v: True,
     ),
 
-    vertcoin2=math.Object(
+    vertcoin2=math.Object( # --> low hashrate net
         PARENT=networks.nets['vertcoin'],
         SHARE_PERIOD=15, # seconds
         CHAIN_LENGTH=24*60*60//10, # shares
@@ -95,12 +95,12 @@
         SPREAD=12, # blocks
         IDENTIFIER='a06a81c827cab974'.decode('hex'),
         PREFIX='7c3614a6bcdcf795'.decode('hex'),
-        P2P_PORT=9346,
+        P2P_PORT=9347,
         MIN_TARGET=4,
         MAX_TARGET=2**256//2**20 - 1,
         PERSIST=False,
         WORKER_PORT=9172,
-        BOOTSTRAP_ADDRS='lovok.no-ip.com us-east.p2pools.net vert.marcsi.ch'.split(' '),
+        BOOTSTRAP_ADDRS='lovok.no-ip.com:9346 lovok.no-ip.com:9347 us-east.p2pools.net:9346 us-east.p2pools.net:9347 vert.marcsi.ch:9346 vert.marcsi.ch:9347'.split(' '),
         ANNOUNCE_CHANNEL='#p2pool-vtc',
         VERSION_CHECK=lambda v: True,
     ),
@@ -119,7 +119,7 @@
         MAX_TARGET=2**256//2**20 - 1,
         PERSIST=True,
         WORKER_PORT=9404,
-        BOOTSTRAP_ADDRS='gpu.qemulab.com 96.51.143.9 aforis.mooo.com 96.126.121.117 gpu.crabdance.com'.split(' '),
+        BOOTSTRAP_ADDRS='gpu.qemulab.com 96.51.143.9 aforis.mooo.com 96.126.121.117 gpu.crabdance.com p2pool.letsmine.it'.split(' '),
         ANNOUNCE_CHANNEL='#p2pool-gpuc',
         VERSION_CHECK=lambda v: True,
     ),
@@ -138,7 +138,7 @@
         MAX_TARGET=2**256//2**20 - 1,
         PERSIST=True,
         WORKER_PORT=9173,
-        BOOTSTRAP_ADDRS='exe.p2pool.info freebtc.eu'.split(' '),
+        BOOTSTRAP_ADDRS='exe.p2pool.info freebtc.eu p2pool.letsmine.it'.split(' '),
         ANNOUNCE_CHANNEL='#p2pool-exe',
         VERSION_CHECK=lambda v: True,
     ),
@@ -160,6 +160,25 @@
         BOOTSTRAP_ADDRS='p2pool.letsmine.it lovok.no-ip.com rt2.hashcrop.info'.split(' '),
         ANNOUNCE_CHANNEL='#p2pool-roto',
         VERSION_CHECK=lambda v: True,
+    ),
+    spaincoin=math.Object(
+        PARENT=networks.nets['spaincoin'],
+        SHARE_PERIOD=15, # seconds
+        CHAIN_LENGTH=24*60*60//10, # shares
+        REAL_CHAIN_LENGTH=24*60*60//10, # shares
+        TARGET_LOOKBEHIND=200, # shares
+        SPREAD=12, # blocks
+        IDENTIFIER='e238d5b8c6931492'.decode('hex'),
+        PREFIX='7409c1a53ef71492'.decode('hex'),
+        P2P_PORT=26491,
+        MIN_TARGET=0,
+        MAX_TARGET=2**256//2**20 - 1,
+        PERSIST=True,
+        WORKER_PORT=26490,
+        BOOTSTRAP_ADDRS='p2pool2.crunchpool.com p2pool.crunchpool.com spa.boulderbtc.com p2pooleu.cloudapp.net 31.31.72.59 p2pool.letsmine.it'.split(' '),
+        ANNOUNCE_CHANNEL='#p2pool-spa',
+        VERSION_CHECK=lambda v: True,
+        VERSION_WARNING=lambda v: 'Upgrade Spaincoin to >=0.8.8.0!' if v < 80800 else None,
     ),                                                                                                                                                                         
 
      spaincoin=math.Object(