From c6d843b6f5b86417f5d7c60f98071851eaa02f12 Mon Sep 17 00:00:00 2001
From: Some Random Crypto Guy <somerandomcryptoguy@protonmail.com>
Date: Sat, 16 Nov 2024 00:48:31 +0000
Subject: [PATCH] hotfix to address the 'difficulty overhead' chain issues;
 added more fasta-sync checkpoints; bumped version number

---
 README.md                          |  10 +++++-----
 src/blocks/checkpoints.dat         | Bin 9924 -> 12164 bytes
 src/checkpoints/checkpoints.cpp    |   1 +
 src/cryptonote_core/blockchain.cpp |  20 +++++++++++++++++---
 src/version.cpp.in                 |   2 +-
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 1e2b9ce..43826a3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Salvium Zero v0.6.3
+# Salvium Zero v0.6.4
 
 Copyright (c) 2023-2024, Salvium
 Portions Copyright (c) 2014-2023, The Monero Project
@@ -172,7 +172,7 @@ invokes cmake commands as needed.
 
     ```bash
     cd salvium
-    git checkout v0.6.3
+    git checkout v0.6.4
     make
     ```
 
@@ -251,7 +251,7 @@ Tested on a Raspberry Pi Zero with a clean install of minimal Raspbian Stretch (
     ```bash
     git clone https://github.com/salvium/salvium
     cd salvium
-    git checkout v0.6.3
+    git checkout v0.6.4
     ```
 
 * Build:
@@ -370,10 +370,10 @@ application.
     cd salvium
     ```
 
-* If you would like a specific [version/tag](https://github.com/salvium/salvium/tags), do a git checkout for that version. eg. 'v0.6.3'. 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/salvium/salvium/tags), do a git checkout for that version. eg. 'v0.6.4'. If you don't care about the version and just want binaries from master, skip this step:
 
     ```bash
-    git checkout v0.6.3
+    git checkout v0.6.4
     ```
 
 * If you are on a 64-bit system, run:
diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat
index cb415cb192cfbecf6584c024e2e2bd2e39d1e129..20cb92123f51fdce7764af796aa787032865e2ef 100644
GIT binary patch
delta 2268
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

delta 10
RcmZpPKjO<cdn4mvH2@ey1S|jm

diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp
index 5ded649..9c53419 100644
--- a/src/checkpoints/checkpoints.cpp
+++ b/src/checkpoints/checkpoints.cpp
@@ -204,6 +204,7 @@ namespace cryptonote
       ADD_CHECKPOINT2(180,   "e20bc8ac6aabb6b0792f23a29ce42a577c6a57d177a8ac1a51b68fb6de508045", "0x262b40");
       ADD_CHECKPOINT2(190,   "f69fdad7a15471b63a82668b618ee5b2a384291269d944b11974a723c1604124", "0x2856a3");
       ADD_CHECKPOINT2(200,   "eba53fa7006dfcdc837a56c0bc8f0e1883cf34861c26934d680252a6878a3f5d", "0x2aa022");
+      ADD_CHECKPOINT2(90000, "e125b5c1b26521f98e29df6ec88f041c176a2c0a3fcacd5bd0ad2278e9b02fd2", "0xc99801f937888"); // 3546475285149832
     }
     return true;
   }
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 0aaa1b8..ab561e1 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -1034,13 +1034,27 @@ size_t Blockchain::recalculate_difficulties(boost::optional<uint64_t> start_heig
   LOG_PRINT_L3("Blockchain::" << __func__);
   CRITICAL_REGION_LOCAL(m_blockchain_lock);
 
-  const uint64_t start_height = start_height_opt ? *start_height_opt : check_difficulty_checkpoints().second;
+  //uint64_t start_height = start_height_opt ? *start_height_opt : check_difficulty_checkpoints().second;
+  uint8_t version = get_current_hard_fork_version();
+  uint64_t start_height = 0;
+  if (start_height_opt) {
+    start_height = *start_height_opt;
+  } else {
+    bool found = false;
+    for (size_t i=0; i<num_mainnet_hard_forks; ++i) {
+      if (version == mainnet_hard_forks[i].version) {
+        start_height = mainnet_hard_forks[i].height;
+        found = true;
+        break;
+      }
+    }
+    start_height = std::max(start_height, check_difficulty_checkpoints().second);
+  }
   const uint64_t top_height = m_db->height() - 1;
   MGINFO("Recalculating difficulties from height " << start_height << " to height " << top_height);
 
   std::vector<uint64_t> timestamps;
   std::vector<difficulty_type> difficulties;
-  uint8_t version = get_current_hard_fork_version();
   size_t difficulty_blocks_count;
   if (version == 1) {
     difficulty_blocks_count = DIFFICULTY_BLOCKS_COUNT;
@@ -6128,7 +6142,7 @@ void Blockchain::cancel()
 }
 
 #if defined(PER_BLOCK_CHECKPOINT)
-static const char expected_block_hashes_hash[] = "3cb6d33c311e54f2b8439a3e4cc047f6b9b74db9fd92955f1db131a5dfce1edf";
+static const char expected_block_hashes_hash[] = "5065d5361119a526b7a45e9e5bdf1d5be86f80e9eb43b0398bf0e47489c81c6d";
 void Blockchain::load_compiled_in_block_hashes(const GetCheckpointsCallback& get_checkpoints)
 {
   if (get_checkpoints == nullptr || !m_fast_sync)
diff --git a/src/version.cpp.in b/src/version.cpp.in
index ae661bb..ef29705 100644
--- a/src/version.cpp.in
+++ b/src/version.cpp.in
@@ -1,5 +1,5 @@
 #define DEF_SALVIUM_VERSION_TAG "@VERSIONTAG@"
-#define DEF_SALVIUM_VERSION "0.6.3"
+#define DEF_SALVIUM_VERSION "0.6.4"
 #define DEF_MONERO_VERSION_TAG "release"
 #define DEF_MONERO_VERSION "0.18.3.3"
 #define DEF_MONERO_RELEASE_NAME "Zero"