diff --git a/configure.ac b/configure.ac index 6bf6dcfeb890..7023f1111ec2 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,8 @@ AC_PREREQ([2.69]) define(_CLIENT_VERSION_MAJOR, 18) define(_CLIENT_VERSION_MINOR, 2) define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_RC, 4) -define(_CLIENT_VERSION_IS_RELEASE, false) +define(_CLIENT_VERSION_RC, 0) +define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2022) define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Dash Core]]) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 2982399e9887..8d1f6dc8f643 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -250,10 +250,10 @@ class CMainParams : public CChainParams { consensus.vDeployments[Consensus::DEPLOYMENT_DIP0024].nFalloffCoeff = 5; // this corresponds to 10 periods // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000079c96bdb79315818b358"); // 1756000 + consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000007d31aeabf4a72ce1fbaa"); // 1796500 // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x000000000000000fd8af332029688d4ccb227f481efa6aff1d662358cc4f76c1"); // 1756000 + consensus.defaultAssumeValid = uint256S("0x000000000000001d531f36005159f19351bd49ca676398a561e55dcccb84eacd"); // 1796500 /** * The message start string is designed to be unlikely to occur in normal data. @@ -355,14 +355,16 @@ class CMainParams : public CChainParams { {1167570, uint256S("0x000000000000000fb7b1e9b81700283dff0f7d87cf458e5edfdae00c669de661")}, {1364585, uint256S("0x00000000000000022f355c52417fca9b73306958f7c0832b3a7bce006ca369ef")}, {1450000, uint256S("0x00000000000000105cfae44a995332d8ec256850ea33a1f7b700474e3dad82bc")}, + {1796500, uint256S("0x000000000000001d531f36005159f19351bd49ca676398a561e55dcccb84eacd")}, } }; + // getchaintxstats 17280 000000000000001d531f36005159f19351bd49ca676398a561e55dcccb84eacd chainTxData = ChainTxData{ - 1660074878, // * UNIX timestamp of last known number of transactions (Block 1718597) - 43702293, // * total number of transactions between genesis and that timestamp - // (the tx=... number in the ChainStateFlushed debug.log lines) - 0.175 // * estimated number of transactions per second after that timestamp + 1672362622, // * UNIX timestamp of last known number of transactions (Block 1718597) + 45744554, // * total number of transactions between genesis and that timestamp + // (the tx=... number in the ChainStateFlushed debug.log lines) + 0.1522379324797504 // * estimated number of transactions per second after that timestamp }; } }; @@ -475,10 +477,10 @@ class CTestNetParams : public CChainParams { consensus.vDeployments[Consensus::DEPLOYMENT_DIP0024].nFalloffCoeff = 5; // this corresponds to 10 periods // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000002d68be93ade9d82"); // 794950 + consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000002d68c04d48c0c9c"); // 808000 // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x000001860e4c7248a9c5cc3bc7106041750560dc5cd9b3a2641b49494bcff5f2"); // 794950 + consensus.defaultAssumeValid = uint256S("0x00000104cb60a2b5e00a8a4259582756e5bf0dca201c0993c63f0e54971ea91a"); // 808000 pchMessageStart[0] = 0xce; pchMessageStart[1] = 0xe2; @@ -554,14 +556,16 @@ class CTestNetParams : public CChainParams { {395750, uint256S("0x000008b78b6aef3fd05ab78db8b76c02163e885305545144420cb08704dce538")}, {470000, uint256S("0x0000009303aeadf8cf3812f5c869691dbd4cb118ad20e9bf553be434bafe6a52")}, {794950, uint256S("0x000001860e4c7248a9c5cc3bc7106041750560dc5cd9b3a2641b49494bcff5f2")}, + {808000, uint256S("0x00000104cb60a2b5e00a8a4259582756e5bf0dca201c0993c63f0e54971ea91a")}, } }; + // getchaintxstats 17280 00000104cb60a2b5e00a8a4259582756e5bf0dca201c0993c63f0e54971ea91a chainTxData = ChainTxData{ - 1659215338, // * UNIX timestamp of last known number of transactions (Block 771537) - 5579961, // * total number of transactions between genesis and that timestamp - // (the tx=... number in the ChainStateFlushed debug.log lines) - 0.018 // * estimated number of transactions per second after that timestamp + 1672374042, // * UNIX timestamp of last known number of transactions (Block 771537) + 5722721, // * total number of transactions between genesis and that timestamp + // (the tx=... number in the ChainStateFlushed debug.log lines) + 0.003149555626489206 // * estimated number of transactions per second after that timestamp }; } };