From ba60541f3e38087f345f64dd4168531703934cdf Mon Sep 17 00:00:00 2001 From: selsta Date: Wed, 23 Dec 2020 02:13:16 +0100 Subject: [PATCH] build: prepare v0.17.1.8 --- README.md | 10 +++++----- contrib/gitian/README.md | 4 ++-- src/blocks/checkpoints.dat | Bin 281028 -> 282180 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 5d2682299..db1ca8869 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.7 | New CLSAG transaction format -| 2210720 | 2020-10-18 | v14 | v0.17.1.1 | v0.17.1.7 | forbid old MLSAG transaction format +| 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 | 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.7 + git checkout tags/v0.17.1.8 ``` * 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.7'. 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.8'. If you don't care about the version and just want binaries from master, skip this step: ```bash - git checkout v0.17.1.7 + git checkout v0.17.1.8 ``` * If you are on a 64-bit system, run: diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md index 9f5857363..a6f68e569 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.7 +VERSION=v0.17.1.8 ./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.7 +VERSION=v0.17.1.8 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 64bbd9dfad28425c93b7bdc8a4d9ae8602cfd53a..e20709f7c942bb38de2fb42ebe17eed946b48b62 100644 GIT binary patch delta 1186 zcmV;T1YP^YlM%$65dk@Y0fhkpg#iME0Ry!G1j9*xIlbZp5RdJQLrpN28QX>PkhyBz zFF$Ko^%Ui8I!cx-EZt?Qbbo>7TScZQX||yW6u)R2yeT8$i)MIily7j2L#mw&Wbh{W zQ>|iF?#?gC&|)Q}KRJ+LjisCQ5#aEtQ$Z152&Km?1OgAM*vx8j-)4o1mA%_$}nFb^70E}K2WbZ#3}=l?x zK8WpC5m2(uHGFc19BZ^uwj?gLDV`$sXSO4%BDXLPwPxYhkJ3=9I;=g3koACm2s)civ0|!gjC6Y z3T1WkWzX68>@rO3_+=2~sl?C~?ohk;LOyjI0aF9Yd+?!m>J!VzuxwXJSTD^IFtO#S za-vJaRi-fL&e>-XGY};yN~^t1lJOYkPY|cRNZ#YMLL}Y)xTk78R+m>+D7QNd;@YMa z5RfTUe7HLIRxYfmwirHDQ$0sv+9>6Jhdbj9J{*4PXIl5m+7fDg;Ts(9gWA`wmc*8n zwpOY@a?ub?%f5b*8Nhs$&J~)Dj+!5~W6|#6E!DxG{zSVL5laqLtZ9^81GwVnvwY}* zEw0BNMdJ#Ed8Csofd=v&a12hsGY5noO(=b!p(tA1QXxJf?v{y}B?OiN#Nw=f=TgzS zwT=F+(z!Qzf^w>S3hR0}tI}eacuCcUv*j)byS}g%P1iNs-gsnx8@J{+V_Nj_S1))Q zh|tWl(JQkFi;W24S*Q*beBU0jy>puF0YA`H+xN7F#cK)144xyW?+pG~aSqp-4tUiA z9@4q9n9a_PZh}1h9qHiqvR*uY$c`Dx;IqiBQ7}^5Am$t3&5(flPxvfJBs{nsERjJ@ zFYr=D~m>s<`OwK_?^7GHI4ANYbSq0z;1g8L1 zgATt$5hB6K1ROVOqy~;;PtFi==Z&M10as=htYMaS=0faAk?p`8s2LZ3dz_5v9}_LJ z0JFUHcy%`q@Q1EfiWi1~Xa`nI^8AJ+a+UQ}=>q4EGGVjG>6dfA|)PZz!SnIYEODkxI^ zRZu&zOu)yC^W&QxQ^Dka6k(Mq(U*I|Jo~DlzOd--moRUHO(L;XxD#5lB-M3=NMgX< zLxA-X*IuhR4JsgCt!~bXUx6i>NFbsaAJ+g)0ia3AbrmDyo}5*8l+iYwpOQXewUR&O zd-)9NBL;hQ4O+pdi!QN>v>L#`5X698LUR;}vC4j-=sA999+kWa{6T>N4eGux8=dt& AG5`Po delta 24 ecmX>yNASpGK}PjP##TlkVrpe%-pa^w*b@L?Xa?c{ diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index 7a2cc0a5a..375f27555 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -244,6 +244,7 @@ namespace cryptonote ADD_CHECKPOINT2(2235500, "3eac1a1253495733e10d00fd5e8e1639741566d91bae38bc6d3342af6b75da53", "0x10cea232ce71d23"); ADD_CHECKPOINT2(2244000, "f06b8a19a75070cd002414d9d3ce59cf6b11ed9db464c6b84d3f22abbff84fae", "0x112b3331539f585"); ADD_CHECKPOINT2(2248500, "125d0872f00b54730b1e6f925f9d211b0158dd0e254de8cefa371f2e7aba5118", "0x115c89ab7abec4a"); + ADD_CHECKPOINT2(2257500, "99643c32f27b157c6952a67af7dbe07ca819e71df386fa9379a344686d2950cf", "0x11c2f448d4f8830"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 04fa1ebdc..1e6df49da 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -5376,7 +5376,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "9df68e5d89dc3789768c4701c5dea3fd32c1df22acc439c29b775eb54cefbf29"; +static const char expected_block_hashes_hash[] = "9fcc97979d033efad4d6513ff20195f0caaa20fa878a088d6b28a87402354bc1"; 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 e32b902c2..e54900507 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.7" +#define DEF_MONERO_VERSION "0.17.1.8" #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@