git://git.novaco.in
/
p2pool.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
aafc095
)
Merge branch 'chk-genesis' of https://github.com/iongchun/p2pool into HEAD
author
Forrest Voight
<forrest@forre.st>
Mon, 27 Jan 2014 13:55:29 +0000 (08:55 -0500)
committer
Forrest Voight
<forrest@forre.st>
Mon, 27 Jan 2014 13:55:29 +0000 (08:55 -0500)
p2pool/bitcoin/networks.py
patch
|
blob
|
history
diff --git
a/p2pool/bitcoin/networks.py
b/p2pool/bitcoin/networks.py
index
a84b26f
..
7c60f80
100644
(file)
--- a/
p2pool/bitcoin/networks.py
+++ b/
p2pool/bitcoin/networks.py
@@
-13,7
+13,7
@@
nets = dict(
ADDRESS_VERSION=0,
RPC_PORT=8332,
RPC_CHECK=defer.inlineCallbacks(lambda bitcoind: defer.returnValue(
- 'bitcoinaddress' in (yield bitcoind.rpc_help()) and
+ 0 == (yield bitcoind.rpc_getblock('000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f'))['height'] and
not (yield bitcoind.rpc_getinfo())['testnet']
)),
SUBSIDY_FUNC=lambda height: 50*100000000 >> (height + 1)//210000,