From 31b2572ec7c50545778a7845241d430533f9b956 Mon Sep 17 00:00:00 2001
From: selsta <selsta@sent.at>
Date: Sat, 2 Jan 2021 18:12:10 +0100
Subject: [PATCH] build: prepare v0.17.1.9
---
README.md | 10 +++++-----
contrib/gitian/README.md | 4 ++--
src/blocks/checkpoints.dat | Bin 282180 -> 283076 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 db1ca8869..6ac9ce57b 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.1.8 | New CLSAG transaction format
-| 2210720 | 2020-10-18 | v14 | v0.17.1.1 | v0.17.1.8 | forbid old MLSAG transaction format
+| 2210000 | 2020-10-17 | v13 | v0.17.0.0 | v0.17.1.9 | New CLSAG transaction format
+| 2210720 | 2020-10-18 | v14 | v0.17.1.1 | v0.17.1.9 | 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.1.8
+ git checkout tags/v0.17.1.9
```
* 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.1.8'. 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.9'. If you don't care about the version and just want binaries from master, skip this step:
```bash
- git checkout v0.17.1.8
+ git checkout v0.17.1.9
```
* If you are on a 64-bit system, run:
diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md
index a6f68e569..696743214 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.1.8
+VERSION=v0.17.1.9
./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.1.8
+VERSION=v0.17.1.9
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 e20709f7c942bb38de2fb42ebe17eed946b48b62..74627bdb39b9b9253dc5a29eb4f78b8ce36d52d3 100644
GIT binary patch
delta 928
zcmV;R17G~aoDsyM5dlYm0fhkpg#iME0Ry!G1Vc`L;S0dIfyE8^yiQfm)r8Z2wole$
zI?d36{}V48LwxPcBakc1^WP?Tk(Hfsf)fWVC27yg`ERkXdb)!Vg9+pR4=716kEacm
zt6CaxqO^h}c@x2#YR&n({-b5~UzSOkhpOWbSufD<#whHDkZXxv8n8I%lvh?1H&P6>
z{jhg`gjMV1jwv44xlm}In3eDUIH-PsJ+DjH5V!yPk^V^5k1pk>mhsIAygG%k-RFy(
zr8*-tCG@;yd7{3@GC#O>xTrCZQ?R|H;v1|e?Nu>c9Y!%eJdce`AY=rq>}Ib2S-gKp
z<HA$uaez>nh)A1+)AXv}4uD^?e-i<)_C=9@sn%AYz*7OUSx1o%GTAlf8H7M6I;%Z(
z><cj&Gf9#jtSzTUG}i?H_7k5kb6U3TMK+5K^KNpNs?OmupE2{M_R-7*-$cd7=GHNF
zw)v+j^MJqjm>Umk4jVubPs^ovw3Wgk_RZ3OC*%m?!H`PDi4GreTInoqU$gQRD+*$N
z+7zDkkq8N=IU9|%sr(7;#xsvjzkKmAriM7ZDueb#_Pc0J^mUV3>XnPT0Q%@V4N0hv
zZc-ugy=0@sky@XKrQU5nTRW=Mwea<O@C|O4Q&Zinhgut~WYDo@1<S{aetGSKBu#WX
z(J7fiYP--0x|kI-{c5#rj4(sNdM4q2_v7X->uN`>$yV&Tnqn9RN20p2?a_T!D{INs
z?LQPT8>a9Uts6=4Z8aYo($*4e7--$_I;Bh7w^P=K>_KDT4-s&mO(eDn$FT_wr{@*5
zK8bm?xEGzUYGEv;NA6F+ma%K<gX&7!FG|l246pJ+hQ{I<5JCs`j@gPd_=Wy|Edz9!
zB~j&e?Vz9}O1A!)%LVm30^n@?s<5c+d`q~)GaQDtVJYKWZBR~ErKqEe!uCD8Vnljg
z?p1-q(V0on4=0oIT=MB=c__+HV_(hce}ZWLDkDE);Oj^_qXHGTjLArb^HC6@M5tl}
z(Ced>>wS}(adJaAkNI`Bgpgx@93X6>-ZFqp0?F;eOy|Gri5Y!dr~GFvnH))jaF&Lz
zq@RK7K=>k+ELwVylkh%3t_mAW|1Gd5H|i#mulvB_3FnZI40_@c8BK6$Ma427=XO%8
zG>W-v7R$a%9aIHUg!yQXU+lC9dGYzX9tU!S)j9g%AY|QBWT#YPT=X#qek#Mi-opyc
C1=247
delta 24
ecmX@ISn$XkK}O3)##TlkVrpe%-pa`0><0j0^ahCl
diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp
index 375f27555..5b9fb46f6 100644
--- a/src/checkpoints/checkpoints.cpp
+++ b/src/checkpoints/checkpoints.cpp
@@ -245,6 +245,7 @@ namespace cryptonote
ADD_CHECKPOINT2(2244000, "f06b8a19a75070cd002414d9d3ce59cf6b11ed9db464c6b84d3f22abbff84fae", "0x112b3331539f585");
ADD_CHECKPOINT2(2248500, "125d0872f00b54730b1e6f925f9d211b0158dd0e254de8cefa371f2e7aba5118", "0x115c89ab7abec4a");
ADD_CHECKPOINT2(2257500, "99643c32f27b157c6952a67af7dbe07ca819e71df386fa9379a344686d2950cf", "0x11c2f448d4f8830");
+ ADD_CHECKPOINT2(2265000, "727a6228a71f5b35c899553ee19d60bfc10c126a009ffd633afb30666e8edbe6", "0x121a33e656ecad4");
return true;
}
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index cd5b4f455..e55700eba 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -5388,7 +5388,7 @@ void Blockchain::cancel()
}
#if defined(PER_BLOCK_CHECKPOINT)
-static const char expected_block_hashes_hash[] = "9fcc97979d033efad4d6513ff20195f0caaa20fa878a088d6b28a87402354bc1";
+static const char expected_block_hashes_hash[] = "b6fa3343a9465692873bb9cf4d161d1d0316d4e3422fa7a57f6228526e8f5520";
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 e54900507..de7d92325 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.1.8"
+#define DEF_MONERO_VERSION "0.17.1.9"
#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@