From 568827dce11f4bb4c4eaf6e6fc7fd83828dec86e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= Date: Tue, 17 Nov 2015 02:38:31 +0100 Subject: [PATCH] Elements: Start Alpha --- src/chainparams.cpp | 129 +++++++++++------------------ src/chainparamsbase.cpp | 30 +++++-- src/chainparamsbase.h | 4 + src/qt/guiutil.cpp | 5 +- src/qt/networkstyle.cpp | 4 +- src/qt/test/paymentservertests.cpp | 2 +- src/test/Checkpoints_tests.cpp | 7 -- src/test/bctest.py | 1 + src/test/miner_tests.cpp | 5 ++ 9 files changed, 87 insertions(+), 100 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 1bd51e9920..2dd63ed831 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -17,10 +17,11 @@ #include "chainparamsseeds.h" +// Elements: change the name in chainparamsbase.h if you need to change the genesis hash const std::map CChainParams::supportedChains = boost::assign::map_list_of - ( "main", uint256S("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f")) - ( "regtest", uint256S("0x0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206")) + ( CHAINPARAMS_ELEMENTS, uint256S("0x300ae16b51c2e42da1e12133c76e4951a08d17b9c346c4a9d9e815c024ebeff7")) + ( CHAINPARAMS_REGTEST, uint256S("0x64593b5e4b59628d2a93d6685064a98c50560acf968855f276ea01900f2c81e1")) ; static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesisOutputScript, uint32_t nTime, uint32_t nNonce, uint32_t nBits, int32_t nVersion, const CAmount& genesisReward) @@ -45,38 +46,12 @@ static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesi } /** - * Build the genesis block. Note that the output of its generation - * transaction cannot be spent since it did not originally exist in the - * database. - * - * CBlock(hash=000000000019d6, ver=1, hashPrevBlock=00000000000000, hashMerkleRoot=4a5e1e, nTime=1231006505, nBits=1d00ffff, nNonce=2083236893, vtx=1) - * CTransaction(hash=4a5e1e, ver=1, vin.size=1, vout.size=1, nLockTime=0) - * CTxIn(COutPoint(000000, -1), coinbase 04ffff001d0104455468652054696d65732030332f4a616e2f32303039204368616e63656c6c6f72206f6e206272696e6b206f66207365636f6e64206261696c6f757420666f722062616e6b73) - * CTxOut(nValue=50.00000000, scriptPubKey=0x5F1DF16B2B704C8A578D0B) - * vMerkleTree: 4a5e1e + * Elements Beta. */ -static CBlock CreateGenesisBlock(uint32_t nTime, uint32_t nNonce, uint32_t nBits, int32_t nVersion, const CAmount& genesisReward) -{ - const char* pszTimestamp = "The Times 03/Jan/2009 Chancellor on brink of second bailout for banks"; - const CScript genesisOutputScript = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG; - return CreateGenesisBlock(pszTimestamp, genesisOutputScript, nTime, nNonce, nBits, nVersion, genesisReward); -} - -/** - * Main network - */ -/** - * What makes a good checkpoint block? - * + Is surrounded by blocks with reasonable timestamps - * (no blocks before with a timestamp after, none after with - * timestamp before) - * + Contains no strange transactions - */ - -class CMainParams : public CChainParams { +class CElementsParams : public CChainParams { public: - CMainParams() { - strNetworkID = "main"; + CElementsParams() { + strNetworkID = CHAINPARAMS_ELEMENTS; consensus.nSubsidyHalvingInterval = 210000; consensus.nMajorityEnforceBlockUpgrade = 750; consensus.nMajorityRejectBlockOutdated = 950; @@ -109,60 +84,54 @@ public: * The characters are rarely used upper ASCII, not valid as UTF-8, and produce * a large 32-bit integer with any alignment. */ - pchMessageStart[0] = 0xf9; - pchMessageStart[1] = 0xbe; - pchMessageStart[2] = 0xb4; - pchMessageStart[3] = 0xd9; - nDefaultPort = 8333; + pchMessageStart[0] = 0xee; + pchMessageStart[1] = 0xa1; + pchMessageStart[2] = 0x1f; + pchMessageStart[3] = 0xfa; + nDefaultPort = 4242; nPruneAfterHeight = 100000; - genesis = CreateGenesisBlock(1231006505, 2083236893, 0x1d00ffff, 1, 50 * COIN); + CScript scriptDestination(CScript() << OP_TRUE); + genesis = CreateGenesisBlock(strNetworkID.c_str(), scriptDestination, 1231006505, 2083236893, 0x1d00ffff, 1, 50 * COIN); consensus.hashGenesisBlock = genesis.GetHash(); - assert(consensus.hashGenesisBlock == supportedChains.find(strNetworkID)->second); - // Note that of those with the service bits flag, most only support a subset of possible options - vSeeds.push_back(CDNSSeedData("bitcoin.sipa.be", "seed.bitcoin.sipa.be", true)); // Pieter Wuille, only supports x1, x5, x9, and xd - vSeeds.push_back(CDNSSeedData("bluematt.me", "dnsseed.bluematt.me", true)); // Matt Corallo, only supports x9 - vSeeds.push_back(CDNSSeedData("dashjr.org", "dnsseed.bitcoin.dashjr.org")); // Luke Dashjr - vSeeds.push_back(CDNSSeedData("bitcoinstats.com", "seed.bitcoinstats.com", true)); // Christian Decker, supports x1 - xf - vSeeds.push_back(CDNSSeedData("xf2.org", "bitseed.xf2.org")); // Jeff Garzik - vSeeds.push_back(CDNSSeedData("bitcoin.jonasschnelli.ch", "seed.bitcoin.jonasschnelli.ch", true)); // Jonas Schnelli, only supports x1, x5, x9, and xd + vFixedSeeds.clear(); //! TODO + vSeeds.clear(); //! TODO + + fMiningRequiresPeers = true; + fDefaultConsistencyChecks = false; + fRequireStandard = true; + fMineBlocksOnDemand = false; + fTestnetToBeDeprecatedFieldRPC = true; + + checkpointData = (CCheckpointData){ + boost::assign::map_list_of + ( 0, consensus.hashGenesisBlock), + 0, + 0, + 0 + }; + base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,111); + base58Prefixes[SCRIPT_ADDRESS] = std::vector(1,196); + base58Prefixes[SECRET_KEY] = std::vector(1,239); + base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x35)(0x87)(0xCF).convert_to_container >(); + base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x35)(0x83)(0x94).convert_to_container >(); + } +}; + +/** + * Use production base58 for tests + */ +class CMainParams : public CElementsParams { +public: + CMainParams() : CElementsParams() { + strNetworkID = CHAINPARAMS_OLD_MAIN; base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,0); base58Prefixes[SCRIPT_ADDRESS] = std::vector(1,5); base58Prefixes[SECRET_KEY] = std::vector(1,128); base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x88)(0xB2)(0x1E).convert_to_container >(); base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x88)(0xAD)(0xE4).convert_to_container >(); - - vFixedSeeds = std::vector(pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main)); - - fMiningRequiresPeers = true; - fDefaultConsistencyChecks = false; - fRequireStandard = true; - fMineBlocksOnDemand = false; - fTestnetToBeDeprecatedFieldRPC = false; - - checkpointData = (CCheckpointData) { - boost::assign::map_list_of - ( 0, consensus.hashGenesisBlock) - ( 11111, uint256S("0x0000000069e244f73d78e8fd29ba2fd2ed618bd6fa2ee92559f542fdb26e7c1d")) - ( 33333, uint256S("0x000000002dd5588a74784eaa7ab0507a18ad16a236e7b1ce69f00d7ddfb5d0a6")) - ( 74000, uint256S("0x0000000000573993a3c9e41ce34471c079dcf5f52a0e824a81e7f953b8661a20")) - (105000, uint256S("0x00000000000291ce28027faea320c8d2b054b2e0fe44a773f3eefb151d6bdc97")) - (134444, uint256S("0x00000000000005b12ffd4cd315cd34ffd4a594f430ac814c91184a0d42d2b0fe")) - (168000, uint256S("0x000000000000099e61ea72015e79632f216fe6cb33d7899acb35b75c8303b763")) - (193000, uint256S("0x000000000000059f452a5f7340de6682a977387c17010ff6e6c3bd83ca8b1317")) - (210000, uint256S("0x000000000000048b95347e83192f69cf0366076336c639f9b7228e9ba171342e")) - (216116, uint256S("0x00000000000001b4f4b433e81ee46494af945cf96014816a4e2370f11b23df4e")) - (225430, uint256S("0x00000000000001c108384350f74090433e7fcf79a606b8e797f065b130575932")) - (250000, uint256S("0x000000000000003887df1f29024b06fc2200b55f8af8f35453d7be294df2d214")) - (279000, uint256S("0x0000000000000001ae8c72a0b0c301f67e3afca10e819efa9041e458e9bd7e40")) - (295000, uint256S("0x00000000000000004d9b4ef50f0f9d686fd69db2e03af35a100370c64632a983")), - 1397080064, // * UNIX timestamp of last checkpoint block - 36544669, // * total number of transactions between genesis and last checkpoint - // (the tx=... number in the SetBestChain debug.log lines) - 60000.0 // * estimated number of transactions per day after checkpoint - }; } }; @@ -172,7 +141,7 @@ public: class CRegTestParams : public CChainParams { public: CRegTestParams() { - strNetworkID = "regtest"; + strNetworkID = CHAINPARAMS_REGTEST; consensus.nSubsidyHalvingInterval = 150; consensus.nMajorityEnforceBlockUpgrade = 750; consensus.nMajorityRejectBlockOutdated = 950; @@ -203,9 +172,9 @@ public: nDefaultPort = 18444; nPruneAfterHeight = 1000; - genesis = CreateGenesisBlock(1296688602, 2, 0x207fffff, 1, 50 * COIN); + CScript scriptDestination(CScript() << OP_TRUE); + genesis = CreateGenesisBlock(strNetworkID.c_str(), scriptDestination, 1296688602, 2, 0x207fffff, 1, 50 * COIN); consensus.hashGenesisBlock = genesis.GetHash(); - assert(consensus.hashGenesisBlock == supportedChains.find(strNetworkID)->second); vFixedSeeds.clear(); //!< Regtest mode doesn't have any fixed seeds. vSeeds.clear(); //!< Regtest mode doesn't have any DNS seeds. @@ -248,6 +217,8 @@ CChainParams* CChainParams::Factory(const std::string& chain) { if (chain == CBaseChainParams::MAIN) return new CMainParams(); + else if (chain == CHAINPARAMS_ELEMENTS) + return new CElementsParams(); else if (chain == CBaseChainParams::REGTEST) return new CRegTestParams(); else diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index 5e8909b3a8..5d1928859f 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -10,13 +10,13 @@ #include -const std::string CBaseChainParams::MAIN = "main"; -const std::string CBaseChainParams::REGTEST = "regtest"; +const std::string CBaseChainParams::MAIN = CHAINPARAMS_OLD_MAIN; +const std::string CBaseChainParams::REGTEST = CHAINPARAMS_REGTEST; void AppendParamsHelpMessages(std::string& strUsage, bool debugHelp) { strUsage += HelpMessageGroup(_("Chain selection options:")); - strUsage += HelpMessageOpt("-chain=", _("Use the chain (default: main). Allowed values: main, testnet, regtest")); + strUsage += HelpMessageOpt("-chain=", strprintf(_("Use the chain (default: %s). Allowed values: main, testnet, regtest"), CHAINPARAMS_ELEMENTS)); if (debugHelp) { strUsage += HelpMessageOpt("-regtest", "Enter regression test mode, which uses a special chain in which blocks can be solved instantly. " "This is intended for regression testing tools and app development."); @@ -24,7 +24,7 @@ void AppendParamsHelpMessages(std::string& strUsage, bool debugHelp) } /** - * Main network + * Old Main network */ class CBaseMainParams : public CBaseChainParams { @@ -32,6 +32,20 @@ public: CBaseMainParams() { nRPCPort = 8332; + strDataDir = CHAINPARAMS_OLD_MAIN; + } +}; + +/** + * Main network for elements + */ +class CBaseElementsParams : public CBaseChainParams +{ +public: + CBaseElementsParams() + { + nRPCPort = 4241; + strDataDir = CHAINPARAMS_ELEMENTS; } }; @@ -44,7 +58,7 @@ public: CBaseRegTestParams() { nRPCPort = 18332; - strDataDir = "regtest"; + strDataDir = CHAINPARAMS_REGTEST; } }; @@ -60,6 +74,8 @@ CBaseChainParams* CBaseChainParams::Factory(const std::string& chain) { if (chain == CBaseChainParams::MAIN) return new CBaseMainParams(); + else if (chain == CHAINPARAMS_ELEMENTS) + return new CBaseElementsParams(); else if (chain == CBaseChainParams::REGTEST) return new CBaseRegTestParams(); else @@ -74,10 +90,10 @@ void SelectBaseParams(const std::string& chain) std::string ChainNameFromCommandLine() { if (GetBoolArg("-testnet", false)) - throw std::runtime_error(strprintf("%s: Invalid option -testnet: elements/%s is a testchain too.", __func__, CBaseChainParams::MAIN)); + throw std::runtime_error(strprintf("%s: Invalid option -testnet: elements/%s is a testchain too.", __func__, CHAINPARAMS_ELEMENTS)); if (GetBoolArg("-regtest", false)) return CBaseChainParams::REGTEST; - return GetArg("-chain", CBaseChainParams::MAIN); + return GetArg("-chain", CHAINPARAMS_ELEMENTS); } bool AreBaseParamsConfigured() diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index b1691db576..c7aa22acad 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -8,6 +8,10 @@ #include #include +#define CHAINPARAMS_OLD_MAIN "main" +#define CHAINPARAMS_ELEMENTS "alphatestnet3" +#define CHAINPARAMS_REGTEST "alpharegtest" + /** * CBaseChainParams defines the base parameters (shared between bitcoin-cli and bitcoind) * of a given instance of the Bitcoin system. diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 8a62f1b49f..e223247661 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -747,10 +747,7 @@ bool SetStartOnSystemStartup(bool fAutoStart) // Write a bitcoin.desktop file to the autostart directory: optionFile << "[Desktop Entry]\n"; optionFile << "Type=Application\n"; - if (chain == CBaseChainParams::MAIN) - optionFile << "Name=Bitcoin\n"; - else - optionFile << strprintf("Name=Bitcoin (%s)\n", chain); + optionFile << strprintf("Name=Elements (%s)\n", chain); optionFile << "Exec=" << pszExePath << strprintf(" -min -chain=%s\n", chain); optionFile << "Terminal=false\n"; optionFile << "Hidden=false\n"; diff --git a/src/qt/networkstyle.cpp b/src/qt/networkstyle.cpp index 9cb4c9c8b1..89e83484c0 100644 --- a/src/qt/networkstyle.cpp +++ b/src/qt/networkstyle.cpp @@ -17,8 +17,8 @@ static const struct { const int iconColorHueShift; const int iconColorSaturationReduction; } network_styles[] = { - {"main", QAPP_APP_NAME_DEFAULT, 0, 0}, - {"regtest", QAPP_APP_NAME_TESTNET, 160, 30} + {CHAINPARAMS_OLD_MAIN, QAPP_APP_NAME_DEFAULT, 0, 0}, + {CHAINPARAMS_REGTEST, QAPP_APP_NAME_TESTNET, 160, 30} }; static const unsigned network_styles_count = sizeof(network_styles)/sizeof(*network_styles); diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp index 84ccfea730..58ff6da0bc 100644 --- a/src/qt/test/paymentservertests.cpp +++ b/src/qt/test/paymentservertests.cpp @@ -64,7 +64,7 @@ static SendCoinsRecipient handleRequest(PaymentServer* server, std::vector testChainParams(CChainParams::Factory(CBaseChainParams::MAIN)); - const CCheckpointData& checkpoints = testChainParams->Checkpoints(); - BOOST_CHECK(Checkpoints::GetTotalBlocksEstimate(checkpoints) >= 134444); -} - BOOST_AUTO_TEST_SUITE_END() diff --git a/src/test/bctest.py b/src/test/bctest.py index 39a27fcd0c..c4f643319c 100644 --- a/src/test/bctest.py +++ b/src/test/bctest.py @@ -11,6 +11,7 @@ def bctest(testDir, testObj, exeext): execprog = testObj['exec'] + exeext execargs = testObj['args'] + execargs[:0] = ["-chain=main"] execrun = [execprog] + execargs stdinCfg = None inputData = None diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index 6238a24260..621d3ffc10 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -221,6 +221,11 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity) txFirst.push_back(new CTransaction(pblock->vtx[0])); pblock->hashMerkleRoot = BlockMerkleRoot(*pblock); pblock->nNonce = blockinfo[i].nonce; + if (!CheckProofOfWork(pblock->GetHash(), pblock->nBits, chainparams.GetConsensus())) + { + printf("WARNING: Skipping miner tests due to changed genesis block\n"); + return; + } CValidationState state; BOOST_CHECK(ProcessNewBlock(state, chainparams, NULL, pblock, true, NULL)); BOOST_CHECK(state.IsValid());