Merge pull request #215 from wowario/masterb

bump version to 0.6.1.1 and update checkpoints.dat

README.md

@@ -45,7 +45,7 @@ Dates are provided in the format YYYY-MM-DD.
 | 53666                          | 2018-10-06 | Cool Cage                | v0.3.0.0               | v0.3.1.3                  | Cryptonight variant 2, LWMA v2, ringsize = 22, MMS
 | 63469                          | 2018-11-11 | Dank Doge               | v0.4.0.0               | v0.4.0.0                  | LWMA v4
 | 81769                          | 2019-02-19 | Erotic EggplantEmoji    | v0.5.0.0               | v0.5.0.2                  | Cryptonight/wow, LWMA v1 with N=144, Updated Bulletproofs, Fee Per Byte, Auto-churn
-| 114969                          | 2019-06-14 | F For Fappening    | v0.6.1.0               | v0.6.1.0                  | RandomWOW, new block weight algorithm, slightly more efficient RingCT format
+| 114969                          | 2019-06-14 | F For Fappening    | v0.6.1.0               | v0.6.1.1                  | RandomWOW, new block weight algorithm, slightly more efficient RingCT format
 
 X's indicate that these details have not been determined as of commit date.
 

src/checkpoints/checkpoints.cpp

@@ -217,6 +217,8 @@ namespace cryptonote
       ADD_CHECKPOINT(88200,  "50bb43d5d563524d6b9f308a2483b80934bab2ab5250757558318834476f1cfb");
       ADD_CHECKPOINT(100000,  "0c1f3bec32fe4ac9bd4b6ce1f4dfc52824f0947d756c9a1a453252c9423071f5");
       ADD_CHECKPOINT(111450,  "d6eadc95607765b36afd8b9148eac20eb101632021348cd34371fc1d8b67f6b6");
+      ADD_CHECKPOINT(114969,  "b48245956b87f243048fd61021f4b3e5443e57eee7ff8ba4762d18926e80b80c"); //Hard fork to v13
+      ADD_CHECKPOINT(114980,  "3a96963b93154889bd7d59c8a60cf8005e864b930627616e51a4ad11cd9a3d50");
 
     return true;
   }

src/cryptonote_core/blockchain.cpp

@@ -4960,7 +4960,7 @@ void Blockchain::cancel()
 }
 
 #if defined(PER_BLOCK_CHECKPOINT)
-static const char expected_block_hashes_hash[] = "7014aab67dba5c34f117548a7f9c137b2ca590ae5e6b701a237163ece6d330eb";
+static const char expected_block_hashes_hash[] = "4907556dee9a2b2f124c218f21525c7a19e894583ca4989e84b74c945a6c1998";
 void Blockchain::load_compiled_in_block_hashes(const GetCheckpointsCallback& get_checkpoints)
 {
   if (get_checkpoints == nullptr || !m_fast_sync)

src/version.cpp.in

@@ -1,5 +1,5 @@
 #define DEF_MONERO_VERSION_TAG "@VERSIONTAG@"
-#define DEF_MONERO_VERSION "0.6.1.0"
+#define DEF_MONERO_VERSION "0.6.1.1"
 #define DEF_MONERO_RELEASE_NAME "F For Fappening"
 #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG