From d1623175b267df596becd30b998c4ea4dd8298f6 Mon Sep 17 00:00:00 2001
From: wowario <wowario@protonmail.com>
Date: Tue, 6 Nov 2018 21:19:09 +0300
Subject: [PATCH 1/2] update checkpoints

---
 README.md                          |   2 +-
 src/blocks/checkpoints.dat         | Bin 7460 -> 7780 bytes
 src/checkpoints/checkpoints.cpp    |   6 ++++++
 src/cryptonote_core/blockchain.cpp |   2 +-
 src/version.cpp.in                 |   2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 89a4b196b..04b75a925 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ Dates are provided in the format YYYY-MM-DD.
 | ------------------------------ | -----------| ----------------- | ---------------------- | -------------------------- | ---------------------------------------------------------------------------------- |
 | 1                              | 2018-04-01 | v7                | v0.1.0.0               | v0.1.0.0                  | Cryptonight variant 1, ringsize >= 8, sorted inputs
 | 6969                           | 2018-04-24 | v8                | v0.2.0.0               | v0.2.0.0                  | Bulletproofs, LWMA difficulty algorithm, ringsize >= 10, reduce unlock to 4
-| 53666                          | 2018-10-06 | v9                | v0.3.0.0               | v0.3.1.1                  | Cryptonight variant 2, LWMA v2, ringsize = 22, MMS
+| 53666                          | 2018-10-06 | v9                | v0.3.0.0               | v0.3.1.2                  | Cryptonight variant 2, LWMA v2, ringsize = 22, MMS
 
 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 13137708071f644741ac3efce2c1c1076c7c8e74..59fc46785a52c43cc99445ca9128e2cd3a7ec362 100644
GIT binary patch
delta 333
zcmV-T0kZz2I^;Y7^RWRV9e+<D=6SC^s3K9<uhba(Q!<C8#TOjgkUAaK&Xku@ehOjN
zz5ktnBu@cgOTsXz7CZS&a#h4!=_;Ft8)=t3P=YHIk5|i^e3oeG+qMDerYJrt$HVgM
zC5f?Cm;{3=`)f{p0zv@r2c;|QXg~>ahUpmifFLeDQ=rGdd9iv-B!3@q_e#kMNu-?8
zIe~OyA`z?z3Es>2Y%9?qLaH^<jQ$;9#u|f2+2~<p=Dce6f|S{6j<l7}EC7IO)>&;G
zgn7s1szYXT%<C^-<)n7##7>-&Abj0VOAL9{GG0=t`SdhVkRWYJ>WUy(ymjwtg;H|)
zb+;W~1!O`lL*OYhWkL>X=uW>4+I?iJZ+_bE31{U`S979dMFARZ{t!bw{5rXNg>}<R
fQCW>KKrTp)lkcw@97{9!m<BeAn)~M5ln2@`qe`8_

delta 10
RcmaE2v&4$=<wizjSpXS<1KR)q

diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp
index 300993018..2f830ef38 100755
--- a/src/checkpoints/checkpoints.cpp
+++ b/src/checkpoints/checkpoints.cpp
@@ -192,6 +192,12 @@ namespace cryptonote
       ADD_CHECKPOINT(57000,  "08a79f09f12bb5d230b63963356a760d51618e526cfc636047a6f3798217c177");
       ADD_CHECKPOINT(59000,  "180b51ee2c5fbcd4362eb7a29df9422481310dd77d10bccdf8930724c31e007e");
       ADD_CHECKPOINT(59900,  "18cc0653ef39cb304c68045dba5eb6b885f936281cd939dea04d0e6c9cd4ae2e");
+      ADD_CHECKPOINT(60000,  "0f02aa57a63f79f63dafed9063abe228a37cb19f00430dc3168b8a8f4ae8016c");
+      ADD_CHECKPOINT(61000,  "509aca8c54eb5fe44623768757b6e890ae39d512478c75f614cbff3d91809350");
+      ADD_CHECKPOINT(62000,  "7fe91ad256c08dbd961e04738968be22fb481093fbfa7959bde7796ccceba0e2");
+      ADD_CHECKPOINT(62150,  "1a7c75f8ebeda0e20eb5877181eafd7db0fc887e3fed43e0b27ab2e7bccafd10");
+      ADD_CHECKPOINT(62269,  "4969555d60742afb93925fd96d83ac28f45e6e3c0e583c9fb3c92d9b2100d38f");
+
 
       return true;
   }
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 3ee53a464..a0e3580e4 100755
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -4452,7 +4452,7 @@ void Blockchain::cancel()
 }
 
 #if defined(PER_BLOCK_CHECKPOINT)
-static const char expected_block_hashes_hash[] = "876bea21d9b941a3b4d281c39cda1f549fa91c3a6b0695b01f81f929f7d6159d";
+static const char expected_block_hashes_hash[] = "4dcb4285e8c51d1672ac96f9408b04a4949f7c50900afb78841d0af890b99e83";
 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 3908a9c39..94fc3c35e 100755
--- 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.3.1.1"
+#define DEF_MONERO_VERSION "0.3.1.2"
 #define DEF_MONERO_RELEASE_NAME "Cool Cage"
 #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
 

From 8b56a44adcd7f4b57d94231b707b19f1c6e97b6a Mon Sep 17 00:00:00 2001
From: wowario <wowario@protonmail.com>
Date: Wed, 7 Nov 2018 19:19:07 +0300
Subject: [PATCH 2/2] counter attack

---
 src/checkpoints/checkpoints.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp
index 2f830ef38..fbeb17bd2 100755
--- a/src/checkpoints/checkpoints.cpp
+++ b/src/checkpoints/checkpoints.cpp
@@ -197,6 +197,9 @@ namespace cryptonote
       ADD_CHECKPOINT(62000,  "7fe91ad256c08dbd961e04738968be22fb481093fbfa7959bde7796ccceba0e2");
       ADD_CHECKPOINT(62150,  "1a7c75f8ebeda0e20eb5877181eafd7db0fc887e3fed43e0b27ab2e7bccafd10");
       ADD_CHECKPOINT(62269,  "4969555d60742afb93925fd96d83ac28f45e6e3c0e583c9fb3c92d9b2100d38f");
+      ADD_CHECKPOINT(62419,  "bd8bf5ac4c4fb07ab4d0d492bd1699def5c095ab6943ad3b63a89d1d8b1ce748");
+      ADD_CHECKPOINT(62425,  "41a922dba6f3906871b2ccaf31ec9c91033470c503959093dae796deda8940ea");
+
 
 
       return true;