git://git.novaco.in / p2pool.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
terracoin net: higher SPREAD value, seednode removed
[p2pool.git] / p2pool / networks.py
diff --git a/p2pool/networks.py b/p2pool/networks.py
index b41f044..892da6a 100644 (file)
--- a/p2pool/networks.py
+++ b/p2pool/networks.py
@@ -7,71 +7,118 @@ from p2pool.util import math
 # REAL_CHAIN_LENGTH must be changed in sync with all other clients
 # changes can be done by changing one, then the other
 
-BitcoinMainnet = math.Object(
-    PARENT=networks.BitcoinMainnet,
-    SHARE_PERIOD=10, # seconds
-    CHAIN_LENGTH=24*60*60//10, # shares
-    REAL_CHAIN_LENGTH=24*60*60//10, # shares
-    TARGET_LOOKBEHIND=200, # shares
-    SPREAD=3, # blocks
-    IDENTIFIER='fc70035c7a81bc6f'.decode('hex'),
-    PREFIX='2472ef181efcd37b'.decode('hex'),
-    NAME='bitcoin',
-    P2P_PORT=9333,
-    MAX_TARGET=2**256//2**32 - 1,
-    PERSIST=True,
-    WORKER_PORT=9332,
-    BOOTSTRAP_ADDRS='74.220.242.6:9334 93.97.192.93 66.90.73.83 67.83.108.0 219.84.64.174 24.167.17.248 109.74.195.142 83.211.86.49 89.78.212.44 94.23.34.145 168.7.116.243 72.14.191.28 94.174.40.189:9344'.split(' '),
-)
-BitcoinTestnet = math.Object(
-    PARENT=networks.BitcoinTestnet,
-    SHARE_PERIOD=10, # seconds
-    CHAIN_LENGTH=24*60*60//10, # shares
-    REAL_CHAIN_LENGTH=24*60*60//10, # shares
-    TARGET_LOOKBEHIND=200, # shares
-    SPREAD=3, # blocks
-    IDENTIFIER='5fc2be2d4f0d6bfb'.decode('hex'),
-    PREFIX='3f6057a15036f441'.decode('hex'),
-    NAME='bitcoin_testnet',
-    P2P_PORT=19333,
-    MAX_TARGET=2**256//2**32 - 1,
-    PERSIST=False,
-    WORKER_PORT=19332,
-    BOOTSTRAP_ADDRS='72.14.191.28'.split(' '),
-)
+nets = dict(
+    bitcoin=math.Object(
+        PARENT=networks.nets['bitcoin'],
+        SHARE_PERIOD=10, # seconds
+        CHAIN_LENGTH=24*60*60//10, # shares
+        REAL_CHAIN_LENGTH=24*60*60//10, # shares
+        TARGET_LOOKBEHIND=200, # shares
+        SPREAD=3, # blocks
+        IDENTIFIER='fc70035c7a81bc6f'.decode('hex'),
+        PREFIX='2472ef181efcd37b'.decode('hex'),
+        P2P_PORT=9333,
+        MIN_TARGET=0,
+        MAX_TARGET=2**256//2**32 - 1,
+        PERSIST=True,
+        WORKER_PORT=9332,
+        BOOTSTRAP_ADDRS='forre.st vps.forre.st 74.220.242.6:9334 93.97.192.93 66.90.73.83 67.83.108.0 219.84.64.174 24.167.17.248 109.74.195.142 83.211.86.49 94.23.34.145 168.7.116.243 94.174.40.189:9344 89.79.79.195 portals94.ns01.us'.split(' '),
+        ANNOUNCE_CHANNEL='#p2pool',
+        VERSION_CHECK=lambda v: 50700 <= v < 60000 or 60010 <= v < 60100 or 60400 <= v,
+    ),
+    bitcoin_testnet=math.Object(
+        PARENT=networks.nets['bitcoin_testnet'],
+        SHARE_PERIOD=10, # seconds
+        CHAIN_LENGTH=60*60//10, # shares
+        REAL_CHAIN_LENGTH=60*60//10, # shares
+        TARGET_LOOKBEHIND=200, # shares
+        SPREAD=3, # blocks
+        IDENTIFIER='5fc2be2d4f0d6bfb'.decode('hex'),
+        PREFIX='3f6057a15036f441'.decode('hex'),
+        P2P_PORT=19333,
+        MIN_TARGET=0,
+        MAX_TARGET=2**256//2**32 - 1,
+        PERSIST=False,
+        WORKER_PORT=19332,
+        BOOTSTRAP_ADDRS='forre.st vps.forre.st liteco.in'.split(' '),
+        ANNOUNCE_CHANNEL='#p2pool-alt',
+        VERSION_CHECK=lambda v: 50700 <= v < 60000 or 60010 <= v < 60100 or 60400 <= v,
+    ),
+    
+    litecoin=math.Object(
+        PARENT=networks.nets['litecoin'],
+        SHARE_PERIOD=10, # seconds
+        CHAIN_LENGTH=24*60*60//10, # shares
+        REAL_CHAIN_LENGTH=24*60*60//10, # shares
+        TARGET_LOOKBEHIND=200, # shares
+        SPREAD=12, # blocks
+        IDENTIFIER='e037d5b8c6923410'.decode('hex'),
+        PREFIX='7208c1a53ef629b0'.decode('hex'),
+        P2P_PORT=9338,
+        MIN_TARGET=0,
+        MAX_TARGET=2**256//2**20 - 1,
+        PERSIST=True,
+        WORKER_PORT=9327,
+        BOOTSTRAP_ADDRS='forre.st vps.forre.st 199.255.95.94 75.12.89.18 181.28.244.151 83.142.189.132 66.90.82.155:11332 201.57.241.77 80.222.255.91 142.68.214.29 24.52.247.82 72.230.179.177 94.127.200.29 200.204.161.215 91.121.9.7 91.235.254.37 198.154.98.195 178.79.136.10'.split(' '),
+        ANNOUNCE_CHANNEL='#p2pool-alt',
+        VERSION_CHECK=lambda v: True,
+    ),
+    litecoin_testnet=math.Object(
+        PARENT=networks.nets['litecoin_testnet'],
+        SHARE_PERIOD=3, # seconds
+        CHAIN_LENGTH=20*60//3, # shares
+        REAL_CHAIN_LENGTH=20*60//3, # shares
+        TARGET_LOOKBEHIND=200, # shares
+        SPREAD=12, # blocks
+        IDENTIFIER='cca5e24ec6408b1e'.decode('hex'),
+        PREFIX='ad9614f6466a39cf'.decode('hex'),
+        P2P_PORT=19338,
+        MIN_TARGET=0,
+        MAX_TARGET=2**256//2000 - 1,
+        PERSIST=False,
+        WORKER_PORT=19327,
+        BOOTSTRAP_ADDRS='forre.st vps.forre.st'.split(' '),
+        ANNOUNCE_CHANNEL='#p2pool-alt',
+        VERSION_CHECK=lambda v: True,
+    ),
 
-LitecoinMainnet = math.Object(
-    PARENT=networks.LitecoinMainnet,
-    SHARE_PERIOD=10, # seconds
-    CHAIN_LENGTH=24*60*60//10, # shares
-    REAL_CHAIN_LENGTH=24*60*60//10, # shares
-    TARGET_LOOKBEHIND=200, # shares
-    SPREAD=12, # blocks
-    IDENTIFIER='e037d5b8c6923410'.decode('hex'),
-    PREFIX='7208c1a53ef629b0'.decode('hex'),
-    NAME='litecoin',
-    P2P_PORT=9338,
-    MAX_TARGET=2**256//2**20 - 1,
-    PERSIST=True,
-    WORKER_PORT=9327,
-    BOOTSTRAP_ADDRS='76.26.53.101 124.205.120.178 190.195.79.161 173.167.113.73 82.161.65.210 67.83.108.0 78.101.67.239 78.100.161.252 87.58.117.233 78.100.162.223 216.239.45.4 78.101.131.221 72.14.191.28 97.81.163.217 69.126.183.240 219.84.64.174 78.101.119.27 89.211.228.244 178.152.122.30 172.16.0.3 76.26.53.101:51319'.split(' '),
-)
-LitecoinTestnet = math.Object(
-    PARENT=networks.LitecoinTestnet,
-    SHARE_PERIOD=10, # seconds
-    CHAIN_LENGTH=24*60*60//10, # shares
-    REAL_CHAIN_LENGTH=24*60*60//10, # shares
-    TARGET_LOOKBEHIND=200, # shares
-    SPREAD=12, # blocks
-    IDENTIFIER='cca5e24ec6408b1e'.decode('hex'),
-    PREFIX='ad9614f6466a39cf'.decode('hex'),
-    NAME='litecoin_testnet',
-    P2P_PORT=19338,
-    MAX_TARGET=2**256//2**17 - 1,
-    PERSIST=False,
-    WORKER_PORT=19327,
-    BOOTSTRAP_ADDRS='72.14.191.28'.split(' '),
-)
+    terracoin=math.Object(
+        PARENT=networks.nets['terracoin'],
+        SHARE_PERIOD=30, # seconds
+        CHAIN_LENGTH=24*60*60//30, # shares
+        REAL_CHAIN_LENGTH=24*60*60//30, # shares
+        TARGET_LOOKBEHIND=200, # shares
+        SPREAD=15, # blocks
+        IDENTIFIER='a41b2356a1b7d35e'.decode('hex'),
+        PREFIX='5623b62178d2b8a3'.decode('hex'),
+        P2P_PORT=9323,
+        MIN_TARGET=0,
+        MAX_TARGET=2**256//2**32 - 1,
+        PERSIST=True,
+        WORKER_PORT=9322,
+        BOOTSTRAP_ADDRS='seed1.p2pool.terracoin.org seed2.p2pool.terracoin.org forre.st vps.forre.st 93.97.192.93 66.90.73.83 67.83.108.0 219.84.64.174 24.167.17.248 109.74.195.142 83.211.86.49 94.23.34.145 168.7.116.243 94.174.40.189:9344 89.79.79.195 portals94.ns01.us'.split(' '),
+        ANNOUNCE_CHANNEL='#p2pool-alt',
+        VERSION_CHECK=lambda v: True,
+    ),
+    terracoin_testnet=math.Object(
+        PARENT=networks.nets['terracoin_testnet'],
+        SHARE_PERIOD=30, # seconds
+        CHAIN_LENGTH=60*60//30, # shares
+        REAL_CHAIN_LENGTH=60*60//30, # shares
+        TARGET_LOOKBEHIND=200, # shares
+        SPREAD=15, # blocks
+        IDENTIFIER='b41b2356a5b7d35d'.decode('hex'),
+        PREFIX='1623b92172d2b8a2'.decode('hex'),
+        P2P_PORT=19323,
+        MIN_TARGET=0,
+        MAX_TARGET=2**256//2**32 - 1,
+        PERSIST=False,
+        WORKER_PORT=19322,
+        BOOTSTRAP_ADDRS='seed1.p2pool.terracoin.org seed2.p2pool.terracoin.org forre.st vps.forre.st'.split(' '),
+        ANNOUNCE_CHANNEL='#p2pool-alt',
+        VERSION_CHECK=lambda v: True,
+    ),
 
-nets=dict((net.NAME, net) for net in set([BitcoinMainnet, BitcoinTestnet, LitecoinMainnet, LitecoinTestnet]))
-realnets=dict((net.NAME, net) for net in nets.itervalues() if '_testnet' not in net.NAME)
+)
+for net_name, net in nets.iteritems():
+    net.NAME = net_name
Peer-to-peer Novacoin mining pool