From 3b72dc05559c698a062872b8247e92154dbabc8f Mon Sep 17 00:00:00 2001
From: Some Random Crypto Guy <somerandomcryptoguy@protonmail.com>
Date: Tue, 7 Jan 2025 23:23:44 +0000
Subject: [PATCH] added code to skip user TXs in v5 when filling block template

---
 README.md                       | 2 +-
 src/cryptonote_core/tx_pool.cpp | 8 ++++++++
 src/version.cpp.in              | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 08ba31e05..7c702bbbe 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Salvium Zero v0.8.0-rc1
+# Salvium Zero v0.8.0-rc2
 
 Copyright (c) 2023-2024, Salvium
 Portions Copyright (c) 2014-2023, The Monero Project
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index 5f86824fb..529fbdf5a 100644
--- a/src/cryptonote_core/tx_pool.cpp
+++ b/src/cryptonote_core/tx_pool.cpp
@@ -1662,6 +1662,14 @@ namespace cryptonote
         continue;
       }
 
+      // HERE BE DRAGONS!!!
+      // SRCG: skip all user TXs for HF 5 - when the node restarts, it'll discard them fully in `tx_memory_pool::validate()`
+      if (version == HF_VERSION_SHUTDOWN_USER_TXS) {
+        LOG_PRINT_L2("  User TXs forbidden by consensus for HF 5 - skipping");
+        continue;
+      }
+      // LAND AHOY!!!
+      
       LOG_PRINT_L2("Considering " << sorted_it->second << ", weight " << meta.weight << ", current block weight " << total_weight << "/" << max_total_weight << ", current coinbase " << print_money(best_coinbase) << ", relay method " << (unsigned)meta.get_relay_method());
 
       if (!meta.matches(relay_category::legacy) && !(m_mine_stem_txes && meta.get_relay_method() == relay_method::stem))
diff --git a/src/version.cpp.in b/src/version.cpp.in
index 1f9073775..51b1399cc 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.8.0-rc1"
+#define DEF_SALVIUM_VERSION "0.8.0-rc2"
 #define DEF_MONERO_VERSION_TAG "release"
 #define DEF_MONERO_VERSION "0.18.3.3"
 #define DEF_MONERO_RELEASE_NAME "Zero"