Merge pull request #166 from stoffu/aeon-bump-0.13.1

Bump version to v0.13.1.0
aeonix · Nov 29, 2019 · 7946a4c · 7946a4c
2 parents d0f98db + dc24483
commit 7946a4c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -98,7 +98,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.0.0-aeon                    | Switch to K12 PoW, reduced tx size with Borromean sigs, fixed ringsize 3, long-term block size, enforced 10 block age   |
+| 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   |
 
 ## 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.13.0.0-aeon
+        git checkout v0.13.1.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.13.0.0-aeon
+	git checkout tags/v0.13.1.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.13.0.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.13.1.0-aeon'. If you dont care about the version and just want binaries from master, skip this step:
 
-        git checkout v0.13.0.0-aeon
+        git checkout v0.13.1.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
@@ -187,6 +187,7 @@ namespace cryptonote
     ADD_CHECKPOINT(959800, "8a89ede82ae1e3408703feae87c99bccca8455744743eede02bd76b43d202dc6");
     ADD_CHECKPOINT(1026000, "ea5ace68a81b3b50ec27a457799fec63a9d45acd35a38e31e2b7b5be2315a13e");
     ADD_CHECKPOINT(1133000, "4efa7a1aa943b3d1a9cd8807cdb34ba10767e6437876e28964dcdf1bb4da62e2");
+    ADD_CHECKPOINT(1157000, "320304a96228979a9565c550c666a5ceaf2f2dbd99aa5ff8354385fb515be7ea");
 
 
     return true;

diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
@@ -4601,7 +4601,7 @@ void Blockchain::cancel()
 }
 
 #if defined(PER_BLOCK_CHECKPOINT)
-static const char expected_block_hashes_hash[] = "964879b73a66dd5abc85692e65a6e6c446c48231700bd58754eea80cc6f7b337";
+static const char expected_block_hashes_hash[] = "279b65bb65ad101eeb3d639265c39f7042f0da8134ee57e9e5f39dc35b8a6147";
 void Blockchain::load_compiled_in_block_hashes()
 {
   const bool testnet = m_nettype == TESTNET;

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.13.0.0"
+#define DEF_MONERO_VERSION "0.13.1.0"
 #define DEF_MONERO_RELEASE_NAME "Aletheia"
 #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG