From b83ff851d21b1d4f8d78e5633a40fab4eb82c892 Mon Sep 17 00:00:00 2001 From: wowario Date: Thu, 2 Feb 2023 00:50:11 +0300 Subject: [PATCH] remove moneropulse urls --- src/checkpoints/checkpoints.cpp | 15 +++------------ src/common/dns_utils.cpp | 4 ++-- src/common/updates.cpp | 9 +-------- src/debug_utilities/dns_checks.cpp | 12 ++++++------ src/p2p/net_node.inl | 7 ------- 5 files changed, 12 insertions(+), 35 deletions(-) diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index 2d36cdf89..8be808741 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -291,22 +291,13 @@ namespace cryptonote std::vector records; // All four MoneroPulse domains have DNSSEC on and valid - static const std::vector dns_urls = { "checkpoints.moneropulse.se" - , "checkpoints.moneropulse.org" - , "checkpoints.moneropulse.net" - , "checkpoints.moneropulse.co" + static const std::vector dns_urls = { }; - static const std::vector testnet_dns_urls = { "testpoints.moneropulse.se" - , "testpoints.moneropulse.org" - , "testpoints.moneropulse.net" - , "testpoints.moneropulse.co" + static const std::vector testnet_dns_urls = { }; - static const std::vector stagenet_dns_urls = { "stagenetpoints.moneropulse.se" - , "stagenetpoints.moneropulse.org" - , "stagenetpoints.moneropulse.net" - , "stagenetpoints.moneropulse.co" + static const std::vector stagenet_dns_urls = { }; if (!tools::dns_utils::load_txt_records_from_dns(records, nettype == TESTNET ? testnet_dns_urls : nettype == STAGENET ? stagenet_dns_urls : dns_urls)) diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp index 40e913800..823e74c62 100644 --- a/src/common/dns_utils.cpp +++ b/src/common/dns_utils.cpp @@ -295,7 +295,7 @@ DNSResolver::DNSResolver() : m_data(new DNSResolverData()) // should be a valid DNSSEC record, and switch to known good // DNSSEC resolvers if verification fails bool available, valid; - static const char *probe_hostname = "updates.moneropulse.org"; + static const char *probe_hostname = ""; auto records = get_txt_record(probe_hostname, available, valid); if (!valid) { @@ -554,7 +554,7 @@ bool load_txt_records_from_dns(std::vector &good_records, const std if (num_valid_records < 2) { - LOG_PRINT_L0("WARNING: no two valid DNS TXT records were received"); + LOG_PRINT_L2("WARNING: no two valid DNS TXT records were received"); return false; } diff --git a/src/common/updates.cpp b/src/common/updates.cpp index 654ad068c..403872a9d 100644 --- a/src/common/updates.cpp +++ b/src/common/updates.cpp @@ -46,13 +46,6 @@ namespace tools // All four MoneroPulse domains have DNSSEC on and valid static const std::vector dns_urls = { - "updates.moneropulse.org", - "updates.moneropulse.net", - "updates.moneropulse.fr", - "updates.moneropulse.de", - "updates.moneropulse.no", - "updates.moneropulse.ch", - "updates.moneropulse.se" }; if (!tools::dns_utils::load_txt_records_from_dns(records, dns_urls)) @@ -102,7 +95,7 @@ namespace tools std::string get_update_url(const std::string &software, const std::string &subdir, const std::string &buildtag, const std::string &version, bool user) { - const char *base = user ? "https://downloads.getmonero.org/" : "https://updates.getmonero.org/"; + const char *base = user ? "" : ""; #ifdef _WIN32 static const char *extension = strncmp(buildtag.c_str(), "source", 6) ? (strncmp(buildtag.c_str(), "install-", 8) ? ".zip" : ".exe") : ".tar.bz2"; #elif defined(__APPLE__) diff --git a/src/debug_utilities/dns_checks.cpp b/src/debug_utilities/dns_checks.cpp index caa0421e9..ada6e0b46 100644 --- a/src/debug_utilities/dns_checks.cpp +++ b/src/debug_utilities/dns_checks.cpp @@ -129,20 +129,20 @@ int main(int argc, char* argv[]) mlog_configure("", true); mlog_set_categories("+" MONERO_DEFAULT_LOG_CATEGORY ":INFO"); - lookup(LOOKUP_A, {"seeds.moneroseeds.se", "seeds.moneroseeds.ae.org", "seeds.moneroseeds.ch", "seeds.moneroseeds.li"}); + lookup(LOOKUP_A, {""}); - lookup(LOOKUP_TXT, {"updates.moneropulse.org", "updates.moneropulse.net", "updates.moneropulse.co", "updates.moneropulse.se", "updates.moneropulse.fr", "updates.moneropulse.de", "updates.moneropulse.no", "updates.moneropulse.ch"}); + lookup(LOOKUP_TXT, {""}); - lookup(LOOKUP_TXT, {"checkpoints.moneropulse.org", "checkpoints.moneropulse.net", "checkpoints.moneropulse.co", "checkpoints.moneropulse.se"}); + lookup(LOOKUP_TXT, {""}); // those are in the code, but don't seem to actually exist #if 0 - lookup(LOOKUP_TXT, {"testpoints.moneropulse.org", "testpoints.moneropulse.net", "testpoints.moneropulse.co", "testpoints.moneropulse.se"); + lookup(LOOKUP_TXT, {""); - lookup(LOOKUP_TXT, {"stagenetpoints.moneropulse.org", "stagenetpoints.moneropulse.net", "stagenetpoints.moneropulse.co", "stagenetpoints.moneropulse.se"}); + lookup(LOOKUP_TXT, {""}); #endif - lookup(LOOKUP_TXT, {"segheights.moneropulse.org", "segheights.moneropulse.net", "segheights.moneropulse.co", "segheights.moneropulse.se"}); + lookup(LOOKUP_TXT, {""}); return 0; CATCH_ENTRY_L0("main", 1); diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 30e3d31b9..763b12363 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -2033,13 +2033,6 @@ namespace nodetool return true; static const std::vector dns_urls = { - "blocklist.moneropulse.se" - , "blocklist.moneropulse.org" - , "blocklist.moneropulse.net" - , "blocklist.moneropulse.no" - , "blocklist.moneropulse.fr" - , "blocklist.moneropulse.de" - , "blocklist.moneropulse.ch" }; std::vector records;