From e190551cb268f52eacc4ac5951a041ee804d8ec9 Mon Sep 17 00:00:00 2001 From: Jimmy Kiselak Date: Mon, 6 Jun 2016 22:16:04 -0400 Subject: [PATCH] put chain params in pound defs --- src/chainparams.cpp | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 15beb38bf..23f3e10d0 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -18,6 +18,14 @@ #include "chainparamsseeds.h" #include "arith_uint256.h" +#define GENESIS_MERKLE_ROOT "b8211c82c3d15bcd78bba57005b86fed515149a53a425eb592c07af99fe559cc" + +#define MAINNET_GENESIS_HASH "0000678ddce6b9b57e58fab6b89a1cf63519ffb4bc097debb1836577ead9a3be" +#define MAINNET_GENESIS_NONCE 71748 + +#define REGTEST_GENESIS_HASH "6e3fcf1299d4ec5d79c3a4c91d624a4acf9e2e173d95a1a0504f677669687556" +#define REGTEST_GENESIS_NONCE 1 + bool CheckProofOfWork2(uint256 hash, unsigned int nBits, const Consensus::Params& params) { bool fNegative; @@ -141,12 +149,12 @@ public: nDefaultPort = 9246; nPruneAfterHeight = 100000; - genesis = CreateGenesisBlock(1446058291, 71748, 0x1f00ffff, 1, 400000000 * COIN, consensus); + genesis = CreateGenesisBlock(1446058291, MAINNET_GENESIS_NONCE, 0x1f00ffff, 1, 400000000 * COIN, consensus); consensus.hashGenesisBlock = genesis.GetHash(); //std::cout << "hex: " << consensus.hashGenesisBlock.GetHex() << std::endl; - assert(consensus.hashGenesisBlock == uint256S("0x0000678ddce6b9b57e58fab6b89a1cf63519ffb4bc097debb1836577ead9a3be")); //std::cout << "merkle root: " << genesis.hashMerkleRoot.GetHex() << std::endl; - assert(genesis.hashMerkleRoot == uint256S("0xb8211c82c3d15bcd78bba57005b86fed515149a53a425eb592c07af99fe559cc")); + assert(consensus.hashGenesisBlock == uint256S(MAINNET_GENESIS_HASH)); + assert(genesis.hashMerkleRoot == uint256S(GENESIS_MERKLE_ROOT)); vSeeds.clear(); vFixedSeeds.clear(); @@ -215,12 +223,12 @@ public: nDefaultPort = 19246; nPruneAfterHeight = 1000; - genesis = CreateGenesisBlock(1446058291, 71748, 0x1f00ffff, 1, 400000000 * COIN, consensus); + genesis = CreateGenesisBlock(1446058291, MAINNET_GENESIS_NONCE, 0x1f00ffff, 1, 400000000 * COIN, consensus); consensus.hashGenesisBlock = genesis.GetHash(); //std::cout << "testnet genesis hash: " << genesis.GetHash().GetHex() << std::endl; //std::cout << "testnet merkle hash: " << genesis.hashMerkleRoot.GetHex() << std::endl; - assert(consensus.hashGenesisBlock == uint256S("0x0000678ddce6b9b57e58fab6b89a1cf63519ffb4bc097debb1836577ead9a3be")); - assert(genesis.hashMerkleRoot == uint256S("0xb8211c82c3d15bcd78bba57005b86fed515149a53a425eb592c07af99fe559cc")); + assert(consensus.hashGenesisBlock == uint256S(MAINNET_GENESIS_HASH)); + assert(genesis.hashMerkleRoot == uint256S(GENESIS_MERKLE_ROOT)); vFixedSeeds.clear(); vSeeds.clear(); @@ -288,12 +296,12 @@ public: nDefaultPort = 29246; nPruneAfterHeight = 1000; - genesis = CreateGenesisBlock(1446058291, 1, 0x207fffff, 1, 400000000 * COIN, consensus); + genesis = CreateGenesisBlock(1446058291, REGTEST_GENESIS_NONCE, 0x207fffff, 1, 400000000 * COIN, consensus); consensus.hashGenesisBlock = genesis.GetHash(); //std::cout << "regtest genensis hash: " << genesis.GetHash().GetHex() << std::endl; //std::cout << "regtest hashmerkleroot: " << genesis.hashMerkleRoot.GetHex() << std::endl; - assert(consensus.hashGenesisBlock == uint256S("0x6e3fcf1299d4ec5d79c3a4c91d624a4acf9e2e173d95a1a0504f677669687556")); - assert(genesis.hashMerkleRoot == uint256S("0xb8211c82c3d15bcd78bba57005b86fed515149a53a425eb592c07af99fe559cc")); + assert(consensus.hashGenesisBlock == uint256S(REGTEST_GENESIS_HASH)); + assert(genesis.hashMerkleRoot == uint256S(GENESIS_MERKLE_ROOT)); vFixedSeeds.clear(); //!< Regtest mode doesn't have any fixed seeds. vSeeds.clear(); //!< Regtest mode doesn't have any DNS seeds.