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

Merge f722a9bd13 into merged_master (Bitcoin PR bitcoin/bitcoin#20018)

Browse source
This commit is contained in:
Byron Hambly 2025-04-07 08:30:10 +02:00
commit 43317158c5
3 changed files with 44 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/init.cpp
View file

@ -1967,6 +1967,13 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
if (connect.size() != 1 || connect[0] != "0") {
connOptions.m_specified_outgoing = connect;
}
if (!connOptions.m_specified_outgoing.empty() && !connOptions.vSeedNodes.empty()) {
LogPrintf("-seednode is ignored when -connect is used\n");
}
if (args.IsArgSet("-dnsseed") && args.GetBoolArg("-dnsseed", DEFAULT_DNSSEED) && args.IsArgSet("-proxy")) {
LogPrintf("-dnsseed is ignored when -connect is used and -proxy is specified\n");
}
}
const std::string& i2psam_arg = args.GetArg("-i2psam", "");