From 309f6ba3f5bc0e6b39a0ba709d585a56113169dd Mon Sep 17 00:00:00 2001 From: selsta Date: Thu, 28 Jul 2022 23:14:02 +0200 Subject: [PATCH] build: prepare v0.18.1.0 --- README.md | 10 +++++----- contrib/gitian/DOCKRUN.md | 12 ++++++------ contrib/gitian/README.md | 2 +- src/blocks/checkpoints.dat | Bin 332676 -> 334596 bytes src/checkpoints/checkpoints.cpp | 1 + src/cryptonote_core/blockchain.cpp | 2 +- src/version.cpp.in | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 5609e0f03..6678a10a5 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.0.0 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm -| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.0.0 | forbid old v14 transaction format +| 2688888 | 2022-08-13 | v15 | v0.18.0.0 | v0.18.1.0 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm +| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.1.0 | 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. @@ -345,7 +345,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.0.0 + git checkout v0.18.1.0 ``` * Build: @@ -464,10 +464,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.0.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.1.0'. If you don't care about the version and just want binaries from master, skip this step: ```bash - git checkout v0.18.0.0 + git checkout v0.18.1.0 ``` * If you are on a 64-bit system, run: diff --git a/contrib/gitian/DOCKRUN.md b/contrib/gitian/DOCKRUN.md index 96998b1fe..69efeeea3 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 -./dockrun.sh v0.17.3.0 +./dockrun.sh v0.18.1.0 ``` The build should run to completion with no errors, and will display the SHA256 checksums @@ -78,7 +78,7 @@ e.g. ```bash # Run build processes with 8 threads -OPT="-j 8" ./dockrun.sh v0.17.3.0 +OPT="-j 8" ./dockrun.sh v0.18.1.0 ``` Post-build @@ -98,16 +98,16 @@ more builder/var/install-linux.log more builder/var/build-linux.log ``` -You can find the compiled archives inside of the container at the following directory (be sure to replace `v0.17.3.0` with the version being built): +You can find the compiled archives inside of the container at the following directory (be sure to replace `v0.18.1.0` with the version being built): ```bash docker exec -it gitrun /bin/bash -ls -la out/v0.17.3.0/ +ls -la out/v0.18.1.0/ ``` -To copy the compiled archives to the local host out of the Docker container, you can run the following (be sure to replace `v0.17.3.0` with the version being built): +To copy the compiled archives to the local host out of the Docker container, you can run the following (be sure to replace `v0.18.1.0` with the version being built): ```bash mkdir out -docker cp gitrun:/home/ubuntu/out/v0.17.3.0 out +docker cp gitrun:/home/ubuntu/out/v0.18.1.0 out ``` diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md index 5211b8409..87c9ead9c 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.0.0 +VERSION=v0.18.1.0 ``` 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 2ed1d630fc7f48eeb4b1be949ae2bbfc8dd383a8..f0a0dbb35b068b86cfcaa2a2eee60202036e1b82 100644 GIT binary patch delta 1963 zcmV;c2UPfkrxb*?6aj330fhkpg#iME0Rx2r1hoMLgA;!t5-4U^L+vC*d{EJ*K$!(f zCwZu;j!ZJzQ4Pz2zT9snj^7vHeD`{tXc-!$i<7l-;3*hUB!0@+`FeZ2)9aOSPUK1E z9HCTnAqc=f_Fk_KLd}-`;3y|&opv0gJPo-&Hf&4$g$Dn0Bm?n>8lbc2=6n!ItITRm z9Z9x*i6MU^7aq#(`Jf(AogFng@((=D`(F_?Ky|?oc0p_OE*2JGy?fc`KbfUo&ceW? zTIJmf?Cf^Gylk5C0#L}8Z!v~o2KVGN9A@KE%M|EH*15%M`H8KgDGVO>O^?OB((v=LZp9r+a(y+oPE_E>ye5HH`}B zT@`=T!$W|!fp#az-ccG3`I);sv3Alr;0f9d?}Cg$yStjsZWN6oAms|NOKTrah8epC z46^VZ{%bu%g3G|NpC1m;L?GO17crNi(MmV)hncYZ#7u&16mzqnmlB&DzC&OfG}=AR z(Wp!JyyU3i$HI$>^Kt`fHc{Vc+{W#bP|$w_e9FlZ@@lb^8u6r#sV+ltvh>2VFl-$R zY)A257Wh^xpDx5yAp$6hdkhB19xgz+uKcGzcEw!$nI2(EY$gc8c(5 zIk}cs(2z2It7j%+IVq|Pnd1gr2okk+Q@A>FYhu(HBRuHX&FT)_OmnSo?Ujf$gx!Di z_~-r6pZP6=Y&yg69%IaY+$SvDVilifmBn6e8Lq4)J?e@Zy$$Wui=&kETc$|zT4H_N ze12VkcQ)RVEfJMh%WFKq+t0MV>SSz*IN*O#t$)dip11U6Iuu>`jp74)qVS*+;}0pD zKF;P0jo^KM7Rc)9U@LfRm@+KUs_1_y`1>@CQ+Q!2+Bvk?RJB3XnPVgvn>T4* zIXL+d)3wc;)X}vWI@FzBh-H_HF`o|^RGW214q+Z4ojVZ-?q^ImtC>1?G~5Q61IA2& zU(xduS3X$ho8b3LGi1c^Tn++wmSrOea41wHmBnvAQ&@Q+m*H^O?hLPn#{Yj#N}2E9 z4Nrz^yr%NWj&4v3p9WDkpTakptJ1AIFvXojfGl;YXKLVSuil9WIPvdikraRX3Cz(1 zyBl>ChiuQ!Q2D;jj9JT)B0dQTQn6vKxYuqrnQn)5<}oHw1ZW_fMe6c{?vnG#yW|T^ zh1Km$_v*`|1T#P0Qan$z(;t70C}28LZBplGv~d?TM}CGY6eW|_lPbuK%RP8oe_fvJ z>bzKIo||qWdrO6O<2kel&C;?sJPr6Pt{>H~xLc_CzEpbj!C_H~GM|qMt&1DgD}vgs z`oS0``?3{sN}KqehkI->rr&%p;2$=BL0$ufB>b8@(ss&RgvlJG$cBF>0cK^C446hI z6G_-n5_$RB*&BaIX#DiSe~Qq&1a__UIDWNj$H{>Kb6a3jM7&-CqMG3S3iO?~6;wPuM_(zKglZVQ4q z+zK=fK&w0?6MS_d={2B*4V~g+BYN-z(WLeexKQntL{|zt*Q&eP6W& z7Uiw83fb~$GDA9R_xl5e7P2`3?2B`$5cqn&+Fg7-NEVI2pla2lxeo`AY0{;-f4i9b z5bJ;{KcC;mMsQT*Xk+y-m#{kv*lAXt@a&bS=J1nR`5Qu>eK3{TAGy;~PK z(pu~sokPQ_)u3??5qSG@H!VP4odquh`yM+N>z_c9=iz@^I9P5QNdQu*(njbplFJ=6 zu)+x?I_)HFUtKS+Qy|{2gg(l(%kS&(T~h-rp#Hp<#S`u@0~!H>(OOP>g7jjnj1nRy z`0o5Nxb>sH4YyTNeQL#+2&gv*SnD#lu&c^Bb$?KIzC-{3 delta 27 hcmZqKCepH8gwd~&v6T^sm|7W`TNzolGO{)c0|0KB2GRfk diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index 330e3653c..6be80dbbd 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -240,6 +240,7 @@ namespace cryptonote ADD_CHECKPOINT2(2092500, "c4e00820c9c7989b49153d5e90ae095a18a11d990e82fcc3be54e6ed785472b5", "0xb4e585a31369cb"); ADD_CHECKPOINT2(2182500, "0d22b5f81982eff21d094af9e821dc2007e6342069e3b1a37b15d97646353124", "0xead4a874083492"); ADD_CHECKPOINT2(2661600, "41c9060e8426012238e8a26da26fcb90797436896cc70886a894c2c560bcccf2", "0x2e0d87526ff161f"); + ADD_CHECKPOINT2(2677000, "1b9fee6246eeb176bd17d637bf252e9af54a4218675f01b4449cc0901867f9eb", "0x2f165bc1a5163ba"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index c37dfe9e7..e0cd8e899 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[] = "e9371004b9f6be59921b27bc81e28b4715845ade1c6d16891d5c455f72e21365"; +static const char expected_block_hashes_hash[] = "a8b24ef4eeea7241b374d4526a3f7c351b53abe7006a3d7eee02ce0af2cc6d66"; 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 c6d473bf9..91fdc9902 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.0.0" +#define DEF_MONERO_VERSION "0.18.1.0" #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@