remove moneropulse urls

This commit is contained in:
wowario 2023-02-02 00:50:11 +03:00
parent 95e7407aa1
commit b83ff851d2
No known key found for this signature in database
GPG Key ID: 793504B449C69220
5 changed files with 12 additions and 35 deletions

View File

@ -291,22 +291,13 @@ namespace cryptonote
std::vector<std::string> records; std::vector<std::string> records;
// All four MoneroPulse domains have DNSSEC on and valid // All four MoneroPulse domains have DNSSEC on and valid
static const std::vector<std::string> dns_urls = { "checkpoints.moneropulse.se" static const std::vector<std::string> dns_urls = {
, "checkpoints.moneropulse.org"
, "checkpoints.moneropulse.net"
, "checkpoints.moneropulse.co"
}; };
static const std::vector<std::string> testnet_dns_urls = { "testpoints.moneropulse.se" static const std::vector<std::string> testnet_dns_urls = {
, "testpoints.moneropulse.org"
, "testpoints.moneropulse.net"
, "testpoints.moneropulse.co"
}; };
static const std::vector<std::string> stagenet_dns_urls = { "stagenetpoints.moneropulse.se" static const std::vector<std::string> stagenet_dns_urls = {
, "stagenetpoints.moneropulse.org"
, "stagenetpoints.moneropulse.net"
, "stagenetpoints.moneropulse.co"
}; };
if (!tools::dns_utils::load_txt_records_from_dns(records, nettype == TESTNET ? testnet_dns_urls : nettype == STAGENET ? stagenet_dns_urls : dns_urls)) if (!tools::dns_utils::load_txt_records_from_dns(records, nettype == TESTNET ? testnet_dns_urls : nettype == STAGENET ? stagenet_dns_urls : dns_urls))

View File

@ -295,7 +295,7 @@ DNSResolver::DNSResolver() : m_data(new DNSResolverData())
// should be a valid DNSSEC record, and switch to known good // should be a valid DNSSEC record, and switch to known good
// DNSSEC resolvers if verification fails // DNSSEC resolvers if verification fails
bool available, valid; 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); auto records = get_txt_record(probe_hostname, available, valid);
if (!valid) if (!valid)
{ {
@ -554,7 +554,7 @@ bool load_txt_records_from_dns(std::vector<std::string> &good_records, const std
if (num_valid_records < 2) 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; return false;
} }

View File

@ -46,13 +46,6 @@ namespace tools
// All four MoneroPulse domains have DNSSEC on and valid // All four MoneroPulse domains have DNSSEC on and valid
static const std::vector<std::string> dns_urls = { static const std::vector<std::string> 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)) 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) 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 #ifdef _WIN32
static const char *extension = strncmp(buildtag.c_str(), "source", 6) ? (strncmp(buildtag.c_str(), "install-", 8) ? ".zip" : ".exe") : ".tar.bz2"; static const char *extension = strncmp(buildtag.c_str(), "source", 6) ? (strncmp(buildtag.c_str(), "install-", 8) ? ".zip" : ".exe") : ".tar.bz2";
#elif defined(__APPLE__) #elif defined(__APPLE__)

View File

@ -129,20 +129,20 @@ int main(int argc, char* argv[])
mlog_configure("", true); mlog_configure("", true);
mlog_set_categories("+" MONERO_DEFAULT_LOG_CATEGORY ":INFO"); 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 // those are in the code, but don't seem to actually exist
#if 0 #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 #endif
lookup(LOOKUP_TXT, {"segheights.moneropulse.org", "segheights.moneropulse.net", "segheights.moneropulse.co", "segheights.moneropulse.se"}); lookup(LOOKUP_TXT, {""});
return 0; return 0;
CATCH_ENTRY_L0("main", 1); CATCH_ENTRY_L0("main", 1);

View File

@ -2033,13 +2033,6 @@ namespace nodetool
return true; return true;
static const std::vector<std::string> dns_urls = { static const std::vector<std::string> 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<std::string> records; std::vector<std::string> records;