From: Forrest Voight <forrest@forre.st>
Date: Mon, 27 Jan 2014 13:55:29 +0000 (-0500)
Subject: Merge branch 'chk-genesis' of https://github.com/iongchun/p2pool into HEAD
X-Git-Url: https://git.novaco.in/?p=p2pool.git;a=commitdiff_plain;h=d43be753b133c401cbc5a933229a42d2f1d76e54;hp=aafc0957deb424c71b75a78dd77149fa487ad52a

Merge branch 'chk-genesis' of https://github.com/iongchun/p2pool into HEAD
---

diff --git a/p2pool/bitcoin/networks.py b/p2pool/bitcoin/networks.py
index a84b26f..7c60f80 100644
--- 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,