Merge pull request p2pool#284 from jameshilliard/cltv-softfork

make sure p2pool is compliant with the cltv softfork
vertiond · Nov 15, 2015 · 482f410 · 482f410
2 parents 6514fd8 + 882dde6
commit 482f410
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/p2pool/networks/bitcoin.py b/p2pool/networks/bitcoin.py
@@ -21,5 +21,5 @@
 WORKER_PORT = 9332
 BOOTSTRAP_ADDRS = 'forre.st vps.forre.st portals94.ns01.us 54.227.25.14 119.1.96.99 204.10.105.113 76.104.150.248 89.71.151.9 76.114.13.54 72.201.24.106 79.160.2.128 207.244.175.195 168.7.116.243 94.23.215.27 218.54.45.177 5.9.157.150 78.155.217.76 91.154.90.163 173.52.43.124 78.225.49.209 220.135.57.230 169.237.101.193:8335 98.236.74.28 204.19.23.19 98.122.165.84:8338 71.90.88.222 67.168.132.228 193.6.148.18 80.218.174.253 50.43.56.102 68.13.4.106 24.246.31.2 176.31.208.222 1.202.128.218 86.155.135.31 204.237.15.51 5.12.158.126:38007 202.60.68.242 94.19.53.147 65.130.126.82 184.56.21.182 213.112.114.73 218.242.51.246 86.173.200.160 204.15.85.157 37.59.15.50 62.217.124.203 80.87.240.47 198.61.137.12 108.161.134.32 198.154.60.183:10333 71.39.52.34:9335 46.23.72.52:9343 83.143.42.177 192.95.61.149 144.76.17.34 46.65.68.119 188.227.176.66:9336 75.142.155.245:9336 213.67.135.99 76.115.224.177 50.148.193.245 64.53.185.79 80.65.30.137 109.126.14.42 76.84.63.146 62.213.58.41 61.219.119.37 209.195.4.74 114.32.105.215 221.15.35.2 78.46.88.136 211.100.23.119 84.75.252.230 123.243.155.184:9350 68.193.128.182'.split(' ')
 ANNOUNCE_CHANNEL = '#p2pool'
-VERSION_CHECK = lambda v: None if 100000 <= v else 'Bitcoin version too old. Upgrade to 0.10.0 or newer!'
+VERSION_CHECK = lambda v: None if 110200 <= v else 'Bitcoin version too old. Upgrade to 0.11.2 or newer!'
 VERSION_WARNING = lambda v: None
diff --git a/p2pool/work.py b/p2pool/work.py
@@ -369,7 +369,7 @@ def get_work(self, pubkey_hash, desired_share_target, desired_pseudoshare_target
         self.last_work_shares.value[bitcoin_data.pubkey_hash_to_address(pubkey_hash, self.node.net.PARENT)]=share_info['bits']
 
         ba = dict(
-            version=min(self.current_work.value['version'], 536870919),
+            version=min(self.current_work.value['version'], 4),
             previous_block=self.current_work.value['previous_block'],
             merkle_link=merkle_link,
             coinb1=packed_gentx[:-self.COINBASE_NONCE_LENGTH-4],