diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index 30e4a1b617..cf088b4f1e 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -39,7 +39,7 @@ static void SetupCliArgs() { SetupHelpOptions(gArgs); - const auto defaultBaseParams = CreateBaseChainParams(CBaseChainParams::MAIN); + const auto defaultBaseParams = CreateBaseChainParams(CBaseChainParams::DEFAULT); const auto testnetBaseParams = CreateBaseChainParams(CBaseChainParams::TESTNET); const auto regtestBaseParams = CreateBaseChainParams(CBaseChainParams::REGTEST); diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index 06ee007803..bd10904bae 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -16,6 +16,8 @@ const std::string CBaseChainParams::TESTNET = "test"; const std::string CBaseChainParams::REGTEST = "regtest"; const std::string CBaseChainParams::LIQUID1 = "liquidv1"; +const std::string CBaseChainParams::DEFAULT = CBaseChainParams::LIQUID1; + void SetupChainParamsBaseOptions() { gArgs.AddArg("-chain=", "Use the chain (default: main). Reserved values: main, test, regtest", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS); diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index b5c8c5603d..a2b82b66ae 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -23,6 +23,8 @@ public: static const std::string LIQUID1; ///@} + static const std::string DEFAULT; + const std::string& DataDir() const { return strDataDir; } int RPCPort() const { return nRPCPort; } int MainchainRPCPort() const { return nMainchainRPCPort; } diff --git a/src/init.cpp b/src/init.cpp index dfda95d0e8..52f07c82ed 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -356,10 +356,12 @@ void SetupServerArgs() SetupHelpOptions(gArgs); gArgs.AddArg("-help-debug", "Print help message with debugging options and exit", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST); // server-only for now - const auto defaultBaseParams = CreateBaseChainParams(CBaseChainParams::MAIN); + const auto defaultBaseParams = CreateBaseChainParams(CBaseChainParams::DEFAULT); + const auto mainnetBaseParams = CreateBaseChainParams(CBaseChainParams::MAIN); const auto testnetBaseParams = CreateBaseChainParams(CBaseChainParams::TESTNET); const auto regtestBaseParams = CreateBaseChainParams(CBaseChainParams::REGTEST); - const auto defaultChainParams = CreateChainParams(CBaseChainParams::MAIN); + const auto defaultChainParams = CreateChainParams(CBaseChainParams::DEFAULT); + const auto mainnetChainParams = CreateChainParams(CBaseChainParams::MAIN); const auto testnetChainParams = CreateChainParams(CBaseChainParams::TESTNET); const auto regtestChainParams = CreateChainParams(CBaseChainParams::REGTEST); diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 1e9826c395..8ec968ba31 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -563,9 +563,11 @@ fs::path static StartupShortcutPath() std::string chain = gArgs.GetChainName(); if (chain == CBaseChainParams::MAIN) return GetSpecialFolderPath(CSIDL_STARTUP) / "Bitcoin.lnk"; + if (chain == CBaseChainParams::LIQUID1) + return GetSpecialFolderPath(CSIDL_STARTUP) / "Liquid.lnk"; if (chain == CBaseChainParams::TESTNET) // Remove this special case when CBaseChainParams::TESTNET = "testnet4" return GetSpecialFolderPath(CSIDL_STARTUP) / "Bitcoin (testnet).lnk"; - return GetSpecialFolderPath(CSIDL_STARTUP) / strprintf("Bitcoin (%s).lnk", chain); + return GetSpecialFolderPath(CSIDL_STARTUP) / strprintf("Elements (%s).lnk", chain); } bool GetStartOnSystemStartup() @@ -646,7 +648,9 @@ fs::path static GetAutostartFilePath() std::string chain = gArgs.GetChainName(); if (chain == CBaseChainParams::MAIN) return GetAutostartDir() / "bitcoin.desktop"; - return GetAutostartDir() / strprintf("bitcoin-%s.desktop", chain); + if (chain == CBaseChainParams::LIQUID1) + return GetAutostartDir() / "liquid.desktop"; + return GetAutostartDir() / strprintf("elements-%s.desktop", chain); } bool GetStartOnSystemStartup() @@ -691,8 +695,10 @@ bool SetStartOnSystemStartup(bool fAutoStart) optionFile << "Type=Application\n"; if (chain == CBaseChainParams::MAIN) optionFile << "Name=Bitcoin\n"; + else if (chain == CBaseChainParams::LIQUID1) + optionFile << "Name=Liquid\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/test/util_tests.cpp b/src/test/util_tests.cpp index 6da42d90a0..5e28d7f2eb 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -666,7 +666,7 @@ BOOST_AUTO_TEST_CASE(util_ReadConfigStream) test_args.SetNetworkOnlyArg("-ccc"); test_args.SetNetworkOnlyArg("-h"); - test_args.SelectConfigNetwork(CBaseChainParams::MAIN); + test_args.SelectConfigNetwork(CBaseChainParams::DEFAULT); BOOST_CHECK(test_args.GetArg("-d", "xxx") == "e"); BOOST_CHECK(test_args.GetArgs("-ccc").size() == 2); BOOST_CHECK(test_args.GetArg("-h", "xxx") == "0"); @@ -996,7 +996,7 @@ BOOST_FIXTURE_TEST_CASE(util_ArgsMerge, ArgsMergeTestingSetup) // Results file is formatted like: // // || | | - BOOST_CHECK_EQUAL(out_sha_hex, "b835eef5977d69114eb039a976201f8c7121f34fe2b7ea2b73cafb516e5c9dc8"); + BOOST_CHECK_EQUAL(out_sha_hex, "08c5432d4056908de004f869ff5b07ba055e99e3d5a30127a7be6880ba717844"); } // Similar test as above, but for ArgsManager::GetChainName function. diff --git a/src/util/system.cpp b/src/util/system.cpp index 779abbc36b..d5214a536f 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -246,7 +246,7 @@ const std::set ArgsManager::GetUnsuitableSectionOnlyArgs() const if (m_network.empty()) return std::set {}; // if it's okay to use the default section for this network, don't worry - if (m_network == CBaseChainParams::MAIN) return std::set {}; + if (m_network == CBaseChainParams::DEFAULT) return std::set {}; for (const auto& arg : m_network_only_args) { if (OnlyHasDefaultSectionSetting(m_settings, m_network, SettingName(arg))) { @@ -256,21 +256,6 @@ const std::set ArgsManager::GetUnsuitableSectionOnlyArgs() const return unsuitables; } -const std::list ArgsManager::GetUnrecognizedSections() const -{ - // Section names to be recognized in the config file. - static const std::set available_sections{ - CBaseChainParams::REGTEST, - CBaseChainParams::TESTNET, - CBaseChainParams::MAIN - }; - - LOCK(cs_args); - std::list unrecognized = m_config_sections; - unrecognized.remove_if([](const SectionInfo& appeared){ return available_sections.find(appeared.m_name) != available_sections.end(); }); - return unrecognized; -} - void ArgsManager::SelectConfigNetwork(const std::string& network) { LOCK(cs_args); @@ -881,13 +866,13 @@ std::string ArgsManager::GetChainName() const if (fTestNet) return CBaseChainParams::TESTNET; - std::string default_chain = "liquidv1"; + std::string default_chain = CBaseChainParams::DEFAULT; return GetArg("-chain", default_chain); } bool ArgsManager::UseDefaultSection(const std::string& arg) const { - return m_network == CBaseChainParams::MAIN || m_network_only_args.count(arg) == 0; + return m_network == CBaseChainParams::DEFAULT || m_network_only_args.count(arg) == 0; } util::SettingsValue ArgsManager::GetSetting(const std::string& arg) const diff --git a/src/util/system.h b/src/util/system.h index 69153b728a..fa1289c789 100644 --- a/src/util/system.h +++ b/src/util/system.h @@ -207,11 +207,6 @@ public: */ const std::set GetUnsuitableSectionOnlyArgs() const; - /** - * Log warnings for unrecognized section names in the config file. - */ - const std::list GetUnrecognizedSections() const; - /** * Return a vector of strings of the given argument * @@ -287,8 +282,8 @@ public: void ForceSetArg(const std::string& strArg, const std::string& strValue); /** - * Returns the appropriate chain name from the program arguments. - * @return CBaseChainParams::MAIN by default; raises runtime error if an invalid combination is given. + * Returns the chain name based on the parameters. + * @return CBaseChainParams::DEFAULT by default. */ std::string GetChainName() const;