Merge pull request monero-project#5170

8bf9243 update readme wording to more accurately reflect PoW (Riccardo Spagni) dd0e1d2 bump version, update readme to reflect, update checkpoints (Riccardo Spagni) 392f085 update quick sync checkpoints and hash (Riccardo Spagni)
EquilibriaCC · Feb 20, 2019 · f96e431 · f96e431
2 parents f8aa6ff + 8bf9243
commit f96e431
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -110,7 +110,8 @@ Dates are provided in the format YYYY-MM-DD.
 | 1546000                        | 2018-04-06 | v7                | v0.12.0.0              | v0.12.3.0                  | Cryptonight variant 1, ringsize >= 7, sorted inputs
 | 1685555                        | 2018-10-18 | v8                | v0.13.0.0              | v0.13.0.0                  | max transaction size at half the penalty free block size, bulletproofs enabled, cryptonight variant 2, fixed ringsize [11](https://youtu.be/KOO5S4vxi0o)
 | 1686275                        | 2018-10-19 | v9                | v0.13.0.0              | v0.13.0.0                  | bulletproofs required
-| XXXXXXX                        | 2019-04-XX | XX                | XXXXXXXXX              | XXXXXXXXX                  | X
+| 1788000                        | 2019-03-09 | v10               | v0.14.0.0              | v0.14.0.0                  | New PoW based on Cryptonight-R, new block weight algorithm, slightly more efficient RingCT format
+| 1788720                        | 2019-03-10 | v11               | v0.14.0.0              | v0.14.0.0                  | forbid old RingCT transaction format
 
 X's indicate that these details have not been determined as of commit date.
 
@@ -179,7 +180,7 @@ invokes cmake commands as needed.
 * Change to the root of the source code directory, change to the most recent release branch, and build:
 
         cd monero
-        git checkout v0.13.0.4
+        git checkout v0.14.0.0
         make
 
     *Optional*: If your machine has several cores and enough memory, enable
@@ -241,7 +242,7 @@ Tested on a Raspberry Pi Zero with a clean install of minimal Raspbian Stretch (
 ```
         git clone https://github.com/monero-project/monero.git
 	cd monero
-	git checkout tags/v0.13.0.4
+	git checkout tags/v0.14.0.0
 ```
 * Build:
 ```
@@ -338,9 +339,9 @@ application.
 
         cd monero
 
-* If you would like a specific [version/tag](https://github.com/monero-project/monero/tags), do a git checkout for that version. eg. 'v0.13.0.0'. 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/monero-project/monero/tags), do a git checkout for that version. eg. 'v0.14.0.0'. If you dont care about the version and just want binaries from master, skip this step:
 
-        git checkout v0.13.0.4
+        git checkout v0.14.0.0
 
 * 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
@@ -210,6 +210,7 @@ namespace cryptonote
     ADD_CHECKPOINT(1530000, "01759bce497ec38e63c78b1038892169203bb78f87e488172f6b854fcd63ba7e");
     ADD_CHECKPOINT(1579000, "7d0d7a2346373afd41ed1e744a939fc5d474a7dbaa257be5c6fff4009e789241");
     ADD_CHECKPOINT(1668900, "ac2dcaf3d2f58ffcf8391639f0f1ebafcb8eac43c49479c7c37f611868d07568");
+    ADD_CHECKPOINT(1775600, "1c6e01c661dc22cab939e79ec6a5272190624ce8356d2f7b958e4f9a57fdb05e");
     return true;
   }
 

diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
@@ -4540,7 +4540,7 @@ void Blockchain::cancel()
 }
 
 #if defined(PER_BLOCK_CHECKPOINT)
-static const char expected_block_hashes_hash[] = "954cb2bbfa2fe6f74b2cdd22a1a4c767aea249ad47ad4f7c9445f0f03260f511";
+static const char expected_block_hashes_hash[] = "570ce2357b08fadac6058e34f95c5e08323f9325de260d07b091a281a948a7b0";
 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,6 +1,6 @@
 #define DEF_MONERO_VERSION_TAG "@VERSIONTAG@"
-#define DEF_MONERO_VERSION "0.13.0.4"
-#define DEF_MONERO_RELEASE_NAME "Beryllium Bullet"
+#define DEF_MONERO_VERSION "0.14.0.0"
+#define DEF_MONERO_RELEASE_NAME "Boron Butterfly"
 #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
 
 #include "version.h"