From 827ca3fd3b092a5190a81d4f688edb55d9d741f0 Mon Sep 17 00:00:00 2001
From: Riccardo Spagni <ric@spagni.net>
Date: Sat, 2 Jun 2018 14:27:48 +0200
Subject: [PATCH 1/2] bump version for 0.12.2 point release

---
 src/version.cpp.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 

From 95ccf508cd6b84b7e62c003cabe24891037765e3 Mon Sep 17 00:00:00 2001
From: Riccardo Spagni <ric@spagni.net>
Date: Sat, 2 Jun 2018 14:31:05 +0200
Subject: [PATCH 2/2] update checkpoints.dat for point release

---
 src/blocks/checkpoints.dat         | Bin 197348 -> 198276 bytes
 src/cryptonote_core/blockchain.cpp |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat
index 501a55673eb30bee550da9b3fcc9093d470890e3..08555850414691beb9b4b841911b7a347e8cb90e 100644
GIT binary patch
delta 957
zcmV;u148`dg$#s^3;{HO0fhkpg#iM!0R!U#f4SW%5an`!v@Q@Ls{ArY=pla#*{OSu
zjc{vTqS4O*%{jn&9QHCb5LL7bO0tB30o`u0(j~(PwgB#VAJ;24*HL$4e=~S&WsbzH
zhKwX`@0p&1Q>Na-U~4{9=pOO_5)$)Dr2?O1H#^A$R%=~pEkK;y5kg^#iGUOacqk@|
zf0rb)k%0p^7&XWN63E(T{5^mra?f7%x_wvmHxCjHsAe{rh+Rfk&zHCdKYPhI3vaL7
zVaa#;Q}AgcfFBdp$r7g+=;aIC3aU9-hdD+wlL4}SqcZaWE*b#rGs7Z<7{3q(Y<|p*
z<34;1%;M>Wx|b(@apX?yw8zi5v+{q#fBs!BdW%vfso*)isdlR3RVJ>sdw&^SEu(7=
z?M@%PpcLPJf=c_ct9NM<-ne(TktOw?QSOW=_F(>wqbzapqRCH{rZ4HE2w=Bz__s2F
ztoRffS98up0r=9i@e_&<kH+z-H#sr?m*1aYlE5-Xo#JATE?C|6IUSXU+734ue+sU7
z9zq5qH8bWLlKE{_mQ&^*BUTjN%mMX{)AittVH`fsb}u|UHUT{hc<vFJ;g-<L83+n6
zDZEk73TSnjwa&zWTheIwc$>G{YiCHNA{kXHukzemWi3cxZJ!5kxt>ub5Ua48D7*;}
z#&>Pj`Yl`YozabeL0?LY9>x>oe-IN-&)f5<f_3dqxCm2gaNND9skg@=&$;SF6KY1K
zd@kM;+cS=zJ!P~{rW)u_+kna1Ei<*d-9S8?{yenF#qJY&25>rPz;oQqIDWb~NET`s
z_GHZ&T<+jgHP8V~`)5-FOqUx^4sV)iD@yt7Ve*N*Qncjq3mo?dh<pv-e?_|a?14}w
zIVg5QF4=rhC?182&$+mLPH-1MH~}RRs4v1H+Pg5Yi8xtJEdQ!#UON>6nlSPJoq^|0
zg*P>qHYQvwB5JDE%C~oD@0~njeF`Exhx{VZuB*YeNBjJ_b)eOcpLIxqC+Zf_uCC*x
zd!>8FVrT*eaG2Q}8=N<oe@N!Sw;FZ~3DdWw{V_=8V2%cFKBUGD9Z06A7#u=CedUeN
zSJkc@wndPVUZQ#v4_khdY}t4XS;cfzw1yzH`qI(ANw2%6*=mxrZ3v5Wl16ofatt@I
zIlnSHE1<%`4*uEx$hK+*R&zOC_=A6Kk6cL}=^6i@Q-)|bwI4=fC*Oc5*!ZxpJVo)q
f2Jkc2`=aVw=Ba#xb*Ip-<17m{g=lOdOF)_(8f(V!

delta 21
bcmZqa<$2P|!zkX!*vbe*Oj{Y5A2R^}N4o{u

diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 54d8fac31..08184fc40 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -4427,7 +4427,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;