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

Merge #910: Fix mainchain RPC warmup message

Browse source 
6b9c31ef8 Fix mainchain RPC warmup message (Steven Roose)

Pull request description:

Tree-SHA512: 357c74b3396e40c39065f7ce4830fd2756731e19d303a0075157d2b1ecef80bacdbfe2693977f16392215481794081b15fec772f946b95cfbec45313309f78c6
This commit is contained in:
Steven Roose 2020-09-28 14:59:55 +02:00
commit ec9b28e089
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

@ -1884,6 +1884,9 @@ bool AppInitMain(InitInterfaces& interfaces)
SetRPCWarmupFinished();
// ELEMENTS:
if (gArgs.GetBoolArg("-validatepegin", Params().GetConsensus().has_parent_chain)) {
uiInterface.InitMessage(_("Awaiting mainchain RPC warmup"));
}
if (!MainchainRPCCheck(true)) { //Initial check only
const std::string err_msg = "ERROR: elements is set to verify pegins but cannot get a 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

1
src/validation.cpp
View file

@ -5294,7 +5294,6 @@ bool MainchainRPCCheck(const bool init)
// Next, check for working and valid rpc
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
while (true) {
try {