diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index a9b952e5a..aa9174c86 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -104,6 +104,11 @@ static bool AppInit(int argc, char* argv[]) } // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause) try { + std::string strChainName = gArgs.GetChainName(); + if (strChainName == CBaseChainParams::MAIN) { + fprintf(stderr, "Please use -testnet or -regtest for now; mainnet is not yet ready.\n"); + return false; + } SelectParams(gArgs.GetChainName()); } catch (const std::exception& e) { fprintf(stderr, "Error: %s\n", e.what()); diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 45e8114bd..6cd35e3f2 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -141,10 +141,8 @@ public: uint256 nNonce = uint256S("000000000000000000000000000000000000000000000000000000000000021d"); genesis = CreateGenesisBlock(1478403829, nNonce, 0x1f07ffff, 4, 0, GenesisSolutions::MAINNET); consensus.hashGenesisBlock = genesis.GetHash(); - //assert(genesis.hashMerkleRoot == uint256S("0x19612bcf00ea7611d315d7f43554fa983c6e8c30cba17e52c679e0e80abf7d42")); - //assert(consensus.hashGenesisBlock == uint256S("0x0007104ccda289427919efc39dc9e4d499804b7bebc22df55f8b834301260602")); - - assert(false); // Mainnet is not yet ready for production! + assert(genesis.hashMerkleRoot == uint256S("0x19612bcf00ea7611d315d7f43554fa983c6e8c30cba17e52c679e0e80abf7d42")); + assert(consensus.hashGenesisBlock == uint256S("0x0007104ccda289427919efc39dc9e4d499804b7bebc22df55f8b834301260602")); // vSeeds.emplace_back("dnsseed.btcprivate.org");