Skip to content

Commit

Permalink
Merge branch 'v4.6.5-dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
tohsnoom committed Aug 2, 2021
2 parents e21c4c7 + 557b049 commit e129439
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 4)
define(_CLIENT_VERSION_MINOR, 6)
define(_CLIENT_VERSION_REVISION, 4)
define(_CLIENT_VERSION_REVISION, 5)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2020)
Expand Down
15 changes: 10 additions & 5 deletions src/chainparams.cpp
Expand Up @@ -67,14 +67,19 @@ static Checkpoints::MapCheckpoints mapCheckpoints =
(1594800,uint256("35d628c9471ff3d2b98d327a87b69669b219e5c473c0ccd54d6db84198b38819"))
(1797000,uint256("3222dfdda3b2c842eaff173e3a632964d56c3f5a957d0b444af2df07dd06754d"))
(2000016,uint256("Fed89c61b9c7e19593c259344eb5d8a3121fd7f516d2cca31499a28f68af73b7"))
(2050000,uint256("6f89ed36393384b07325b96e54b59abdd8a1803b98b1ccaae14cc80c8912395e"))
(2078350,uint256("55599f4c11d8e59a8eb94047789123da1eb64d2a4bcce09f499d4e2ad01e3b5a"))
(2108600,uint256("0bd5d302f078b69a55a1e8caeb643dd8034407d17cb6adc63e867eba5699d7b6"));
(2100000,uint256("6de337c80ebc7188068bbc75c5b56a41c9985bbf7ed3d6d9bf5944cf4b07df89"))
(2200000,uint256("c2cf136b10ed51ec789dfe6deb295897860c3ebe6249a7f104d431aacbe6e024"))
(2272870,uint256("c33f86f3df7aaa4b3dbde7aa208868c749be4c93005be3acc20797cbf0c30c7b"))
(2273000,uint256("3fbd64cbde35ec010d7b27912d4e80f355f53fc59abcbbbe048bafd48950ef2d"))
(2300000,uint256("e362137475764e6b21ce5371a989215a5f935d796bd4df24254fb55881aa42eb"))
(2351323,uint256("6bdef58f67eba723a9e4cac88866934119de74cf04b88cf726175b75ae9cc928"))
(2354800,uint256("c0aac8e944fd0ce6ae51bda6df11d08ba8fd3705a7d6eca1da61f1b90070ba59"))
(2356600,uint256("d001912873bd1077dae83bdb023dfa96e2e2444910a2bf8e7a585d7d21b3bcd6"));

static const Checkpoints::CCheckpointData data = {
&mapCheckpoints,
1615666837, // * UNIX timestamp of last checkpoint block
7626589, // * total number of transactions between genesis and last checkpoint
1627926765, // * UNIX timestamp of last checkpoint block
8524881, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines)
2000 // * estimated number of transactions per day after checkpoint
};
Expand Down
2 changes: 1 addition & 1 deletion src/clientversion.h
Expand Up @@ -16,7 +16,7 @@
//! These need to be macros, as clientversion.cpp's and vitae*-res.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 4
#define CLIENT_VERSION_MINOR 6
#define CLIENT_VERSION_REVISION 4
#define CLIENT_VERSION_REVISION 5
#define CLIENT_VERSION_BUILD 0

//! Set to true for release, false for prerelease or test build
Expand Down

0 comments on commit e129439

Please sign in to comment.