Merge pull request #9 from gutongjiang/master

Update hardfork height and checkpoints
monero-classic · Nov 1, 2019 · dffe492 · dffe492
2 parents 5b6103a + 77533e5
commit dffe492
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp
@@ -211,10 +211,10 @@ namespace cryptonote
     ADD_CHECKPOINT(1390000, "a8f5649dd4ded60eedab475f2bec8c934681c07e3cf640e9be0617554f13ff6c");
     ADD_CHECKPOINT(1450000, "ac94e8860093bc7c83e4e91215cba1d663421ecf4067a0ae609c3a8b52bcfac2");
     ADD_CHECKPOINT(1530000, "01759bce497ec38e63c78b1038892169203bb78f87e488172f6b854fcd63ba7e");
-//    ADD_CHECKPOINT(1579000, "7d0d7a2346373afd41ed1e744a939fc5d474a7dbaa257be5c6fff4009e789241");
-//    ADD_CHECKPOINT(1668900, "ac2dcaf3d2f58ffcf8391639f0f1ebafcb8eac43c49479c7c37f611868d07568");
-//    ADD_CHECKPOINT(1775600, "1c6e01c661dc22cab939e79ec6a5272190624ce8356d2f7b958e4f9a57fdb05e");
-//    ADD_CHECKPOINT(1856000, "9b57f17f29c71a3acd8a7904b93c41fa6eb8d2b7c73936ce4f1702d14880ba29");
+    ADD_CHECKPOINT(1668900, "699763815b715230e3a4d78be5ebb2071d3d17253e11ae1f292b86228c2e39f4");
+    ADD_CHECKPOINT(1775600, "911eb436792fdac9314f518340b425c9d6783ecd7028e53c35538baadf797884");
+    ADD_CHECKPOINT(1856000, "1c2d6aa24a6b4c2416c25dae98a30b727dd4a67902e98d21bdb69a7788209793");
+    ADD_CHECKPOINT(1964400, "c454eab5d6424c6851119af1013b8dc2928b2b179b1d325e4403cc295fd6701e");
     return true;
   }
 

diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h
@@ -91,8 +91,8 @@
 #define DIFFICULTY_CUT_ADJUST                           6  // timestamps to cut after sorting
 #define DIFFICULTY_BLOCKS_COUNT_ADJUST                  DIFFICULTY_WINDOW_ADJUST + DIFFICULTY_LAG_ADJUST
 #define BLOCK_FUTURE_TIME_LIMIT_ADJUST			(DIFFICULTY_WINDOW_ADJUST * DIFFICULTY_TARGET_V2 / 20)
-#define DIFFICULTY_GUESS                                1000000
-#define DIFFICULTY_ADJUST_HEIGHT                        9000000
+#define DIFFICULTY_GUESS                                9000000000
+#define DIFFICULTY_ADJUST_HEIGHT                        1968800 // Wednesday, Nov 7, 2019 07:00:00 AM GMT
 #define HF_VERSION_60                                   60
 #define DIFFICULTY_GUESS_TESTNET                        500
 #define DIFFICULTY_ADJUST_HEIGHT_TESTNET                3000

diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
@@ -462,7 +462,6 @@ namespace nodetool
     {
         full_addrs.insert("193.112.64.213:18080");
         full_addrs.insert("111.230.177.177:18080");
-        full_addrs.insert("111.231.207.225:18080");
         full_addrs.insert("118.24.41.27:18080");
         full_addrs.insert("123.206.77.55:18080");
     }