From da0c68074e7a9164c0cc4e751c486c6f61f1963e Mon Sep 17 00:00:00 2001 From: wowario Date: Fri, 14 Jun 2019 13:21:06 +0300 Subject: [PATCH] bump version to 0.6.1.1 and update checkpoints.dat --- README.md | 2 +- src/blocks/checkpoints.dat | Bin 13924 -> 14372 bytes src/checkpoints/checkpoints.cpp | 2 ++ src/cryptonote_core/blockchain.cpp | 2 +- src/version.cpp.in | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 940ce1c8a..5861e1faa 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Dates are provided in the format YYYY-MM-DD. | 53666 | 2018-10-06 | Cool Cage | v0.3.0.0 | v0.3.1.3 | Cryptonight variant 2, LWMA v2, ringsize = 22, MMS | 63469 | 2018-11-11 | Dank Doge | v0.4.0.0 | v0.4.0.0 | LWMA v4 | 81769 | 2019-02-19 | Erotic EggplantEmoji | v0.5.0.0 | v0.5.0.2 | Cryptonight/wow, LWMA v1 with N=144, Updated Bulletproofs, Fee Per Byte, Auto-churn -| 114969 | 2019-06-14 | F For Fappening | v0.6.1.0 | v0.6.1.0 | RandomWOW, new block weight algorithm, slightly more efficient RingCT format +| 114969 | 2019-06-14 | F For Fappening | v0.6.1.0 | v0.6.1.1 | RandomWOW, new block weight algorithm, slightly more efficient RingCT format X's indicate that these details have not been determined as of commit date. diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat index 3f480e4af5c56cf7caa064f89ace12e5a5be6b61..90c59adb0276f4e425f4c6ff820144b277b43f76 100644 GIT binary patch delta 462 zcmV;<0WtpMY@~1j!Lb2jHh(YB=+s29fk@VyfS4cc(`&ReWb(7WAx2@*kS6xqhAfTW*esOFe`k3NAI@>=Z~j$AGdV zEpG<9{|i{I&^4TS8)3E^1@4iYnN50D@R@Dt{%iS@vz99&5CBwTQh%X&c1$Ec0JEo7 zx+~TIJZ(8|zvjQ;l+dSgH2ZZw4A@)Hg80XpcqBL$4Es4mn=^loH__>E?ibw)0#KC2 zw^jHnG0K(c*;Oq*JT~T*^-ODj3U{qQ*rPX~!;|GWe#aA$^m~zW=;mp|Qk)kL%nZvp z@kUGMNee$Cpv&_+`+w+JCcqatkonnV{oxdzFD#c~vI&d`h)Viy0uB4*%)w4nTExG% z4B2NR%)ezD7OvD|$MB*erQM%S)efb4{`Xk3PC#_%wC|C^3=;#GBa4T@?Q_;g` E?<=6`TmS$7 delta 10 RcmZ2d@Fa(E^G3#GGXNXD1Y`gJ diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index e19761dee..460bf6241 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -217,6 +217,8 @@ namespace cryptonote ADD_CHECKPOINT(88200, "50bb43d5d563524d6b9f308a2483b80934bab2ab5250757558318834476f1cfb"); ADD_CHECKPOINT(100000, "0c1f3bec32fe4ac9bd4b6ce1f4dfc52824f0947d756c9a1a453252c9423071f5"); ADD_CHECKPOINT(111450, "d6eadc95607765b36afd8b9148eac20eb101632021348cd34371fc1d8b67f6b6"); + ADD_CHECKPOINT(114969, "b48245956b87f243048fd61021f4b3e5443e57eee7ff8ba4762d18926e80b80c"); //Hard fork to v13 + ADD_CHECKPOINT(114980, "3a96963b93154889bd7d59c8a60cf8005e864b930627616e51a4ad11cd9a3d50"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 8a3b037b8..c6fb52bed 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -4960,7 +4960,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "7014aab67dba5c34f117548a7f9c137b2ca590ae5e6b701a237163ece6d330eb"; +static const char expected_block_hashes_hash[] = "4907556dee9a2b2f124c218f21525c7a19e894583ca4989e84b74c945a6c1998"; 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 a51227373..57e851ade 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.6.1.0" +#define DEF_MONERO_VERSION "0.6.1.1" #define DEF_MONERO_RELEASE_NAME "F For Fappening" #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG