From c3137f76951d21e860c3a039e77c17baef6dd7d0 Mon Sep 17 00:00:00 2001 From: wowario Date: Thu, 10 Dec 2020 09:28:54 +0300 Subject: [PATCH] update checkpoints, bump version --- README.md | 2 +- src/blocks/checkpoints.dat | Bin 32068 -> 33924 bytes src/checkpoints/checkpoints.cpp | 3 ++- src/cryptonote_core/blockchain.cpp | 2 +- src/version.cpp.in | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ee37bbcc0..ad46a2e62 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,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.1.0 | 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.2.0 | 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/blocks/checkpoints.dat b/src/blocks/checkpoints.dat index b2101a86ce063053f2e4fc4747403af97fc2df00..59a9eb79744c15840c6d2f8d7e5a79fa55a37a94 100644 GIT binary patch delta 1884 zcmV-i2c!7J`T>NA0s;~Ou>wMUe-4`UzD2BLDQlRK*cE1LIWf168eJO$JO55;_*Mg9 zT55LK7UAd0ImfBq+m}kMFp`3OYRHSRAROQ^_0pbQTyc$Vq%yOh2>Wc@}9vf2rW3voN~1 z;KYtUGxa=dmto8`s8X`ZIZJ$${DtX%!VMck(k(=^-QoHGpj586Lv`-n0&@r!(-70u zYl{yOr#*`KpW0lN(DA;A<7q2{OGjjs8i3Ii%J#*hwpx?aAk1et`*&#ELD7gg=%sBt znjXJJLHh_HfTO1)U>Sv^e^DrfNI-p%nu32BSEv}w{o!Wj_0rY(@glf}z#fDXv7FG7 z!EArk?@1JZ-x=$0A&qxye)~>Ce~QG1%*OW!CA(tR(}T}PqBH6{bs~ROFDtYeCgeP0 zO&bO#vFHv`r~T?7g|Ht=$*^Tba}diJT%k-x9<5<`xh|`|@0XInf7~$PPC3G&4lP_A zKH(q7-@1UQ#&wJc&O_N>EN?%Ro<89lffBW38PSV!Q_4u!GqUkdKdQrCG91et?)r&p zbk5r=Ql_fwlUP$_I*x%1^I!R8C(W}vyDsTB-ZBX|Wf*k}{m`;V^XX^_3n1XkAW;1f zgSyYR(*8V95@I!Wf1OOM0=|Q1K??JQ9m-vEc}DMMtcVqx@oPa}?xI`xj%xj%(NBV{ zrULwBfnZ#*=EQYcRhuEu_x2e3EcP2HnfBf-D7VA8sNF&bEh<I)dFai}pZ&4Axe@LFFhx>Ock~S+X3r>+n8f!mc!_&pF-7CMVFtXoAOSw~I2;ZRP zE!q&2g=nwQA2Y?@l6kWPje;{G2)rfsprQ>xOLvr?%oAGlI zs$_TAB)+;T~&-*E>-OZDu01G8)KEFcCQLJhe@V3uv(^Wq5li> zFQqE^x>@&nn)!DU5G}gcL9Wf|z~m>-tYLTw&)TCD;DEqjT);im_p5Y4_>}F9afzCYqNrIQGQiS!{IxzMt&k#UylwG}0i|B>UU*g&c=r_Husm(tu7M<7BMODe}stt(4e;Oj^2wAP(1i@l!K0={=cM{weZz@ z7D|lbob=vl2RXaaAarjem_=hAzET1kzM6g6ZgA+JMefVZTof1Hk~ zc}r*=4;&j4Wt#q0#*KK&pI2>&0#+`24!n2ioP-U zQI_jF0HrOt)&M_E5-nQqqo_>c5Qq4XTuzA2r zh{q`LBXTzbx3KSxdCtk%AxswnZXuiPwokyW$r=AHHA&7f=HV=W8}*J^@>}*2FNNJ= zX-0=2a)h`%D8?0`skLHHBnW6}zv#L}%GbmLoPxQqM6onXe(HowR!pH^P93C6kxJpU z(u7gHkrZ_c0hY#_6~foz_kvIlZ)jnpXbRR>IPum*F^;=iR~)yf*@|XX!8Zxo4nl6q WjWDJhW8T}`&(Y2x>T=7CU={O;PoP}@ delta 13 UcmZqaWIFPTk?AYrMkc3P04G@mIRF3v diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index fc20884f7..6ecfd510e 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -200,7 +200,7 @@ namespace cryptonote return true; } // make RPC call to daemon - // curl http://127.0.0.1:34568/json_rpc -d '{"jsonrpc":"2.0","id":"0","method":"get_block","params":{"height":247600}}' -H 'Content-Type: application/json' + // curl http://127.0.0.1:34568/json_rpc -d '{"jsonrpc":"2.0","id":"0","method":"get_block","params":{"height":271600}}' -H 'Content-Type: application/json' // "wide_cumulative_difficulty": "0x14eb4d0131fe8", ADD_CHECKPOINT2(1, "97f4ce4d7879b3bea54dcec738cd2ebb7952b4e9bb9743262310cd5fec749340", "0x2"); ADD_CHECKPOINT2(6969, "aa7b66e8c461065139b55c29538a39c33ceda93e587f84d490ed573d80511c87", "0x118eef693fd"); //Hard fork to v8 @@ -214,6 +214,7 @@ namespace cryptonote ADD_CHECKPOINT2(253999, "755a289fe8a68e96a0f69069ba4007b676ec87dce2e47dfb9647fe5691f49883", "0x172d026ef7fe8"); //Hard fork to v16 ADD_CHECKPOINT2(254287, "b37cb55abe73965b424f8028bf71bef98d069645077ffa52f0c134907b7734e3", "0x1746622f56668"); //Hard fork to v17 ADD_CHECKPOINT2(256700, "389a8ab95a80e84ec74639c1078bc67b33af208ef00f53bd9609cfc40efa7059", "0x185ace3c1bd68"); + ADD_CHECKPOINT2(271600, "9597cdbdc52ca57d7dbd8f9c0a23a73194ef2ebbcfdc75c21992672706108d43", "0x1e2d2d6a2a9e8"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 623ce8f98..bf2e47c74 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -5467,7 +5467,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "5b78fd258ef3078654d2b15c9c2d6baab371805b94a9aa748f615995b207d045"; +static const char expected_block_hashes_hash[] = "bd1d32aed063dd71c1355dc950eb0fc22b10e41530029f54d40a0fd6f6b328f1"; 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 6b7579114..2ec288579 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.1.0" +#define DEF_MONERO_VERSION "0.9.2.0" #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@