From 5bb83ab04279699178c5268effde5ee569187ef1 Mon Sep 17 00:00:00 2001 From: selsta Date: Mon, 23 Nov 2020 13:12:58 +0100 Subject: [PATCH] build: prepare v0.17.1.5 --- README.md | 10 +++++----- contrib/gitian/README.md | 4 ++-- src/blocks/checkpoints.dat | Bin 277956 -> 279428 bytes src/checkpoints/checkpoints.cpp | 1 + src/cryptonote_core/blockchain.cpp | 2 +- src/version.cpp.in | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 11c0fb0ba..bfc70a544 100644 --- a/README.md +++ b/README.md @@ -134,8 +134,8 @@ Dates are provided in the format YYYY-MM-DD. | 1788000 | 2019-03-09 | v10 | v0.14.0.0 | v0.14.1.2 | New PoW based on Cryptonight-R, new block weight algorithm, slightly more efficient RingCT format | 1788720 | 2019-03-10 | v11 | v0.14.0.0 | v0.14.1.2 | forbid old RingCT transaction format | 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.1.3 | New CLSAG transaction format -| 2210720 | 2020-10-18 | v14 | v0.17.1.1 | v0.17.1.3 | forbid old MLSAG transaction format +| 2210000 | 2020-10-17 | v13 | v0.17.0.0 | v0.17.1.5 | New CLSAG transaction format +| 2210720 | 2020-10-18 | v14 | v0.17.1.1 | v0.17.1.5 | forbid old MLSAG 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. @@ -295,7 +295,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 tags/v0.17.1.3 + git checkout tags/v0.17.1.5 ``` * Build: @@ -412,10 +412,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.17.1.3'. 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.17.1.5'. If you don't care about the version and just want binaries from master, skip this step: ```bash - git checkout v0.17.1.3 + git checkout v0.17.1.5 ``` * If you are on a 64-bit system, run: diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md index 9ca369e49..12a9b3e68 100644 --- a/contrib/gitian/README.md +++ b/contrib/gitian/README.md @@ -126,7 +126,7 @@ Setup for LXC: ```bash GH_USER=fluffypony -VERSION=v0.17.1.3 +VERSION=v0.17.1.5 ./gitian-build.py --setup $GH_USER $VERSION ``` @@ -182,7 +182,7 @@ If you chose to do detached signing using `--detach-sign` above (recommended), y ```bash GH_USER=fluffypony -VERSION=v0.17.1.3 +VERSION=v0.17.1.5 gpg --detach-sign ${VERSION}-linux/${GH_USER}/monero-linux-*-build.assert gpg --detach-sign ${VERSION}-win/${GH_USER}/monero-win-*-build.assert diff --git a/src/blocks/checkpoints.dat b/src/blocks/checkpoints.dat index 1332ec5f7b63158ed5fffda41af79b2f0f31b2d9..bcbfbb7ee0e12fd8841abe06e70fed473e894d0b 100644 GIT binary patch delta 1509 zcmVILB56~kj5;_Ak10pd;cbnv2_X3PN1_s-ASqoH_dzhtVHXzld|dz zTn^e>f8HHVhH1%-)$_JU^wV^KElB4$O!x2Q8V{w7HQ5;l187WVy2y8&s5UCZVzpo8 zsev~6&W5OMckTBxl9*ln8MpYv`z&rJcR?b(8Uh@?(qg{Qy>L4l!3?hXktDBK{G0vs zgvkD`$YxfF#9mxLV4mW>bD|2=myw`37EHPsnlBBx{cVBQn;EA%)pLU;G zKC_-F^!Au+bJ*;6pAU&{@X012u}_~pVDux zs)=&$Vi!?A7Zrwl`wwkpp6YG>hQ?Bhf8Rcopy()AUYK}>=X@A!c?7G-2hs4%jGJwt zs2Y2JWLN$8JSbEKc=n?4!)6nd020SyAA^nVUI{MD1~shs?Ue`ksdV~WDst!7(q-lV zHidbYRX)3`>n6?(EYZ5|*X^{~kuTA_no$O@QTs-{9)ix@brRMr!QUNDRF9kIfA&9j zbaEXg3Dq)0YTku7X16HY=W;yDmO*Ja4H<7h@>AzTF^7yFN{2miE7@9ub))a|Z6#gh z{S^{%2KigG^fG=3mx$AJ@tLW{e`mE#G;$>r=K4iHq&?zsi@{DGJ&)R4Qd!K{C$rTM zEPB6Vb|9YX3uALNlo~)#t-Pq)Q7qYw(9g%(Z)d4Tbr%W?&J;Ez*_bm59H6p{wV~gU z^(Y)?8wS0y;Z9Vxh!FJW>kAYFYu@WT6PxMs1O$c@yAcbO5qWE^&+IINfBw;FVf+!6 z5c&QvaB-M`d$uuig^QA`pyWd*cbtiip5qcc@YGDNc1XiYx%X7*ffRC(&ji;o5Emwt z+K?T9cdzY+j9o1uP!GzCuo{Zd*ALRw0!50WBB4Q7vj|SZ(p|?7W=8SQ$L*#;hW4(m z06|9F7FO-PT6m0k%Es5wf6?1^aj;c4wY%Ql5&cMK{g8H3()Z}u+4z0K+0(=UZJyef zlW}$X`2Cu3Bza+838DvB+{)bcrIecDv@rn|Rdvs4jigC0WdP^cNrGVX#FaNSpPiPl z8u?0>8U)pLpi<9P9-RSpKWic{=2+qJBur~r`Fq4c!;8~1Uvjate4;^L4p7`SDRs=0TlP(;A;5Bx3X8J8{Tu9^cegIlY?u(2~u-4=wLOzoXCPO62 zd)jY@qu3yYOsRpi6@D|Ei~IXQk#%0p)PF2`NM zua|#M^5PEyrJague}m9ie_(L`l@jLZM5-~+AZPC-Mf(+BMcq}sL#c&6Hn>QDCTUm8 z^8IO!bF4(Mkd$^R6jt^fWAZK6yZFfAOf&d)Y$#8F#+6u+YJoA+>xFKW)#N!yZTEpy ze$#xFD7KE@%v7#~;HDU~8&=c0lR>DB5v_#rs*&l1E*1fvOAQG^e%L-j)bO$eM^RBzxBHG{YtN(C Lm<+55(1P_Y;8*yl delta 25 fcmZo^7d-M?fa$wHBU39AV=EJoWZufea>y0{bBqVg diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index 93bbeee46..d966eebda 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -241,6 +241,7 @@ namespace cryptonote ADD_CHECKPOINT2(2206500, "dd3c8590f33eaa546a4ce69d02f27fd58a2f115cd32d733bd9426f8278f0cb8a", "0xf8725275799f0d"); ADD_CHECKPOINT2(2210500, "ed17259215ac6aabe6e8252b5b5eff613d2e69cc2111173e567109aa78301911", "0xfbcb50a9a6a433"); ADD_CHECKPOINT2(2224000, "e34bc71301600df96d08aaa6b0bde932cba1b06a3dd57076e3f664a078810a80", "0x1052fc256fceb6f"); + ADD_CHECKPOINT2(2235500, "3eac1a1253495733e10d00fd5e8e1639741566d91bae38bc6d3342af6b75da53", "0x10cea232ce71d23"); return true; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index d4b844c58..89ecda2cd 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -5376,7 +5376,7 @@ void Blockchain::cancel() } #if defined(PER_BLOCK_CHECKPOINT) -static const char expected_block_hashes_hash[] = "1d166275537bfbb5841d98da298c65089f3006d751776b2dc8a4f0275ef0ce58"; +static const char expected_block_hashes_hash[] = "3a2a0720f7ed3573d2b632f7ba127e2f97edac3af34bf924df57c13a88bf2460"; 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 aa6d50926..6658cb3b1 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.17.1.3" +#define DEF_MONERO_VERSION "0.17.1.5" #define DEF_MONERO_RELEASE_NAME "Oxygen Orion" #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG #define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@