From 1663089b334166742674b705709f3705932e4785 Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Fri, 3 Oct 2014 10:31:36 +0200 Subject: [PATCH] MoneroPulse log wording tweaks --- src/cryptonote_core/blockchain_storage.cpp | 4 ++-- src/cryptonote_core/checkpoints_create.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cryptonote_core/blockchain_storage.cpp b/src/cryptonote_core/blockchain_storage.cpp index 6f1b4121c..5148ea634 100644 --- a/src/cryptonote_core/blockchain_storage.cpp +++ b/src/cryptonote_core/blockchain_storage.cpp @@ -1799,13 +1799,13 @@ void blockchain_storage::check_against_checkpoints(checkpoints& points, bool enf // if asked to enforce checkpoints, roll back to a couple of blocks before the checkpoint if (enforce) { - LOG_ERROR("Checkpoint failed when adding new checkpoints, rolling back!"); + LOG_ERROR("Local blockchain failed to pass a checkpoint, rolling back!"); std::list empty; rollback_blockchain_switching(empty, pt.first - 2); } else { - LOG_ERROR("Checkpoint failed when adding new checkpoints, this could be very bad."); + LOG_ERROR("WARNING: local blockchain failed to pass a MoneroPulse checkpoint, and you could be on a fork. You should either sync up from scratch, OR download a fresh blockchain bootstrap, OR enable checkpoint enforcing with the --enforce-dns-checkpointing command-line option"); } } } diff --git a/src/cryptonote_core/checkpoints_create.cpp b/src/cryptonote_core/checkpoints_create.cpp index db1b83609..140f8dae3 100644 --- a/src/cryptonote_core/checkpoints_create.cpp +++ b/src/cryptonote_core/checkpoints_create.cpp @@ -113,6 +113,7 @@ bool load_checkpoints_from_json(cryptonote::checkpoints& checkpoints, std::strin bool load_checkpoints_from_dns(cryptonote::checkpoints& checkpoints) { + // All four MoneroPulse domains have DNSSEC on and valid static const std::vector dns_urls = { "checkpoints.moneropulse.se" , "checkpoints.moneropulse.org" , "checkpoints.moneropulse.net" @@ -144,13 +145,13 @@ bool load_checkpoints_from_dns(cryptonote::checkpoints& checkpoints) if (records.size() == 0) { - LOG_PRINT_L1("Fetching checkpoints from DNS TXT records failed, no TXT records available."); + LOG_PRINT_L1("Fetching MoneroPulse checkpoints failed, no TXT records available."); return true; } if (avail && !valid) { - LOG_PRINT_L0("WARNING: all checkpoints.moneropulse.net/org/co/se records failed DNSSEC validation and/or returned no records"); + LOG_PRINT_L0("WARNING: MoneroPulse failed DNSSEC validation and/or returned no records"); return true; }