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

Chainparams: Remove CHAINPARAMS_ELEMENTS

Browse source
This commit is contained in:
Jorge Timón 2017-09-21 07:27:07 +02:00
parent 81f986b014
commit 3866795457
No known key found for this signature in database
GPG key ID: 8866C18EA1C944A2
4 changed files with 4 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/chainparams.cpp
View file

@ -117,7 +117,7 @@ public:
defaultFedpegScript = CScript() << OP_2 << ParseHex("02d51090b27ca8f1cc04984614bd749d8bab6f2a3681318d3fd0dd43b2a39dd774") << ParseHex("03a75bd7ac458b19f98047c76a6ffa442e592148c5d23a1ec82d379d5d558f4fd8") << ParseHex("034c55bede1bce8e486080f8ebb7a0e8f106b49efb295a8314da0e1b1723738c66") << OP_3 << OP_CHECKMULTISIG;
consensus.fedpegScript = StrHexToScriptWithDefault(GetArg("-fedpegscript", ""), defaultFedpegScript);
strNetworkID = CHAINPARAMS_ELEMENTS;
strNetworkID = CHAINPARAMS_OLD_MAIN;
consensus.nSubsidyHalvingInterval = 210000;
consensus.BIP34Height = 227931;
consensus.BIP34Hash = uint256S("0x000000000000024b89b42a942fe0d9fea3bb44ab7bd1b19115dd6a759c0808b8");
@ -397,7 +397,6 @@ public:
const std::vector<std::string> CChainParams::supportedChains =
boost::assign::list_of
( CHAINPARAMS_ELEMENTS )
( CHAINPARAMS_REGTEST )
;
@ -412,8 +411,6 @@ std::unique_ptr<CChainParams> CreateChainParams(const std::string& chain)
{
if (chain == CBaseChainParams::MAIN)
return std::unique_ptr<CChainParams>(new CMainParams());
else if (chain == CHAINPARAMS_ELEMENTS)
return std::unique_ptr<CChainParams>(new CElementsParams());
else if (chain == CBaseChainParams::REGTEST)
return std::unique_ptr<CChainParams>(new CRegTestParams());
else if (chain == CBaseChainParams::CUSTOM) {