Merge pull request #5816

ca8d4a3 Fix check for disconnecting peers when syncing (jagerman)
Fix check for disconnecting peers when syncing
2025-12-22 15:16:40 -08:00 · 2019-09-04 09:34:44 -05:00 · 2019-08-16 21:19:14 -03:00 · 2019-07-18 17:18:13 +02:00 · 2019-07-18 16:56:57 +02:00 · 2019-07-18 16:54:25 +02:00
4 changed files with 8 additions and 8 deletions
--- a/README.md
+++ b/README.md
@@ -147,8 +147,8 @@ Dates are provided in the format YYYY-MM-DD.
 | 1546000                        | 2018-04-06 | v7                | v0.12.0.0              | v0.12.3.0                  | Cryptonight variant 1, ringsize >= 7, sorted inputs
 | 1685555                        | 2018-10-18 | v8                | v0.13.0.0              | v0.13.0.4                  | max transaction size at half the penalty free block size, bulletproofs enabled, cryptonight variant 2, fixed ringsize [11](https://youtu.be/KOO5S4vxi0o)
 | 1686275                        | 2018-10-19 | v9                | v0.13.0.0              | v0.13.0.4                  | bulletproofs required
-| 1788000                        | 2019-03-09 | v10               | v0.14.0.0              | v0.14.1.1                  | New PoW based on Cryptonight-R, new block weight algorithm, slightly more efficient RingCT format
-| 1788720                        | 2019-03-10 | v11               | v0.14.0.0              | v0.14.1.1                  | forbid old RingCT transaction format
+| 1788000                        | 2019-03-09 | v10               | v0.14.0.0              | v0.14.1.2                  | New PoW based on Cryptonight-R, new block weight algorithm, slightly more efficient RingCT format
+| 1788720                        | 2019-03-10 | v11               | v0.14.0.0              | v0.14.1.2                  | forbid old RingCT transaction format
 | XXXXXXX                        | 2019-10-XX | XX                | XXXXXXXXX              | XXXXXXXXX                  | X

 X's indicate that these details have not been determined as of commit date.
@@ -304,7 +304,7 @@ Tested on a Raspberry Pi Zero with a clean install of minimal Raspbian Stretch (
    ```bash
    git clone https://github.com/monero-project/monero.git
    cd monero
-    git checkout tags/v0.14.1.1
+    git checkout tags/v0.14.1.2
    ```

 * Build:
@@ -421,10 +421,10 @@ application.
    cd monero
    ```

-* If you would like a specific [version/tag](https://github.com/monero-project/monero/tags), do a git checkout for that version. eg. 'v0.14.1.1'. If you don't care about the version and just want binaries from master, skip this step:
+* If you would like a specific [version/tag](https://github.com/monero-project/monero/tags), do a git checkout for that version. eg. 'v0.14.1.2'. If you don't care about the version and just want binaries from master, skip this step:
 	
    ```bash
-    git checkout v0.14.1.1
+    git checkout v0.14.1.2
    ```

 * If you are on a 64-bit system, run:
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -4849,7 +4849,7 @@ void Blockchain::cancel()
 }

 #if defined(PER_BLOCK_CHECKPOINT)
-static const char expected_block_hashes_hash[] = "cfca50ea0c87718ac92a14654c60d7ee8f6453e2765b329b40d10da4ed85a4f2";
+static const char expected_block_hashes_hash[] = "7dafb40b414a0e59bfced6682ef519f0b416bc914dd3d622b72e0dd1a47117c2";
 void Blockchain::load_compiled_in_block_hashes(const GetCheckpointsCallback& get_checkpoints)
 {
  if (get_checkpoints == nullptr || !m_fast_sync)
--- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
@@ -341,7 +341,7 @@ namespace cryptonote

    if(m_core.have_block(hshd.top_id))
    {
-      if (target > hshd.current_height)
+      if (target > m_core.get_current_blockchain_height())
      {
        MINFO(context << "peer is not ahead of us and we're syncing, disconnecting");
        return false;
--- 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.14.1.1"
+#define DEF_MONERO_VERSION "0.14.1.2"
 #define DEF_MONERO_RELEASE_NAME "Boron Butterfly"
 #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
Author	SHA1	Message	Date
luigi1111	adc2e3f1dc	Merge pull request #5816 `ca8d4a3` Fix check for disconnecting peers when syncing (jagerman)	2019-09-04 09:34:44 -05:00
Jason Rhinelander	ca8d4a38c9	Fix check for disconnecting peers when syncing The check added here (in #5732/#5733) is supposed to disconnect behind peers when the current node is syncing, but actually disconnects behind peers always. We are syncing when `target > our_height`, but the check here triggers when `target > remote_height`, which is basically always true when the preceding `m_core.have_block(hshd.top_id)` check is true.	2019-08-16 21:19:14 -03:00
Riccardo Spagni	8f0aedfa1a	Merge pull request #5762 `0a9bda81` bump version to 0.14.1.2 (Riccardo Spagni) `f4f00acc` update checkpoints.dat hash (Riccardo Spagni)	2019-07-18 17:18:13 +02:00
Riccardo Spagni	0a9bda813d	bump version to 0.14.1.2	2019-07-18 16:56:57 +02:00
Riccardo Spagni	f4f00accdb	update checkpoints.dat hash	2019-07-18 16:54:25 +02:00