Merge pull request #108 from quangvu3/master

Prepare for release 0.3 (Aomori)
sumoproject · Apr 2, 2018 · 8836abb · 8836abb
2 parents 8500ff7 + 613ed5b
commit 8836abb
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
@@ -74,6 +74,7 @@ DISABLE_VS_WARNINGS(4267)
 
 // used to overestimate the block reward when estimating a per kB to use
 #define BLOCK_REWARD_OVERESTIMATE   ((uint64_t)(16000000000))
+#define MAINNET_HARDFORK_V3_HEIGHT  ((uint64_t)(116520))
 
 static const struct {
   uint8_t version;
@@ -83,7 +84,7 @@ static const struct {
 } mainnet_hard_forks[] = {
   { 1, 1, 0, 1482806500 },
   { 2, 21300, 0, 1497657600 },
-  { 3, 117600, 0, 1522800000 }  // April 04, 2018
+  { 3, MAINNET_HARDFORK_V3_HEIGHT, 0, 1522800000 }
 };
 static const uint64_t mainnet_hard_fork_version_1_till = (uint64_t)-1;
 
@@ -676,6 +677,11 @@ difficulty_type Blockchain::get_difficulty_for_next_block()
   std::vector<uint64_t> timestamps;
   std::vector<difficulty_type> difficulties;
   auto height = m_db->height();
+  // Reset network hashrate to 2.0 MHz when hardfork v3 comes
+  if (!m_testnet && (uint64_t)height >= MAINNET_HARDFORK_V3_HEIGHT && (uint64_t)height <= MAINNET_HARDFORK_V3_HEIGHT + (uint64_t)DIFFICULTY_BLOCKS_COUNT_V2){
+    return (difficulty_type) 480000000;
+  }
+
   size_t difficult_block_count = get_current_hard_fork_version() < 2 ? DIFFICULTY_BLOCKS_COUNT : DIFFICULTY_BLOCKS_COUNT_V2;
 
   // ND: Speedup

diff --git a/src/cryptonote_core/checkpoints.cpp b/src/cryptonote_core/checkpoints.cpp
@@ -171,7 +171,8 @@ namespace cryptonote
     ADD_CHECKPOINT(20251, "08f1086be149c18dece35b5bf0220aeb3ff8c5f01192838db8ca5a685f42d041");
     ADD_CHECKPOINT(50000, "ae36641cf06ed788375bfb32f0038cbcd98f1d7bfb09937148fb1a57c6b52dd8");
     ADD_CHECKPOINT(75000, "b26f4e1225569da282b77659020bace52e5e89abbdee33e9e52266b1e71803a5");
-
+    ADD_CHECKPOINT(100000, "ffe474fe8353f90700c8138ddea3547d5c1e4a6facb1df85897e7a6e4daab540");
+    ADD_CHECKPOINT(116134, "ce0883907ab7eaa5c94fe602afc0522fa2228585789747f9f20e65dea4a465d9");
     return true;
   }
 

diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
@@ -394,9 +394,9 @@ namespace nodetool
     if (testnet)
     {
       memcpy(&m_network_id, &::config::testnet::NETWORK_ID, 16);
-      full_addrs.insert("158.69.242.193:29733");
       full_addrs.insert("91.121.81.92:29733");
       full_addrs.insert("144.217.164.165:29733");
+      full_addrs.insert("217.182.76.94:29733");
     }
     else
     {
@@ -472,12 +472,12 @@ namespace nodetool
       if (!full_addrs.size())
       {
         LOG_PRINT_L0("DNS seed node lookup either timed out or failed, falling back to defaults");
-        full_addrs.insert("158.69.242.193:19733");
         full_addrs.insert("91.121.81.92:19733");
+        full_addrs.insert("192.99.32.219:19733");
         full_addrs.insert("144.217.164.165:19733");
-        full_addrs.insert("168.235.77.153:19733");
-        full_addrs.insert("185.34.136.245:19733");
-        full_addrs.insert("107.191.61.96:19733");
+        full_addrs.insert("133.18.53.223:19733");
+        full_addrs.insert("217.182.76.94:19733");
+        full_addrs.insert("46.105.92.108:19733");
       }
     }
 

diff --git a/src/version.h.in b/src/version.h.in
@@ -1,4 +1,4 @@
 #define SUMOKOIN_VERSION_TAG "@VERSIONTAG@"
-#define SUMOKOIN_VERSION "0.2.0.0"
-#define SUMOKOIN_RELEASE_NAME "Sapporo"
+#define SUMOKOIN_VERSION "0.3.0.0"
+#define SUMOKOIN_RELEASE_NAME "Aomori"
 #define SUMOKOIN_VERSION_FULL SUMOKOIN_VERSION "-" SUMOKOIN_VERSION_TAG