Merge pull request #3 from quangvu3/master

Prepare for v0.3.3.0 release
sumoproject · Jun 20, 2018 · afe15b6 · afe15b6
2 parents 6d19973 + a2fb3c4
commit afe15b6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 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
@@ -85,7 +85,8 @@ static const struct {
   { 1, 1, 0, 1482806500 },
   { 2, 21300, 0, 1497657600 },
   { 3, MAINNET_HARDFORK_V3_HEIGHT, 0, 1522800000 },
-  { 4, 137500, 0, 1528045200 }
+  { 4, 137500, 0, 1528045200 },
+  { 5, 165000, 0, 1529643600 }
 };
 static const uint64_t mainnet_hard_fork_version_1_till = (uint64_t)-1;
 
@@ -1396,7 +1397,7 @@ bool Blockchain::handle_alternative_block(const block& b, const crypto::hash& id
     if(is_a_checkpoint)
     {
       //do reorganize!
-      LOG_PRINT_GREEN("###### REORGANIZE on height: " << alt_chain.front()->second.height << " of " << m_db->height() - 1 << ", checkpoint is found in alternative chain on height " << bei.height, LOG_LEVEL_0);
+      LOG_PRINT_GREEN("###### REORGANIZE on height: " << alt_chain.front()->second.height << " of " << m_db->height() - 1 << ", checkpoint is found in alternative chain on height " << bei.height, LOG_LEVEL_1);
 
       bool r = switch_to_alternative_blockchain(alt_chain, true);
 
@@ -1408,7 +1409,7 @@ bool Blockchain::handle_alternative_block(const block& b, const crypto::hash& id
     else if(main_chain_cumulative_difficulty < bei.cumulative_difficulty) //check if difficulty bigger then in main chain
     {
       //do reorganize!
-      LOG_PRINT_GREEN("###### REORGANIZE on height: " << alt_chain.front()->second.height << " of " << m_db->height() - 1 << " with cum_difficulty " << m_db->get_block_cumulative_difficulty(m_db->height() - 1) << std::endl << " alternative blockchain size: " << alt_chain.size() << " with cum_difficulty " << bei.cumulative_difficulty, LOG_LEVEL_0);
+      LOG_PRINT_GREEN("###### REORGANIZE on height: " << alt_chain.front()->second.height << " of " << m_db->height() - 1 << " with cum_difficulty " << m_db->get_block_cumulative_difficulty(m_db->height() - 1) << std::endl << " alternative blockchain size: " << alt_chain.size() << " with cum_difficulty " << bei.cumulative_difficulty, LOG_LEVEL_1);
 
       bool r = switch_to_alternative_blockchain(alt_chain, false);
       if (r)
@@ -1419,7 +1420,7 @@ bool Blockchain::handle_alternative_block(const block& b, const crypto::hash& id
     }
     else
     {
-      LOG_PRINT_BLUE("----- BLOCK ADDED AS ALTERNATIVE ON HEIGHT " << bei.height << std::endl << "id:\t" << id << std::endl << "PoW:\t" << proof_of_work << std::endl << "difficulty:\t" << current_diff, LOG_LEVEL_0);
+      LOG_PRINT_BLUE("----- BLOCK ADDED AS ALTERNATIVE ON HEIGHT " << bei.height << std::endl << "id:\t" << id << std::endl << "PoW:\t" << proof_of_work << std::endl << "difficulty:\t" << current_diff, LOG_LEVEL_1);
       return true;
     }
   }

diff --git a/src/cryptonote_core/checkpoints.cpp b/src/cryptonote_core/checkpoints.cpp
@@ -172,7 +172,7 @@ namespace cryptonote
     ADD_CHECKPOINT(75000, "b26f4e1225569da282b77659020bace52e5e89abbdee33e9e52266b1e71803a5");
     ADD_CHECKPOINT(100000, "ffe474fe8353f90700c8138ddea3547d5c1e4a6facb1df85897e7a6e4daab540");
     ADD_CHECKPOINT(116520, "da1cb8f30305cd5fad7d6c33b3ed88fede053e0926102d8e544b65e93e33a08b"); // v3 fork
-    ADD_CHECKPOINT(136240, "addf156324aa69a8c2ca2236ba3a205ab63d0d3fc23f75a57fb7c94123c578ab");
+    ADD_CHECKPOINT(137500, "0a50041b952bdc1b1f2c6a5e8749600f545e43ddfa255607b529df95f8945e5d"); // v4 fork
     return true;
   }
 

diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
@@ -394,9 +394,11 @@ namespace nodetool
     if (testnet)
     {
       memcpy(&m_network_id, &::config::testnet::NETWORK_ID, 16);
-      full_addrs.insert("91.121.81.92:29733");
+      full_addrs.insert("192.99.32.219:29733");
       full_addrs.insert("144.217.164.165:29733");
       full_addrs.insert("217.182.76.94:29733");
+      full_addrs.insert("139.99.40.69:29733");
+      full_addrs.insert("46.105.92.108:29733");
     }
     else
     {
@@ -471,13 +473,16 @@ namespace nodetool
 
       if (!full_addrs.size())
       {
-        LOG_PRINT_L0("DNS seed node lookup either timed out or failed, falling back to defaults");
+        LOG_PRINT_L1("DNS seed node lookup either timed out or failed, falling back to defaults");
         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("133.18.53.223:19733");
         full_addrs.insert("217.182.76.94:19733");
         full_addrs.insert("46.105.92.108:19733");
+        full_addrs.insert("158.69.242.193:19733");
+        full_addrs.insert("139.99.193.21:19733");
+        full_addrs.insert("139.99.40.69: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.3.2.0"
+#define SUMOKOIN_VERSION "0.3.3.0"
 #define SUMOKOIN_RELEASE_NAME "Aomori"
 #define SUMOKOIN_VERSION_FULL SUMOKOIN_VERSION "-" SUMOKOIN_VERSION_TAG