Merge pull request #66 from wowario/testnet-stagenet

Add stagenet and reset testnet

src/cryptonote_core/blockchain.cpp

@@ -116,16 +116,8 @@ static const struct {
   uint8_t threshold;
   time_t time;
 } stagenet_hard_forks[] = {
-  // version 1 from the start of the blockchain
-  { 1, 1, 0, 1341378000 },
-
-  // versions 2-7 in rapid succession from March 13th, 2018
-  { 2, 32000, 0, 1521000000 },
-  { 3, 33000, 0, 1521120000 },
-  { 4, 34000, 0, 1521240000 },
-  { 5, 35000, 0, 1521360000 },
-  { 6, 36000, 0, 1521480000 },
-  { 7, 37000, 0, 1521600000 },
+ { 7, 1, 0, 1519605000 },
+ { 8, 10, 0, 1530621606 },
 };
 
 //------------------------------------------------------------------

src/p2p/net_node.inl

@@ -372,13 +372,20 @@ namespace nodetool
     if (nettype == cryptonote::TESTNET) {
              full_addrs.insert("206.189.166.14:11180");
              full_addrs.insert("104.236.48.55:11180");
-    } else {
+    }
+    else if (nettype == cryptonote::STAGENET)
+    {
+            full_addrs.insert("206.189.166.14:38080");
+            full_addrs.insert("104.236.48.55:38080");
+    }
+    else
+    {
              full_addrs.insert("66.70.218.230:34567");
              full_addrs.insert("34.209.48.213:34567");
              full_addrs.insert("159.65.91.59:34567");
              full_addrs.insert("138.197.31.246:34567");
-
     }
+    
     return full_addrs;
   }
 

src/wallet/wallet2.cpp

@@ -9142,9 +9142,9 @@ uint64_t wallet2::get_daemon_blockchain_target_height(string &err)
 uint64_t wallet2::get_approximate_blockchain_height() const
 {
   // time of v8 fork
-  const time_t fork_time = m_nettype == TESTNET ? 1529020649 : 1524622167;
+  const time_t fork_time = m_nettype == TESTNET ? 1530634467 : m_nettype == STAGENET ? 1530635153 : 1524622167;
   // v8 fork block
-  const uint64_t fork_block = m_nettype == TESTNET ? 10 : 6969;
+  const uint64_t fork_block = m_nettype == TESTNET ? 10 : m_nettype == STAGENET ? 10 : 6969;
   // avg seconds per block
   const int seconds_per_block = DIFFICULTY_TARGET_V2;
   // Calculated blockchain height