From 45fdcc01a7d88b03fde21a1d7173e61aff188318 Mon Sep 17 00:00:00 2001 From: Thaer Khawaja Date: Fri, 11 Jan 2019 16:33:51 -0800 Subject: [PATCH] Set block height (363000), version (v0.3.0.0), name (Dandy Dromedary) --- README.md | 3 +++ src/blocks/checkpoints.dat | Bin 34276 -> 44100 bytes src/cryptonote_core/blockchain.cpp | 6 ++++-- src/version.cpp.in | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 80bb40e6..9c0b0ae9 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,9 @@ Dates are provided in the format YYYY-MM-DD. | 2017-11-29 | v3 | 0.1.3.0 | 0.1.3.1 | Difficulty adjustment algorithm updated to WWHM | | 2017-12-06 | v4 | 0.1.4.0 | 0.1.4.0 | Difficulty adjustment tweaks | | 2018-05-01 | v5 | 0.2.0.0 | 0.2.0.2 | Upstream track of v0.12.0 with Multisig, Subaddresses, CN variant 1 | +| 2018-05-05 | v6 | 0.2.3.0 | 0.2.3.0 | LWMA + stricter FTL settings | +| 2018-06-18 | v7 | 0.2.4.0 | 0.2.4.5 | CryptoNight-Fast PoW | +| 2019-01-26 | v8 | 0.3.0.0 | 0.3.0.0 | SECOR (uncle mining) protocol, multi-output Bulletproofs, CNFastv2 | X's indicate that these details have not been determined as of commit date. diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat index f87862c051ba536a30187dd6a65cfdf2a52668f9..d61d305f32679204f394ee60f98e6de09dc725b1 100644 GIT binary patch delta 9915 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 delta 13 UcmX?dgXu{(6O%s6My5xt04QMvUjP6A diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 214be0f8..edb779e9 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -96,7 +96,9 @@ static const struct { { 4, 70000, 0, 1513136914 }, { 5, 170000, 0, 1525150523}, { 6, 172500, 0, 1525504168}, - { 7, 204000, 0, 1529361270} + { 7, 204000, 0, 1529361270}, + { 8, 363000, 0, 1548465980} + }; static const struct { @@ -4946,7 +4948,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "e54dd76f1f9f650f11edc49782d3cca5afc370013cad0cbb27a5bdff0c56cb43"; +static const char expected_block_hashes_hash[] = "fde723635bab019c8c81ffa17baa3b09a36566ff16fb3225f7a3544ea4f36544"; void Blockchain::load_compiled_in_block_hashes() { LOG_PRINT_L3("Blockchain::" << __func__); diff --git a/src/version.cpp.in b/src/version.cpp.in index 251a8f2d..9637b073 100644 --- 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.2.4.4" -#define DEF_MONERO_RELEASE_NAME "Classy Caiman" +#define DEF_MONERO_VERSION "0.3.0.0" +#define DEF_MONERO_RELEASE_NAME "Dandy Dromedary" #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG #include "version.h"