From 8adea0a0346f836426209dccc70df8602fc55dac Mon Sep 17 00:00:00 2001 From: wowario Date: Thu, 8 Nov 2018 17:52:47 +0300 Subject: [PATCH 1/2] update checkpoints --- src/checkpoints/checkpoints.cpp | 2 ++ src/version.cpp.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index 0f3dc64db..fa242c8c2 100755 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -202,6 +202,8 @@ namespace cryptonote ADD_CHECKPOINT(62425, "41a922dba6f3906871b2ccaf31ec9c91033470c503959093dae796deda8940ea"); ADD_CHECKPOINT(62479, "a2e8ff4205ba2980eb70921b0b21b5fc656ee273664ea94b860c68ca069b60dd"); ADD_CHECKPOINT(62503, "25fa115962988b4b8f8cfd22744a3e653b22ead8c8468e64caf334fc75a97d08"); + ADD_CHECKPOINT(62550, "bde522a8a81c392c98c979434aa1dd9d20b4ca52230ba6ae0362872757808a48"); + ADD_CHECKPOINT(62629, "8368e1ce1d421f1fc969364558433e2b2363d0ffcb5f2d946633095e3e6734f5"); return true; } diff --git a/src/version.cpp.in b/src/version.cpp.in index 8ff3212b8..15db5ab41 100755 --- 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.3.1.3" +#define DEF_MONERO_VERSION "0.3.1.4" #define DEF_MONERO_RELEASE_NAME "Cool Cage" #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG From 7bc2142590602da6a5e4bfb1a41436ba94b274dc Mon Sep 17 00:00:00 2001 From: wowario Date: Thu, 8 Nov 2018 18:21:52 +0300 Subject: [PATCH 2/2] correct cumulative difficulty count --- src/cryptonote_basic/difficulty.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cryptonote_basic/difficulty.cpp b/src/cryptonote_basic/difficulty.cpp index fbd97df30..530fe81a6 100644 --- a/src/cryptonote_basic/difficulty.cpp +++ b/src/cryptonote_basic/difficulty.cpp @@ -256,9 +256,9 @@ namespace cryptonote { assert(timestamps.size() == cumulative_difficulties.size() && timestamps.size() <= static_cast(N+1) ); - if ( height <= DIFFICULTY_HEIGHT ){ + /*if ( height <= DIFFICULTY_HEIGHT ){ return static_cast(DIFFICULTY_GUESS); - } + }*/ for ( int64_t i = 1; i <= N; i++ ) { ST = static_cast(timestamps[i]) - static_cast(timestamps[i-1]);