From 97e3ce5f1838459969121287f53fd48724312004 Mon Sep 17 00:00:00 2001 From: selsta Date: Mon, 11 Mar 2024 15:13:49 +0100 Subject: [PATCH] build: prepare v0.18.3.3 --- README.md | 10 +++++----- contrib/gitian/DOCKRUN.md | 2 +- contrib/gitian/README.md | 2 +- src/blocks/checkpoints.dat | Bin 385988 -> 387844 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 665c2dd8c..8d84c8149 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.3.2 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm -| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.3.2 | forbid old v14 transaction format +| 2688888 | 2022-08-13 | v15 | v0.18.0.0 | v0.18.3.3 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm +| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.3.3 | 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.3.2 + git checkout v0.18.3.3 ``` * 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.3.2'. 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.3.3'. If you don't care about the version and just want binaries from master, skip this step: ```bash - git checkout v0.18.3.2 + git checkout v0.18.3.3 ``` * If you are on a 64-bit system, run: diff --git a/contrib/gitian/DOCKRUN.md b/contrib/gitian/DOCKRUN.md index ef302c1e5..7994d39cc 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.3.2 +VERSION=v0.18.3.3 ./dockrun.sh $VERSION ``` diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md index 37346006a..6a97cbccb 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.3.2 +VERSION=v0.18.3.3 ``` 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 d304c30deee262ff4e944836cc2e52a54e675f97..2dc9ce3b3b822affba9cf9220d2b9fdd784ace42 100644 GIT binary patch delta 1898 zcmV-w2bK85#}|aw7Xhq+0fhkpg#iME0Rx2r1hoML!{dLF7;gMp%v=RUkx|dUMev!| z33HXJ@tU)qrU%;2D5>WS033{*&g2GWI;-zM>0W zyfnNE?-YOJ1H@VPGyeW#f&Du@6RLlOjO`jVESeR+2-hmg@}=J_kfY*)-t5Wj90J8{ zf0cO5GwChe5!!!)MXH{(>gUpbYZ7(SX5iRC) z{wL4547L*bmg?k%R#RxnD`L?=*rb%GZBupy_AGyg81e_HGN=l73fU?2+yElt=X<75 zS5ujW`?`Pmw0r+IQK(I@4`4F(J|W|R9CX{?1caIZt^QrXy|{ukP<0{UYy6Pxva5Fl z!#FjrVn$?L&|v{3UpH1O@InSk5V{o{TQLxQ?-`g#Uc^9pxN*UQ_5^IN^r?t# zBOrg(;4CRSp_<6yvu*grgWL1#!MSr-4A=nmbQ)KG-d+3l7w?u{TG?Z^auaM(xi@TN z$aaEsqp6nrDA=u?%-iD-;_q#uQt&z0JYT=n1B!3>$!y{aF!NqK_jPk1=?W_Rov+dE z+)Kx{&YaH;>X+=4Z5}P(<{J5_FJN^`wBCPiqN_G|^b*t~!iZLAhdsHXq*An8-GHd! zfeGE$)9EUJU-6JDkh)|Y$s+jya+X=Rki$>c{Kgus5OPb5GD{Bg;6W8S=p(! zX1p_Efj=i}eOVvcQSPDG(pg~;q7P*)2;R8cBPf_A|4B%$_}hO0APff~l}dBR%vHAwQ2yL*$!sU^)VF6CC@cRW^2flXYvoqo<`qQDV%@F(=GYZ zt7c^yLSBTMW%sK6wcUT1mR)b0DhLm|B^!b*KI3;AAX(5xlwAL6uddC*!=!k8V_~DZ zhVfUO>Re-QQNR5E10)6*A9+U^c+pLDG`t70sjf*>(jVx`yY%!{y|vovdq7yeJCTsp zX$UJdhJ(N|I0K=*8?&($|2}`OYEs}J(YiTrLJ*{J6V;Dj8?Qnp#Bw&(cs*ckm`t>k z8O_7WVYh~#d-2~WUr&&;k*7;7(Xp;JI9KICy#VUE7r#>`hlLPBX_%fraF^(B$eVXr zpa#HWG4jZJ#^x`j^ge@>rhGkl?xeszrQQYU3+KRx-8an_W(5;TFXDf0QWgwFwQue! zgs4!3Coq$pY=WVBI7cM;$ngL64~nKU2}8a`hn{96aee;{Vu`DIw-L>Y3N}|x-f-xa zrWnyvuW26fE1Y^qwy4qtoGFn@IVnB7#45gD0W^bC^P^(WAxDoON_JA4HkL;j6Y;uO-kiOpCZ++DIB=mp&xF z&Xi@wEGz)bUuKO{$Q`4#9z~yyYHcVYu+dP-;q^`9Zn4OrJyhy+RR0rq&#iY!Y35vh z#CsN9<1@Dg3&|C9kgFDEM^7V12~OM-^(OW(1LDuU+=Kw+6B~(y`t`W%lOFRS--Y1G z$OEdhSEj&N4B3CX%?3?vv!Z*tVk=X&YVJ`k7^hWsK{1?G<>)|>8%-;h%sTM4*(DE8 zUbbM;evoZ*K?Bip5CJAICmcv6tWfsDD}2zv@Cr@S1=ON@B}_oS^xT(nURL&dpHzH1 znq2_i{_ST3-i9Da_$XqBqD5FGUlD5JBsP@Z^K40=ty6zgbm~DCns!085P(=bP{0X8 z`63qTd&}zrRLCUyKltICZopJJiIFjBo#i2Ven^ddrEzZrs_&}9XXT0`SY-oN9XjuF z!VJ!enmQrcjriVov3hF{?(oSPXVGK;1-Vp{9&`m9mQOXG_#qR%TeML50zJP@LoNzH z;jj`2`CU#>*eS783iEf>a9wBVU8nD!xf4!M#0a-UoDTLN@tof=bGAMD8i5tv2_B-> kSw=%M9Wn?}47yyB)2&n)7 diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index c8cfb1289..07f13656b 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -249,6 +249,7 @@ namespace cryptonote ADD_CHECKPOINT2(2971000, "3d4cac5ac515eeabd18769ab943af85f36db51d28720def0d0e6effc2c8f5ce3", "0x436e532738b8b5b"); ADD_CHECKPOINT2(2985000, "08f5e6b7301c1b6ed88268a28f8677a06e8ff943b3f9e48d3080f71f9c134bfb", "0x444b7b42a633c96"); ADD_CHECKPOINT2(3088000, "bddf8ca09110d33d6d497f13a113630c2b6af1c84d4f3a6f35cb1446f2604ade", "0x4aed3615c2f8c3e"); + ADD_CHECKPOINT2(3102800, "083f4a34f9490403b564286e7f13fd1ed45c52c86fa47195f151594e5bc87504", "0x4bbed52d4da5dfb"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index c29520a1e..104c26977 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -5552,7 +5552,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "374d836b26c46b9d8fdbc977da7a89a43c2eefb65659901ee4d0053d302e1468"; +static const char expected_block_hashes_hash[] = "0046a0019beb6e697e27d834d6127851425f7ee09bfb8e9f8df7b1420131aca8"; 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 f4bb1779f..ac6ebaa89 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.3.2" +#define DEF_MONERO_VERSION "0.18.3.3" #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@