diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-12-07 10:22:38 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-12-07 10:22:38 -0600 |
| commit | 1cb3ea0447e26066cfe9f23c5547a37be320fbb5 (patch) | |
| tree | 7b375b54e6e70feb4caa2d4a02699bc65e5432dd /src | |
| parent | Merge pull request #7063 (diff) | |
| parent | build: prepare v0.17.1.6 (diff) | |
| download | monero-1cb3ea0447e26066cfe9f23c5547a37be320fbb5.tar.xz | |
Merge pull request #7065
b34d50f build: prepare v0.17.1.6 (selsta)
Diffstat (limited to 'src')
| -rw-r--r-- | src/blocks/checkpoints.dat | bin | 279428 -> 280452 bytes | |||
| -rw-r--r-- | src/checkpoints/checkpoints.cpp | 1 | ||||
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 2 | ||||
| -rw-r--r-- | src/version.cpp.in | 2 |
4 files changed, 3 insertions, 2 deletions
diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat Binary files differindex bcbfbb7ee..7f5f996cb 100644 --- a/src/blocks/checkpoints.dat +++ b/src/blocks/checkpoints.dat diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index d966eebda..d4733007b 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -242,6 +242,7 @@ namespace cryptonote ADD_CHECKPOINT2(2210500, "ed17259215ac6aabe6e8252b5b5eff613d2e69cc2111173e567109aa78301911", "0xfbcb50a9a6a433"); ADD_CHECKPOINT2(2224000, "e34bc71301600df96d08aaa6b0bde932cba1b06a3dd57076e3f664a078810a80", "0x1052fc256fceb6f"); ADD_CHECKPOINT2(2235500, "3eac1a1253495733e10d00fd5e8e1639741566d91bae38bc6d3342af6b75da53", "0x10cea232ce71d23"); + ADD_CHECKPOINT2(2244000, "f06b8a19a75070cd002414d9d3ce59cf6b11ed9db464c6b84d3f22abbff84fae", "0x112b3331539f585"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 89ecda2cd..78fc57967 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -5376,7 +5376,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "3a2a0720f7ed3573d2b632f7ba127e2f97edac3af34bf924df57c13a88bf2460"; +static const char expected_block_hashes_hash[] = "6a6436850ed9df5975ca0c45513647c3d401ed8523ff5a793ad93136fa34fd3b"; 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 6658cb3b1..00b5c5643 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.17.1.5" +#define DEF_MONERO_VERSION "0.17.1.6" #define DEF_MONERO_RELEASE_NAME "Oxygen Orion" #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG #define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@ |