Skip to content

Commit 3266b2e

Browse files
committed
Add DEFAULT chain and set to liquidv1
This fixes f.e. that when arguments are set in CLI or the config file without a network attached (`port` instead of `liquidv1.port`), they will now be assigned to the liquidv1 instead of Bitcoin mainnet.
1 parent c7ee0ac commit 3266b2e

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

src/chainparamsbase.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ const std::string CBaseChainParams::TESTNET = "test";
1616
const std::string CBaseChainParams::REGTEST = "regtest";
1717
const std::string CBaseChainParams::LIQUID1 = "liquidv1";
1818

19+
const std::string CBaseChainParams::DEFAULT = CBaseChainParams::LIQUID1;
20+
1921
void SetupChainParamsBaseOptions()
2022
{
2123
gArgs.AddArg("-chain=<chain>", "Use the chain <chain> (default: main). Reserved values: main, test, regtest", false, OptionsCategory::CHAINPARAMS);

src/chainparamsbase.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ class CBaseChainParams
2222
static const std::string REGTEST;
2323
static const std::string LIQUID1;
2424

25+
static const std::string DEFAULT;
26+
2527
const std::string& DataDir() const { return strDataDir; }
2628
int RPCPort() const { return nRPCPort; }
2729
int MainchainRPCPort() const { return nMainchainRPCPort; }

src/init.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,10 +363,12 @@ void SetupServerArgs()
363363
SetupHelpOptions(gArgs);
364364
gArgs.AddArg("-help-debug", "Print help message with debugging options and exit", false, OptionsCategory::DEBUG_TEST); // server-only for now
365365

366-
const auto defaultBaseParams = CreateBaseChainParams(CBaseChainParams::MAIN);
366+
const auto defaultBaseParams = CreateBaseChainParams(CBaseChainParams::DEFAULT);
367+
const auto mainnetBaseParams = CreateBaseChainParams(CBaseChainParams::MAIN);
367368
const auto testnetBaseParams = CreateBaseChainParams(CBaseChainParams::TESTNET);
368369
const auto regtestBaseParams = CreateBaseChainParams(CBaseChainParams::REGTEST);
369-
const auto defaultChainParams = CreateChainParams(CBaseChainParams::MAIN);
370+
const auto defaultChainParams = CreateChainParams(CBaseChainParams::DEFAULT);
371+
const auto mainnetChainParams = CreateChainParams(CBaseChainParams::MAIN);
370372
const auto testnetChainParams = CreateChainParams(CBaseChainParams::TESTNET);
371373
const auto regtestChainParams = CreateChainParams(CBaseChainParams::REGTEST);
372374

src/util/system.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class ArgsManagerHelper {
174174
* See also comments around ArgsManager::ArgsManager() below. */
175175
static inline bool UseDefaultSection(const ArgsManager& am, const std::string& arg) EXCLUSIVE_LOCKS_REQUIRED(am.cs_args)
176176
{
177-
return (am.m_network == CBaseChainParams::MAIN || am.m_network_only_args.count(arg) == 0);
177+
return (am.m_network == CBaseChainParams::DEFAULT || am.m_network_only_args.count(arg) == 0);
178178
}
179179

180180
/** Convert regular argument into the network-specific setting */
@@ -336,7 +336,7 @@ const std::set<std::string> ArgsManager::GetUnsuitableSectionOnlyArgs() const
336336
if (m_network.empty()) return std::set<std::string> {};
337337

338338
// if it's okay to use the default section for this network, don't worry
339-
if (m_network == CBaseChainParams::MAIN) return std::set<std::string> {};
339+
if (m_network == CBaseChainParams::DEFAULT) return std::set<std::string> {};
340340

341341
for (const auto& arg : m_network_only_args) {
342342
std::pair<bool, std::string> found_result;

0 commit comments

Comments
 (0)