GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #188 from jtimon/e14-remove-chainparams-bitcoinid

Browse source 
Remove CChainParams::bitcoinID
This commit is contained in:
Gregory Sanders 2017-06-27 09:53:34 -04:00 • committed by GitHub
commit a1ed9bfd34
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/chainparams.cpp
View file

@ -126,12 +126,9 @@ public:
nDefaultPort = 9042;
nPruneAfterHeight = 100000;
// SHA256 of Bitcoin genesis mainnet hash for NUMS bitcoin asset id
bitcoinID = BITCOINID;
parentGenesisBlockHash = uint256S("000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943");
CScript scriptDestination(CScript() << std::vector<unsigned char>(parentGenesisBlockHash.begin(), parentGenesisBlockHash.end()) << OP_WITHDRAWPROOFVERIFY);
genesis = CreateGenesisBlock(strNetworkID.c_str(), scriptDestination, 1231006505, genesisChallengeScript, 1, MAX_MONEY, 100, bitcoinID);
genesis = CreateGenesisBlock(strNetworkID.c_str(), scriptDestination, 1231006505, genesisChallengeScript, 1, MAX_MONEY, 100, BITCOINID);
consensus.hashGenesisBlock = genesis.GetHash();
scriptCoinbaseDestination = CScript() << ParseHex("0229536c4c83789f59c30b93eb40d4abbd99b8dcc99ba8bd748f29e33c1d279e3c") << OP_CHECKSIG;
@ -232,10 +229,7 @@ public:
nDefaultPort = 7042;
nPruneAfterHeight = 1000;
// SHA256 of Bitcoin genesis mainnet hash for NUMS bitcoin asset id
bitcoinID = BITCOINID;
genesis = CreateGenesisBlock(strNetworkID.c_str(), defaultRegtestScript, 1296688602, genesisChallengeScript, 1, MAX_MONEY, 100, bitcoinID);
genesis = CreateGenesisBlock(strNetworkID.c_str(), defaultRegtestScript, 1296688602, genesisChallengeScript, 1, MAX_MONEY, 100, BITCOINID);
consensus.hashGenesisBlock = genesis.GetHash();
parentGenesisBlockHash = uint256S("0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206");