Merge pull request #3330 from UdjinM6/bp20200211

Backport "candidates", update release notes
This commit is contained in:
UdjinM6 2020-02-12 16:42:12 +03:00 committed by GitHub
commit e1a2337d1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 1 deletions

View File

@ -160,6 +160,7 @@ There are a few changes in existing RPC interfaces in this release:
- individual Dash-specific fields which were used to display soft-fork progress in `getblockchaininfo` are replaced - individual Dash-specific fields which were used to display soft-fork progress in `getblockchaininfo` are replaced
with the backported `statistics` object with the backported `statistics` object
- `privatesend_balance` field is shown in all related RPC results regardless of the Lite Mode or PrivateSend state - `privatesend_balance` field is shown in all related RPC results regardless of the Lite Mode or PrivateSend state
- added `pubKeyOperator` field for each masternode in `quorum info` RPC response
There are also new RPC commands: There are also new RPC commands:
- `getbestchainlock` - `getbestchainlock`
@ -232,6 +233,9 @@ modules were reorganized in separate folders to make navigation through code a b
See detailed [set of changes](https://github.com/dashpay/dash/compare/v0.14.0.5...dashpay:v0.15.0.0). See detailed [set of changes](https://github.com/dashpay/dash/compare/v0.14.0.5...dashpay:v0.15.0.0).
- [`15c6df583`](https://github.com/dashpay/dash/commit/15c6df583) Bring back "about" menu icon (#3329)
- [`2c30818f7`](https://github.com/dashpay/dash/commit/2c30818f7) Add pubKeyOperator to `quorum info` rpc response (#3327)
- [`2bbf78c1b`](https://github.com/dashpay/dash/commit/2bbf78c1b) Update release-notes.md
- [`2c305d02d`](https://github.com/dashpay/dash/commit/2c305d02d) Update translations 2020-02-03 (#3322) - [`2c305d02d`](https://github.com/dashpay/dash/commit/2c305d02d) Update translations 2020-02-03 (#3322)
- [`672e18e48`](https://github.com/dashpay/dash/commit/672e18e48) Only sync mempool from v0.15+ (proto 70216+) nodes (#3321) - [`672e18e48`](https://github.com/dashpay/dash/commit/672e18e48) Only sync mempool from v0.15+ (proto 70216+) nodes (#3321)
- [`829bde81e`](https://github.com/dashpay/dash/commit/829bde81e) Fix dark text on dark background in combobox dropdowns on windows (#3315) - [`829bde81e`](https://github.com/dashpay/dash/commit/829bde81e) Fix dark text on dark background in combobox dropdowns on windows (#3315)
@ -464,6 +468,7 @@ Thanks to everyone who directly contributed to this release:
- Alexander Block (codablock) - Alexander Block (codablock)
- Amir Abrams (AmirAbrams) - Amir Abrams (AmirAbrams)
- -k (charlesrocket) - -k (charlesrocket)
- Cofresi
- Nathan Marley (nmarley) - Nathan Marley (nmarley)
- PastaPastaPasta - PastaPastaPasta
- Riku (rikublock) - Riku (rikublock)
@ -497,7 +502,7 @@ Dash Core tree 0.12.1.x was a fork of Bitcoin Core tree 0.12.
These release are considered obsolete. Old release notes can be found here: These release are considered obsolete. Old release notes can be found here:
- [v0.14.0.4](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.14.0.5.md) released December/08/2019 - [v0.14.0.5](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.14.0.5.md) released December/08/2019
- [v0.14.0.4](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.14.0.4.md) released November/22/2019 - [v0.14.0.4](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.14.0.4.md) released November/22/2019
- [v0.14.0.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.14.0.3.md) released August/15/2019 - [v0.14.0.3](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.14.0.3.md) released August/15/2019
- [v0.14.0.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.14.0.2.md) released July/4/2019 - [v0.14.0.2](https://github.com/dashpay/dash/blob/master/doc/release-notes/dash/release-notes-0.14.0.2.md) released July/4/2019

View File

@ -229,6 +229,7 @@ RES_ICONS = \
qt/res/icons/tx_input.png \ qt/res/icons/tx_input.png \
qt/res/icons/tx_output.png \ qt/res/icons/tx_output.png \
qt/res/icons/tx_mined.png \ qt/res/icons/tx_mined.png \
qt/res/icons/about.png \
qt/res/icons/about_qt.png \ qt/res/icons/about_qt.png \
qt/res/icons/verify.png \ qt/res/icons/verify.png \
qt/res/icons/fontbigger.png \ qt/res/icons/fontbigger.png \

View File

@ -44,6 +44,7 @@
<file alias="filesave">res/icons/filesave.png</file> <file alias="filesave">res/icons/filesave.png</file>
<file alias="debugwindow">res/icons/debugwindow.png</file> <file alias="debugwindow">res/icons/debugwindow.png</file>
<file alias="browse">res/icons/browse.png</file> <file alias="browse">res/icons/browse.png</file>
<file alias="about">res/icons/about.png</file>
<file alias="about_qt">res/icons/about_qt.png</file> <file alias="about_qt">res/icons/about_qt.png</file>
<file alias="verify">res/icons/verify.png</file> <file alias="verify">res/icons/verify.png</file>
<file alias="hd_enabled">res/icons/hd_enabled.png</file> <file alias="hd_enabled">res/icons/hd_enabled.png</file>

View File

@ -93,6 +93,7 @@ UniValue BuildQuorumInfo(const llmq::CQuorumCPtr& quorum, bool includeMembers, b
auto& dmn = quorum->members[i]; auto& dmn = quorum->members[i];
UniValue mo(UniValue::VOBJ); UniValue mo(UniValue::VOBJ);
mo.push_back(Pair("proTxHash", dmn->proTxHash.ToString())); mo.push_back(Pair("proTxHash", dmn->proTxHash.ToString()));
mo.push_back(Pair("pubKeyOperator", dmn->pdmnState->pubKeyOperator.Get().ToString()));
mo.push_back(Pair("valid", quorum->qc.validMembers[i])); mo.push_back(Pair("valid", quorum->qc.validMembers[i]));
if (quorum->qc.validMembers[i]) { if (quorum->qc.validMembers[i]) {
CBLSPublicKey pubKey = quorum->GetPubKeyShare(i); CBLSPublicKey pubKey = quorum->GetPubKeyShare(i);