diff --git a/INSTALL.md b/INSTALL.md index d9000e2184d70..9839be076bfab 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -3,3 +3,5 @@ Building DMS See doc/build-*.md for instructions on building the various elements of the DMS Core reference implementation of the Documentchain. + +Wallet setup https://dms.cash/support/guides/wallet.html diff --git a/README.md b/README.md index fc8ea89bca76a..13943f03068a4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -DMS Core staging tree 0.12 +DMS Core - Documentchain project ===================== https://dms.cash @@ -13,6 +13,13 @@ document revision. DMS is the project-own coin used to pay the storage fees. DMS is an experimental digital currency forked from Dash 0.12.3.2 DMS Core is the name of the open source software which enables the use of this currency. +Help and Support +--------------------- +* Wallet installation https://dms.cash/support/guides/wallet.html +* User interface https://dms.cash/support/wallet/ +* Document revision https://dms.cash/support/guides/dms.html +* Masternode setup https://dms.cash/support/guides/masternode.html + License --------------------- diff --git a/configure.ac b/configure.ac index c6e33ba2c05d8..d86c25647c029 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ 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, 11) +define(_CLIENT_VERSION_REVISION, 12) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2019) diff --git a/doc/Doxyfile b/doc/Doxyfile index a89849a9e8707..ae557fd951a96 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.11.0 +PROJECT_NUMBER = 0.12.12.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 8f37b20cd6b90..d0de5ae3e4bad 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,4 +1,4 @@ -DMS Core 0.12.9 +DMS Core ===================== This is the official reference wallet for DMS digital currency and comprises the backbone of the Documentchain peer-to-peer network. You can [download DMS Core](https://github.com/Krekeler/documentchain/releases) or [build it yourself](#building) using the guides below. @@ -24,8 +24,8 @@ Drag DMS-Qt to your applications folder, and then run DMS-Qt. ### Need Help? -* See the [Dash documentation](https://dashpay.atlassian.net/wiki/display/DOC) -for help and more information. DMS is forked from Dash 0.12.3 +* 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) Building --------------------- diff --git a/doc/README_windows.txt b/doc/README_windows.txt index f081870b41fb6..3f4596b9c956d 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -18,6 +18,4 @@ However, it downloads and stores the entire history of DMS transactions; depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. -See the dash wiki at: - https://dashpay.atlassian.net/wiki/ -for more help and information. DMS is forked from Dash 0.12.3 +See the Wallet support page at: https://dms.cash/support/wallet/ diff --git a/doc/files.md b/doc/files.md index 0da58a93119c8..4bb91cae3b866 100644 --- a/doc/files.md +++ b/doc/files.md @@ -2,35 +2,23 @@ * banlist.dat: stores the IPs/Subnets of banned nodes * dms.conf: contains configuration settings for dmsd or dms-qt * dmsd.pid: stores the process id of dmsd while running -* blocks/blk000??.dat: block data (custom, 128 MiB per file); since 0.8.0 -* blocks/rev000??.dat; block undo data (custom); since 0.8.0 (format changed since pre-0.8) -* blocks/index/*; block index (LevelDB); since 0.8.0 -* chainstate/*; block chain state database (LevelDB); since 0.8.0 -* database/*: BDB database environment; only used for wallet since 0.8.0 +* blocks/blk000??.dat: block data (custom, 128 MiB per file) +* blocks/rev000??.dat; block undo data (custom) +* blocks/index/*; block index (LevelDB) +* chainstate/*; block chain state database (LevelDB) +* database/*: BDB database environment +* documents/*: Document files of the integrated document revision; since 0.12.12 +* documents/desc/*.desc: Document description files; since 0.12.12 * db.log: wallet database log file * debug.log: contains debug information and general logging generated by dmsd or dms-qt -* fee_estimates.dat: stores statistics used to estimate minimum transaction fees and priorities required for confirmation; since 0.10.0 -* mempool.dat: dump of the mempool's transactions; since 0.14.0. +* fee_estimates.dat: stores statistics used to estimate minimum transaction fees and priorities required for confirmation +* mempool.dat: dump of the mempool's transactions * governance.dat: stores data for governance obgects * masternode.conf: contains configuration settings for remote masternodes * mncache.dat: stores data for masternode list * mnpayments.dat: stores data for masternode payments * netfulfilled.dat: stores data about recently made network requests -* peers.dat: peer IP address database (custom format); since 0.7.0 +* peers.dat: peer IP address database (custom format) * wallet.dat: personal wallet (BDB) with keys and transactions -* .cookie: session RPC authentication cookie (written at start when cookie authentication is used, deleted on shutdown): since 0.12.0 -* onion_private_key: cached Tor hidden service private key for `-listenonion`: since 0.12.0 - -Only used in pre-0.8.0 ---------------------- -* blktree/*; block chain index (LevelDB); since pre-0.8, replaced by blocks/index/* in 0.8.0 -* coins/*; unspent transaction output database (LevelDB); since pre-0.8, replaced by chainstate/* in 0.8.0 - -Only used before 0.8.0 ---------------------- -* blkindex.dat: block chain index database (BDB); replaced by {chainstate/*,blocks/index/*,blocks/rev000??.dat} in 0.8.0 -* blk000?.dat: block data (custom, 2 GiB per file); replaced by blocks/blk000??.dat in 0.8.0 - -Only used before 0.7.0 ---------------------- -* addr.dat: peer IP address database (BDB); replaced by peers.dat in 0.7.0 +* .cookie: session RPC authentication cookie (written at start when cookie authentication is used, deleted on shutdown) +* onion_private_key: cached Tor hidden service private key for `-listenonion` diff --git a/doc/release-notes/dms/release-notes-0.12.12.0.md b/doc/release-notes/dms/release-notes-0.12.12.0.md new file mode 100644 index 0000000000000..21b9c78d0a3e6 --- /dev/null +++ b/doc/release-notes/dms/release-notes-0.12.12.0.md @@ -0,0 +1,17 @@ +DMS Core version 0.12.12.0 +====================================== + +Release is available from: + + + +## Notable changes + +* Document revision within the wallet +* Mining menu item and status icon +* Main menu has been cleaned up +* RPC commands and settings for document management systems + +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 985a0463628f6..28a1f1cc56839 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin Core developers // Copyright (c) 2014-2017 The Dash Core developers -// Copyright (c) 2018 The Documentchain developers +// Copyright (c) 2018-2019 The Documentchain developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -246,27 +246,29 @@ class CMainParams : public CChainParams { fAllowMultiplePorts = false; nPoolMaxTransactions = 3; - nFulfilledRequestExpireTime = 60*60; // fulfilled requests expire in 1 hour + nFulfilledRequestExpireTime = 25*60; // fulfilled requests expire in 1 hour TODO: set to 60*60 as soon as we have more masternodes strSporkAddress = "D6JKVPFgRhYHPDvuQ1ocwDBsk2bDrx8CXo"; // TODO https://github.com/dashpay/dash/commit/611879aa6d973ab995088647d701a4747d0716d3#diff-64cbe1ad5465e13bc59ee8bb6f3de2e7 checkpointData = (CCheckpointData) { boost::assign::map_list_of - ( 0, uint256S("0x00000af4a21d6e8daa4026a5eafc7132089a7dbb9d3921b12c4fa39b78c9a010")) - ( 133, uint256S("0x00003c1aa0d920b6a665b71fb8ebde8dff0426ed02483a1f3165a1b9533f339f")) - ( 1444, uint256S("0x000052ddaadcb557173492fc2b0a381d63917532b6c933b7145410d491ba5167")) - ( 4600, uint256S("0x00003e6d58a4974170d74f8ccb55aca3afeca21fc6a25789c64a88ac3b44c239")) - ( 8410, uint256S("0x000000dcc96e66827c73c603c96683bb53d536e878fa282ef3e1a30ee42c4121")) - ( 15000, uint256S("0x0000024a04c4ac9eb28385fa0a18b6911b7ee22c64c3af476cd72bcf27fa136f")) - ( 20013, uint256S("0x000000465d652bda5d5746ec620b0926de583a622011b61404af02fd07176236")) - ( 26990, uint256S("0x00000ac7439f65441970eed887d5bad2ecf6a1bbde4f39a4a21f50aaa648d049")) + ( 0, uint256S("0x00000af4a21d6e8daa4026a5eafc7132089a7dbb9d3921b12c4fa39b78c9a010")) // 2018-Aug-26 + ( 133, uint256S("0x00003c1aa0d920b6a665b71fb8ebde8dff0426ed02483a1f3165a1b9533f339f")) // 2018-Aug-27 + ( 4600, uint256S("0x00003e6d58a4974170d74f8ccb55aca3afeca21fc6a25789c64a88ac3b44c239")) // 2018-Sep-14 + ( 8410, uint256S("0x000000dcc96e66827c73c603c96683bb53d536e878fa282ef3e1a30ee42c4121")) // 2018-Oct-01 + ( 15000, uint256S("0x0000024a04c4ac9eb28385fa0a18b6911b7ee22c64c3af476cd72bcf27fa136f")) // 2018-Oct-31 + ( 20013, uint256S("0x000000465d652bda5d5746ec620b0926de583a622011b61404af02fd07176236")) // 2018-Nov-24 + ( 26990, uint256S("0x00000ac7439f65441970eed887d5bad2ecf6a1bbde4f39a4a21f50aaa648d049")) // 2018-Dec-25 + ( 35993, uint256S("0x000000d3ea06a03deccce15641c113ce59bc9ed662d878eb1d971fb0478df9cc")) // 2019-Feb-03 + ( 46096, uint256S("0x000000a402d9343d7b70df237cfedadefbd002d18f95ce775d33956e7f7e4141")) // 2019-Mar-19 + ( 51834, uint256S("0x00001617483dacc4cb349535a9d1806c0b749801111d705362d61d7df72269d7")) // 2019-Apr-13 }; chainTxData = ChainTxData{ 1535270400, // * UNIX timestamp of last known number of transactions 0, // * total number of transactions between genesis and that timestamp // (the tx=... number in the SetBestChain debug.log lines) - 500 // 0.1 TODO // * estimated number of transactions per second after that timestamp https://github.com/dashpay/dash/commit/658479355e298307e7d087893c4fd545ab61a0cc#diff-64cbe1ad5465e13bc59ee8bb6f3de2e7 + 0.1 // * estimated number of transactions per second after that timestamp https://github.com/dashpay/dash/commit/658479355e298307e7d087893c4fd545ab61a0cc#diff-64cbe1ad5465e13bc59ee8bb6f3de2e7 }; } }; diff --git a/src/clientversion.h b/src/clientversion.h index e5fa4ddf4a56c..2000f10890058 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,7 +18,7 @@ //! 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 11 +#define CLIENT_VERSION_REVISION 12 #define CLIENT_VERSION_BUILD 0 //! Set to true for release, false for prerelease or test build @@ -32,8 +32,8 @@ #endif //HAVE_CONFIG_H -// Release code names: Alice 0.12.9, Bob 0.12.10, Carol 0.12.11 -#define RELEASE_CODE_NAME "Carol" +// Release code names: Alice 0.12.9, Bob 0.12.10, Carol 0.12.11, Dave 0.12.12 +#define RELEASE_CODE_NAME "Dave" /** * Converts the parameter X to a string after macro replacement on X has been performed. diff --git a/src/qt/documentlist.cpp b/src/qt/documentlist.cpp index 8a0a748b2fee4..a4b3fb607b58d 100644 --- a/src/qt/documentlist.cpp +++ b/src/qt/documentlist.cpp @@ -240,7 +240,7 @@ QString Document::documentRevision() } catch (const std::exception& e) { return revError + "

" + QString::fromStdString(e.what()) + "

"; } catch (...) { - return revError + "

" + tr("Unknown Error.") + "

"; + return revError + "

" + tr("Unknown error.") + "

"; } } @@ -384,7 +384,7 @@ QString Document::writeToBlockchain() QMessageBox::critical(NULL, tr("RPC Error"), QString::fromStdString(e.what())); return ""; } catch (...) { - QMessageBox::critical(NULL, tr("RPC Error"), tr("Unknown Error.")); + QMessageBox::critical(NULL, tr("RPC Error"), tr("Unknown error.")); return ""; } }