From 853171bbf0099b86e8c219ce13abff79166f9389 Mon Sep 17 00:00:00 2001 From: selsta Date: Mon, 26 Sep 2022 22:41:36 +0200 Subject: [PATCH] build: prepare v0.18.1.2 --- README.md | 10 +++++----- contrib/gitian/DOCKRUN.md | 2 +- contrib/gitian/README.md | 2 +- src/blocks/checkpoints.dat | Bin 338244 -> 339972 bytes src/checkpoints/checkpoints.cpp | 1 + src/cryptonote_core/blockchain.cpp | 2 +- src/version.cpp.in | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6976ed370..52dbdc851 100644 --- a/README.md +++ b/README.md @@ -138,8 +138,8 @@ Dates are provided in the format YYYY-MM-DD. | 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.3.2 | New CLSAG transaction format | 2210720 | 2020-10-18 | v14 | v0.17.1.1 | v0.17.3.2 | forbid old MLSAG transaction format -| 2688888 | 2022-08-13 | v15 | v0.18.0.0 | v0.18.1.1 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm -| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.1.1 | forbid old v14 transaction format +| 2688888 | 2022-08-13 | v15 | v0.18.0.0 | v0.18.1.2 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm +| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.1.2 | forbid old v14 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. @@ -344,7 +344,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 v0.18.1.1 + git checkout v0.18.1.2 ``` * Build: @@ -463,10 +463,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.18.1.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.18.1.2'. If you don't care about the version and just want binaries from master, skip this step: ```bash - git checkout v0.18.1.1 + git checkout v0.18.1.2 ``` * If you are on a 64-bit system, run: diff --git a/contrib/gitian/DOCKRUN.md b/contrib/gitian/DOCKRUN.md index 6f75908c3..4e2e43c93 100644 --- a/contrib/gitian/DOCKRUN.md +++ b/contrib/gitian/DOCKRUN.md @@ -57,7 +57,7 @@ The dockrun.sh script will do everything to build the binaries. Just specify the version to build as its only argument, e.g. ```bash -VERSION=v0.18.1.1 +VERSION=v0.18.1.2 ./dockrun.sh $VERSION ``` diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md index 1464d03ab..f233b20d7 100644 --- a/contrib/gitian/README.md +++ b/contrib/gitian/README.md @@ -133,7 +133,7 @@ Common setup part: su - gitianuser GH_USER=YOUR_GITHUB_USER_NAME -VERSION=v0.18.1.1 +VERSION=v0.18.1.2 ``` Where `GH_USER` is your GitHub user name and `VERSION` is the version tag you want to build. diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat index eee34e60fafe410b187acfe7e09de29ddbfbaf2e..9820cc41687f24da7a3143fe796b892dd8ddda4b 100644 GIT binary patch delta 1769 zcmVHbG2tAx$>Nd$B7_7_> z_yZ&tEaUl^B59n$u$UQ!dIdypL;?5FPR3}Diza(7J)cCs=`b3&uq~uo#j7GVm0iGf zV)EKWMQMLgSPJ{-=gu&DejzWBJjABxEa`y7+;8&h=og*&wNX+;c)~tA9kEPA-=Auf z?=j+Bjzrr3!6t+sV;Y!%dVK=s6Rz$bN^;-C?T$SxSw+NswIs-meP|*}g*oqL?8@>~ z-*F?e$l4wNmuL%o<)(cHeP1YAPDO&C50TZQwQD2HqqkT8?BMv(F*h zj+Hm+`{@||q<)1d^N;QI3h^8{lSW8t%~&Q5ZMk~BLmsm&wD=9ls7u8Cs_j~CNg`NN zk0KUSV%JpO;F0Y!=-;VOBjdjXeM z*>$U}0s>2`jxTn7ypV5I3+1EKU$`l4L9Dmj$u0g!x_qr-(I&aE!;Yb}YZDqpr*lC|+A zEr^SToE`ljLa95eT`9|SPJJf`jKhq`EXwMQxtV4W?3mGp3nq83`t*l;3@=sE>U0~n zDD~k+Ye5?+1Ua8?*$lXJSoGjb&Vzq@f(;`%b*~EtjZg`S<)-OeN`dg1)UUHTRkxVD zI$&r8b8|%9z*#c-9;tJi%74Fu(!c>sGa0A%H!KIo1-xF6)lll0SNJu5E>3*+YNk%H zF|#ZFjOt8-x8gQEI+|Oor-56`d4HgmGg# zUfSc*w{xg5K@T;Kh@mK5p!Jasv zdb(>4Y^cNcFkf?t1dG_VcPLzv+u zb`bGQD*AOqWOM6~NQf~5m0FEsE@&OvOg~v@?6=7T+Eh*>KCFMI!sPfGrig_Sf_^@7 z1cP~M$#`F6#M`9Q42^O+%6#M>@3rz++8Hv@s zn4}YQr2&am*IaAoZ7hGC@556N^a|9MoBYQBSuS;R08lcdJL!l&_@IQ)^#% z&fl9Z`&;Uv^)l7a3NV$qlV-ak=xMb0z<3opiL}IGGLKxn78zZvF1VCdf}fCTOv6D- zIO~P{`blck=$F?qDn7}#jSU}^iU-P`r1WeUk6H>DjUqv(X?uUWcC1i4FL-`z-&#iy zpPg!ZGay@ht(5bLoQvk~>O&MmJ7!TLoHrF#b?0DQ%AJ;-u;2|46(9oS`kgQNqV0cD zgoBffz{9?><2M*a(1q+YEUdAkv#O4#FjIAG86I7gfLSDrK{nXTJC&SC2bF2Ig}^p} z2nLEHc@sM{kpzDx{%<66^KhtI!l}JtMk?YSRBJMuf9dU=eXtB!zYxw%4v$lVAwB=O zbX?ZwC;Y3WX5up?1qNOVWnQbOgP^d|aY8y--b62+XZHT>Y9XuD4%R|w5()JlaR}yFH5(hl;rH*fMOg!9aS+*!{9J;BUNFUt7{b Lr6HI(5kM_CKN@Er delta 27 hcmZp9AadlA2;^o}2b2H+ diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index db2296df9..cc6c03096 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -242,6 +242,7 @@ namespace cryptonote ADD_CHECKPOINT2(2661600, "41c9060e8426012238e8a26da26fcb90797436896cc70886a894c2c560bcccf2", "0x2e0d87526ff161f"); ADD_CHECKPOINT2(2677000, "1b9fee6246eeb176bd17d637bf252e9af54a4218675f01b4449cc0901867f9eb", "0x2f165bc1a5163ba"); ADD_CHECKPOINT2(2706000, "d8eb144c5e1fe6b329ecc900ec95e7792fccff84175fb23a25ed59d7299a511c", "0x310f7d89372f705"); + ADD_CHECKPOINT2(2720000, "b19fb41dff15bd1016afbee9f8469f05aab715c9e5d1b974466a11fd58ecbb86", "0x3216b5851ddbb61"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index eee27987f..761680016 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -5604,7 +5604,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "a913c311ed4cbe42c5b36c13215021dd50705b17d03ddc2e637ab7e85b22ac89"; +static const char expected_block_hashes_hash[] = "52105e0e45013e4c6705d5b7902268f5989b6eea71f5a04160176297a79f4b32"; 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 a28be1a1d..e19d2ae53 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.18.1.1" +#define DEF_MONERO_VERSION "0.18.1.2" #define DEF_MONERO_RELEASE_NAME "Fluorine Fermi" #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG #define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@