From 9cbb48d6e9ef06c96bd536e7bea5b8364be4dd4a Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Fri, 7 Jun 2019 13:52:21 +0300 Subject: [PATCH 1/2] Release 1.8.2 version bump --- README.md | 3 +++ src/version.cpp.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 234c29b37..35572929c 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,9 @@ Dates are provided in the format YYYY-MM-DD. | 2018-10-31 | v11 | 1.5.0 | 1.5.1 | PoW algorithm from Monero v8 (CN v2), enabled checkpoints for mainnet | | 2019-03-07 | v12 | 1.6.0 | 1.6.0 | Own PoW algorithm - CryptoNight V8 ReverseWaltz - tweaked from CryptoNight Monero v8 (CN v2) | | 2019-03-20 | v13 | 1.7.7 | 1.7.7 | RTA Mining | +| 2019-06-06 | v14 | 1.8.1 | 1.8.1 | Merge with monero 13: bulletproofs enabled, fixed ring size 11 | +| 2019-06-07 | v15 | 1.8.1 | 1.8.2 | bulletproofs required + ## Installing Graft Network from a package diff --git a/src/version.cpp.in b/src/version.cpp.in index d5b4b8855..d7b4885d5 100644 --- a/src/version.cpp.in +++ b/src/version.cpp.in @@ -1,5 +1,5 @@ #define DEF_GRAFT_VERSION_TAG "@VERSIONTAG@" -#define DEF_GRAFT_VERSION "1.8.1" +#define DEF_GRAFT_VERSION "1.8.2" #define DEF_GRAFT_RELEASE_NAME "Vela Pulsar" #define DEF_GRAFT_VERSION_FULL DEF_GRAFT_VERSION "-" DEF_GRAFT_VERSION_TAG From ffc61bb7dfe06c4b9ea9e793e624987c667c3611 Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Fri, 7 Jun 2019 17:04:42 +0300 Subject: [PATCH 2/2] fix: compile error on ubuntu 16.04 --- src/cryptonote_core/cryptonote_core.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index a30947235..516d18cc1 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -1060,14 +1060,11 @@ namespace cryptonote return true; } //----------------------------------------------------------------------------------------------- - size_t core::get_block_sync_size(uint64_t height) const + size_t core::get_block_sync_size(uint64_t /*height*/) const { - static const uint64_t quick_height = m_nettype == TESTNET ? 0 : m_nettype == MAINNET ? 0 : 0; // to not make many diffs with monero if (block_sync_size > 0) return block_sync_size; - if (height >= quick_height) - return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT; - return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT_PRE_V4; + return BLOCKS_SYNCHRONIZING_DEFAULT_COUNT; } //----------------------------------------------------------------------------------------------- bool core::are_key_images_spent_in_pool(const std::vector& key_im, std::vector &spent) const