From 8780d6b43d9c30cbb45a61202678a3ac248ffeaf Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Wed, 20 Feb 2019 23:15:06 +0200 Subject: [PATCH 1/4] update readme via cherry-pick --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9ec880621..1b2605644 100644 --- a/README.md +++ b/README.md @@ -123,9 +123,10 @@ Dates are provided in the format YYYY-MM-DD. | 1288616 | 2017-04-15 | v5 | v0.10.3.0 | v0.10.3.1 | Adjusted minimum blocksize and fee algorithm | | 1400000 | 2017-09-16 | v6 | v0.11.0.0 | v0.11.0.0 | Allow only RingCT transactions, allow only >= ringsize 5 | | 1546000 | 2018-04-06 | v7 | v0.12.0.0 | v0.12.3.0 | Cryptonight variant 1, ringsize >= 7, sorted inputs -| 1685555 | 2018-10-18 | v8 | v0.13.0.0 | v0.13.0.4 | max transaction size at half the penalty free block size, bulletproofs enabled, cryptonight variant 2, fixed ringsize [11](https://youtu.be/KOO5S4vxi0o) -| 1686275 | 2018-10-19 | v9 | v0.13.0.0 | v0.13.0.4 | bulletproofs required -| XXXXXXX | 2019-04-XX | XX | XXXXXXXXX | XXXXXXXXX | X +| 1685555 | 2018-10-18 | v8 | v0.13.0.0 | v0.13.0.0 | max transaction size at half the penalty free block size, bulletproofs enabled, cryptonight variant 2, fixed ringsize [11](https://youtu.be/KOO5S4vxi0o) +| 1686275 | 2018-10-19 | v9 | v0.13.0.0 | v0.13.0.0 | bulletproofs required +| 1788000 | 2019-03-09 | v10 | v0.14.0.0 | v0.14.0.0 | 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.0.0 | forbid old RingCT transaction format X's indicate that these details have not been determined as of commit date. From e518f2b1c09584728487d7bd3f796876f127e077 Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Wed, 20 Feb 2019 18:30:13 +0200 Subject: [PATCH 2/4] update checkpoints, update README for 0.14.1 release --- README.md | 14 +++++++------- src/checkpoints/checkpoints.cpp | 1 + src/version.cpp.in | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 1b2605644..fa758cc5f 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,7 @@ Dates are provided in the format YYYY-MM-DD. | 1546000 | 2018-04-06 | v7 | v0.12.0.0 | v0.12.3.0 | Cryptonight variant 1, ringsize >= 7, sorted inputs | 1685555 | 2018-10-18 | v8 | v0.13.0.0 | v0.13.0.0 | max transaction size at half the penalty free block size, bulletproofs enabled, cryptonight variant 2, fixed ringsize [11](https://youtu.be/KOO5S4vxi0o) | 1686275 | 2018-10-19 | v9 | v0.13.0.0 | v0.13.0.0 | bulletproofs required -| 1788000 | 2019-03-09 | v10 | v0.14.0.0 | v0.14.0.0 | New PoW based on Cryptonight-R, new block weight algorithm, slightly more efficient RingCT format +| 1788000 | 2019-03-09 | v10 | v0.14.0.0 | v0.14.0.0 | Cryptonight-R PoW, new block weight algorithm, slightly more efficient RingCT format | 1788720 | 2019-03-10 | v11 | v0.14.0.0 | v0.14.0.0 | forbid old RingCT transaction format X's indicate that these details have not been determined as of commit date. @@ -200,7 +200,7 @@ invokes cmake commands as needed. * Change to the root of the source code directory, change to the most recent release branch, and build: cd monero - git checkout release-v0.13 + git checkout release-v0.14 make *Optional*: If your machine has several cores and enough memory, enable @@ -260,11 +260,11 @@ Tested on a Raspberry Pi Zero with a clean install of minimal Raspbian Stretch ( ``` * If using an external hard disk without an external power supply, ensure it gets enough power to avoid hardware issues when syncing, by adding the line "max_usb_current=1" to /boot/config.txt -* Clone monero and checkout most recent release version: +* Clone monero and checkout the most recent release version: ``` git clone https://github.com/monero-project/monero.git cd monero - git checkout tags/release-v0.13 + git checkout tags/v0.14.1.0 ``` * Build: ``` @@ -361,9 +361,9 @@ 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. 'release-0.13'. If you dont care about the version and just want binaries from master, skip this step: - - git checkout release-v0.13 +* If you would like a specific [version/tag](https://github.com/monero-project/monero/tags), do a git checkout for that version. eg. 'v0.14.1.0'. If you dont care about the version and just want binaries from master, skip this step: + + git checkout v0.14.1.0 * If you are on a 64-bit system, run: diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index 96f575b2d..414e481e3 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -208,6 +208,7 @@ namespace cryptonote ADD_CHECKPOINT(1530000, "01759bce497ec38e63c78b1038892169203bb78f87e488172f6b854fcd63ba7e"); ADD_CHECKPOINT(1579000, "7d0d7a2346373afd41ed1e744a939fc5d474a7dbaa257be5c6fff4009e789241"); ADD_CHECKPOINT(1668900, "ac2dcaf3d2f58ffcf8391639f0f1ebafcb8eac43c49479c7c37f611868d07568"); + ADD_CHECKPOINT(1775600, "1c6e01c661dc22cab939e79ec6a5272190624ce8356d2f7b958e4f9a57fdb05e"); return true; } diff --git a/src/version.cpp.in b/src/version.cpp.in index ff2405811..8aaa41b19 100644 --- a/src/version.cpp.in +++ b/src/version.cpp.in @@ -1,6 +1,6 @@ #define DEF_MONERO_VERSION_TAG "@VERSIONTAG@" -#define DEF_MONERO_VERSION "0.13.0.0-master" -#define DEF_MONERO_RELEASE_NAME "Beryllium Bullet" +#define DEF_MONERO_VERSION "0.14.1.0" +#define DEF_MONERO_RELEASE_NAME "Boron Butterfly" #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG #include "version.h" From f3b368c659de15f7a94dbdc642f991479c0a7050 Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Wed, 20 Feb 2019 18:17:07 +0200 Subject: [PATCH 3/4] update checkpoints hash --- src/blocks/checkpoints.dat | Bin 208420 -> 221956 bytes src/cryptonote_core/blockchain.cpp | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat index 03e2cd2a81769168f39f2628dad7358217ad763c..adc433522a41adf3dd189c74e282867b9e5c1413 100644 GIT binary patch delta 13665 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 delta 22 dcmZoU#=GPW4^yFJBU39AV=EKWRwia8Jpfh&1`YrK diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 9f1f376f3..ffd160aed 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -4697,8 +4697,8 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "954cb2bbfa2fe6f74b2cdd22a1a4c767aea249ad47ad4f7c9445f0f03260f511"; -void Blockchain::load_compiled_in_block_hashes(const GetCheckpointsCallback& get_checkpoints) +static const char expected_block_hashes_hash[] = "570ce2357b08fadac6058e34f95c5e08323f9325de260d07b091a281a948a7b0"; +void Blockchain::load_compiled_in_block_hashes() { if (get_checkpoints == nullptr || !m_fast_sync) { From 082149c580e1699e334dd601f38f3efad3a4670a Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Tue, 5 Mar 2019 13:46:35 +0200 Subject: [PATCH 4/4] fix merge errors, update recommended version to 0.14.0.2 --- README.md | 8 ++++---- src/cryptonote_core/blockchain.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fa758cc5f..f611c98dd 100644 --- a/README.md +++ b/README.md @@ -123,10 +123,10 @@ Dates are provided in the format YYYY-MM-DD. | 1288616 | 2017-04-15 | v5 | v0.10.3.0 | v0.10.3.1 | Adjusted minimum blocksize and fee algorithm | | 1400000 | 2017-09-16 | v6 | v0.11.0.0 | v0.11.0.0 | Allow only RingCT transactions, allow only >= ringsize 5 | | 1546000 | 2018-04-06 | v7 | v0.12.0.0 | v0.12.3.0 | Cryptonight variant 1, ringsize >= 7, sorted inputs -| 1685555 | 2018-10-18 | v8 | v0.13.0.0 | v0.13.0.0 | max transaction size at half the penalty free block size, bulletproofs enabled, cryptonight variant 2, fixed ringsize [11](https://youtu.be/KOO5S4vxi0o) -| 1686275 | 2018-10-19 | v9 | v0.13.0.0 | v0.13.0.0 | bulletproofs required -| 1788000 | 2019-03-09 | v10 | v0.14.0.0 | v0.14.0.0 | Cryptonight-R PoW, new block weight algorithm, slightly more efficient RingCT format -| 1788720 | 2019-03-10 | v11 | v0.14.0.0 | v0.14.0.0 | forbid old RingCT transaction format +| 1685555 | 2018-10-18 | v8 | v0.13.0.0 | v0.13.0.4 | max transaction size at half the penalty free block size, bulletproofs enabled, cryptonight variant 2, fixed ringsize [11](https://youtu.be/KOO5S4vxi0o) +| 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.0.2 | Cryptonight-R PoW, new block weight algorithm, slightly more efficient RingCT format +| 1788720 | 2019-03-10 | v11 | v0.14.0.0 | v0.14.0.2 | forbid old RingCT transaction format X's indicate that these details have not been determined as of commit date. diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index ffd160aed..3bc4b2c2c 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -4698,7 +4698,7 @@ void Blockchain::cancel() #if defined(PER_BLOCK_CHECKPOINT) static const char expected_block_hashes_hash[] = "570ce2357b08fadac6058e34f95c5e08323f9325de260d07b091a281a948a7b0"; -void Blockchain::load_compiled_in_block_hashes() +void Blockchain::load_compiled_in_block_hashes(const GetCheckpointsCallback& get_checkpoints) { if (get_checkpoints == nullptr || !m_fast_sync) {