From c54f5de51fe5aaebc1ebf7b688a00f6525385962 Mon Sep 17 00:00:00 2001 From: Klaus-Uwe Mitterer Date: Wed, 24 Jan 2018 16:48:33 +0100 Subject: [PATCH] update URLs --- src/common/updates.cpp | 5 +---- src/cryptonote_basic/checkpoints.cpp | 11 +++-------- src/cryptonote_core/blockchain.cpp | 5 ++++- src/p2p/net_node.h | 6 ++---- src/p2p/net_node.inl | 15 ++------------- 5 files changed, 12 insertions(+), 30 deletions(-) diff --git a/src/common/updates.cpp b/src/common/updates.cpp index 8a057b1c..a04a7ba9 100644 --- a/src/common/updates.cpp +++ b/src/common/updates.cpp @@ -45,10 +45,7 @@ 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.co", - "updates.moneropulse.se" + "updates.danico.in" }; if (!tools::dns_utils::load_txt_records_from_dns(records, dns_urls)) diff --git a/src/cryptonote_basic/checkpoints.cpp b/src/cryptonote_basic/checkpoints.cpp index f7faf3ca..8df77a00 100644 --- a/src/cryptonote_basic/checkpoints.cpp +++ b/src/cryptonote_basic/checkpoints.cpp @@ -211,16 +211,11 @@ 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 = { "node1.danico.in" + , "node2.danico.in" }; - 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 = { }; if (!tools::dns_utils::load_txt_records_from_dns(records, testnet ? testnet_dns_urls : dns_urls)) diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index a802ae56..48d5f858 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -1015,11 +1015,14 @@ bool Blockchain::validate_miner_transaction(const block& b, size_t cumulative_bl MERROR_VER("block size " << cumulative_block_size << " is bigger than allowed for this blockchain"); return false; } + if(base_reward + fee < money_in_use) { MERROR_VER("coinbase transaction spend too much money (" << print_money(money_in_use) << "). Block reward is " << print_money(base_reward + fee) << "(" << print_money(base_reward) << "+" << print_money(fee) << ")"); + return true; return false; - } + } + // From hard fork 2, we allow a miner to claim less block reward than is allowed, in case a miner wants less dust if (m_hardfork->get_current_version() < 2) { diff --git a/src/p2p/net_node.h b/src/p2p/net_node.h index 81ba5bc1..36749423 100644 --- a/src/p2p/net_node.h +++ b/src/p2p/net_node.h @@ -131,10 +131,8 @@ namespace nodetool virtual std::map get_blocked_hosts() { CRITICAL_REGION_LOCAL(m_blocked_hosts_lock); return m_blocked_hosts; } private: const std::vector m_seed_nodes_list = - { "seeds.moneroseeds.se" - , "seeds.moneroseeds.ae.org" - , "seeds.moneroseeds.ch" - , "seeds.moneroseeds.li" + { "node1.danico.in" + , "node2.danico.in" }; bool islimitup=false; diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index a3887541..51726597 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -409,22 +409,11 @@ namespace nodetool std::set full_addrs; if (testnet) { - full_addrs.insert("212.83.175.67:28080"); - full_addrs.insert("5.9.100.248:28080"); - full_addrs.insert("163.172.182.165:28080"); - full_addrs.insert("195.154.123.123:28080"); - full_addrs.insert("212.83.172.165:28080"); } else { - full_addrs.insert("107.152.130.98:18080"); - full_addrs.insert("212.83.175.67:18080"); - full_addrs.insert("5.9.100.248:18080"); - full_addrs.insert("163.172.182.165:18080"); - full_addrs.insert("161.67.132.39:18080"); - full_addrs.insert("198.74.231.92:18080"); - full_addrs.insert("195.154.123.123:28080"); - full_addrs.insert("212.83.172.165:28080"); + full_addrs.insert("173.212.249.24:14086"); + full_addrs.insert("173.212.243.115:14086"); } return full_addrs; }