Skip to content

Commit 060c553

Browse files
committed
(partial) Merge bitcoin#27491: refactor: Move chain constants to the util library
1 parent 9882aef commit 060c553

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

src/bitcoind.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ static bool AppInit(NodeContext& node, int argc, char* argv[])
163163
}
164164
// Check for chain settings (Params() calls are only valid after this clause)
165165
try {
166-
SelectParams(args.GetChainName());
166+
SelectParams(args.GetChainType());
167167
} catch (const std::exception& e) {
168168
return InitError(Untranslated(strprintf("%s\n", e.what())));
169169
}

src/chainparams.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ std::optional<Consensus::LLMQParams> CChainParams::GetLLMQ(Consensus::LLMQType l
160160
class CMainParams : public CChainParams {
161161
public:
162162
CMainParams() {
163-
strNetworkID = CBaseChainParams::MAIN;
163+
m_chain_type = ChainType::MAIN;
164164
consensus.nSubsidyHalvingInterval = 210240; // Note: actual number of blocks per calendar year with DGW v3 is ~200700 (for example 449750 - 249050)
165165
consensus.nMasternodePaymentsStartBlock = 100000; // not true, but it's ok as long as it's less then nMasternodePaymentsIncreaseBlock
166166
consensus.nMasternodePaymentsIncreaseBlock = 158000; // actual historical value
@@ -356,7 +356,7 @@ class CMainParams : public CChainParams {
356356
class CTestNetParams : public CChainParams {
357357
public:
358358
CTestNetParams() {
359-
strNetworkID = CBaseChainParams::TESTNET;
359+
m_chain_type = ChainType::TESTNET;
360360
consensus.nSubsidyHalvingInterval = 210240;
361361
consensus.nMasternodePaymentsStartBlock = 4010; // not true, but it's ok as long as it's less then nMasternodePaymentsIncreaseBlock
362362
consensus.nMasternodePaymentsIncreaseBlock = 4030;
@@ -528,7 +528,7 @@ class CTestNetParams : public CChainParams {
528528
class CDevNetParams : public CChainParams {
529529
public:
530530
explicit CDevNetParams(const ArgsManager& args) {
531-
strNetworkID = CBaseChainParams::DEVNET;
531+
m_chain_type = ChainType::DEVNET;
532532
consensus.nSubsidyHalvingInterval = 210240;
533533
consensus.nMasternodePaymentsStartBlock = 4010; // not true, but it's ok as long as it's less then nMasternodePaymentsIncreaseBlock
534534
consensus.nMasternodePaymentsIncreaseBlock = 4030;
@@ -758,7 +758,7 @@ class CDevNetParams : public CChainParams {
758758
class CRegTestParams : public CChainParams {
759759
public:
760760
explicit CRegTestParams(const ArgsManager& args) {
761-
strNetworkID = CBaseChainParams::REGTEST;
761+
m_chain_type = ChainType::REGTEST;
762762
consensus.nSubsidyHalvingInterval = 150;
763763
consensus.nMasternodePaymentsStartBlock = 240;
764764
consensus.nMasternodePaymentsIncreaseBlock = 350;

src/chainparams.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,10 @@ class CChainParams
121121
bool AllowMultipleAddressesFromGroup() const { return fAllowMultipleAddressesFromGroup; }
122122
/** How long to wait until we allow retrying of a LLMQ connection */
123123
int LLMQConnectionRetryTimeout() const { return nLLMQConnectionRetryTimeout; }
124-
/** Return the network string */
125-
std::string NetworkIDString() const { return strNetworkID; }
124+
/** Return the chain type string */
125+
std::string GetChainTypeString() const { return ChainTypeToString(m_chain_type); }
126+
/** Return the chain type */
127+
ChainType GetChainType() const { return m_chain_type; }
126128
/** Return the list of hostnames to look up for DNS seeds */
127129
const std::vector<std::string>& DNSSeeds() const { return vSeeds; }
128130
const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { return base58Prefixes[type]; }
@@ -167,7 +169,7 @@ class CChainParams
167169
std::vector<std::string> vSeeds;
168170
std::vector<unsigned char> base58Prefixes[MAX_BASE58_TYPES];
169171
int nExtCoinType;
170-
std::string strNetworkID;
172+
ChainType m_chain_type;
171173
CBlock genesis;
172174
CBlock devnetGenesis;
173175
std::vector<uint8_t> vFixedSeeds;

src/qt/guiutil.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ bool LabelOutOfFocusEventFilter::eventFilter(QObject* watched, QEvent* event)
708708
#ifdef WIN32
709709
fs::path static StartupShortcutPath()
710710
{
711-
std::string chain = gArgs.GetChainName();
711+
ChainType chain = gArgs.GetChainType();
712712
if (chain == ChainType::MAIN)
713713
return GetSpecialFolderPath(CSIDL_STARTUP) / "Dash Core.lnk";
714714
if (chain == ChainType::TESTNET) // Remove this special case when ChainType::TESTNET = "testnet4"

0 commit comments

Comments
 (0)