From 09ee78197c7e35be145f16dc085ada7a1b1bed89 Mon Sep 17 00:00:00 2001 From: selsta Date: Tue, 23 Aug 2022 23:50:09 +0200 Subject: [PATCH] build: prepare v0.18.1.1 --- README.md | 10 +++++----- contrib/gitian/DOCKRUN.md | 2 +- contrib/gitian/README.md | 2 +- src/blocks/checkpoints.dat | Bin 334596 -> 338244 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 6678a10a5..9e6026ba4 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.1.0 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm -| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.1.0 | forbid old v14 transaction format +| 2688888 | 2022-08-13 | v15 | v0.18.0.0 | v0.18.1.1 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm +| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.1.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. @@ -345,7 +345,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.1.0 + git checkout v0.18.1.1 ``` * Build: @@ -464,10 +464,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.1.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.1.1'. If you don't care about the version and just want binaries from master, skip this step: ```bash - git checkout v0.18.1.0 + git checkout v0.18.1.1 ``` * If you are on a 64-bit system, run: diff --git a/contrib/gitian/DOCKRUN.md b/contrib/gitian/DOCKRUN.md index 06e4894a2..6f75908c3 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.1.0 +VERSION=v0.18.1.1 ./dockrun.sh $VERSION ``` diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md index 87c9ead9c..1464d03ab 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.1.0 +VERSION=v0.18.1.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 f0a0dbb35b068b86cfcaa2a2eee60202036e1b82..eee34e60fafe410b187acfe7e09de29ddbfbaf2e 100644 GIT binary patch delta 3704 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 diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index 6be80dbbd..db2296df9 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -241,6 +241,7 @@ namespace cryptonote ADD_CHECKPOINT2(2182500, "0d22b5f81982eff21d094af9e821dc2007e6342069e3b1a37b15d97646353124", "0xead4a874083492"); ADD_CHECKPOINT2(2661600, "41c9060e8426012238e8a26da26fcb90797436896cc70886a894c2c560bcccf2", "0x2e0d87526ff161f"); ADD_CHECKPOINT2(2677000, "1b9fee6246eeb176bd17d637bf252e9af54a4218675f01b4449cc0901867f9eb", "0x2f165bc1a5163ba"); + ADD_CHECKPOINT2(2706000, "d8eb144c5e1fe6b329ecc900ec95e7792fccff84175fb23a25ed59d7299a511c", "0x310f7d89372f705"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index e0cd8e899..b4abde1ad 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -5604,7 +5604,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "a8b24ef4eeea7241b374d4526a3f7c351b53abe7006a3d7eee02ce0af2cc6d66"; +static const char expected_block_hashes_hash[] = "a913c311ed4cbe42c5b36c13215021dd50705b17d03ddc2e637ab7e85b22ac89"; 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 91fdc9902..a28be1a1d 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.1.0" +#define DEF_MONERO_VERSION "0.18.1.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@