Add parent genesis hash to chainparams, simplify checks

This commit is contained in:
instagibbs 2016-08-15 11:06:05 -04:00 committed by Gregory Sanders
parent 99ca4d2120
commit 9f4ea3d03f
4 changed files with 13 additions and 11 deletions

View file

@ -2091,12 +2091,8 @@ bool BitcoindRPCCheck(bool init)
return false;
}
UniValue result = reply["result"];
if (GetBoolArg("-testnet", false) && result.isStr() && result.get_str() != "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943") { //FIXME: Stick parent chain(s) genesis in chainparams
LogPrintf("ERROR: Invalid parent genesis block hash response via RPC. Contacting wrong parent daemon?");
return false;
}
if (GetBoolArg("-regtest", false) && result.isStr() && result.get_str() != "0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206") {
LogPrintf("ERROR: Invalid parent genesis block hash response via RPC. Contacting wrong parent daemon?");
if (!result.isStr() || result.get_str() != Params().ParentGenesisBlockHash().GetHex()) {
LogPrintf("ERROR: Invalid parent genesis block hash response via RPC. Contacting wrong parent daemon?\n");
return false;
}
} catch (const std::runtime_error& re) {