Merge pull request #270 from stoffu/aeon-bump-0.14.2

bump version to v0.14.2.0
aeonix · May 21, 2022 · 033e35e · 033e35e
2 parents 7178eec + f593c77
commit 033e35e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -99,7 +99,7 @@ Dates are provided in the format YYYY-MM-DD.
 | 592000                        | 2015-08-04 | v1 (exceptional, version not bumped)      | v0.9.0.0                 | v0.9.14.0                     | blocktime = 240 seconds, CryptoNight-Lite, lower mining priority for ringsize < 3       |
 | 963500                        | 2018-06-03 | v7                | v0.12.0.0                 | v0.12.9.0-aeon                    | Rebase to Monero's latest codebase with RingCT disabled, CryptoNight-Lite variant 1, limited use of ringsize 1, ban ringsize 2   |
 | 1146200                       | 2019-10-25 | v8                | v0.13.0.0-aeon            | v0.13.1.0-aeon                    | Switch to K12 PoW, reduced tx size with Borromean sigs, fixed ringsize 3, long-term block size, enforced 10 block age   |
-| 1280000                       | 2020-11-11 | v9                | v0.14.1.0-aeon            | v0.14.1.0-aeon                    | Difficulty algorithm variant 9 (cut/sort removed, lag reduced to 8), change to the block median used to calculate penalty, deterministic unlock times   |
+| 1280000                       | 2020-11-11 | v9                | v0.14.1.0-aeon            | v0.14.2.0-aeon                    | Difficulty algorithm variant 9 (cut/sort removed, lag reduced to 8), change to the block median used to calculate penalty, deterministic unlock times   |
 
 ## Compiling Aeon from source
 
@@ -168,7 +168,7 @@ invokes cmake commands as needed.
 * Change to the root of the source code directory, change to the most recent release tag, and build:
 
         cd aeon
-        git checkout v0.14.1.0-aeon
+        git checkout v0.14.2.0-aeon
         make
 
     *Optional*: If your machine has several cores and enough memory, enable
@@ -232,7 +232,7 @@ Tested on a Raspberry Pi Zero with a clean install of minimal Raspbian Stretch (
 ```
         git clone https://github.com/aeonix/aeon.git
 	cd aeon
-	git checkout tags/v0.14.1.0-aeon
+	git checkout tags/v0.14.2.0-aeon
 ```
 * Build:
 ```
@@ -329,9 +329,9 @@ application.
 
         cd aeon
 
-* If you would like a specific [version/tag](https://github.com/aeonix/aeon/tags), do a git checkout for that version. eg. 'v0.14.1.0-aeon'. If you dont care about the version and just want binaries from master, skip this step:
+* If you would like a specific [version/tag](https://github.com/aeonix/aeon/tags), do a git checkout for that version. eg. 'v0.14.2.0-aeon'. If you dont care about the version and just want binaries from master, skip this step:
 
-        git checkout v0.14.1.0-aeon
+        git checkout v0.14.2.0-aeon
 
 * If you are on a 64-bit system, run:
 

diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat
diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp
@@ -212,6 +212,7 @@ namespace cryptonote
     ADD_CHECKPOINT2(1133000, "4efa7a1aa943b3d1a9cd8807cdb34ba10767e6437876e28964dcdf1bb4da62e2", "1627621413427613");
     ADD_CHECKPOINT2(1157000, "320304a96228979a9565c550c666a5ceaf2f2dbd99aa5ff8354385fb515be7ea", "11699971284450871988");
     ADD_CHECKPOINT2(1260000, "6afc9c592c80638da2a11cedd716926f5c63b877945855808c25553000902d3f", "158147492702791503418");
+    ADD_CHECKPOINT2(1470000, "b419aa44016b6b1f93acecd963a27ead03f56fba8bed038e8f9704ae8fc4731b", "559264147197470555383");
 
 
     return true;

diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
@@ -4753,7 +4753,7 @@ void Blockchain::cancel()
 }
 
 #if defined(PER_BLOCK_CHECKPOINT)
-static const char expected_block_hashes_hash[] = "b48e3da66412efa76fd5bef558c057eb606cadc4f71777b04b03ae7264ec8deb";
+static const char expected_block_hashes_hash[] = "be840174483a3d59313fe40417f76df8c4a2b169fd2d217c130d67b745e28c07";
 void Blockchain::load_compiled_in_block_hashes(const GetCheckpointsCallback& get_checkpoints)
 {
   if (get_checkpoints == nullptr || !m_fast_sync)

diff --git a/src/version.cpp.in b/src/version.cpp.in
@@ -1,5 +1,5 @@
 #define DEF_MONERO_VERSION_TAG "@VERSIONTAG@"
-#define DEF_MONERO_VERSION "0.14.1.0"
+#define DEF_MONERO_VERSION "0.14.2.0"
 #define DEF_MONERO_RELEASE_NAME "Chronos"
 #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
 #define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@