From 1f1e74b3903b066fd2ba43463319e492f982d732 Mon Sep 17 00:00:00 2001 From: selsta Date: Wed, 8 Apr 2026 20:19:52 +0200 Subject: [PATCH] build: prepare v0.18.5.0 --- README.md | 10 +++++----- contrib/gitian/DOCKRUN.md | 2 +- contrib/gitian/README.md | 2 +- src/blocks/checkpoints.dat | Bin 451076 -> 457732 bytes src/checkpoints/checkpoints.cpp | 1 + src/cryptonote_core/blockchain.cpp | 2 +- src/version.cpp.in | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index cc986a71e..b8eb2a99f 100644 --- a/README.md +++ b/README.md @@ -138,8 +138,8 @@ Dates are provided in the format YYYY-MM-DD. | 1978433 | 2019-11-30 | v12 | v0.15.0.0 | v0.16.0.0 | New PoW based on RandomX, only allow >= 2 outputs, change to the block median used to calculate penalty, v1 coinbases are forbidden, rct sigs in coinbase forbidden, 10 block lock time for incoming outputs | 2210000 | 2020-10-17 | v13 | v0.17.0.0 | v0.17.3.2 | New CLSAG transaction format | 2210720 | 2020-10-18 | v14 | v0.17.1.1 | v0.17.3.2 | forbid old MLSAG transaction format -| 2688888 | 2022-08-13 | v15 | v0.18.0.0 | v0.18.4.6 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm -| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.4.6 | forbid old v14 transaction format +| 2688888 | 2022-08-13 | v15 | v0.18.0.0 | v0.18.5.0 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm +| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.5.0 | forbid old v14 transaction format | XXXXXXX | XXX-XX-XX | XXX | vX.XX.X.X | vX.XX.X.X | XXX | X's indicate that these details have not been determined as of commit date. @@ -344,7 +344,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 v0.18.4.6 + git checkout v0.18.5.0 ``` * Build: @@ -463,10 +463,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.18.4.6'. 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.18.5.0'. If you don't care about the version and just want binaries from master, skip this step: ```bash - git checkout v0.18.4.6 + git checkout v0.18.5.0 ``` * If you are on a 64-bit system, run: diff --git a/contrib/gitian/DOCKRUN.md b/contrib/gitian/DOCKRUN.md index b37b12c86..8f8f8715c 100644 --- a/contrib/gitian/DOCKRUN.md +++ b/contrib/gitian/DOCKRUN.md @@ -57,7 +57,7 @@ The dockrun.sh script will do everything to build the binaries. Just specify the version to build as its only argument, e.g. ```bash -VERSION=v0.18.4.6 +VERSION=v0.18.5.0 ./dockrun.sh $VERSION ``` diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md index d601cbffd..c010ba622 100644 --- a/contrib/gitian/README.md +++ b/contrib/gitian/README.md @@ -133,7 +133,7 @@ Common setup part: su - gitianuser GH_USER=YOUR_GITHUB_USER_NAME -VERSION=v0.18.4.6 +VERSION=v0.18.5.0 ``` Where `GH_USER` is your GitHub user name and `VERSION` is the version tag you want to build. diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat index a5e8ff3e64a2078d74d526f927e08d880af7dd3c..5b8f04c85e6c0e2eeba1b6ec1dcebe2d5aaed81f 100644 GIT binary patch delta 6739 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 diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index 94d390509..dc24a8efa 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -258,6 +258,7 @@ namespace cryptonote ADD_CHECKPOINT2(3541000, "74c457bed9ceef40f31f43bb8fab804077519d45c910dcad2acf4dd8556195c7", "0x76ff158c682d218"); ADD_CHECKPOINT2(3576000, "5da4891bfd06be270193bd949f2a623a2b0cb0ebfaad21c70a6cb18e418e5b6a", "0x7cb2e203e867b57"); ADD_CHECKPOINT2(3609000, "2c49c7eb40959b4d7a452dcec64e65c59a8b1ebec12ffe0af42bc9468eddae56", "0x823db8bb8f45661"); + ADD_CHECKPOINT2(3661900, "ac392757a92123f68d63cd72f0d1410f63df1102a53b5d39fc4d53d0998b20a3", "0x8a38f2195826a97"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index e402a1036..97fb8b8e3 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -5593,7 +5593,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "e60d8cd6d77f55df0874bddc4e0e1c7e387374b95180aa5f172bc83abc7cb799"; +static const char expected_block_hashes_hash[] = "3aed3b6b896e8c1f97802b65f84966526d1ac8d75f417e5ce666f31a5928ac3f"; 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 100726846..ccc88dd9d 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.6" +#define DEF_MONERO_VERSION "0.18.5.0" #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@