From c18cdd36231553447ac3e0d388d81ca42d0bff13 Mon Sep 17 00:00:00 2001 From: selsta Date: Fri, 26 Mar 2021 01:52:08 +0100 Subject: [PATCH] build: prepare v0.17.2.0 --- README.md | 10 +++++----- contrib/gitian/README.md | 4 ++-- src/blocks/checkpoints.dat | Bin 283076 -> 290628 bytes src/checkpoints/checkpoints.cpp | 1 + src/cryptonote_core/blockchain.cpp | 2 +- src/version.cpp.in | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6ac9ce57b..69825c89c 100644 --- a/README.md +++ b/README.md @@ -134,8 +134,8 @@ Dates are provided in the format YYYY-MM-DD. | 1788000 | 2019-03-09 | v10 | v0.14.0.0 | v0.14.1.2 | New PoW based on Cryptonight-R, new block weight algorithm, slightly more efficient RingCT format | 1788720 | 2019-03-10 | v11 | v0.14.0.0 | v0.14.1.2 | forbid old RingCT transaction format | 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.1.9 | New CLSAG transaction format -| 2210720 | 2020-10-18 | v14 | v0.17.1.1 | v0.17.1.9 | forbid old MLSAG transaction format +| 2210000 | 2020-10-17 | v13 | v0.17.0.0 | v0.17.2.0 | New CLSAG transaction format +| 2210720 | 2020-10-18 | v14 | v0.17.1.1 | v0.17.2.0 | forbid old MLSAG 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. @@ -295,7 +295,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 tags/v0.17.1.9 + git checkout tags/v0.17.2.0 ``` * Build: @@ -412,10 +412,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.17.1.9'. 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.17.2.0'. If you don't care about the version and just want binaries from master, skip this step: ```bash - git checkout v0.17.1.9 + git checkout v0.17.2.0 ``` * If you are on a 64-bit system, run: diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md index 696743214..05262434b 100644 --- a/contrib/gitian/README.md +++ b/contrib/gitian/README.md @@ -126,7 +126,7 @@ Setup for LXC: ```bash GH_USER=fluffypony -VERSION=v0.17.1.9 +VERSION=v0.17.2.0 ./gitian-build.py --setup $GH_USER $VERSION ``` @@ -182,7 +182,7 @@ If you chose to do detached signing using `--detach-sign` above (recommended), y ```bash GH_USER=fluffypony -VERSION=v0.17.1.9 +VERSION=v0.17.2.0 gpg --detach-sign ${VERSION}-linux/${GH_USER}/monero-linux-*-build.assert gpg --detach-sign ${VERSION}-win/${GH_USER}/monero-win-*-build.assert diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat index 74627bdb39b9b9253dc5a29eb4f78b8ce36d52d3..10eb6c45d805c5885fdb6e5f751677659cb561a4 100644 GIT binary patch delta 7636 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 CI@DkQ delta 24 ecmX?dPw>cMK}PpR##TlkVrpe%-pa^wI1m77z6V?Y diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index 5b9fb46f6..2d48eaa1e 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -246,6 +246,7 @@ namespace cryptonote ADD_CHECKPOINT2(2248500, "125d0872f00b54730b1e6f925f9d211b0158dd0e254de8cefa371f2e7aba5118", "0x115c89ab7abec4a"); ADD_CHECKPOINT2(2257500, "99643c32f27b157c6952a67af7dbe07ca819e71df386fa9379a344686d2950cf", "0x11c2f448d4f8830"); ADD_CHECKPOINT2(2265000, "727a6228a71f5b35c899553ee19d60bfc10c126a009ffd633afb30666e8edbe6", "0x121a33e656ecad4"); + ADD_CHECKPOINT2(2325000, "f61261994b368700f0cbbfb4477433fa36a3c7537908ab2d1a06ac2987cc8b01", "0x154bceeffaff847"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index c68cd84bb..247b0f4c9 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -5390,7 +5390,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "b6fa3343a9465692873bb9cf4d161d1d0316d4e3422fa7a57f6228526e8f5520"; +static const char expected_block_hashes_hash[] = "b198c2514bed71ca0a43cba6590090068daf6d207b351d8a4c7d0f0f791c095f"; 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 de7d92325..013c1adac 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.17.1.9" +#define DEF_MONERO_VERSION "0.17.2.0" #define DEF_MONERO_RELEASE_NAME "Oxygen Orion" #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG #define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@