From a700e6103be8ac25d04751b101a03e03782bbecc Mon Sep 17 00:00:00 2001 From: selsta Date: Thu, 10 Dec 2020 20:12:27 +0100 Subject: [PATCH] build: prepare v0.17.1.7 --- README.md | 10 +++++----- contrib/gitian/README.md | 4 ++-- src/blocks/checkpoints.dat | Bin 280452 -> 281028 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 b12716cbe..5d2682299 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.6 | New CLSAG transaction format -| 2210720 | 2020-10-18 | v14 | v0.17.1.1 | v0.17.1.6 | forbid old MLSAG transaction format +| 2210000 | 2020-10-17 | v13 | v0.17.0.0 | v0.17.1.7 | New CLSAG transaction format +| 2210720 | 2020-10-18 | v14 | v0.17.1.1 | v0.17.1.7 | 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.6 + git checkout tags/v0.17.1.7 ``` * 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.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.17.1.7'. If you don't care about the version and just want binaries from master, skip this step: ```bash - git checkout v0.17.1.6 + git checkout v0.17.1.7 ``` * If you are on a 64-bit system, run: diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md index 0763c01ad..9f5857363 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.6 +VERSION=v0.17.1.7 ./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.6 +VERSION=v0.17.1.7 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 7f5f996cb839d2258a39e209b4d56d7c32f80b67..64bbd9dfad28425c93b7bdc8a4d9ae8602cfd53a 100644 GIT binary patch delta 605 zcmV-j0;2tdj}gR^5dkNG0fhkpg#iME0Ry!G1cOI^ClI4F13O^h$nsjJkr`fK%Jwcr zMNdwu8%d)Xz-?`Ht-M#oJ8P2YfOBeRaQ)I+>K5V%ECa1XCIVc4et=aPT_kFms!rL= zF^Mm20trX`c%-4{X{?{qD^tryO1;I!r;@V8B)!LMyqBOhC9^FPXU+5TNuc_I$P){F zBHbf@@{Fg15-ru3R;53|1$pL&Ww6P^s;lwn%I1eF42U(Ogn@#&jFZ>dpOPZ#?Bc?y zU0LAUeSbISLTnab9o|-&HmP-=(~gHUm-~z?Pbl^{=nTbk9&DJ~Al9;9j&f+6$x>M2 z`-1!k&IMseBH{U%4s$rqg~bOQhGNH(09W6C8q??2e6TaX`$*c8?Iew1m)R87epGgf zG>v58qE-rKt~20mpTO{J29Pc9wGV}Km18flH~aZBGsNQEU9Z};P$cg;TV~-MY^%K) z>_CP`<{7zjCt_phV|}xg8YqgB=wu4QXzA$PJ@O7=ylAy4*fQRH@b>383&CW?yO->L zb9)q8S0%-*;+Fq9bBddfIT!;RC;|ID6~6DQ1*LPuTIx=rKS4jSuY6=<2+H0sV`expR4p{(BNVTyvZBrx+mtlsYa;sCTc!aqp|-aY?Za zhQah1@Kq%g%5sn-zao$e-a%NTBk)M9P;#qrDrVg delta 24 ecmX>yS+J#FkWsFYv6T^sm|7W`w=%Lcy8{4N?gmN# diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index d4733007b..7a2cc0a5a 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -243,6 +243,7 @@ namespace cryptonote ADD_CHECKPOINT2(2224000, "e34bc71301600df96d08aaa6b0bde932cba1b06a3dd57076e3f664a078810a80", "0x1052fc256fceb6f"); ADD_CHECKPOINT2(2235500, "3eac1a1253495733e10d00fd5e8e1639741566d91bae38bc6d3342af6b75da53", "0x10cea232ce71d23"); ADD_CHECKPOINT2(2244000, "f06b8a19a75070cd002414d9d3ce59cf6b11ed9db464c6b84d3f22abbff84fae", "0x112b3331539f585"); + ADD_CHECKPOINT2(2248500, "125d0872f00b54730b1e6f925f9d211b0158dd0e254de8cefa371f2e7aba5118", "0x115c89ab7abec4a"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 78fc57967..04fa1ebdc 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -5376,7 +5376,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "6a6436850ed9df5975ca0c45513647c3d401ed8523ff5a793ad93136fa34fd3b"; +static const char expected_block_hashes_hash[] = "9df68e5d89dc3789768c4701c5dea3fd32c1df22acc439c29b775eb54cefbf29"; 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 00b5c5643..e32b902c2 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.6" +#define DEF_MONERO_VERSION "0.17.1.7" #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@