From cdeb286359e37e47eb3c67181914fd92d059108c Mon Sep 17 00:00:00 2001 From: selsta Date: Sat, 18 Mar 2023 21:23:42 +0100 Subject: [PATCH] build: prepare v0.18.2.1 --- README.md | 10 +++++----- contrib/gitian/DOCKRUN.md | 2 +- contrib/gitian/README.md | 2 +- src/blocks/checkpoints.dat | Bin 352068 -> 355460 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 70040775c..7e2e2b130 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.2.0 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm -| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.2.0 | forbid old v14 transaction format +| 2688888 | 2022-08-13 | v15 | v0.18.0.0 | v0.18.2.1 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm +| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.2.1 | 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.2.0 + git checkout v0.18.2.1 ``` * 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.2.0'. 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.2.1'. If you don't care about the version and just want binaries from master, skip this step: ```bash - git checkout v0.18.2.0 + git checkout v0.18.2.1 ``` * If you are on a 64-bit system, run: diff --git a/contrib/gitian/DOCKRUN.md b/contrib/gitian/DOCKRUN.md index 3984d899d..dc58caada 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.2.0 +VERSION=v0.18.2.1 ./dockrun.sh $VERSION ``` diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md index 5f1882fb1..22d59697e 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.2.0 +VERSION=v0.18.2.1 ``` 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 c57534879934664e3dc966d67c098666acc4fa92..e401c61d8964887a539f64af1dbf233cc8bf8a2c 100644 GIT binary patch delta 3446 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 delta 27 hcmZpw=%M9Wn^`Z2LOHF2Z;ax diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index 10253d888..7a4ac44f4 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -244,6 +244,7 @@ namespace cryptonote ADD_CHECKPOINT2(2706000, "d8eb144c5e1fe6b329ecc900ec95e7792fccff84175fb23a25ed59d7299a511c", "0x310f7d89372f705"); ADD_CHECKPOINT2(2720000, "b19fb41dff15bd1016afbee9f8469f05aab715c9e5d1b974466a11fd58ecbb86", "0x3216b5851ddbb61"); ADD_CHECKPOINT2(2817000, "39726d19ccaac01d150bec827b877ffae710b516bd633503662036ef4422e577", "0x3900669561954c1"); + ADD_CHECKPOINT2(2844000, "28fc7b446dfef5b469f5778eb72ddf32a307a5f5a9823d1c394e772349e05d40", "0x3af384ec0e97d12"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 8edb33b5a..3b3b1d87e 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -5627,7 +5627,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "b2da201879dc7a14bcb283875a9608d465b247fdea96fc80a2972b5063259591"; +static const char expected_block_hashes_hash[] = "af0467d5d8ac1ad7232ebfd8610ec775df3438cc3b7e8033c10ad71874b72e15"; 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 182143fc3..9702a14ce 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.2.0" +#define DEF_MONERO_VERSION "0.18.2.1" #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@