diff --git a/configure.ac b/configure.ac index d86c25647c029..99bfb4381d095 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 12) define(_CLIENT_VERSION_REVISION, 12) -define(_CLIENT_VERSION_BUILD, 0) +define(_CLIENT_VERSION_BUILD, 1) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2019) define(_COPYRIGHT_HOLDERS,[The %s developers]) diff --git a/contrib/seeds/README.md b/contrib/seeds/README.md index 0f7d9a9494e0d..ae72f9f6455be 100644 --- a/contrib/seeds/README.md +++ b/contrib/seeds/README.md @@ -21,13 +21,10 @@ Ubuntu: ### Internal notice -Compilation computer, ~/documentchain/contrib/seeds$ +Compilation computer - cp nodes_main.txt ori.txt + cd ~/documentchain/contrib/seeds vi nodes_main.txt python3 generate-seeds.py ./ -Code computer: copy result to chainparamsseeds.h - - rm nodes_main.txt - mv ori.txt nodes_main.txt +Code computer: copy result to chainparamsseeds.h, copy node_main.txt diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt index a5972508c3485..fa37bb97ba14a 100644 --- a/contrib/seeds/nodes_main.txt +++ b/contrib/seeds/nodes_main.txt @@ -6,5 +6,5 @@ 107.172.248.127:41319 107.174.203.97:41319 159.69.189.185:41319 -185.216.214.161:41319 -195.201.226.128:41319 \ No newline at end of file +195.201.226.128:41319 +217.160.60.76:41319 \ No newline at end of file diff --git a/doc/Doxyfile b/doc/Doxyfile index ae557fd951a96..e71e12a80dece 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.12.0 +PROJECT_NUMBER = 0.12.12.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.12.12.1.md b/doc/release-notes/dms/release-notes-0.12.12.1.md new file mode 100644 index 0000000000000..def59aa9c5f10 --- /dev/null +++ b/doc/release-notes/dms/release-notes-0.12.12.1.md @@ -0,0 +1,14 @@ +DMS Core version 0.12.12.1 +====================================== + +Release is available from: + + + +## Notable changes + +* Final determination of block reward split between miner and masternode + +Please report bugs using the issue tracker at github: + + \ No newline at end of file diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 70010eab0acc4..5bb4883ee0bbf 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -181,7 +181,7 @@ class CMainParams : public CChainParams { consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000000000000100010"); // TODO // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x00000516a96541bf40e137db48544378afd997d0ed3c7dc6d007ab6e953499be"); // TODO + consensus.defaultAssumeValid = uint256S("0x0000062c9eeac8249ff40512763846be367c9404c2ebded2646309bb30a28f4a"); // 59098 /** * The message start string is designed to be unlikely to occur in normal data. @@ -262,6 +262,7 @@ class CMainParams : public CChainParams { ( 35993, uint256S("0x000000d3ea06a03deccce15641c113ce59bc9ed662d878eb1d971fb0478df9cc")) // 2019-Feb-03 ( 46096, uint256S("0x000000a402d9343d7b70df237cfedadefbd002d18f95ce775d33956e7f7e4141")) // 2019-Mar-19 ( 51834, uint256S("0x00001617483dacc4cb349535a9d1806c0b749801111d705362d61d7df72269d7")) // 2019-Apr-13 + ( 59098, uint256S("0x0000062c9eeac8249ff40512763846be367c9404c2ebded2646309bb30a28f4a")) // 2019-May-15 }; chainTxData = ChainTxData{ diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h index 14e14f3e486c6..ce0177515e80d 100644 --- a/src/chainparamsseeds.h +++ b/src/chainparamsseeds.h @@ -16,8 +16,8 @@ static SeedSpec6 pnSeed6_main[] = { {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xac,0xf8,0x7f}, 41319}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xae,0xcb,0x61}, 41319}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x9f,0x45,0xbd,0xb9}, 41319}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xd8,0xd6,0xa1}, 41319}, - {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0xc9,0xe2,0x80}, 41319} + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0xc9,0xe2,0x80}, 41319}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xa0,0x3c,0x4c}, 41319} }; static SeedSpec6 pnSeed6_test[] = { diff --git a/src/clientversion.h b/src/clientversion.h index 2000f10890058..17a1c28059cfe 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -19,7 +19,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 12 #define CLIENT_VERSION_REVISION 12 -#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 diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 2dccadeb32590..b2afb9df14abc 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -26,7 +26,7 @@ static const uint64_t GB_BYTES = 1000000000LL; /* Minimum free space (in GB) needed for data directory */ -static const uint64_t BLOCK_CHAIN_SIZE = 10; +static const uint64_t BLOCK_CHAIN_SIZE = 2; /* Minimum free space (in GB) needed for data directory when pruned; Does not include prune target */ static const uint64_t CHAIN_STATE_SIZE = 1; /* Total required space (in GB) depending on user choice (prune, not prune) */