Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-01 14:26:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7638

Browse source 
c18cdd3 build: prepare v0.17.2.0 (selsta)
This commit is contained in:
luigi1111 2021-03-29 22:00:40 -04:00
commit f719b74cd1
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
6 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
src/blocks/checkpoints.dat
View file

Binary file not shown.

1
src/checkpoints/checkpoints.cpp
View file

@ -246,6 +246,7 @@ namespace cryptonote
ADD_CHECKPOINT2(2248500, "125d0872f00b54730b1e6f925f9d211b0158dd0e254de8cefa371f2e7aba5118", "0x115c89ab7abec4a");
ADD_CHECKPOINT2(2257500, "99643c32f27b157c6952a67af7dbe07ca819e71df386fa9379a344686d2950cf", "0x11c2f448d4f8830");
ADD_CHECKPOINT2(2265000, "727a6228a71f5b35c899553ee19d60bfc10c126a009ffd633afb30666e8edbe6", "0x121a33e656ecad4");
ADD_CHECKPOINT2(2325000, "f61261994b368700f0cbbfb4477433fa36a3c7537908ab2d1a06ac2987cc8b01", "0x154bceeffaff847");
return true;
}

2
src/cryptonote_core/blockchain.cpp
View file

@ -5390,7 +5390,7 @@ void Blockchain::cancel()
}
#if defined(PER_BLOCK_CHECKPOINT)
static const char expected_block_hashes_hash[] = "b6fa3343a9465692873bb9cf4d161d1d0316d4e3422fa7a57f6228526e8f5520";
static const char expected_block_hashes_hash[] = "b198c2514bed71ca0a43cba6590090068daf6d207b351d8a4c7d0f0f791c095f";
void Blockchain::load_compiled_in_block_hashes(const GetCheckpointsCallback& get_checkpoints)
{
if (get_checkpoints == nullptr || !m_fast_sync)

2
src/version.cpp.in
View file

@ -1,5 +1,5 @@
#define DEF_MONERO_VERSION_TAG "@VERSIONTAG@"
#define DEF_MONERO_VERSION "0.17.1.9"
#define DEF_MONERO_VERSION "0.17.2.0"
#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@