From a2e37eb3d8ed149a2a0eaf80f630ab6efc9f4210 Mon Sep 17 00:00:00 2001
From: selsta <selsta@sent.at>
Date: Tue, 13 Oct 2020 01:13:06 +0200
Subject: [PATCH] build: prepare v0.17.1.0

---
 README.md                          |  10 +++++-----
 contrib/gitian/README.md           |   4 ++--
 src/blocks/checkpoints.dat         | Bin 274116 -> 275780 bytes
 src/checkpoints/checkpoints.cpp    |   1 +
 src/cryptonote_core/blockchain.cpp |   2 +-
 src/version.cpp.in                 |   2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 153b02de4..f1c530b20 100644
--- a/README.md
+++ b/README.md
@@ -134,8 +134,8 @@ Dates are provided in the format YYYY-MM-DD.
 | 1788000                        | 2019-03-09 | v10               | v0.14.0.0              | v0.14.1.2                  | New PoW based on Cryptonight-R, new block weight algorithm, slightly more efficient RingCT format
 | 1788720                        | 2019-03-10 | v11               | v0.14.0.0              | v0.14.1.2                  | forbid old RingCT transaction format
 | 1978433                        | 2019-11-30* | v12                | v0.15.0.0              | v0.16.0.0                  | New PoW based on RandomX, only allow >= 2 outputs, change to the block median used to calculate penalty, v1 coinbases are forbidden, rct sigs in coinbase forbidden, 10 block lock time for incoming outputs
-| 2210000                        | 2020-10-17 | v13                | v0.17.0.0              | v0.17.0.1                  | New CLSAG transaction format 
-| 2210720                        | 2020-10-18 | v14               | v0.17.0.0              | v0.17.0.1                  | forbid old MLSAG transaction format
+| 2210000                        | 2020-10-17 | v13                | v0.17.0.0              | v0.17.1.0                  | New CLSAG transaction format
+| 2210720                        | 2020-10-18 | v14               | v0.17.0.0              | v0.17.1.0                  | forbid old MLSAG transaction format
 | XXXXXXX                        | XXX-XX-XX | XXX                | vX.XX.X.X              | vX.XX.X.X                  | XXX |
 
 X's indicate that these details have not been determined as of commit date.
@@ -295,7 +295,7 @@ Tested on a Raspberry Pi Zero with a clean install of minimal Raspbian Stretch (
     ```bash
     git clone https://github.com/monero-project/monero.git
     cd monero
-    git checkout tags/v0.17.0.1
+    git checkout tags/v0.17.1.0
     ```
 
 * Build:
@@ -412,10 +412,10 @@ application.
     cd monero
     ```
 
-* If you would like a specific [version/tag](https://github.com/monero-project/monero/tags), do a git checkout for that version. eg. 'v0.17.0.1'. If you don't care about the version and just want binaries from master, skip this step:
+* If you would like a specific [version/tag](https://github.com/monero-project/monero/tags), do a git checkout for that version. eg. 'v0.17.1.0'. If you don't care about the version and just want binaries from master, skip this step:
 
     ```bash
-    git checkout v0.17.0.1
+    git checkout v0.17.1.0
     ```
 
 * If you are on a 64-bit system, run:
diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md
index b66ba6d74..2b277f8c4 100644
--- a/contrib/gitian/README.md
+++ b/contrib/gitian/README.md
@@ -126,7 +126,7 @@ Setup for LXC:
 
 ```bash
 GH_USER=fluffypony
-VERSION=v0.17.0.1
+VERSION=v0.17.1.0
 
 ./gitian-build.py --setup $GH_USER $VERSION
 ```
@@ -182,7 +182,7 @@ If you chose to do detached signing using `--detach-sign` above (recommended), y
 
 ```bash
 GH_USER=fluffypony
-VERSION=v0.17.0.1
+VERSION=v0.17.1.0
 
 gpg --detach-sign ${VERSION}-linux/${GH_USER}/monero-linux-*-build.assert
 gpg --detach-sign ${VERSION}-win/${GH_USER}/monero-win-*-build.assert
diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat
index 78001a37f10eb8904144f07456ac0f6233a4cfaa..1a39fda5d9289a3af3e2c3fb2931b81c15ef4532 100644
GIT binary patch
delta 1702
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

delta 24
ecmX@|O5n&{0mj{pjIE47#MH{jyp@sVupR(*!UypH

diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp
index a3f69f3cd..2d47ec922 100644
--- a/src/checkpoints/checkpoints.cpp
+++ b/src/checkpoints/checkpoints.cpp
@@ -238,6 +238,7 @@ namespace cryptonote
     ADD_CHECKPOINT2(2092500, "c4e00820c9c7989b49153d5e90ae095a18a11d990e82fcc3be54e6ed785472b5", "0xb4e585a31369cb");
     ADD_CHECKPOINT2(2182500, "0d22b5f81982eff21d094af9e821dc2007e6342069e3b1a37b15d97646353124", "0xead4a874083492");
     ADD_CHECKPOINT2(2193000, "6e91b917a40309f89f75f2c8d7be5a6d1a3c425634f07f7d1867bd32d2e602ed", "0xf085140f17389d");
+    ADD_CHECKPOINT2(2206500, "dd3c8590f33eaa546a4ce69d02f27fd58a2f115cd32d733bd9426f8278f0cb8a", "0xf8725275799f0d");
     return true;
   }
 
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 613367791..645123fae 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -5364,7 +5364,7 @@ void Blockchain::cancel()
 }
 
 #if defined(PER_BLOCK_CHECKPOINT)
-static const char expected_block_hashes_hash[] = "13a12943851891505712e0e82dfd68aefb601651249066cb44c5365b41ed80ad";
+static const char expected_block_hashes_hash[] = "49db4105aadc7c296ffbf5d56de1785361684671544489f3c5e56cb40ef92a28";
 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 a6de3256c..0c24fd45c 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.17.0.1"
+#define DEF_MONERO_VERSION "0.17.1.0"
 #define DEF_MONERO_RELEASE_NAME "Oxygen Orion"
 #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
 #define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@