From c765eca1fbbfde6165d5ed5e56276878b3496c77 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Thu, 23 Jul 2026 09:51:20 +0200 Subject: use FCMP branch, bump simplybs, rebase patches --- patches/monero/0014-change-earliest-fork-height-message.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'patches/monero/0014-change-earliest-fork-height-message.patch') diff --git a/patches/monero/0014-change-earliest-fork-height-message.patch b/patches/monero/0014-change-earliest-fork-height-message.patch index 3a4321b..5345e0d 100644 --- a/patches/monero/0014-change-earliest-fork-height-message.patch +++ b/patches/monero/0014-change-earliest-fork-height-message.patch @@ -1,17 +1,17 @@ -From 7c58eb392e94ff5b50bcb15b8d91038476743ba9 Mon Sep 17 00:00:00 2001 +From 513d714b87d2a00e1fcf84d2b0be88acdef32e76 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Wed, 29 Jan 2025 16:13:28 +0100 -Subject: [PATCH 14/20] change earliest fork height message +Subject: [PATCH 14/22] change earliest fork height message --- src/wallet/wallet2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp -index c50a840b6..a7532d7ec 100644 +index 89009bc77..06a732296 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp -@@ -12380,7 +12380,7 @@ bool wallet2::use_fork_rules(uint8_t version, int64_t early_blocks) +@@ -12053,7 +12053,7 @@ bool wallet2::use_fork_rules(uint8_t version, int64_t early_blocks) boost::optional result = m_node_rpc_proxy.get_height(height); THROW_WALLET_EXCEPTION_IF(result, error::wallet_internal_error, "Failed to get height"); result = m_node_rpc_proxy.get_earliest_height(version, earliest_height); @@ -21,5 +21,5 @@ index c50a840b6..a7532d7ec 100644 bool close_enough = (int64_t)height >= (int64_t)earliest_height - early_blocks && earliest_height != std::numeric_limits::max(); // start using the rules that many blocks beforehand if (close_enough) -- -2.50.1 (Apple Git-155) +2.54.0 (Apple Git-157) -- cgit v1.2.3