diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-03-18 18:51:11 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-03-18 18:51:11 +0200 |
| commit | 5710edf0401aa5804430bfb10b119aaa3db9873d (patch) | |
| tree | a4561c6b54442f92e692cbdccd3b42a4e7615ab0 | |
| parent | Merge pull request #2133 (diff) | |
| parent | update checkpoints (diff) | |
| download | monero-5710edf0401aa5804430bfb10b119aaa3db9873d.tar.xz | |
Merge pull request #3429
428fb45f update checkpoints (Riccardo Spagni)
3fedd51d update checkpoints.dat to block 1532400 (Riccardo Spagni)
83dbc5be update version to 0.12 Lithium Luna (Riccardo Spagni)
Diffstat (limited to '')
| -rw-r--r-- | src/blocks/checkpoints.dat | bin | 173732 -> 191524 bytes | |||
| -rw-r--r-- | src/checkpoints/checkpoints.cpp | 2 | ||||
| -rw-r--r-- | src/version.cpp.in | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat Binary files differindex c12c3d8a0..cff103804 100644 --- a/src/blocks/checkpoints.dat +++ b/src/blocks/checkpoints.dat diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index f709465c8..2c11af4b2 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -205,6 +205,8 @@ namespace cryptonote ADD_CHECKPOINT(1200000, "fa7d13a90850882060479d100141ff84286599ae39c3277c8ea784393f882d1f"); ADD_CHECKPOINT(1300000, "31b34272343a44a9f4ac7de7a8fcf3b7d8a3124d7d6870affd510d2f37e74cd0"); ADD_CHECKPOINT(1390000, "a8f5649dd4ded60eedab475f2bec8c934681c07e3cf640e9be0617554f13ff6c"); + ADD_CHECKPOINT(1450000, "ac94e8860093bc7c83e4e91215cba1d663421ecf4067a0ae609c3a8b52bcfac2"); + ADD_CHECKPOINT(1530000, "01759bce497ec38e63c78b1038892169203bb78f87e488172f6b854fcd63ba7e"); return true; diff --git a/src/version.cpp.in b/src/version.cpp.in index 18d62db6b..f83a85d9d 100644 --- a/src/version.cpp.in +++ b/src/version.cpp.in @@ -1,6 +1,6 @@ #define DEF_MONERO_VERSION_TAG "@VERSIONTAG@" -#define DEF_MONERO_VERSION "0.11.1.0-master" -#define DEF_MONERO_RELEASE_NAME "Helium Hydra" +#define DEF_MONERO_VERSION "0.12.0.0-master" +#define DEF_MONERO_RELEASE_NAME "Lithium Luna" #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG #include "version.h" |