From 7ec823b255a8b2ab683ff1f8f594779a784d3d73 Mon Sep 17 00:00:00 2001 From: Harald Krekeler Date: Tue, 4 May 2021 18:52:37 +0200 Subject: [PATCH] Release 0.13.3.1 "Ivan" --- configure.ac | 2 +- doc/Doxyfile | 2 +- ...-0.13.3.0.md => release-notes-0.13.3.1.md} | 8 +++++--- src/chainparams.cpp | 19 ++++++++++--------- src/clientversion.h | 4 ++-- 5 files changed, 19 insertions(+), 16 deletions(-) rename doc/release-notes/dms/{release-notes-0.13.3.0.md => release-notes-0.13.3.1.md} (78%) diff --git a/configure.ac b/configure.ac index 498f90c50d255..1c46c8864f0a8 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 13) define(_CLIENT_VERSION_REVISION, 3) -define(_CLIENT_VERSION_BUILD, 0) +define(_CLIENT_VERSION_BUILD, 1) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2021) define(_COPYRIGHT_HOLDERS,[The %s developers]) diff --git a/doc/Doxyfile b/doc/Doxyfile index 4a5ed5871a7b5..2b7dd120ced40 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.13.3.0 +PROJECT_NUMBER = 0.13.3.1 # 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.13.3.0.md b/doc/release-notes/dms/release-notes-0.13.3.1.md similarity index 78% rename from doc/release-notes/dms/release-notes-0.13.3.0.md rename to doc/release-notes/dms/release-notes-0.13.3.1.md index 39f8845321e07..90066e30960df 100644 --- a/doc/release-notes/dms/release-notes-0.13.3.0.md +++ b/doc/release-notes/dms/release-notes-0.13.3.1.md @@ -1,18 +1,20 @@ -DMS Core version 0.13.3.0 "Ivan", 20 March 2021 +DMS Core version 0.13.3.1 "Ivan", 4 May 2021 ====================================== Release is available from: - + ## Most important changes * DIP0002 - Special Transactions * DIP0003 - Deterministic Masternode List * DIP0004 - Simplified Verification of Deterministic Masternode Lists +* BIP68, BIP112, and BIP113 (CSV) +* Information and notes page on main form ## New code base -DMS Core was newly forked from Dash Core 0.13.3. +DMS Core was newly forked from Dash Core 0.13.3 See Dash release notes for more news: * [0.13.0](../dash/release-notes-0.13.0.md) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 498b3115b6ade..e4c480cef015d 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -228,7 +228,6 @@ class CMainParams : public CChainParams { consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1622505600; // Jun 1th, 2021 consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1654041600; // Jun 1th, 2022 - // Deployment of DIP0001, Documentchain: active since block 143481 consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].bit = 1; consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nStartTime = 1589536800; // May 15th, 2020 @@ -251,10 +250,10 @@ class CMainParams : public CChainParams { consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nThreshold = 320; // 80% of 400 // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000000004fb67187c74"); // = 5.477.812.960.372 total work, block 212723 + consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000000562b792bb20"); // = 5.921.544.780.576 total work, block 222876 // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x0000000540497ce3a503d7f546f5faafe4c28e0e7a15cd81074416428b57a114"); // 212723 + consensus.defaultAssumeValid = uint256S("0x00000003bd8ad5f5f5373342f9c2fddfb33f9e0344eb743521631875b596a20a"); // 222876 /** * The message start string is designed to be unlikely to occur in normal data. @@ -353,11 +352,12 @@ class CMainParams : public CChainParams { (189933, uint256S("0x000000019cf3a28ce96ad31a446d0fe3fe796f80d1df0e315805daf8ec671b4e")) // 2020-Dec-08 (199995, uint256S("0x00000009b7ca8806f82b23aa8464967c4f60134941208daa69c320a0c4e98be8")) // 2021-Jan-21 (212723, uint256S("0x0000000540497ce3a503d7f546f5faafe4c28e0e7a15cd81074416428b57a114")) // 2021-Mar-18 + (222876, uint256S("0x00000003bd8ad5f5f5373342f9c2fddfb33f9e0344eb743521631875b596a20a")) // 2021-May-01 }; chainTxData = ChainTxData{ - 1616057716, // * UNIX timestamp of last known number of transactions - 367264, // * total number of transactions between genesis and that timestamp + 1619902162, // * UNIX timestamp of last known number of transactions + 387457, // * 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 }; @@ -431,10 +431,10 @@ class CTestNetParams : public CChainParams { consensus.vDeployments[Consensus::DEPLOYMENT_DIP0003].nThreshold = 7; // 70% of 10 // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000000000b72cd691"); // = 3.073.169.041, block 218465 + consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000000000c242844f"); // = 3.259.139.151, block 228638 // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x00023a8e78286941126db6a05eaeaff77a1ee208155c477767cc2cb34e51313b"); // 218465 + consensus.defaultAssumeValid = uint256S("0x0000330efa75e85c976bfd15e54b842ad4a2a3d28c8405c7b3be7c410d7cd15e"); // 228638 (after llmq modification) pchMessageStart[0] = 0xce; // same as Dash Testnet pchMessageStart[1] = 0x44; // D @@ -524,10 +524,11 @@ class CTestNetParams : public CChainParams { (200002, uint256S("0x0000b3570deee849c7201145ac12d3680999f57d3ab48b8411c4d04bafbef30d")) // 2020-Dec-20 (208992, uint256S("0x000210a9ce41a4f2c6e251b8c1ab76bd9bc31fac1f96b579db19eee033356eab")) // 2021-Feb-01 (218465, uint256S("0x00023a8e78286941126db6a05eaeaff77a1ee208155c477767cc2cb34e51313b")) // 2021-Mar-17 + (228638, uint256S("0x0000330efa75e85c976bfd15e54b842ad4a2a3d28c8405c7b3be7c410d7cd15e")) // 2021-May-03 (after llmq modification) }; chainTxData = ChainTxData{ - 1615998010, // * UNIX timestamp of last known number of transactions - 222062, // * total number of transactions between genesis and that timestamp + 1620038328, // * UNIX timestamp of last known number of transactions + 237402, // * total number of transactions between genesis and that timestamp // (the tx=... number in the UpdateTip debug.log lines) 0.005 // * estimated number of transactions per second after that timestamp }; diff --git a/src/clientversion.h b/src/clientversion.h index edb41c40d83d9..d0bc406ae3fc1 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,7 +18,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 13 #define CLIENT_VERSION_REVISION 3 -#define CLIENT_VERSION_BUILD 0 +#define CLIENT_VERSION_BUILD 1 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true @@ -41,7 +41,7 @@ 6. Faythe 0.12.14 29 Nov 2019 7. Grace 0.12.15 17 Apr 2020 8. Heidi 0.12.16 8 Oct 2020 - 9. Ivan 0.13.3 20 Mar 2021 + 9. Ivan 0.13.3 3 May 2021 */ #define RELEASE_CODE_NAME "Ivan"