diff options
author | Riccardo Spagni <ric@spagni.net> | 2019-03-07 15:17:31 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2019-03-07 15:17:31 +0200 |
commit | 49afbd0c53d29656689f319c7d3543204ead4e59 (patch) | |
tree | 24fa57c1676d033567227750278a2adce0168cf9 /src/cryptonote_core/blockchain.cpp | |
parent | Merge pull request #4852 (diff) | |
parent | fix merge errors, update recommended version to 0.14.0.2 (diff) | |
download | monero-49afbd0c53d29656689f319c7d3543204ead4e59.tar.xz |
Merge pull request #5232
082149c5 fix merge errors, update recommended version to 0.14.0.2 (Riccardo Spagni)
f3b368c6 update checkpoints hash (Riccardo Spagni)
e518f2b1 update checkpoints, update README for 0.14.1 release (Riccardo Spagni)
8780d6b4 update readme via cherry-pick (Riccardo Spagni)
Diffstat (limited to 'src/cryptonote_core/blockchain.cpp')
-rw-r--r-- | src/cryptonote_core/blockchain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 2c1b9d447..50e0f1959 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -4705,7 +4705,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "954cb2bbfa2fe6f74b2cdd22a1a4c767aea249ad47ad4f7c9445f0f03260f511"; +static const char expected_block_hashes_hash[] = "570ce2357b08fadac6058e34f95c5e08323f9325de260d07b091a281a948a7b0"; void Blockchain::load_compiled_in_block_hashes(const GetCheckpointsCallback& get_checkpoints) { if (get_checkpoints == nullptr || !m_fast_sync) |