From 32f701b0cd8a8045424f4434e6bb0ca288bf5818 Mon Sep 17 00:00:00 2001 From: selsta Date: Fri, 1 Aug 2025 17:25:46 +0200 Subject: [PATCH] build: prepare v0.18.4.2 --- README.md | 10 +++++----- contrib/gitian/DOCKRUN.md | 2 +- contrib/gitian/README.md | 2 +- src/blocks/checkpoints.dat | Bin 431364 -> 433476 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 03f8f15904..4ec6602bed 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.4.1 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm -| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.4.1 | forbid old v14 transaction format +| 2688888 | 2022-08-13 | v15 | v0.18.0.0 | v0.18.4.2 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm +| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.4.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.4.1 + git checkout v0.18.4.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.4.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.4.2'. If you don't care about the version and just want binaries from master, skip this step: ```bash - git checkout v0.18.4.1 + git checkout v0.18.4.2 ``` * If you are on a 64-bit system, run: diff --git a/contrib/gitian/DOCKRUN.md b/contrib/gitian/DOCKRUN.md index 85979c1d75..a35dd1b937 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.4.1 +VERSION=v0.18.4.2 ./dockrun.sh $VERSION ``` diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md index 4f454b5e43..918ba0f01d 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.4.1 +VERSION=v0.18.4.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 0a84c41085451ddff505a5e922ed50742b3092b4..9744c3fc32217e7f534e71f43ff42c316fc57172 100644 GIT binary patch delta 2159 zcmV-#2$1)Lsv5+)8Ub~I0fhkpg#iME0Rx2r1cdAJo(k6DL+k901MgGILe}N_!Lrml2jF3$H zYHZOM0isXPR;T7bzp>z(+H5zZhnBm?!xdo=?gP%jg`@FPs$A;Zj#>@*?S$PGN$oE@ z6Ua5d)UV$^DSswN6#PP<$TfAZHB+?~Qzt}hN5-)yLi$+WRt(NXsx3idUtQWSIY-Fd zdr4S+#NK@DiI3~(dV-faB`*2=-k$~!n@tCNhxyEi-pG5)49oX0JX@*c}Q zuzksSLJNiA%*(lGi7wAjptU1DPV6>^;5=yj4u97!E20Z_C|@n1cF&r!!x>g%RA~Ps znRXf1B*zBf0tJSrs{?7VR?8VIdnai+;j#rXfYX@G(C8Q#Ktgm$h?1pD-5y7&fX@4sPl~qn_R8#}Q<-#FVInQkV`J0P|A!X~> z7xtFCBW4!QZM6`-B<1>*Ql7g`_K%~#e1?zd`=E9Z46f%laTuPG4=+n(jf@Iskd*GF zM(yaa(rM2iO393@>%oh=(~Z1b@Tw?FcRnm7{iXPktxNA2&8)w);UgS7;k0mE7+( zI9<2w_YD~TTC_cu-k|2wTm}e9mJ7F=;efLR8U#I3%1fN5Xw~f)`xph4`zv2ytR68O zS+BRX$xK~FRaHHla0q&rHTZ)s$KAqV#lsn>Ipdll#mf5p0?u8mFA<0gt$&ij5QU0e zYN400A)-SBf0c-u>?x%N_z0=7h}{AB;4ov>VKRyj{n?sS9l8T2q;OWD6xe{jcwweZ zhGMwTI%m;Z9nWgY&KZs9!hGWlse{Rhg~L$Ke?6BEdot!{XrEtrLvCZ~L14?6^e>S2 z=g5OJ)c72oGBjIhgxXVn(tl{IkLr?S6*0pp`v1~-L>mB^7YTqxqi*n6oh02onW;#W z)94ZCtD$4q+}-bczUFSB;8pYc9I&`E?3mzkkh z=5AqCQ!h#=5%N8(c@9uU7XWw(Y8MH}7qH0^YU#d%rL~hkUhjM?`marl zPy|oTQxRSU45tbTZ+{580$!++;Z<|bzldf$HbARUzmfOVjVnmHDiogX{A=7JNhBEx zv6iO8N4lsCv=-w?cjw3y@6WQUcVbx48u#8^6XiXFn zm|~hBbScaR!2$l-z43`{C~C2sMsa*?kP$(qHrJ-Pu9NrbfO~#`ey~9Fh`LLIV#T{PAe<#3maRa{v%HP*}v<)na=e_^eVac zWAJ7Q`x9qmO|oG_lyZ`2O$@EaV|SH#lnSt{VIUhXcd3Q#wQp71pd`PV#8OA25|Gav zR`#QlYiCyp8qrT9-JxRoL2%J%So;-PP(*l-hbLliDSy8jrBhd{)3Et!dsh4JL3VdC z1yx{Vf02HXMg6)`9aC^xV@w=%M{GO})EWMiHR0F3wtxc~qF diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index e75369e143..0d9affba5e 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -253,6 +253,7 @@ namespace cryptonote ADD_CHECKPOINT2(3198000, "1d685b39be51e4e84e0af69fa78e023c7cb21de7d33acd012d0371d5f78712d5", "0x517d415fee3a816"); ADD_CHECKPOINT2(3375700, "96ef57b830ef7a7ccb61ada8595a4670765b6954d8cbf45c6cf583700a676302", "0x61209b7da8a0fa6"); ADD_CHECKPOINT2(3451000, "0cbc912e06e1adae11f6c9cb675d3159d225b4b04d4a6c61defe50ae1816dd60", "0x6aa5fc4226bab97"); + ADD_CHECKPOINT2(3468000, "c4024dbfa9d4b2e54ed129b413946d2d5af36eef5ab4a93abe5cb552de985f5a", "0x6d067f3e550a29b"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index d552a4d39f..d597edb250 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -5605,7 +5605,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "12b86a377b4d914182c382efc8b1c23bcf3b758434c47a88ac09f12f4576cd90"; +static const char expected_block_hashes_hash[] = "3d40f1bca1151ab8da423044b2809e2d1b5a68ed978c0e0434670ad4a1ec517b"; 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 12397c14cd..09b2f55336 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.4.1" +#define DEF_MONERO_VERSION "0.18.4.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@