aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortobtoht <tob@featherwallet.org>2025-08-05 16:09:20 +0000
committertobtoht <tob@featherwallet.org>2025-08-05 16:09:20 +0000
commit2987b720069489cfc24d8d9ffc06ff017ffcb4d4 (patch)
tree87e4f614caa2a3e1605ad1f29e939504df764cba /src
parent35efc7e340cf3d672c66e48112e275b03ff69cd6 (diff)
parent32f701b0cd8a8045424f4434e6bb0ca288bf5818 (diff)
downloadmonzero-core-2987b720069489cfc24d8d9ffc06ff017ffcb4d4.tar.gz
monzero-core-2987b720069489cfc24d8d9ffc06ff017ffcb4d4.tar.xz
monzero-core-2987b720069489cfc24d8d9ffc06ff017ffcb4d4.zip
Merge pull request #10019
32f701b build: prepare v0.18.4.2 (selsta)
Diffstat (limited to 'src')
-rw-r--r--src/blocks/checkpoints.datbin431364 -> 433476 bytes
-rw-r--r--src/checkpoints/checkpoints.cpp1
-rw-r--r--src/cryptonote_core/blockchain.cpp2
-rw-r--r--src/version.cpp.in2
4 files changed, 3 insertions, 2 deletions
diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat
index 0a84c4108..9744c3fc3 100644
--- a/src/blocks/checkpoints.dat
+++ b/src/blocks/checkpoints.dat
Binary files differ
diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp
index e75369e14..0d9affba5 100644
--- a/src/checkpoints/checkpoints.cpp
+++ b/src/checkpoints/checkpoints.cpp
@@ -253,6 +253,7 @@ namespace cryptonote
ADD_CHECKPOINT2(3198000, "1d685b39be51e4e84e0af69fa78e023c7cb21de7d33acd012d0371d5f78712d5", "0x517d415fee3a816");
ADD_CHECKPOINT2(3375700, "96ef57b830ef7a7ccb61ada8595a4670765b6954d8cbf45c6cf583700a676302", "0x61209b7da8a0fa6");
ADD_CHECKPOINT2(3451000, "0cbc912e06e1adae11f6c9cb675d3159d225b4b04d4a6c61defe50ae1816dd60", "0x6aa5fc4226bab97");
+ ADD_CHECKPOINT2(3468000, "c4024dbfa9d4b2e54ed129b413946d2d5af36eef5ab4a93abe5cb552de985f5a", "0x6d067f3e550a29b");
return true;
}
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index d552a4d39..d597edb25 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -5605,7 +5605,7 @@ void Blockchain::cancel()
}
#if defined(PER_BLOCK_CHECKPOINT)
-static const char expected_block_hashes_hash[] = "12b86a377b4d914182c382efc8b1c23bcf3b758434c47a88ac09f12f4576cd90";
+static const char expected_block_hashes_hash[] = "3d40f1bca1151ab8da423044b2809e2d1b5a68ed978c0e0434670ad4a1ec517b";
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 12397c14c..09b2f5533 100644
--- 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.18.4.1"
+#define DEF_MONERO_VERSION "0.18.4.2"
#define DEF_MONERO_RELEASE_NAME "Fluorine Fermi"
#define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
#define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@