Add segwit activation parameters

qq431169079 · Feb 20, 2017 · 4f31345 · 4f31345
1 parent 7252669
commit 4f31345
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/p2pool/networks/bitcoin.py b/p2pool/networks/bitcoin.py
@@ -23,6 +23,7 @@
 ANNOUNCE_CHANNEL = '#p2pool'
 VERSION_CHECK = lambda v: None if 100000 <= v else 'Bitcoin version too old. Upgrade to 0.11.2 or newer!' # not a bug. BIP65 support is ensured by SOFTFORKS_REQUIRED
 VERSION_WARNING = lambda v: None
-SOFTFORKS_REQUIRED = set(['bip65', 'csv'])
-MINIMUM_PROTOCOL_VERSION = 1500
-NEW_MINIMUM_PROTOCOL_VERSION = 1600
+SOFTFORKS_REQUIRED = set(['bip65', 'csv', 'segwit'])
+MINIMUM_PROTOCOL_VERSION = 1600
+NEW_MINIMUM_PROTOCOL_VERSION = 1700
+SEGWIT_ACTIVATION_VERSION = 17
diff --git a/p2pool/networks/bitcoin_testnet.py b/p2pool/networks/bitcoin_testnet.py
@@ -13,10 +13,11 @@
 MAX_TARGET = 2**256//2**32 - 1
 PERSIST = False
 WORKER_PORT = 19332
-BOOTSTRAP_ADDRS = 'forre.st vps.forre.st liteco.in'.split(' ')
+BOOTSTRAP_ADDRS = 'forre.st vps.forre.st liteco.in 78.158.149.247'.split(' ')
 ANNOUNCE_CHANNEL = '#p2pool-alt'
 VERSION_CHECK = lambda v: None if 100000 <= v else 'Bitcoin version too old. Upgrade to 0.11.2 or newer!' # not a bug. BIP65 support is ensured by SOFTFORKS_REQUIRED
 VERSION_WARNING = lambda v: None
-SOFTFORKS_REQUIRED = set(['bip65', 'csv'])
-MINIMUM_PROTOCOL_VERSION = 1500
-NEW_MINIMUM_PROTOCOL_VERSION = 1600
+SOFTFORKS_REQUIRED = set(['bip65', 'csv', 'segwit'])
+MINIMUM_PROTOCOL_VERSION = 1600
+NEW_MINIMUM_PROTOCOL_VERSION = 1700
+SEGWIT_ACTIVATION_VERSION = 15
diff --git a/p2pool/networks/btcregtest.py b/p2pool/networks/btcregtest.py
@@ -20,3 +20,4 @@
 SOFTFORKS_REQUIRED = set(['bip65', 'csv', 'segwit'])
 MINIMUM_PROTOCOL_VERSION = 1600
 NEW_MINIMUM_PROTOCOL_VERSION = 1700
+SEGWIT_ACTIVATION_VERSION = 15
diff --git a/p2pool/networks/litecoin.py b/p2pool/networks/litecoin.py
@@ -17,3 +17,7 @@
 ANNOUNCE_CHANNEL = '#p2pool-ltc'
 VERSION_CHECK = lambda v: None if 100400 <= v else 'Litecoin version too old. Upgrade to 0.10.4 or newer!'
 VERSION_WARNING = lambda v: None
+SOFTFORKS_REQUIRED = set(['bip65', 'csv', 'segwit'])
+MINIMUM_PROTOCOL_VERSION = 1600
+NEW_MINIMUM_PROTOCOL_VERSION = 1700
+SEGWIT_ACTIVATION_VERSION = 17