Merge pull request #316 from graft-project/fix/ubuntu16-build

Fix/ubuntu16 build
graft-project · Jun 7, 2019 · 1e65b61 · 1e65b61
2 parents 2c7cab5 + ffc61bb
commit 1e65b61
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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/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<crypto::key_image>& key_im, std::vector<bool> &spent) const

diff --git 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