From 4f1262bae9a02201b7ac91893dd4bb68dfb82b37 Mon Sep 17 00:00:00 2001 From: selsta Date: Mon, 27 Mar 2023 18:52:04 +0200 Subject: [PATCH] build: prepare v0.18.2.2 --- README.md | 10 +++++----- contrib/gitian/DOCKRUN.md | 2 +- contrib/gitian/README.md | 2 +- src/blocks/checkpoints.dat | Bin 355460 -> 356356 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 7e2e2b1304c..9acea573ac4 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.2.1 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm -| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.2.1 | forbid old v14 transaction format +| 2688888 | 2022-08-13 | v15 | v0.18.0.0 | v0.18.2.2 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm +| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.2.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.2.1 + git checkout v0.18.2.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.2.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.2.2'. If you don't care about the version and just want binaries from master, skip this step: ```bash - git checkout v0.18.2.1 + git checkout v0.18.2.2 ``` * If you are on a 64-bit system, run: diff --git a/contrib/gitian/DOCKRUN.md b/contrib/gitian/DOCKRUN.md index dc58caada30..d8cf8222ebe 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.2.1 +VERSION=v0.18.2.2 ./dockrun.sh $VERSION ``` diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md index 22d59697ec2..153af75416d 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.2.1 +VERSION=v0.18.2.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 e401c61d8964887a539f64af1dbf233cc8bf8a2c..eb3a40fa22389bf4f3c7bdfccd7f03f869b60a6d 100644 GIT binary patch delta 931 zcmV;U16=%s*%gG~6#>A30fhkpg#iME0Rx2r1hoMLgKU31KO#rz9hUX#pT3>R?QDfJ zeCSnY7tJa5UHXnj8eD|D^B>xcyZC{WAEvmQi>HuS#3cWCiNF!fRe88$M2^&p)7Vc8IFCd+HZ2h-d@g8>p*$t-)= zENn`vbzOh4Oot(*3n*c-HmLxPqW>tnFI8`0S|>`037lL)cm;0jC2z}CjH~>nCLH~JLbgauySqGvg7G-Z^W{k|qHXH_{_ShXwi5k++ zB)%%jy@32MJ3p5jEO{sJq9Z?v$u$m4bg53X#OQwn#8-RoY8D<|-Uh=j+4p77?_(Cj zvukK4S0*B=APy7b)Yf>+f5g7gPU}A%4{P*1X79I8fFG*Zeqlj9@~8GM3VJQdJb|=L zxAIxpQ%iOdqiw$+vZSm02A4^XmZ8-)+W&<5UcJL+o&#ljQME6{k{yb!%k)WJpm6^CJ$vP{wnBhwfANhQdIvq7Rf1N*lV=W~sXReL|J^cp8--94{ zm6Nin;Va3Jc4PWv_{>jmydG!^!LFSh41j<7C^`^^vk`@=fQwFrW(rfIGw8V$%MlH0 zBV1z`3!RrI6%RU*Hxe-Bn@`SMXXKNYC3KftHDoj{>K9)>v0$8OJ-^F1oYpO~b4-~9 z;>in%sKSqch%+CEWK`Y&Ad1E^ViMPw{SO%!I6t*MZvQ()G9Vx0mWN}~A`9uz9ru5O zn@a$A6e0oda-^N%YA8EbI)0ujRIfJP#$*MPMU;TIBT^c8)Ia&@BGE}=puTQR?@G{lk1Kc0pVmK?JEpZ-#GPeu!<^oAC- zNg`=I7Oh3pIcbrg$zTS9sd1~AVvK(a0kJ$7o7o2Er=IVB*YqEK0}9CJn5Iz+_K1 FgbC?}wDkZ0 delta 27 hcmZp9Alhw=%M9Wn^v60RVrq2kig= diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index 7a4ac44f491..507e807e2ad 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -245,6 +245,7 @@ namespace cryptonote ADD_CHECKPOINT2(2720000, "b19fb41dff15bd1016afbee9f8469f05aab715c9e5d1b974466a11fd58ecbb86", "0x3216b5851ddbb61"); ADD_CHECKPOINT2(2817000, "39726d19ccaac01d150bec827b877ffae710b516bd633503662036ef4422e577", "0x3900669561954c1"); ADD_CHECKPOINT2(2844000, "28fc7b446dfef5b469f5778eb72ddf32a307a5f5a9823d1c394e772349e05d40", "0x3af384ec0e97d12"); + ADD_CHECKPOINT2(2851000, "5bf0e47fc782263191a33f63a67db6c711781dc2a3c442e17ed901ec401be5c9", "0x3b6cd8a8ed610e8"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 772d86953cb..6329718c52a 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[] = "af0467d5d8ac1ad7232ebfd8610ec775df3438cc3b7e8033c10ad71874b72e15"; +static const char expected_block_hashes_hash[] = "2c95b5af1f3ee41893ae0c585fd59207a40f28ed4addbaad64a46a39b82955e7"; 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 9702a14cef6..76cae29eba1 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.2.1" +#define DEF_MONERO_VERSION "0.18.2.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@