testnet: add seed nodes, checkpoints, wallet: fix approximation of height

Author: hayzamjs

src/checkpoints/checkpoints.cpp

@@ -182,6 +182,16 @@ bool checkpoints::check_for_conflicts(const checkpoints &other) const {
 
 bool checkpoints::init_default_checkpoints(network_type nettype) {
  if (nettype == TESTNET) {
+ ADD_CHECKPOINT2(
+ 10, "a76e3b124834af91af028718e9dc03277bcd08845deecf1e52061b6411b3356c",
+ "0x25");
+ ADD_CHECKPOINT2(
+ 15, "325dafccc380a19243c1f5edb3ac16696e65500d8de3d38f77504e7b76bb9a26",
+ "0x54");
+ ADD_CHECKPOINT2(
+ 20, "992cf60da2c6a5643bb5bc0674af748473fa2b40ceb4739cde1e9d4a7d35dbbc",
+ "0x1d4c84")
+
  return true;
  }
 

src/p2p/net_node.inl

@@ -702,7 +702,10 @@ namespace nodetool
  {
  std::set<std::string> full_addrs;
  if (m_nettype == cryptonote::TESTNET)
- {}
+ {
+ full_addrs.insert("65.21.221.2:22822");
+ full_addrs.insert("65.21.221.3:22822");
+ }
  else if (m_nettype == cryptonote::STAGENET)
  {
  full_addrs.insert("65.21.221.2:33833");

src/wallet/wallet2.cpp

@@ -13404,26 +13404,15 @@ uint64_t wallet2::get_daemon_blockchain_target_height(string &err) {
 }
 
 uint64_t wallet2::get_approximate_blockchain_height() const {
- // time of v2 fork
- const time_t fork_time = m_nettype == TESTNET ? 1448285909
- : m_nettype == STAGENET ? 1520937818
- : 1458748658;
- // v2 fork block
- const uint64_t fork_block = m_nettype == TESTNET ? 624634
- : m_nettype == STAGENET ? 32000
- : 1009827;
- // avg seconds per block
- const int seconds_per_block = DIFFICULTY_TARGET_V2;
- // Calculated blockchain height
+ const int seconds_per_block = DIFFICULTY_TARGET;
+ const time_t epochTimeMiningStarted = 1596258914;
+ const time_t currentTime = time(NULL);
  uint64_t approx_blockchain_height =
- fork_block + (time(NULL) - fork_time) / seconds_per_block;
- // testnet and stagenet got some huge rollbacks, so the estimation is way off
- static const uint64_t approximate_rolled_back_blocks =
- m_nettype == TESTNET ? 342100 : 30000;
- if ((m_nettype == TESTNET || m_nettype == STAGENET) &&
- approx_blockchain_height > approximate_rolled_back_blocks)
- approx_blockchain_height -= approximate_rolled_back_blocks;
+ (currentTime < epochTimeMiningStarted)
+ ? 0
+ : (currentTime - epochTimeMiningStarted) / seconds_per_block;
  LOG_PRINT_L2("Calculated blockchain height: " << approx_blockchain_height);
+
  return approx_blockchain_height;
 }