From fbcd8da082fe9b7f4d1b771b392e6a0e8654e7fb Mon Sep 17 00:00:00 2001 From: selsta Date: Mon, 2 Oct 2023 12:59:37 +0200 Subject: [PATCH] build: prepare v0.18.3.1 --- README.md | 10 +++++----- contrib/gitian/DOCKRUN.md | 2 +- contrib/gitian/README.md | 2 +- src/blocks/checkpoints.dat | Bin 371332 -> 373124 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 7a7e3f135..bf8bbae75 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.0 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm -| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.3.0 | forbid old v14 transaction format +| 2688888 | 2022-08-13 | v15 | v0.18.0.0 | v0.18.3.1 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm +| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.3.1 | 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.0 + git checkout v0.18.3.1 ``` * 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.0'. 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.1'. If you don't care about the version and just want binaries from master, skip this step: ```bash - git checkout v0.18.3.0 + git checkout v0.18.3.1 ``` * If you are on a 64-bit system, run: diff --git a/contrib/gitian/DOCKRUN.md b/contrib/gitian/DOCKRUN.md index 5712db886..5e5092507 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.0 +VERSION=v0.18.3.1 ./dockrun.sh $VERSION ``` diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md index fc175e9d3..d5f6ba0e0 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.0 +VERSION=v0.18.3.1 ``` 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 8840ae19e953e65164566fa864c57adbe829bf37..bb6f9b4215fc71481a1677b9e7fdf0f7b794a286 100644 GIT binary patch delta 1834 zcmV+_2i5q5)fR-~76HbA0fhkpg#iME0Rx2r1hoMLgQ|b}Ark(WVKq*cR;A3BN@8|> znazXj0+9|w7YhLBXljnC=gM#%by3PUwWNuD_SR!T0ftHV*0Al};{8Pc2#UhGAKa=eJ3(@))lyzB zv=~;Gun>PQw+`RrS~Vt^33 z9Y-gIwAoDcvja6{Uk7UbyjW~7`9gm8vdPzt4fF*iSP0L8C@FUhH zKklR1AA1v{50b(R>@|6Lz>x>fP_>kGP?Lx^fFgft1+djKDLNb}7bRY)m9{ApW>fi= zx6P5iy{PVW>Wam>=06Vekhd~F)_w-{SWl440g^*C|4Qa`M+09<=$L&y9GNe^Hqi!d zr6HYhF?I0l#N(SjvVDH|2f1D$&7|skU`w9Kexlx|viO%QF?;FoQ2R+q0{1~G*6LQ^ zmYIKzz7+IB4BrOF|EbXr)2L5@P~{zy?e~*wtwn~_kCb zOm3La6G8cGJE26bRq5s~yYkh|6D8qp^!Lm@ML2d|JMpy9B+6Soiz_5cxrB(UVYCWMrwI?cXn(7Yg4-MwT)CJXd? zYsxr9OY1S+|x3VruPtrt$Ke6KetE_fCrho>8uFId`js2q#Gi$lS14(12%!fz>gaPD#tuRr^VK z%7x}+G?;)uw-Blf@WSe09DpFoxWS+03^5;Ji;5sZxH4_#ZhiGzm1I%84uWYp>tuTo zmtoQ9b>~)Z2!unvW>*09I%6*t<57RA4Fu`E5~5SaBTG+J)vBn7Y0T1^8b2aAvK4Q= zcyJOPgET_q*#O#X-n5}T`@&*;y4I8qB+0Sw( zv-fBDRR*^kUPaGPh%o=%OEeT%vAR=9nzj`v+sA(*xd&2GRO&zu)}>mKb{dT?u6yn} zH#3}1V*(`VCm^Sxp%N;P=xomZCLPYMZ?psv_7;8Uss`BU1F0gn>JKmh8qAF`pe8~4 z#Z{el92>9q{YPDbvUYctnh1Ys7uL8K|BQlHIuLtdu|dP0UXU@xk^IUG)%G`7$hrqo z=g~(xw^@v57_|{~VuvMFPrtslgUR^Y!6N5#3)X>#9Wpe0g#o{^MZ#oJQX2!Qh$Q0q z#u>0)butXazjBpWAKUr)xXY0^QGm0h-2~fAZl6tlJhQoegG9na`APd=T0#5|Pf% zXa{Sk{m14^9msnwdx|z0oZEiZWr$6R*f{i42|P3jQy4 zy*ecgEBVn-t z+-R!{PRPa~2As1G$K*tCIJaK0&BwmAbyPbbglK?lRN`phtbmfctNIB?7-Oqk|1ad$ z*m_)Gi^PB#~X1vX_4K?1!qE^hnGA92tq7_)ud9uwxNH=_?=fvO(B2%NF_MI zG-p~t(9yU64u?I?na%Np>Nl%&tWKc3m^I3}d%m*<=_JM|`=I7$)iL0@T#1FzrzsP} zjE1k}lGaYqs=dJ4ln3-X?)h-9io_M!P-jM{4$bVeFXv;(#`C;;CWVr7J>65Y>r}AG zHO-qHrXDTXEZ%>@P!QTPjJ(J9X#yd#sX)tFN3zyQ6OXmG(<~8Ky7C^>qUwCb4CE3y z6VV|Vix+%d7^hsOwla3y2ojco#*#AWkD`Q)EHktY0Wyo{zfi@@VnC)}HM!k|Gi`iY zB#SYmPNjY2y7FBEony}pW$=ZnrI#2~==)=FLpy4Fn+a delta 27 hcmZp9EY@;WjB!;XV=E&NF|{%>w=%M9Wn^t$1pt3?2qXXi diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index 2d36cdf89..fe1508e21 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -247,6 +247,7 @@ namespace cryptonote ADD_CHECKPOINT2(2844000, "28fc7b446dfef5b469f5778eb72ddf32a307a5f5a9823d1c394e772349e05d40", "0x3af384ec0e97d12"); ADD_CHECKPOINT2(2851000, "5bf0e47fc782263191a33f63a67db6c711781dc2a3c442e17ed901ec401be5c9", "0x3b6cd8a8ed610e8"); ADD_CHECKPOINT2(2971000, "3d4cac5ac515eeabd18769ab943af85f36db51d28720def0d0e6effc2c8f5ce3", "0x436e532738b8b5b"); + ADD_CHECKPOINT2(2985000, "08f5e6b7301c1b6ed88268a28f8677a06e8ff943b3f9e48d3080f71f9c134bfb", "0x444b7b42a633c96"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 54ee3b088..5d85379a5 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -5582,7 +5582,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "10b24cd1f61aeb4b07a0569af6b80db91d58f12bdc93cd4711e52a1410c7b5f5"; +static const char expected_block_hashes_hash[] = "bc9c91329af96137390d9c709fa3cecc924f1b25dadb7589f0d751cd93f3cc39"; 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 d76979550..c93430003 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.0" +#define DEF_MONERO_VERSION "0.18.3.1" #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@