From 18e784c60dc01af11af50b95fb39a33e7178de44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Softwareb=C3=BCro=20Krekeler?= Date: Wed, 7 Oct 2020 21:28:59 +0200 Subject: [PATCH] Release 0.12.16 "Heidi" Document Revision v2 --- configure.ac | 2 +- doc/Doxyfile | 2 +- .../dms/release-notes-0.12.16.0.md | 20 ++++++++++++++++ src/chainparams.cpp | 23 ++++++++++++------- src/clientversion.h | 5 ++-- src/masternodeman.cpp | 2 +- src/sendalert.cpp | 2 +- src/validation.cpp | 4 ++-- 8 files changed, 44 insertions(+), 16 deletions(-) create mode 100644 doc/release-notes/dms/release-notes-0.12.16.0.md diff --git a/configure.ac b/configure.ac index 9243d753a42bc..ffff6a7b98f0a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 12) -define(_CLIENT_VERSION_REVISION, 15) +define(_CLIENT_VERSION_REVISION, 16) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2020) diff --git a/doc/Doxyfile b/doc/Doxyfile index 8fe01dd38ab0d..a2f5cd8de2125 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -41,7 +41,7 @@ PROJECT_NAME = "DMS Core" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.12.15.0 +PROJECT_NUMBER = 0.12.16.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/doc/release-notes/dms/release-notes-0.12.16.0.md b/doc/release-notes/dms/release-notes-0.12.16.0.md new file mode 100644 index 0000000000000..3c63ed0383f71 --- /dev/null +++ b/doc/release-notes/dms/release-notes-0.12.16.0.md @@ -0,0 +1,20 @@ +DMS Core version 0.12.16.0 "Heidi", 7 Oct 2020 +====================================== + +Release is available from: + + + +## Notable changes + +* Document Revision [v2](https://github.com/Krekeler/documentchain/blob/master/dms-docs/document-revision-data.md) +* BIP9 soft fork (CSV): BIP68, BIP112, BIP113 +* New button "Use available balance" in send coins +* Turkish translation (new language) +* "Pay only the required fee" as default in Qt wallet +* RPC function: listdocuments verbose +* Several improvements + +Please report bugs using the issue tracker at github: + + diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 4e456b454924a..e11070759d806 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -177,10 +177,10 @@ class CMainParams : public CChainParams { consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nThreshold = 3226; // 80% of 4032 // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000000001c0fca849bf"); // = 1.928.384.235.967 total work, block 135808 + consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000000032f04770142"); // = 3.500.473.254.210 total work, block 175594 // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x00000025868ef0958009ba542ded2faf5242cd835445ca6c5556eff5a19161ab"); // 135808 + consensus.defaultAssumeValid = uint256S("0x0000000ee3871b495f8f26714200b50dbe56fb48c9bde4a9b1a4b72ba5793c1c"); // 175594 /** * The message start string is designed to be unlikely to occur in normal data. @@ -268,11 +268,15 @@ class CMainParams : public CChainParams { (120004, uint256S("0x00000031fd82d41fa6fda29a405a55162304822be9b03beed79e47f25d3f3296")) // 2020-Feb-06 (127991, uint256S("0x00000042ec60e4badf5e3288b1dbb8da2a27af4b88b6ec299e7149586784ccfd")) // 2020-Mar-12 (135808, uint256S("0x00000025868ef0958009ba542ded2faf5242cd835445ca6c5556eff5a19161ab")) // 2020-Apr-15 + (144997, uint256S("0x00000074c2b1520d116c447d2cf6170951642fc50487b300074d76952fc20a4d")) // 2020-May-25 + (154972, uint256S("0x00000053c7c6c55129d6e9c9477ddcdbd351847d748ff77eff13dbc44bde58d4")) // 2020-Jul-08 + (165993, uint256S("0x000000391480ecb91edb3bc72ed1a206c6640c7c8927c244536e0bc90c43b51f")) // 2020-Aug-25 + (175594, uint256S("0x0000000ee3871b495f8f26714200b50dbe56fb48c9bde4a9b1a4b72ba5793c1c")) // 2020-Oct-06 }; chainTxData = ChainTxData{ - 1586930538, // * UNIX timestamp of last known number of transactions - 205946, // * total number of transactions between genesis and that timestamp + 1601994910, // * UNIX timestamp of last known number of transactions + 295331, // * total number of transactions between genesis and that timestamp // (the tx=... number in the UpdateTip debug.log lines) 0.04 // * estimated number of transactions per second after that timestamp }; @@ -339,10 +343,10 @@ class CTestNetParams : public CChainParams { consensus.vDeployments[Consensus::DEPLOYMENT_BIP147].nThreshold = 8; // 80% of 10 MN // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000000000566f4ad8"); // = 1450134232, block 140464 + consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000000000008e4b3670"); // = 2.387.293.808, block 183038 // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x00000174ee13b777c20a7aa6aef53650f0e42777788ec2c00e36a76658dfc6f6"); // 140464 + consensus.defaultAssumeValid = uint256S("0x0000265f61ad4c3c7841f177c56d9616ea1f2b0ed795271139760028e8c2bd82"); // 183038 pchMessageStart[0] = 0xce; // same as Dash Testnet pchMessageStart[1] = 0x44; // D @@ -420,10 +424,13 @@ class CTestNetParams : public CChainParams { (130004, uint256S("0x00004646f1ca07c4dc563368ac427c930fc22d2e1f7b689eddbbdf5c2026e97a")) (137044, uint256S("0x000090f59b07ccd5285bd79dd9a4190cd23cd6efd3d0b7b1c4069e9ce9897c12")) (140464, uint256S("0x00000174ee13b777c20a7aa6aef53650f0e42777788ec2c00e36a76658dfc6f6")) + (160000, uint256S("0x0002f859981fb98abbde73b1574a0e3c05676185de4c0c385c23392ba1703cf2")) // 2020-Jul-03 + (174000, uint256S("0x0002beb9fd3c0207b45f5825811b7a847cd043b8c1222f64e7dd172e201a6bf5")) // 2020-Aug-30 + (183038, uint256S("0x0000265f61ad4c3c7841f177c56d9616ea1f2b0ed795271139760028e8c2bd82")) // 2020-Oct-06 }; chainTxData = ChainTxData{ - 1586930531, // * UNIX timestamp of last known number of transactions - 142227, // * total number of transactions between genesis and that timestamp + 1601997461, // * UNIX timestamp of last known number of transactions + 185643, // * total number of transactions between genesis and that timestamp // (the tx=... number in the UpdateTip debug.log lines) 0.003 // * estimated number of transactions per second after that timestamp }; diff --git a/src/clientversion.h b/src/clientversion.h index 5c19288485475..a6a858ba8a317 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,7 +18,7 @@ //! These need to be macros, as clientversion.cpp's and dms*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 12 -#define CLIENT_VERSION_REVISION 15 +#define CLIENT_VERSION_REVISION 16 #define CLIENT_VERSION_BUILD 0 //! Set to true for release, false for prerelease or test build @@ -40,7 +40,8 @@ // Erin 0.12.13, 16 Aug 2019 // Faythe 0.12.14, 29 Nov 2019 // Grace 0.12.15, 17 Apr 2020 -#define RELEASE_CODE_NAME "Grace" +// Heidi 0.12.16, Oct 2020 +#define RELEASE_CODE_NAME "Heidi" /** * Converts the parameter X to a string after macro replacement on X has been performed. diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp index f4a45b75829e3..a17d099925b43 100644 --- a/src/masternodeman.cpp +++ b/src/masternodeman.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2014-2017 The Dash Core developers -// Copyright (c) 2018 The Documentchain developers +// Copyright (c) 2018-2020 The Documentchain developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/sendalert.cpp b/src/sendalert.cpp index d8f8ab95c4897..dc4a40c011e93 100644 --- a/src/sendalert.cpp +++ b/src/sendalert.cpp @@ -57,7 +57,7 @@ void ThreadSendAlert(CConnman& connman) // Higher numbers mean higher priority alert.nPriority = 5000; alert.strComment = ""; - alert.strStatusBar = "URGENT: Upgrade required: see https://www.dms.org"; + alert.strStatusBar = "URGENT: Upgrade required: see https://documentchain.org"; // Set specific client version/versions here. If setSubVer is empty, no filtering on subver is done: // alert.setSubVer.insert(std::string("/DMS Core:0.12.0.58/")); diff --git a/src/validation.cpp b/src/validation.cpp index 5dc1c3a57fbb2..c3eca80701cbf 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1358,8 +1358,8 @@ CAmount GetMasternodePayment(int nHeight, CAmount blockValue) if(nHeight > nMNPIBlock+(nMNPIPeriod*10)) ret += blockValue /100; // 130000 - 46.0% ~ 2020-03-20 if(nHeight > nMNPIBlock+(nMNPIPeriod*11)) ret += blockValue /100; // 137000 - 47.0% ~ 2020-04-20 if(nHeight > nMNPIBlock+(nMNPIPeriod*12)) ret += blockValue /100; // 144000 - 48.0% ~ 2020-05-21 - if(nHeight > nMNPIBlock+(nMNPIPeriod*13)) ret += blockValue /100; // 151000 - 49.0% ~ 2020-06 - if(nHeight > nMNPIBlock+(nMNPIPeriod*14)) ret += blockValue /100; // 158000 - 50.0% ~ 2020-07 + if(nHeight > nMNPIBlock+(nMNPIPeriod*13)) ret += blockValue /100; // 151000 - 49.0% ~ 2020-06-20 + if(nHeight > nMNPIBlock+(nMNPIPeriod*14)) ret += blockValue /100; // 158000 - 50.0% ~ 2020-07-21 return ret; }