From 633f1542e25467ead5eee69e8b44082357f6b5db Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Thu, 13 Jun 2019 17:36:41 +0200 Subject: [PATCH] prep for 0.14.1 release --- README.md | 6 +++--- src/blocks/checkpoints.dat | Bin 221956 -> 232004 bytes src/checkpoints/checkpoints.cpp | 1 + src/cryptonote_core/blockchain.cpp | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cd005ac49..3c4f5ac86 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ Monero uses a fixed-schedule software upgrade (hard fork) mechanism to implement Dates are provided in the format YYYY-MM-DD. -| Software upgrade block height | Date | Fork version | Minimum Monero version | Recommended Monero version | Details | +| Software upgrade block height | Date | Fork version | Minimum Monero version | Recommended Monero version | Details | | ------------------------------ | -----------| ----------------- | ---------------------- | -------------------------- | ---------------------------------------------------------------------------------- | | 1009827 | 2016-03-22 | v2 | v0.9.4 | v0.9.4 | Allow only >= ringsize 3, blocktime = 120 seconds, fee-free blocksize 60 kb | | 1141317 | 2016-09-21 | v3 | v0.9.4 | v0.10.0 | Splits coinbase into denominations | @@ -147,8 +147,8 @@ 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.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 | 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.2 | forbid old RingCT transaction format +| 1788000 | 2019-03-09 | v10 | v0.14.0.0 | v0.14.1.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.1.0 | forbid old RingCT transaction format | XXXXXXX | 2019-10-XX | XX | XXXXXXXXX | XXXXXXXXX | X X's indicate that these details have not been determined as of commit date. diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat index adc433522a41adf3dd189c74e282867b9e5c1413..b975af6b4ff6ce83414e5f34668b326b553eea33 100644 GIT binary patch delta 10150 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 diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index e31b96646..11bbe2e24 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -209,6 +209,7 @@ namespace cryptonote ADD_CHECKPOINT(1579000, "7d0d7a2346373afd41ed1e744a939fc5d474a7dbaa257be5c6fff4009e789241"); ADD_CHECKPOINT(1668900, "ac2dcaf3d2f58ffcf8391639f0f1ebafcb8eac43c49479c7c37f611868d07568"); ADD_CHECKPOINT(1775600, "1c6e01c661dc22cab939e79ec6a5272190624ce8356d2f7b958e4f9a57fdb05e"); + ADD_CHECKPOINT(1856000, "9b57f17f29c71a3acd8a7904b93c41fa6eb8d2b7c73936ce4f1702d14880ba29"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 3841aa1cf..23534f0d3 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -4845,7 +4845,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "570ce2357b08fadac6058e34f95c5e08323f9325de260d07b091a281a948a7b0"; +static const char expected_block_hashes_hash[] = "cfca50ea0c87718ac92a14654c60d7ee8f6453e2765b329b40d10da4ed85a4f2"; void Blockchain::load_compiled_in_block_hashes(const GetCheckpointsCallback& get_checkpoints) { if (get_checkpoints == nullptr || !m_fast_sync)