From 5b162aea14e1b6605fb1e4ec63acb99fc5ccda19 Mon Sep 17 00:00:00 2001 From: wowario Date: Thu, 15 Apr 2021 19:49:37 +0300 Subject: [PATCH 1/2] bump version --- README.md | 2 +- src/version.cpp.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 28d16568a..94ea0196c 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ Dates are provided in the format YYYY-MM-DD. | 114,969 | 2019-06-14 | F For Fappening | v0.6.1.0 | v0.6.1.2 | RandomWOW, new block weight algorithm, slightly more efficient RingCT format | 160,777 | 2019-11-20 | Gaping Goatse | v0.7.0.0 | v0.7.1.0 | Only allow >= 2 outputs, change to the block median used to calculate penalty, rct sigs in coinbase forbidden, 4 unlock time as protocol rule | - | 2020-06-28 | Hallucinogenic Hypnotoad | v0.8.0.0 | v0.8.0.2 | Dandelion++ support -| 253,999 | 2020-10-09 | Illiterate Illuminati | v0.9.0.0 | v0.9.3.2 | Dynamic coinbase unlock (up to 1 mo.), Deterministic unlock times, Enforce maximum coinbase amount, show_qr_code wallet command, CLSAG +| 253,999 | 2020-10-09 | Illiterate Illuminati | v0.9.0.0 | v0.9.3.3 | Dynamic coinbase unlock (up to 1 mo.), Deterministic unlock times, Enforce maximum coinbase amount, show_qr_code wallet command, CLSAG X's indicate that these details have not been determined as of commit date. diff --git a/src/version.cpp.in b/src/version.cpp.in index 427fa404d..3450103b3 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.9.3.2" +#define DEF_MONERO_VERSION "0.9.3.3" #define DEF_MONERO_RELEASE_NAME "Illiterate Illuminati" #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG #define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@ From f897aa5dbfcf3ec49df47dc5f51f60c3d9fc2bbd Mon Sep 17 00:00:00 2001 From: wowario Date: Thu, 15 Apr 2021 23:27:06 +0300 Subject: [PATCH 2/2] diff hotfix 2 --- src/cryptonote_basic/difficulty.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/cryptonote_basic/difficulty.cpp b/src/cryptonote_basic/difficulty.cpp index d51653e89..dfdfd3b70 100644 --- a/src/cryptonote_basic/difficulty.cpp +++ b/src/cryptonote_basic/difficulty.cpp @@ -375,7 +375,16 @@ namespace cryptonote { if (HEIGHT < 200 && m_nettype == TESTNET) { return 500; } assert(timestamps.size() == N+1); - uint64_t L(0), next_D, i, this_timestamp(0), previous_timestamp(0), avg_D; + // hardcoding previously erroneously calculated difficulty entries + if(HEIGHT == 307686) return 25800000; + if(HEIGHT == 307692) return 1890000; + if(HEIGHT == 307735) return 17900000; + if(HEIGHT == 307742) return 21300000; + if(HEIGHT == 307750) return 10900000; + if(HEIGHT == 307766) return 2960000; + + uint64_t i, this_timestamp(0), previous_timestamp(0); + difficulty_type L(0), next_D, avg_D; previous_timestamp = timestamps[0]-T; for ( i = 1; i <= N; i++) { @@ -386,7 +395,7 @@ namespace cryptonote { previous_timestamp = this_timestamp; } if (L < N*N*T/20 ) { L = N*N*T/20; } - avg_D = static_cast(( cumulative_difficulties[N] - cumulative_difficulties[0] )/ N); + avg_D = ( cumulative_difficulties[N] - cumulative_difficulties[0] )/ N; // Prevent round off error for small D and overflow for large D. if (avg_D > 2000000*N*N*T && HEIGHT < 307800) {