From 3cb7fda42805a72e0193f016dff9c8f3ab301d1d Mon Sep 17 00:00:00 2001 From: selsta Date: Sun, 24 Oct 2021 18:16:59 +0200 Subject: [PATCH] build: prepare v0.17.3.0 --- README.md | 10 +++++----- contrib/gitian/README.md | 4 ++-- src/blocks/checkpoints.dat | Bin 303748 -> 309700 bytes src/checkpoints/checkpoints.cpp | 1 + src/cryptonote_core/blockchain.cpp | 2 +- src/device/device_ledger.hpp | 2 +- src/version.cpp.in | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index dbe5f3777..2a88765f5 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.1 | New CLSAG transaction format -| 2210720 | 2020-10-18 | v14 | v0.17.1.1 | v0.17.1.7 | forbid old MLSAG transaction format +| 2210000 | 2020-10-17 | v13 | v0.17.0.0 | v0.17.3.0 | New CLSAG transaction format +| 2210720 | 2020-10-18 | v14 | v0.17.1.1 | v0.17.3.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.2.3 + git checkout tags/v0.17.3.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.2.3'. 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.3.0'. If you don't care about the version and just want binaries from master, skip this step: ```bash - git checkout v0.17.2.3 + git checkout v0.17.3.0 ``` * If you are on a 64-bit system, run: diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md index 05262434b..73c948f4a 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.2.0 +VERSION=v0.17.3.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.2.0 +VERSION=v0.17.3.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 675e90dd7314fdf1d0e600bf9473aa24ee05755a..dead2879fb07b658f96a800e72ad7dbf493f71b5 100644 GIT binary patch delta 6023 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 Bz=r?; delta 24 ecmX@|S*Ycx5Mx&(V=E&NF|{%>Z)Id@UIYMbb_b~d diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index 30bf5980d..c426d8dad 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -248,6 +248,7 @@ namespace cryptonote ADD_CHECKPOINT2(2265000, "727a6228a71f5b35c899553ee19d60bfc10c126a009ffd633afb30666e8edbe6", "0x121a33e656ecad4"); ADD_CHECKPOINT2(2325000, "f61261994b368700f0cbbfb4477433fa36a3c7537908ab2d1a06ac2987cc8b01", "0x154bceeffaff847"); ADD_CHECKPOINT2(2430000, "5f7f4273eb6be024df3c4311a8d28482220a253190efa1719f35b7782587740c", "0x1c3f14ba9b0bebc"); + ADD_CHECKPOINT2(2478000, "692fc889f5328c9cfe47e9846ca2bb3d61d82dbeb37077e90e0f8c36b8fc0c84", "0x1fbb38d0aae41a6"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 18d5e5dac..6327cb71e 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -5430,7 +5430,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "ff99bc76e59e0d6268e2d8ed54a2206d828de643fcb13be8d296611fc051a540"; +static const char expected_block_hashes_hash[] = "134194090ed578843d24734e766760a50463961200d8e8a9dda410c1c18e30db"; void Blockchain::load_compiled_in_block_hashes(const GetCheckpointsCallback& get_checkpoints) { if (get_checkpoints == nullptr || !m_fast_sync) diff --git a/src/device/device_ledger.hpp b/src/device/device_ledger.hpp index c9aadbd00..d95391355 100644 --- a/src/device/device_ledger.hpp +++ b/src/device/device_ledger.hpp @@ -45,7 +45,7 @@ namespace hw { /* Minimal supported version */ #define MINIMAL_APP_VERSION_MAJOR 1 #define MINIMAL_APP_VERSION_MINOR 7 - #define MINIMAL_APP_VERSION_MICRO 6 + #define MINIMAL_APP_VERSION_MICRO 8 #define VERSION(M,m,u) ((M)<<16|(m)<<8|(u)) #define VERSION_MAJOR(v) (((v)>>16)&0xFF) diff --git a/src/version.cpp.in b/src/version.cpp.in index 214b0a39d..dbd3e8161 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.2.3" +#define DEF_MONERO_VERSION "0.17.3.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@