diff --git a/configure.ac b/configure.ac index 99bfb4381d095..1400ce709fe6f 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 12) -define(_CLIENT_VERSION_REVISION, 12) -define(_CLIENT_VERSION_BUILD, 1) +define(_CLIENT_VERSION_REVISION, 13) +define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2019) define(_COPYRIGHT_HOLDERS,[The %s developers]) diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt index fa37bb97ba14a..21fdf17ef2f16 100644 --- a/contrib/seeds/nodes_main.txt +++ b/contrib/seeds/nodes_main.txt @@ -1,3 +1,4 @@ +45.124.64.164:41319 85.214.65.60:41319 91.200.100.209:41319 95.216.143.13:41319 @@ -5,6 +6,7 @@ 104.206.241.183:41319 107.172.248.127:41319 107.174.203.97:41319 +145.239.184.91:41319 159.69.189.185:41319 195.201.226.128:41319 -217.160.60.76:41319 \ No newline at end of file +217.160.60.76:41319 diff --git a/contrib/seeds/nodes_test.txt b/contrib/seeds/nodes_test.txt index 4770b870e18ea..fbd2dc4f996d3 100644 --- a/contrib/seeds/nodes_test.txt +++ b/contrib/seeds/nodes_test.txt @@ -1,3 +1,4 @@ 85.214.65.60:41419 95.216.143.13:41419 +107.174.203.97:41419 195.201.226.128:41419 diff --git a/doc/Doxyfile b/doc/Doxyfile index b49180732152f..5481565aff911 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.1 +PROJECT_NUMBER = 0.12.13.0 # 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/README.md b/doc/README.md index d0de5ae3e4bad..c4e175021aaf9 100644 --- a/doc/README.md +++ b/doc/README.md @@ -16,16 +16,16 @@ Unpack the files into a directory and run: ### Windows -Unpack the files into a directory, and then run dms-qt.exe. +Run "dmscore-...-setup.exe" or unpack the ZIP file into a directory, and then run dms-qt.exe. ### macOS (formerly OS X) -Drag DMS-Qt to your applications folder, and then run DMS-Qt. +Open the .dmg file and drag DMS-Qt to your applications folder, and then run DMS-Qt. ### Need Help? * See the [Supportpages](https://dms.cash/support/) for help and more information -* DMS is forked from Dash, see [Dash documentation](https://dashpay.atlassian.net/wiki/display/DOC) +* DMS is forked from Dash, see [Dash documentation](https://docs.dash.org/en/stable/) Building --------------------- diff --git a/doc/bitcoin_logo_doxygen.png b/doc/bitcoin_logo_doxygen.png index cdc49a160ce1e..70a02dd787921 100644 Binary files a/doc/bitcoin_logo_doxygen.png and b/doc/bitcoin_logo_doxygen.png differ diff --git a/doc/release-notes/dms/release-notes-0.12.13.0.md b/doc/release-notes/dms/release-notes-0.12.13.0.md new file mode 100644 index 0000000000000..7bf81c6e171c2 --- /dev/null +++ b/doc/release-notes/dms/release-notes-0.12.13.0.md @@ -0,0 +1,21 @@ +DMS Core version 0.12.13.0 "Erin", 16 Aug 2019 +====================================== + +Release is available from: + + + +## Notable changes + +* macOS Wallet +* GUI design, new logo and icons +* Weak mining +* BIP65 start block 84100 +* BIP66 start block 84000 +* bitcoin#9049 +* bitcoin#14697 +* Public testnet + +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 1447f2e1e7bbc..6a935ce33ddba 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("0x0000062c9eeac8249ff40512763846be367c9404c2ebded2646309bb30a28f4a"); // 59098 + consensus.defaultAssumeValid = uint256S("0x00000295f0e654ec4c7ec2e4051acaca0eda31ae2ca2d7a38e56a7875cf457dd"); // 79403 /** * The message start string is designed to be unlikely to occur in normal data. diff --git a/src/chainparamsseeds.h b/src/chainparamsseeds.h index ce0177515e80d..c0b2adc1112a1 100644 --- a/src/chainparamsseeds.h +++ b/src/chainparamsseeds.h @@ -8,6 +8,7 @@ * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly. */ static SeedSpec6 pnSeed6_main[] = { + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x2d,0x7c,0x40,0xa4}, 41319}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd6,0x41,0x3c}, 41319}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5b,0xc8,0x64,0xd1}, 41319}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd8,0x8f,0x0d}, 41319}, @@ -15,6 +16,7 @@ static SeedSpec6 pnSeed6_main[] = { {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x68,0xce,0xf1,0xb7}, 41319}, {{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,0x91,0xef,0xb8,0x5b}, 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,0xc3,0xc9,0xe2,0x80}, 41319}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xd9,0xa0,0x3c,0x4c}, 41319} @@ -23,6 +25,7 @@ static SeedSpec6 pnSeed6_main[] = { static SeedSpec6 pnSeed6_test[] = { {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x55,0xd6,0x41,0x3c}, 41419}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x5f,0xd8,0x8f,0x0d}, 41419}, + {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x6b,0xae,0xcb,0x61}, 41419}, {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xc3,0xc9,0xe2,0x80}, 41419} }; #endif // DMS_CHAINPARAMSSEEDS_H diff --git a/src/clientversion.h b/src/clientversion.h index 17a1c28059cfe..9fbea8920072b 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,8 +18,8 @@ //! These need to be macros, as clientversion.cpp's and dms*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 12 -#define CLIENT_VERSION_REVISION 12 -#define CLIENT_VERSION_BUILD 1 +#define CLIENT_VERSION_REVISION 13 +#define CLIENT_VERSION_BUILD 0 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true @@ -32,8 +32,8 @@ #endif //HAVE_CONFIG_H -// Release code names: Alice 0.12.9, Bob 0.12.10, Carol 0.12.11, Dave 0.12.12 -#define RELEASE_CODE_NAME "Dave" +// Release code names: Alice 0.12.9, Bob 0.12.10, Carol 0.12.11, Dave 0.12.12, Erin 0.12.13 +#define RELEASE_CODE_NAME "Erin" /** * Converts the parameter X to a string after macro replacement on X has been performed. diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index b81dae9b3d2fe..c3aeb4a1e0dfb 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -108,9 +108,6 @@ WalletView::WalletView(const PlatformStyle *_platformStyle, QWidget *parent): // Pass through messages from transactionView connect(transactionView, SIGNAL(message(QString,QString,unsigned int)), this, SIGNAL(message(QString,QString,unsigned int))); - - // Pass through messages from documentsPage - connect(documentsPage, SIGNAL(message(QString,QString,unsigned int)), this, SIGNAL(message(QString,QString,unsigned int))); } WalletView::~WalletView()