From f65197d73e0abf82fbf5e4bdb69ec27c749f0800 Mon Sep 17 00:00:00 2001 From: wowario Date: Wed, 14 Apr 2021 17:11:13 +0300 Subject: [PATCH 1/2] bumb version --- README.md | 2 +- src/version.cpp.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 166187e30..2a27e4685 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ Dates are provided in the format YYYY-MM-DD. | 114,969 | 2019-06-14 | F For Fappening | v0.6.1.0 | v0.6.1.2 | RandomWOW, new block weight algorithm, slightly more efficient RingCT format | 160,777 | 2019-11-20 | Gaping Goatse | v0.7.0.0 | v0.7.1.0 | Only allow >= 2 outputs, change to the block median used to calculate penalty, rct sigs in coinbase forbidden, 4 unlock time as protocol rule | - | 2020-06-28 | Hallucinogenic Hypnotoad | v0.8.0.0 | v0.8.0.2 | Dandelion++ support -| 253,999 | 2020-10-09 | Illiterate Illuminati | v0.9.0.0 | v0.9.2.2 | Dynamic coinbase unlock (up to 1 mo.), Deterministic unlock times, Enforce maximum coinbase amount, show_qr_code wallet command, CLSAG +| 253,999 | 2020-10-09 | Illiterate Illuminati | v0.9.0.0 | v0.9.3.1 | Dynamic coinbase unlock (up to 1 mo.), Deterministic unlock times, Enforce maximum coinbase amount, show_qr_code wallet command, CLSAG X's indicate that these details have not been determined as of commit date. diff --git a/src/version.cpp.in b/src/version.cpp.in index 0aa916998..1c8ba9527 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.9.2.2" +#define DEF_MONERO_VERSION "0.9.3.1" #define DEF_MONERO_RELEASE_NAME "Illiterate Illuminati" #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG #define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@ From a5f901b46f49642585a12b55d7c12ceaa61ddf88 Mon Sep 17 00:00:00 2001 From: wowario Date: Wed, 14 Apr 2021 17:58:03 +0300 Subject: [PATCH 2/2] update checkpoints --- src/blocks/checkpoints.dat | Bin 35332 -> 38468 bytes src/checkpoints/checkpoints.cpp | 2 ++ src/cryptonote_core/blockchain.cpp | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat index a91014e1175109b3ccbf4eba7e932a9cf7cb9159..15eb07e9de8125cfef1f52ba6cb1682dac35fbdc 100644 GIT binary patch delta 3173 zcmV-r44U(Vlmf)80s&dE0RxJEy9Hpl>i#+vRh{-=)|IptjXPe4lJ1(KK~;jwG$ubn z^;tVJdH-F9;ZTCL&4@yL-n1oWlVdU;b!-z#i~F?vyKM(wXMN__j?1fm2(wk z0aC345fryTJ8+hoo1_Ka#YUZdAW|3^*M?VHkPD)>((uDlEh0@p?L%P;#4SUc3H|_~ zo)Da|vwaY4o(`g8ELJS+ofSG2yOv1AE1Z*KAI7DX@&`N++Xt;q2Noi=N|Bzmi%5bugU5afp=LBKD-%u@-^uPeYJdDNrWiX@q|LUgQ6%Of z%z?xrxRBMJrxV>{1%pqb(0K*~J}3@XK4Jz=eeC__%CXwA!ezkX-xyE|NOw5X^cFcRBb)-&M8cKv`3W!lg-egHQI z;kTM<7YLd|ExQHEz36v$2BkCyzF<;#Ytn|~$q*wb1Iyf#q_gnZ3=Xrfq1v!x z>dpqkm@D))Epl$+Jmen%r&~h(WTYvhucg-hwY!oOLlzuDT<8Xk=UFvbrN#gjfSs^^ z6?Q$AV^uBUm78g0Jrf$M-1Cw^2H~xDfTYFh$GN#U`BCRmvy3Qz%Qm~RrDf%7pKF#$ z5;|EqUWN50X|w9O7K0PADKRO&`Qf+As$$@`FryhEM-Z2!hc?)`e%-#!mPIB!rny89 zdX`D}U|b0S>bati)8kmrJ1s2U8r~Lvs$*wWod=k@>3=v6*0r4R#j;zIi{D)Xd8!K3 z0Vq2P9~F%~jLpkEcQ39cL7H=TdE4PG5YUlKw6)Acg~ZQ?cM-FOi(R6`XX){U-6_ns*d&?ZtPB>0q|2Cn#;zzf?te(2+pqZ<3D@eD2N=4JVWKT;z?D8{nQmk)kS5+R+uxH&dpE@ zXWH@=rz&q<<#y4Q5?MF&7Pq`K6sh$<5fz7^pXu(uK%!Gbm4T^*UY^^Q3L2}GaD2%? z8cG_nijfcg**rsng9NxrEf(JI<({MR)$Uk>UxAb^jUFm_jDvK4KKkd)Sf5!*rpAT^ z${QuwATPj^#EReeGvpB+SIw|AdPb|wdCZaPQ71eyCz^4Y3t=0b{tq=;$=4TA{>^D< zG7jybtT^5-+)3GgymyKA;$`TLb9~YBbVv-G%i92jDy{4oPiJ~P-k@DW)aufZ#`bB@ zwHsJlC0sXxpjyCxNj*|2suMH}^N5aEjyxwRK^zI>fbq}KZj|<(Q;Kj#fetmbo6(ZY ztv}uE^_20rD;|K~VF#6}sMI7u@Ff8NfJb2aAfC6YxY|b3WA41=+X+f+7xX1=yrUH; zQ~cf6R2*?|@6P3vR>3?hpJ$XvabN*xFA4q~v2``!Fwstb9{mMV@hK^B>R)r`cMcM( z?ZS20jA*qV9H_JU-r&lWALS}+?`g**CQ^gP{aIg@7(je-9Y3f3Y*!l3>Js;ZI%JT0 zo-TId*FB{%iGfr5YAKz|C~I-_6@#$lfo$DxvH_3=I? z0!Ykzbq~_3YBwj)G8?B^EuZ4m^Rmc9;kVAm;gFZY_uE1@@B5a4+Y-<9ekHoUWrd6<7 zPQ{-sBjntjXTYr2qM8>~)Cy9yhe0@^xn1XHRiV|}re={5rtKit1SU#wg(b{$ECbBH z)r4Swiad~JBN}Z9vX z&upc34I2Z&qLMwjAV7`;5bELXic#Vv1gU?Il>BZGm8|_yj(vZfjXKdWV_(G^xC8-4 zL&6jxL*Nh;B0PR%1^4d`{-0#cC+Ye)D}I!J0%N2Nm#42QFnMwE;QxDoA5G)a7eRYyhyT`5>Y_=LO|pAE%- z1|j0nm#ZQw5#B8FfBOd~SiUnvZk8n_*F*I!`gEqiofUf8MSvPlmGqiQ1y-PpotK@~ zl}AR}CyHc%L z{?hyt3fo#y9Nf+Xw6FDBks8jRK;^(dxJDgGHd+jJ{0nPSW_M;Zl3yZI#IWLV%mjxq L&!w!RR69xDU& diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index 3c3c892c6..a3e5761d8 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -217,6 +217,8 @@ namespace cryptonote ADD_CHECKPOINT2(271600, "9597cdbdc52ca57d7dbd8f9c0a23a73194ef2ebbcfdc75c21992672706108d43", "0x1e2d2d6a2a9e8"); ADD_CHECKPOINT2(278300, "b10dcdf7a51651f60fbcc0447409773eef1458d2c706d9a61daf467571ac19c9", "0x20a83a16d3968"); ADD_CHECKPOINT2(282700, "79c06cafd7cb5f76bcebbf8f1ae16203bb41fd75b284bcd0eb0b457991ab7d4a", "0x22e3baf142de8"); + ADD_CHECKPOINT2(307692, "d822cd72037f62824ec87c9dc11768b45dc2632f697fa372e1885789c90f37fc", "0x305e124633878"); // low has block (Difficulty: 1890000), reason why careful people have audits + ADD_CHECKPOINT2(307800, "3594894b4231cfdfe911afed6552f9fb4cfe6048bacd0973a3a98623ec8548ce", "0x308b305ca7618"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 91ab77f04..e067f2dde 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -5460,7 +5460,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "cd0bfa35324c7486bf92d6d1058ad95df89f6c186dabd652e53a560ee5863b06"; +static const char expected_block_hashes_hash[] = "392961db5c3578616c40283e5469f5fae7f628a0b4a13c87db9339cad35f8e53"; void Blockchain::load_compiled_in_block_hashes(const GetCheckpointsCallback& get_checkpoints) { if (get_checkpoints == nullptr || !m_fast_sync)