fresh checkpoint, deprecation prevention, version change to 3.0.1-1

bze-alphateam · Aug 13, 2020 · 650cb71 · 650cb71
1 parent 41a0b16
commit 650cb71
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 3)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_REVISION, 1)
-define(_CLIENT_VERSION_BUILD, 50)
+define(_CLIENT_VERSION_BUILD, 51)
 define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
 define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
 define(_CLIENT_VERSION_IS_RELEASE, true)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -155,7 +155,7 @@ class CMainParams : public CChainParams {
 
         // The best chain should have at least this much work.
         // consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000000000000004000");
-        consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000008d89d032d11f"); // chainwork of the last checkpoint
+        consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000008d9a03d79a68"); // chainwork of the last checkpoint
 
 
 
@@ -260,10 +260,11 @@ class CMainParams : public CChainParams {
 			( 165300, uint256S("0x000001f49a3c070be93770e8d7e84b281c159e367d56c809048d02441db1956c"))
 			( 444600, uint256S("0x0000181b00e928fac7c5841f04ab99038cedbd3776ff658df6eb6c841ccc2ea3"))
 			( 586000, uint256S("0x0000094cf923b3cccc179769b948b1cd091382a7ab19db2369ef8e66d0e49cfd"))
-            ( 868010, uint256S("0x00006ed38c012a59d3f17be569eb9da5c4147a3a9297ffd189b46c02d9d0ef4e")),
+            ( 868010, uint256S("0x00006ed38c012a59d3f17be569eb9da5c4147a3a9297ffd189b46c02d9d0ef4e"))
+            ( 1200000, uint256S("0x0000fddbdaa51d886f34bb7db2b49022a5f5f9e23307d3342373bac90070c363")),
 
-			1576073696,     // * UNIX timestamp of last checkpoint block
-			1913443,         // * total number of transactions between genesis and last checkpoint
+			1596365964,     // * UNIX timestamp of last checkpoint block
+			2519866,         // * total number of transactions between genesis and last checkpoint
 							//   (the tx=... number in the SetBestChain debug.log lines)
 			3000  // * estimated number of transactions per day after checkpoint
 

diff --git a/src/deprecation.h b/src/deprecation.h
@@ -8,7 +8,7 @@
 // Deprecation policy:
 // * Shut down 16 weeks' worth of blocks after the estimated release block height.
 // * A warning is shown during the 2 weeks' worth of blocks prior to shut down.
-static const int APPROX_RELEASE_HEIGHT = 964000;
+static const int APPROX_RELEASE_HEIGHT = 1215600;
 static const int WEEKS_UNTIL_DEPRECATION = 26;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 60);