X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=p2pool%2Fnetworks.py;h=aacfc196ce07d0f3b6119c1d8d47ce46d90731a1;hb=f732111a6e08d7d0649c330d1c703535a8ea80b5;hp=4efa8cbc86b008828103cfc644a04482ff1fb62b;hpb=37d9fbcbaef1e6dc514c79c7d4fa11297d96eb16;p=p2pool.git

diff --git a/p2pool/networks.py b/p2pool/networks.py
index 4efa8cb..aacfc19 100644
--- a/p2pool/networks.py
+++ b/p2pool/networks.py
@@ -7,98 +7,43 @@ 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_FUNC=lambda ts: 24*60*60//10 if ts >= 1325805105 else 24*60*60//10//2, # 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,
+nets = dict(
+    novacoin=math.Object(
+        PARENT=networks.nets['novacoin'],
+        SHARE_PERIOD=15, # seconds
+        CHAIN_LENGTH=12*60*60//10, # shares
+        REAL_CHAIN_LENGTH=12*60*60//10, # shares
+        TARGET_LOOKBEHIND=200, # shares
+        SPREAD=3, # blocks
+        IDENTIFIER='e037d5b8c6923610'.decode('hex'),
+        PREFIX='7208c1a53ef659b0'.decode('hex'),
+        P2P_PORT=9777,
+        MIN_TARGET=0,
+        MAX_TARGET=2**256//2**20 - 1,
+        PERSIST=True,
+        WORKER_PORT=8336,
+        BOOTSTRAP_ADDRS=''.split(' '),
+        ANNOUNCE_CHANNEL='#p2pool-alt',
+        VERSION_CHECK=lambda v: v >= 60011,
+    ),
+    novacoin_testnet=math.Object(
+        PARENT=networks.nets['novacoin_testnet'],
+        SHARE_PERIOD=4, # seconds
+        CHAIN_LENGTH=20*60//3, # shares
+        REAL_CHAIN_LENGTH=20*60//3, # shares
+        TARGET_LOOKBEHIND=200, # shares
+        SPREAD=3, # blocks
+        IDENTIFIER='e037d5b8c7923110'.decode('hex'),
+        PREFIX='7208c1a54ef619b0'.decode('hex'),
+        P2P_PORT=19777,
+        MIN_TARGET=0,
+        MAX_TARGET=2**256//2**20 - 1,
+        PERSIST=False,
+        WORKER_PORT=18336,
+        BOOTSTRAP_ADDRS=''.split(' '),
+        ANNOUNCE_CHANNEL='#p2pool-alt',
+        VERSION_CHECK=lambda v: v >= 60011,
+    ),
 )
-BitcoinTestnet = math.Object(
-    PARENT=networks.BitcoinTestnet,
-    SHARE_PERIOD=10, # seconds
-    CHAIN_LENGTH=24*60*60//10, # shares
-    REAL_CHAIN_LENGTH_FUNC=lambda ts: 24*60*60//10 if ts >= 1325805105 else 24*60*60//10//2, # 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,
-)
-
-NamecoinMainnet = math.Object(
-    PARENT=networks.NamecoinMainnet,
-    SHARE_PERIOD=10, # seconds
-    CHAIN_LENGTH=24*60*60//10, # shares
-    REAL_CHAIN_LENGTH=24*60*60//10, # shares
-    TARGET_LOOKBEHIND=3600//10, # shares
-    SPREAD=3, # blocks
-    IDENTIFIER='d5b1192062c4c454'.decode('hex'),
-    PREFIX='b56f3d0fb24fc982'.decode('hex'),
-    NAME='namecoin',
-    P2P_PORT=9334,
-    MAX_TARGET=2**256//2**32 - 1,
-    PERSIST=True,
-    WORKER_PORT=9331,
-)
-NamecoinTestnet = math.Object(
-    PARENT=networks.NamecoinTestnet,
-    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='8dd303d014a01a60'.decode('hex'),
-    PREFIX='4d6581d24f51acbf'.decode('hex'),
-    NAME='namecoin_testnet',
-    P2P_PORT=19334,
-    MAX_TARGET=2**256//2**32 - 1,
-    PERSIST=False,
-    WORKER_PORT=19331,
-)
-
-LitecoinMainnet = math.Object(
-    PARENT=networks.LitecoinMainnet,
-    SHARE_PERIOD=10, # seconds
-    CHAIN_LENGTH=24*60*60//10, # shares
-    REAL_CHAIN_LENGTH_FUNC=lambda ts: 24*60*60//10 if ts >= 1325805105 else 24*60*60//10//2, # 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,
-)
-LitecoinTestnet = math.Object(
-    PARENT=networks.LitecoinTestnet,
-    SHARE_PERIOD=10, # seconds
-    CHAIN_LENGTH=24*60*60//10, # shares
-    REAL_CHAIN_LENGTH_FUNC=lambda ts: 24*60*60//10 if ts >= 1325805105 else 24*60*60//10//2, # 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,
-)
-
-nets=dict((net.NAME, net) for net in set([BitcoinMainnet, BitcoinTestnet, NamecoinMainnet, NamecoinTestnet, 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