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

Fix mainchain RPC warmup message

Browse source
This commit is contained in:
Steven Roose 2020-09-21 17:57:15 +02:00
parent 4ae7d7abf1
commit c0e7cf64eb
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/init.cpp
View file

@ -1877,6 +1877,9 @@ bool AppInitMain(InitInterfaces& interfaces)
SetRPCWarmupFinished(); SetRPCWarmupFinished();
// ELEMENTS: // ELEMENTS:
if (gArgs.GetBoolArg("-validatepegin", Params().GetConsensus().has_parent_chain)) {
uiInterface.InitMessage(_("Awaiting mainchain RPC warmup"));
}
if (!MainchainRPCCheck(true)) { //Initial check only if (!MainchainRPCCheck(true)) { //Initial check only
const std::string err_msg = "ERROR: elements is set to verify pegins but cannot get valid response from the mainchain daemon. Please check debug.log for more information.\n\nIf you haven't setup a bitcoind please get the latest stable version from https://bitcoincore.org/en/download/ or if you do not need to validate pegins set in your elements configuration validatepegin=0"; const std::string err_msg = "ERROR: elements is set to verify pegins but cannot get valid response from the mainchain daemon. Please check debug.log for more information.\n\nIf you haven't setup a bitcoind please get the latest stable version from https://bitcoincore.org/en/download/ or if you do not need to validate pegins set in your elements configuration validatepegin=0";
// We fail immediately if this node has RPC server enabled // We fail immediately if this node has RPC server enabled

1
src/validation.cpp
View file

@ -5288,7 +5288,6 @@ bool MainchainRPCCheck(const bool init)
// Next, check for working and valid rpc // Next, check for working and valid rpc
if (gArgs.GetBoolArg("-validatepegin", Params().GetConsensus().has_parent_chain)) { if (gArgs.GetBoolArg("-validatepegin", Params().GetConsensus().has_parent_chain)) {
uiInterface.InitMessage(_("Awaiting mainchain RPC warmup"));
// During init try until a non-RPC_IN_WARMUP result // During init try until a non-RPC_IN_WARMUP result
while (true) { while (true) {
try { try {