diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-09-14 18:25:43 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-09-14 18:25:43 +0200 |
| commit | 3399c2a257057c5b3db2823cc9d709c27b00e1ec (patch) | |
| tree | b7329f83f13d8e797a6b8cc7ee72bce6dd619f85 | |
| parent | Merge pull request #2396 (diff) | |
| parent | update checkpoint hashes (diff) | |
| download | monero-3399c2a257057c5b3db2823cc9d709c27b00e1ec.tar.xz | |
Merge pull request #2404
e5238adf update checkpoint hashes (Riccardo Spagni)
d4f56bdf update hardcoded checkpoints (Riccardo Spagni)
ed730511 update checkpoints.dat (Riccardo Spagni)
| -rw-r--r-- | src/blocks/checkpoints.dat | bin | 38400036 -> 44480036 bytes | |||
| -rw-r--r-- | src/cryptonote_basic/checkpoints.cpp | 2 | ||||
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat Binary files differindex a15f53e67..15fa042cf 100644 --- a/src/blocks/checkpoints.dat +++ b/src/blocks/checkpoints.dat diff --git a/src/cryptonote_basic/checkpoints.cpp b/src/cryptonote_basic/checkpoints.cpp index 103a4a33e..98e509561 100644 --- a/src/cryptonote_basic/checkpoints.cpp +++ b/src/cryptonote_basic/checkpoints.cpp @@ -167,6 +167,8 @@ namespace cryptonote ADD_CHECKPOINT(1100000, "3fd720c5c8b3072fc1ccda922dec1ef25f9ed88a1e6ad4103d0fe00b180a5903"); ADD_CHECKPOINT(1150000, "1dd16f626d18e1e988490dfd06de5920e22629c972c58b4d8daddea0038627b2"); ADD_CHECKPOINT(1200000, "fa7d13a90850882060479d100141ff84286599ae39c3277c8ea784393f882d1f"); + ADD_CHECKPOINT(1300000, "31b34272343a44a9f4ac7de7a8fcf3b7d8a3124d7d6870affd510d2f37e74cd0"); + ADD_CHECKPOINT(1390000, "a8f5649dd4ded60eedab475f2bec8c934681c07e3cf640e9be0617554f13ff6c"); return true; diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 93a4e26f8..69d2edf65 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -4129,7 +4129,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "23d8a8c73de7b2383c72a016d9a6034e69d62dd48077d1c414e064ceab6daa94"; +static const char expected_block_hashes_hash[] = "d3ca80d50661684cde0e715d46d7c19704d2e216b21ed088af9fd4ef37ed4d65"; void Blockchain::load_compiled_in_block_hashes() { if (m_fast_sync && get_blocks_dat_start(m_testnet) != nullptr && get_blocks_dat_size(m_testnet) > 0) |