From 49f4645f1dae31153528101283d5091346440917 Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Wed, 23 May 2018 21:10:06 +0200 Subject: [PATCH 1/3] bump version for point release --- src/version.cpp.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.cpp.in b/src/version.cpp.in index f83a85d9d..9fed91d99 100644 --- 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.12.0.0-master" +#define DEF_MONERO_VERSION "0.12.1.0-master" #define DEF_MONERO_RELEASE_NAME "Lithium Luna" #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG From 6715c9066766d19e63249d8364feaa3b01391db2 Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Wed, 23 May 2018 21:13:54 +0200 Subject: [PATCH 2/3] update checkpoints for point release --- src/checkpoints/checkpoints.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index 2c11af4b2..ef1ee171d 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -207,7 +207,7 @@ namespace cryptonote ADD_CHECKPOINT(1390000, "a8f5649dd4ded60eedab475f2bec8c934681c07e3cf640e9be0617554f13ff6c"); ADD_CHECKPOINT(1450000, "ac94e8860093bc7c83e4e91215cba1d663421ecf4067a0ae609c3a8b52bcfac2"); ADD_CHECKPOINT(1530000, "01759bce497ec38e63c78b1038892169203bb78f87e488172f6b854fcd63ba7e"); - + ADD_CHECKPOINT(1579000, "7d0d7a2346373afd41ed1e744a939fc5d474a7dbaa257be5c6fff4009e789241"); return true; } From 45975fd8eb6c0d3d24af7ea76d8b10b01f29b62f Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Wed, 23 May 2018 21:16:57 +0200 Subject: [PATCH 3/3] update checkpoints --- src/blocks/checkpoints.dat | Bin 191524 -> 197348 bytes src/cryptonote_core/blockchain.cpp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat index cff103804949d31efbd591efc10d2ca6e0755d0c..501a55673eb30bee550da9b3fcc9093d470890e3 100644 GIT binary patch delta 5889 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 XwOUqdBL=Vk;j{%MQY@zbavVW7;ka$l delta 19 acmaFT%CqDKH&dc`BU39A<5ngnr8fXZX$DCE diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index d1ef7d6fe..6a75c52dd 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -4403,7 +4403,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "1d3df1a177bd6f752d87c0d7b960e502605742721afb39953265f1e0f7f9b01f"; +static const char expected_block_hashes_hash[] = "59261c03b54bcb21bd463f9fe40a94f40840a12642e9a3b3bfb11b35839a5fe3"; void Blockchain::load_compiled_in_block_hashes() { const bool testnet = m_nettype == TESTNET;