diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-06-08 14:53:54 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-06-08 14:53:54 -0500 |
| commit | 2619d966c6180ad7207e38f4c2d22113065c3e91 (patch) | |
| tree | a2e03688247b505d65a5d42f3604d466585c7077 | |
| parent | Merge pull request #3604 (diff) | |
| parent | update checkpoints.dat for point release (diff) | |
| download | monero-2619d966c6180ad7207e38f4c2d22113065c3e91.tar.xz | |
Merge pull request #3908
827ca3f bump version for 0.12.2 point release (fluffypony)
95ccf50 update checkpoints.dat for point release (fluffypony)
| -rw-r--r-- | src/blocks/checkpoints.dat | bin | 197348 -> 198276 bytes | |||
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 2 | ||||
| -rw-r--r-- | src/version.cpp.in | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat Binary files differindex 501a55673..085558504 100644 --- a/src/blocks/checkpoints.dat +++ b/src/blocks/checkpoints.dat diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 66e7acff8..fbb2a2223 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -4431,7 +4431,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "59261c03b54bcb21bd463f9fe40a94f40840a12642e9a3b3bfb11b35839a5fe3"; +static const char expected_block_hashes_hash[] = "0924bc1c47aae448321fde949554be192878dd800e6489379865218f84eacbca"; void Blockchain::load_compiled_in_block_hashes() { const bool testnet = m_nettype == TESTNET; diff --git a/src/version.cpp.in b/src/version.cpp.in index 9fed91d99..a03da7889 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.12.1.0-master" +#define DEF_MONERO_VERSION "0.12.2.0-master" #define DEF_MONERO_RELEASE_NAME "Lithium Luna" #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG |