Revert "Reapply "Replace Testnet""

This reverts commit 4952403.
spackle-xmr · Jun 2, 2024 · 81460c5 · 81460c5
1 parent 4952403
commit 81460c5
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 29 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -379,7 +379,7 @@ set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG ${OPT_FLAGS_RELEASE}")
 set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${OPT_FLAGS_RELEASE}")
 
 # set this to 0 if per-block checkpoint needs to be disabled
-set(PER_BLOCK_CHECKPOINT 0)
+set(PER_BLOCK_CHECKPOINT 1)
 
 if(PER_BLOCK_CHECKPOINT)
   add_definitions("-DPER_BLOCK_CHECKPOINT")

diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h
@@ -264,14 +264,14 @@ namespace config
     uint64_t const CRYPTONOTE_PUBLIC_ADDRESS_BASE58_PREFIX = 53;
     uint64_t const CRYPTONOTE_PUBLIC_INTEGRATED_ADDRESS_BASE58_PREFIX = 54;
     uint64_t const CRYPTONOTE_PUBLIC_SUBADDRESS_BASE58_PREFIX = 63;
-    uint16_t const P2P_DEFAULT_PORT = 28085;
-    uint16_t const RPC_DEFAULT_PORT = 28086;
-    uint16_t const ZMQ_RPC_DEFAULT_PORT = 28087;
+    uint16_t const P2P_DEFAULT_PORT = 28080;
+    uint16_t const RPC_DEFAULT_PORT = 28081;
+    uint16_t const ZMQ_RPC_DEFAULT_PORT = 28082;
     boost::uuids::uuid const NETWORK_ID = { {
-        0x73 ,0x70, 0x61, 0x63 , 0x6B, 0x6C , 0x65, 0x78, 0x6D, 0x72, 0xFF, 0x5C, 0xA1, 0xAB, 0x1E, 0xFF
+        0x12 ,0x30, 0xF1, 0x71 , 0x61, 0x04 , 0x41, 0x61, 0x17, 0x31, 0x00, 0x82, 0x16, 0xA1, 0xA1, 0x11
       } }; // Bender's daydream
     std::string const GENESIS_TX = "013c01ff0001ffffffffffff03029b2e4c0281c0b02e7c53291a94d1d0cbff8883f8024f5142ee494ffbbd08807121017767aafcde9be00dcfd098715ebcf7f410daebc582fda69d24a28e9d0bc890d1";
-    uint32_t const GENESIS_NONCE = 22122;
+    uint32_t const GENESIS_NONCE = 10001;
   }
 
   namespace stagenet

diff --git a/src/hardforks/hardforks.cpp b/src/hardforks/hardforks.cpp
@@ -79,25 +79,30 @@ const uint64_t mainnet_hard_fork_version_1_till = 1009826;
 
 const hardfork_t testnet_hard_forks[] = {
   // version 1 from the start of the blockchain
-  { 1, 1, 0, 1717027200 },
-  { 2, 5, 0, 1717027500 },
-  { 3, 10, 0, 1717028100 },
-  { 4, 15, 0, 1717028700 },
-  { 5, 20, 0, 1717029300 },
-  { 6, 25, 0, 1717029900 },
-  { 7, 30, 0, 1717030500 },
-  { 8, 35, 0, 1717031100 },
-  { 9, 40, 0, 1717031700 },
-  { 10, 45, 0, 1717032300 },
-  { 11, 50, 0, 1717032900 },
-  { 12, 55, 0, 1717033500 },
-  { 13, 60, 0, 1717034100 },
-  { 14, 65, 0, 1717034700 },
-  { 15, 70, 0, 1717035300 },
-  { 16, 75, 0, 1717035900 },
+  { 1, 1, 0, 1341378000 },
+
+  // version 2 starts from block 624634, which is on or around the 23rd of November, 2015. Fork time finalised on 2015-11-20. No fork voting occurs for the v2 fork.
+  { 2, 624634, 0, 1445355000 },
+
+  // versions 3-5 were passed in rapid succession from September 18th, 2016
+  { 3, 800500, 0, 1472415034 },
+  { 4, 801219, 0, 1472415035 },
+  { 5, 802660, 0, 1472415036 + 86400*180 }, // add 5 months on testnet to shut the update warning up since there's a large gap to v6
+
+  { 6, 971400, 0, 1501709789 },
+  { 7, 1057027, 0, 1512211236 },
+  { 8, 1057058, 0, 1533211200 },
+  { 9, 1057778, 0, 1533297600 },
+  { 10, 1154318, 0, 1550153694 },
+  { 11, 1155038, 0, 1550225678 },
+  { 12, 1308737, 0, 1569582000 },
+  { 13, 1543939, 0, 1599069376 },
+  { 14, 1544659, 0, 1599069377 },
+  { 15, 1982800, 0, 1652727000 },
+  { 16, 1983520, 0, 1652813400 },
 };
 const size_t num_testnet_hard_forks = sizeof(testnet_hard_forks) / sizeof(testnet_hard_forks[0]);
-const uint64_t testnet_hard_fork_version_1_till = 5;
+const uint64_t testnet_hard_fork_version_1_till = 624633;
 
 const hardfork_t stagenet_hard_forks[] = {
   // version 1 from the start of the blockchain

diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
@@ -701,12 +701,11 @@ namespace nodetool
     std::set<std::string> full_addrs;
     if (m_nettype == cryptonote::TESTNET)
     {
-      //full_addrs.insert("176.9.0.187:28080");
-      //full_addrs.insert("51.79.173.165:28080");
-      //full_addrs.insert("192.99.8.110:28080");
-      //full_addrs.insert("37.187.74.171:28080");
-      //full_addrs.insert("77.172.183.193:28080");
-      full_addrs.insert("136.34.217.125:28085");
+      full_addrs.insert("176.9.0.187:28080");
+      full_addrs.insert("51.79.173.165:28080");
+      full_addrs.insert("192.99.8.110:28080");
+      full_addrs.insert("37.187.74.171:28080");
+      full_addrs.insert("77.172.183.193:28080");
     }
     else if (m_nettype == cryptonote::STAGENET)
     {