Merge branch 'master' into groestlize

Yokomoko · Jun 12, 2018 · e40b734 · e40b734
2 parents f38e72f + afcb011
commit e40b734
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -12,11 +12,11 @@ Linux:
 * sudo pip install -r requirements.txt
 
 Windows:
-* Install Python 2.7: http://www.python.org/getit/
-* Install Twisted: http://twistedmatrix.com/trac/wiki/Downloads
-* Install Zope.Interface: http://pypi.python.org/pypi/zope.interface/3.8.0
-* Install python win32 api: http://sourceforge.net/projects/pywin32/files/pywin32/Build%20218/
-* Install python win32 api wmi wrapper: https://pypi.python.org/pypi/WMI/#downloads
+* Install [Python 2.7](http://www.python.org/getit/)
+* Install [Twisted](http://twistedmatrix.com/trac/wiki/Downloads)
+* Install [Zope.Interface](http://pypi.python.org/pypi/zope.interface/3.8.0)
+* Install [python win32 api](http://sourceforge.net/projects/pywin32/files/pywin32/Build%20218/)
+* Install [python win32 api wmi wrapper](https://pypi.python.org/pypi/WMI/#downloads)
 * Unzip the files into C:\Python27\Lib\site-packages
 
 Running P2Pool:

diff --git a/p2pool/bitcoin/networks/bitcoin.py b/p2pool/bitcoin/networks/bitcoin.py
@@ -13,7 +13,7 @@
 RPC_PORT = 8332
 RPC_CHECK = defer.inlineCallbacks(lambda bitcoind: defer.returnValue(
             (yield helper.check_genesis_block(bitcoind, '000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f')) and
-            not (yield bitcoind.rpc_getinfo())['testnet']
+            (yield bitcoind.rpc_getblockchaininfo())['chain'] != 'test'
         ))
 SUBSIDY_FUNC = lambda height: 50*100000000 >> (height + 1)//210000
 POW_FUNC = data.hash256

diff --git a/p2pool/bitcoin/networks/bitcoin_testnet.py b/p2pool/bitcoin/networks/bitcoin_testnet.py
@@ -13,7 +13,7 @@
 RPC_PORT = 18332
 RPC_CHECK = defer.inlineCallbacks(lambda bitcoind: defer.returnValue(
             'bitcoinaddress' in (yield bitcoind.rpc_help()) and
-            (yield bitcoind.rpc_getinfo())['testnet']
+            (yield bitcoind.rpc_getblockchaininfo())['chain'] == 'test'
         ))
 SUBSIDY_FUNC = lambda height: 50*100000000 >> (height + 1)//210000
 POW_FUNC = data.hash256

diff --git a/p2pool/bitcoin/networks/fastcoin.py b/p2pool/bitcoin/networks/fastcoin.py
@@ -13,7 +13,7 @@
 RPC_PORT = 9527
 RPC_CHECK = defer.inlineCallbacks(lambda bitcoind: defer.returnValue(
             'fastcoinaddress' in (yield bitcoind.rpc_help()) and
-            not (yield bitcoind.rpc_getinfo())['testnet']
+            (yield bitcoind.rpc_getblockchaininfo())['chain'] != 'test'
         ))
 SUBSIDY_FUNC = lambda height: 32*100000000 >> (height + 1)//2592000
 POW_FUNC = lambda data: pack.IntType(256).unpack(__import__('ltc_scrypt').getPoWHash(data))

diff --git a/p2pool/bitcoin/networks/litecoin.py b/p2pool/bitcoin/networks/litecoin.py
@@ -13,7 +13,7 @@
 RPC_PORT = 9332
 RPC_CHECK = defer.inlineCallbacks(lambda bitcoind: defer.returnValue(
             'litecoinaddress' in (yield bitcoind.rpc_help()) and
-            not (yield bitcoind.rpc_getinfo())['testnet']
+            (yield bitcoind.rpc_getblockchaininfo())['chain'] != 'test'
         ))
 SUBSIDY_FUNC = lambda height: 50*100000000 >> (height + 1)//840000
 POW_FUNC = lambda data: pack.IntType(256).unpack(__import__('ltc_scrypt').getPoWHash(data))

diff --git a/p2pool/bitcoin/networks/litecoin_testnet.py b/p2pool/bitcoin/networks/litecoin_testnet.py
@@ -13,7 +13,7 @@
 RPC_PORT = 19332
 RPC_CHECK = defer.inlineCallbacks(lambda bitcoind: defer.returnValue(
             'litecoinaddress' in (yield bitcoind.rpc_help()) and
-            (yield bitcoind.rpc_getinfo())['testnet']
+            (yield bitcoind.rpc_getblockchaininfo())['chain'] == 'test'
         ))
 SUBSIDY_FUNC = lambda height: 50*100000000 >> (height + 1)//840000
 POW_FUNC = lambda data: pack.IntType(256).unpack(__import__('ltc_scrypt').getPoWHash(data))

diff --git a/p2pool/bitcoin/networks/namecoin.py b/p2pool/bitcoin/networks/namecoin.py
@@ -13,7 +13,7 @@
 RPC_PORT = 8336
 RPC_CHECK = defer.inlineCallbacks(lambda bitcoind: defer.returnValue(
             'namecoinaddress' in (yield bitcoind.rpc_help()) and
-            not (yield bitcoind.rpc_getinfo())['testnet']
+            (yield bitcoind.rpc_getblockchaininfo())['chain'] != 'test'
         ))
 SUBSIDY_FUNC = lambda height: 50*100000000 >> (height + 1)//210000
 POW_FUNC = data.hash256

diff --git a/p2pool/bitcoin/networks/namecoin_testnet.py b/p2pool/bitcoin/networks/namecoin_testnet.py
@@ -13,7 +13,7 @@
 RPC_PORT = 18336
 RPC_CHECK = defer.inlineCallbacks(lambda bitcoind: defer.returnValue(
             'namecoinaddress' in (yield bitcoind.rpc_help()) and
-            (yield bitcoind.rpc_getinfo())['testnet']
+            (yield bitcoind.rpc_getblockchaininfo())['chain'] == 'test'
         ))
 SUBSIDY_FUNC = lambda height: 50*100000000 >> (height + 1)//210000
 POW_FUNC = data.hash256

diff --git a/p2pool/bitcoin/networks/terracoin.py b/p2pool/bitcoin/networks/terracoin.py
@@ -13,7 +13,7 @@
 RPC_PORT = 13332
 RPC_CHECK = defer.inlineCallbacks(lambda bitcoind: defer.returnValue(
             'terracoinaddress' in (yield bitcoind.rpc_help()) and
-            not (yield bitcoind.rpc_getinfo())['testnet']
+            (yield bitcoind.rpc_getblockchaininfo())['chain'] != 'test'
         ))
 SUBSIDY_FUNC = lambda height: 20*100000000 >> (height + 1)//1050000
 POW_FUNC = data.hash256

diff --git a/p2pool/bitcoin/networks/terracoin_testnet.py b/p2pool/bitcoin/networks/terracoin_testnet.py
@@ -13,7 +13,7 @@
 RPC_PORT = 23332
 RPC_CHECK = defer.inlineCallbacks(lambda bitcoind: defer.returnValue(
             'terracoinaddress' in (yield bitcoind.rpc_help()) and
-            (yield bitcoind.rpc_getinfo())['testnet']
+            (yield bitcoind.rpc_getblockchaininfo())['chain'] == 'test'
         ))
 SUBSIDY_FUNC = lambda height: 20*100000000 >> (height + 1)//1050000
 POW_FUNC = data.hash256