From ac1a34c5d07c87b4a8c9b8a74db255b851f3ed2d Mon Sep 17 00:00:00 2001 From: selsta Date: Tue, 3 Mar 2020 23:17:18 +0100 Subject: [PATCH] build: prepare v0.15.0.5 update --- README.md | 8 ++++---- contrib/gitian/README.md | 6 +++--- src/blocks/checkpoints.dat | Bin 245956 -> 255748 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 e00ba468c..8a59bab10 100644 --- a/README.md +++ b/README.md @@ -153,7 +153,7 @@ Dates are provided in the format YYYY-MM-DD. | 1686275 | 2018-10-19 | v9 | v0.13.0.0 | v0.13.0.4 | bulletproofs required | 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.15.0.1 | 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 transactions +| 1978433 | 2019-11-30* | v12 | v0.15.0.0 | v0.15.0.5 | 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 transactions | 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. @@ -315,7 +315,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.15.0.1 + git checkout tags/v0.15.0.5 ``` * Build: @@ -432,10 +432,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.15.0.1'. 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.15.0.5'. If you don't care about the version and just want binaries from master, skip this step: ```bash - git checkout v0.15.0.1 + git checkout v0.15.0.5 ``` * If you are on a 64-bit system, run: diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md index 2a8b22a7d..0da1ff506 100644 --- a/contrib/gitian/README.md +++ b/contrib/gitian/README.md @@ -126,7 +126,7 @@ Setup for LXC: ```bash GH_USER=fluffypony -VERSION=v0.15.0.1 +VERSION=v0.15.0.5 ./gitian-build.py --setup $GH_USER $VERSION ``` @@ -167,7 +167,7 @@ If all went well, this produces a number of (uncommitted) `.assert` files in the Checking your work ------------------ -Take a look in the assert files and note the SHA256 checksums listed there. eg for `v0.15.0.1` you should get this checksum: +Take a look in the assert files and note the SHA256 checksums listed there. eg for `v0.15.0.5` you should get this checksum: ``` 2b95118f53d98d542a85f8732b84ba13b3cd20517ccb40332b0edd0ddf4f8c62 monero-x86_64-linux-gnu.tar.gz @@ -183,7 +183,7 @@ If you chose to do detached signing using `--detach-sign` above (recommended), y ```bash GH_USER=fluffypony -VERSION=v0.15.0.1 +VERSION=v0.15.0.5 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 3ba55cadce6e4f9fcbdf71e0b890e5f503dbca30..408d3ca8616bef7f83fb38abc8efc48211668d39 100644 GIT binary patch delta 9891 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 delta 21 bcmZoU$A6@epOLwdv6T^sn6@%9A3gv8N*V@- diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index 4a4b3c5c2..a5fed1dd9 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -211,6 +211,7 @@ namespace cryptonote ADD_CHECKPOINT(1775600, "1c6e01c661dc22cab939e79ec6a5272190624ce8356d2f7b958e4f9a57fdb05e"); ADD_CHECKPOINT(1856000, "9b57f17f29c71a3acd8a7904b93c41fa6eb8d2b7c73936ce4f1702d14880ba29"); ADD_CHECKPOINT(1958000, "98a5d6e51afdf3146e0eefb10a66e8648d8d4d5c2742be8835e976ba217c9bb2"); + ADD_CHECKPOINT(2046000, "5e867f0b8baefed9244a681df97fc885d8ab36c3dfcd24c7a3abf3b8ac8b8314"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 64708a580..11a6a4c0e 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -5029,7 +5029,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "bd0028887df452e58655a68015f74b923f29e9829b0b2c030d64feee67a2f537"; +static const char expected_block_hashes_hash[] = "d2ecd6b7a1937dcabd2b1108d3060a85bfdd523b2baa65f84430f674744750d5"; 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 a7a89c945..c62233774 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.15.0.1" +#define DEF_MONERO_VERSION "0.15.0.5" #define DEF_MONERO_RELEASE_NAME "Carbon Chamaeleon" #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG #define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@